@kenkaiiii/ggcoder 4.3.219 → 4.3.221

package/dist/ui/App.js

@@ -1,41 +1,26 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useState, useRef, useCallback, useEffect, useMemo } from "react";
-import { Box, Text, useStdout } from "ink";
+import { Box, useStdout } from "ink";
 import { useTerminalSize } from "./hooks/useTerminalSize.js";
+import { useChatLayoutMeasurements } from "./hooks/useChatLayoutMeasurements.js";
+import { useTaskPickerController } from "./hooks/useTaskPickerController.js";
+import { useGoalPickerController } from "./hooks/useGoalPickerController.js";
 import { useDoublePress } from "./hooks/useDoublePress.js";
 import { useTaskBarStore, useTaskBarPolling, focusTaskBar, exitTaskBar, expandTaskBar, collapseTaskBar, navigateTaskBar, killTask, } from "./stores/taskbar-store.js";
 import { playNotificationSound } from "../utils/sound.js";
-import { formatError, } from "@kenkaiiii/gg-ai";
+import {} from "@kenkaiiii/gg-ai";
 import { extractImagePaths } from "../utils/image.js";
-import { buildGoalReferenceContext, formatGoalReferencesForPrompt, } from "../core/goal-references.js";
 import { useAgentLoop } from "./hooks/useAgentLoop.js";
-import { UserMessage } from "./components/UserMessage.js";
-import { AssistantMessage } from "./components/AssistantMessage.js";
-import { ToolExecution } from "./components/ToolExecution.js";
-import { ToolUseLoader } from "./components/ToolUseLoader.js";
-import { ToolGroupExecution } from "./components/ToolGroupExecution.js";
-import { ServerToolExecution } from "./components/ServerToolExecution.js";
-import { MessageResponse } from "./components/MessageResponse.js";
-import { SubAgentPanel } from "./components/SubAgentPanel.js";
-import { CompactionSpinner, CompactionDone } from "./components/CompactionNotice.js";
+import { useTranscriptHistory } from "./hooks/useTranscriptHistory.js";
 import { createWebSearchTool } from "../tools/web-search.js";
-import { StreamingArea } from "./components/StreamingArea.js";
-import { ActivityIndicator } from "./components/ActivityIndicator.js";
-import { InputArea } from "./components/InputArea.js";
-import { Footer, doesFooterFitOnOneLine } from "./components/Footer.js";
-import { GoalStatusBar, reconcileGoalStatusEntriesWithRuns, removeGoalStatusEntry, syncGoalStatusEntries, } from "./components/GoalStatusBar.js";
-import { Banner } from "./components/Banner.js";
-import { PlanOverlay } from "./components/PlanOverlay.js";
-import { ModelSelector } from "./components/ModelSelector.js";
-import { PixelOverlay } from "./components/PixelOverlay.js";
-import { SkillsOverlay } from "./components/SkillsOverlay.js";
-import { ThemeSelector } from "./components/ThemeSelector.js";
-import { BackgroundTasksBar, getFooterStatusLayoutDecision, } from "./components/BackgroundTasksBar.js";
+import { ChatScreen } from "./components/ChatScreen.js";
+import { FullScreenOverlayRouter } from "./components/FullScreenOverlayRouter.js";
+import { SessionSummaryDisplay } from "./components/SessionSummary.js";
+import { reconcileGoalStatusEntriesWithRuns, removeGoalStatusEntry, syncGoalStatusEntries, } from "./components/GoalStatusBar.js";
 import { useTheme, useSetTheme } from "./theme/theme.js";
 import { useTerminalTitle } from "./hooks/useTerminalTitle.js";
 import { getGitBranch } from "../utils/git.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";
@@ -48,65 +33,40 @@ import { PROMPT_COMMANDS, getPromptCommand } from "../core/prompt-commands.js";
 import { isFirstTimeSetup, markSetupAudited, getAnnouncedLanguages, markLanguagesAnnounced, } from "../core/setup-history.js";
 import { loadCustomCommands } from "../core/custom-commands.js";
 import { buildSystemPrompt } from "../system-prompt.js";
-import { detectLanguages, LANGUAGE_DISPLAY_NAMES, } from "../core/language-detector.js";
+import { detectLanguages } from "../core/language-detector.js";
 import { detectVerifyCommands } from "../core/verify-commands.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, loadGoalRunsSync, reconcileActiveGoalRuns, saveGoalRunsSync, updateGoalTask, upsertGoalRun, } from "../core/goal-store.js";
-import { getNextPendingTask, loadTasksSync, markTaskInProgress, saveTasksSync, } from "../core/tasks-store.js";
+import { appendGoalDecision, appendGoalEvidence, formatGoalBlockingPrerequisites, goalHasBlockingPrerequisites, loadGoalRuns, reconcileActiveGoalRuns, updateGoalTask, upsertGoalRun, } from "../core/goal-store.js";
+import { getNextPendingTask, markTaskInProgress } from "../core/tasks-store.js";
 import { canCompleteGoalRun, decideGoalNextAction } from "../core/goal-controller.js";
 import { runGoalPrerequisiteChecks } from "../core/goal-prerequisites.js";
 import { runGoalVerifierCommand } from "../core/goal-verifier.js";
+import { checkGoalWorktreeIntegration, isGoalWorktreeDirtyError } from "../core/goal-worktree.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 { buildUserContentWithAttachments } from "./prompt-routing.js";
+import { submitPromptCommand } from "./submit-prompt-command.js";
+import { handleUiSlashCommand } from "./submit-slash-commands.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, getGoalSetupPaneTransitionAfterRun, isAgentSpacingItem, MIN_LIVE_AREA_ROWS, nextGoalModeAfterAgentDone, shouldTopSpaceAfterPrintedAgentBoundary, shouldTopSpaceAssistantAfterToolBoundary, shouldTopSpaceStreamingAssistant, } from "./layout-decisions.js";
+import { appendGoalProgressDraft, completedItemsWithDurableGoalTerminalProgress, formatGoalTerminalProgress, formatGoalWorkerFinishedTitle, getGoalContinuationChoiceKey, goalTerminalProgressId, routeGoalSyntheticEvent, summarizeGoalCompletion, } from "./goal-progress.js";
+import { getDoneFlushDecision, nextGoalModeAfterAgentDone, shouldTopSpaceAfterPrintedAgentBoundary, shouldTopSpaceStreamingAssistant, } from "./layout-decisions.js";
+import { isTranscriptSpacingItem } from "./transcript/spacing.js";
+import { renderTranscriptItem } from "./transcript/TranscriptRenderer.js";
+import { formatDuration } from "./duration-format.js";
+import { pickDurationVerb } from "./duration-summary.js";
+import { toErrorItem } from "./error-item.js";
+import { addLinesChanged, buildSessionSummary, createSessionStats, recordServerToolCall, recordToolEnd, recordTurnEnd, } from "./session-summary.js";
+import { buildGoalDirtyWorktreePauseRun, buildGoalDirtyWorktreeUserPrompt, buildGoalTaskPromptWithReferences, buildGoalUserPauseRun, goalDirtyWorktreeInfoText, goalRunNeedsExplicitContinuationAfterWorker, goalTaskProgress, shouldKeepGoalRunTrackedAfterDecision, shouldRunGoalTaskInMainCheckout, } from "./goal-run-helpers.js";
 import { compactHistory, getNextGeneratedItemId, isActiveItem, isSameAssistantText, normalizeAssistantText, partitionCompleted, pinStreamingTextBeforeToolBoundary, removeItemsWithIds, uniqueItemsById, } 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";
-/**
- * Build an ErrorItem from any thrown value. Centralises headline / message /
- * guidance extraction so every error answers the same question for the user:
- *   "Should I retry, or is this a ggcoder bug to report?"
- */
-function toErrorItem(err, id, contextPrefix) {
-    const f = formatError(err);
-    const headline = contextPrefix ? `${contextPrefix} — ${f.headline}` : f.headline;
-    // For ggcoder bugs, swap the generic "see /help" guidance for an actual URL
-    // so users have a clear place to send the report.
-    const guidance = f.source === "ggcoder"
-        ? `This looks like a ggcoder bug — please send it to the dev at ${GGCODER_BUG_REPORT_URL}.`
-        : f.guidance;
-    // Mirror every user-visible error into ~/.gg/debug.log so reports can be
-    // diagnosed even after the terminal scrollback is gone.
-    log("ERROR", "ui-error", headline, {
-        source: f.source,
-        message: f.message,
-        ...(f.provider ? { provider: f.provider } : {}),
-        ...(f.statusCode != null ? { statusCode: String(f.statusCode) } : {}),
-        ...(f.requestId ? { requestId: f.requestId } : {}),
-        ...(err instanceof Error && err.stack ? { stack: err.stack } : {}),
-    });
-    return {
-        kind: "error",
-        headline,
-        message: f.message,
-        guidance,
-        id,
-    };
-}
+export { buildGoalDirtyWorktreePauseRun, buildGoalDirtyWorktreeUserPrompt, buildGoalUserPauseRun, goalDirtyWorktreeInfoText, goalRunNeedsExplicitContinuationAfterWorker, shouldKeepGoalRunTrackedAfterDecision, shouldRunGoalTaskInMainCheckout, } from "./goal-run-helpers.js";
 /** Tools that get aggregated into a single compact group when possible. */
 const AGGREGATABLE_TOOLS = new Set([
     "read",
@@ -118,114 +78,6 @@ const AGGREGATABLE_TOOLS = new Set([
     "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;
-}
-function goalProgressLoaderStatus(item) {
-    if (item.status === "failed" || item.status === "fail" || item.status === "blocked") {
-        return "error";
-    }
-    if (item.phase === "worker_finished" ||
-        item.phase === "verifier_finished" ||
-        item.phase === "terminal") {
-        return "done";
-    }
-    return "running";
-}
-function goalProgressColor(item, theme) {
-    const isError = item.status === "failed" || item.status === "fail" || item.status === "blocked";
-    if (isError)
-        return theme.error;
-    if (item.phase === "worker_finished" || item.phase === "terminal")
-        return theme.success;
-    if (item.phase === "verifier_finished" || item.phase === "verifier_started")
-        return theme.accent;
-    if (item.phase === "orchestrator_reviewing" || item.phase === "orchestrator_working") {
-        return theme.secondary;
-    }
-    if (item.phase === "continuing")
-        return theme.warning;
-    return theme.primary;
-}
-// ── Duration summary ─────────────────────────────────────
-function formatDuration(ms) {
-    const totalSec = Math.round(ms / 1000);
-    if (totalSec < 60)
-        return `${totalSec}s`;
-    const min = Math.floor(totalSec / 60);
-    const sec = totalSec % 60;
-    return sec > 0 ? `${min}m ${sec}s` : `${min}m`;
-}
-function pickDurationVerb(toolsUsed) {
-    const has = (name) => toolsUsed.includes(name);
-    const hasAny = (...names) => names.some(has);
-    const writing = has("edit") || has("write");
-    const reading = has("read") || has("grep") || has("find") || has("ls");
-    // Multi-tool combos (most specific first)
-    if (has("subagent") && writing)
-        return "Orchestrated changes for";
-    if (has("subagent"))
-        return "Delegated work for";
-    if (has("web-fetch") && writing)
-        return "Researched & coded for";
-    if (has("web-fetch") && reading)
-        return "Researched for";
-    if (has("web-fetch"))
-        return "Fetched the web for";
-    if (has("bash") && writing)
-        return "Built & ran for";
-    if (has("edit") && has("write"))
-        return "Crafted code for";
-    if (has("edit") && has("bash"))
-        return "Refactored & tested for";
-    if (has("edit") && reading)
-        return "Refactored for";
-    if (has("edit"))
-        return "Refactored for";
-    if (has("write") && has("bash"))
-        return "Wrote & ran for";
-    if (has("write") && reading)
-        return "Wrote code for";
-    if (has("write"))
-        return "Wrote code for";
-    if (has("bash") && has("grep"))
-        return "Hacked away for";
-    if (has("bash") && reading)
-        return "Ran & investigated for";
-    if (has("bash"))
-        return "Executed commands for";
-    if (hasAny("task-output", "task-stop"))
-        return "Managed background processes for";
-    if (has("grep") && has("read"))
-        return "Investigated for";
-    if (has("grep") && has("find"))
-        return "Scoured the codebase for";
-    if (has("grep"))
-        return "Searched for";
-    if (has("read") && has("find"))
-        return "Explored for";
-    if (has("read"))
-        return "Studied the code for";
-    if (has("find") || has("ls"))
-        return "Browsed files for";
-    // No tools used — pure text response
-    const phrases = [
-        "Pondered for",
-        "Thought for",
-        "Reasoned for",
-        "Mulled it over for",
-        "Noodled on it for",
-        "Brewed up a response in",
-        "Cooked up an answer in",
-        "Worked out a reply in",
-        "Channeled wisdom for",
-        "Conjured a response in",
-    ];
-    return phrases[Math.floor(Math.random() * phrases.length)];
-}
 // ── App Component ──────────────────────────────────────────
 export function App(props) {
     const theme = useTheme();
@@ -235,7 +87,9 @@ export function App(props) {
     // Hoisted before terminal title hook so it can reference them
     const [lastUserMessage, setLastUserMessage] = useState("");
     const [exitPending, setExitPending] = useState(false);
+    const [quittingSummary, setQuittingSummary] = useState(null);
     const [goalMode, setGoalMode] = useState(props.sessionStore?.goalMode ?? props.goalModeRef?.current ?? "off");
+    const [planMode, setPlanMode] = useState(props.sessionStore?.planMode ?? props.planModeRef?.current ?? false);
     // Terminal title — updated later after agentLoop is created
     // (hoisted here so the hook is always called in the same order)
     const [titleRunning, setTitleRunning] = useState(false);
@@ -279,10 +133,6 @@ export function App(props) {
     const goalContinuationRecentChoicesRef = useRef(new Map());
     const startGoalRunRef = useRef(() => { });
     const [runAllTasks, setRunAllTasks] = useState(props.sessionStore?.runAllTasks ?? false);
-    const [taskPickerOpen, setTaskPickerOpen] = useState(false);
-    const [taskPickerTasks, setTaskPickerTasks] = useState(() => loadTasksSync(props.cwd));
-    const [goalPickerOpen, setGoalPickerOpen] = useState(false);
-    const [goalPickerGoals, setGoalPickerGoals] = useState(() => loadGoalRunsSync(props.cwd));
     const runAllTasksRef = useRef(props.sessionStore?.runAllTasks ?? false);
     const startTaskRef = useRef(() => { });
     const runAllPixelRef = useRef(props.sessionStore?.runAllPixel ?? false);
@@ -290,6 +140,11 @@ export function App(props) {
     const startPixelFixRef = useRef(() => { });
     const cwdRef = useRef(props.cwd);
     const [displayedCwd, setDisplayedCwd] = useState(props.cwd);
+    const taskPicker = useTaskPickerController({
+        displayedCwd,
+        onStartTask: (title, prompt, taskId) => startTaskRef.current(title, prompt, taskId),
+        onRunAllTasksChange: setRunAllTasks,
+    });
     const [doneStatus, setDoneStatus] = useState(props.sessionStore?.doneStatus ?? null);
     // Suppress "done" status when a plan overlay is about to open
     const planOverlayPendingRef = useRef(false);
@@ -302,12 +157,6 @@ export function App(props) {
     const [thinkingLevel, setThinkingLevel] = useState(props.thinking);
     const [renderMarkdown, setRenderMarkdown] = useState(true);
     const messagesRef = useRef(props.sessionStore?.messages ?? props.messages);
-    const repoMapInjectionEnabledRef = useRef(true);
-    const repoMapDirtyRef = useRef(true);
-    const repoMapMarkdownRef = useRef("");
-    const repoMapSnapshotRef = useRef(undefined);
-    const repoMapChangedCountRef = useRef(0);
-    const repoMapCacheRef = useRef(createRepoMapCache());
     const [planAutoExpand, setPlanAutoExpand] = useState(props.sessionStore?.planAutoExpand ?? false);
     const [goalAutoExpand, setGoalAutoExpand] = useState(props.sessionStore?.goalAutoExpand ?? false);
     const goalAutoExpandRef = useRef(props.sessionStore?.goalAutoExpand ?? false);
@@ -315,6 +164,7 @@ export function App(props) {
     const planStepsRef = useRef(props.sessionStore?.planSteps ?? []);
     const [planSteps, setPlanSteps] = useState(props.sessionStore?.planSteps ?? []);
     const goalModeStateRef = useRef(goalMode);
+    const planModeStateRef = useRef(planMode);
     // Stuck-guard for the plan-continuation follow-up nudge. Tracks how many
     // times we've nudged the agent to continue the same step. Reset whenever a
     // new [DONE:n] marker advances progress (see onTurnText). Caps at 2 nudges
@@ -333,6 +183,8 @@ export function App(props) {
     const sessionManagerRef = useRef(props.sessionsDir ? new SessionManager(props.sessionsDir) : null);
     const sessionPathRef = useRef(props.sessionStore?.sessionPath ?? props.sessionPath);
     const persistedIndexRef = useRef(messagesRef.current.length);
+    const sessionStatsRef = useRef(props.sessionStore?.sessionStats ??
+        createSessionStats({ sessionId: props.sessionStore?.sessionId ?? props.sessionId }));
     /** Last actual API-reported input token count (from turn_end). */
     const lastActualTokensRef = useRef(0);
     /** Timestamp (ms) when lastActualTokensRef was last updated by turn_end. */
@@ -384,58 +236,24 @@ export function App(props) {
         });
     }, [props.sessionStore]);
     const sessionStore = props.sessionStore;
-    const terminalHistoryContextRef = useRef({
-        theme,
-        columns,
-        version: props.version,
-        model: currentModel,
-        provider: currentProvider,
-        cwd: displayedCwd,
-    });
-    useEffect(() => {
-        terminalHistoryContextRef.current = {
+    const { pendingHistoryFlushRef, streamedAssistantFlushRef, queueFlush, finalizeSubmittedUserItem, clearPendingHistory, } = useTranscriptHistory({
+        terminalHistoryPrinter: props.terminalHistoryPrinter,
+        terminalHistoryContext: {
             theme,
             columns,
             version: props.version,
             model: currentModel,
             provider: currentProvider,
             cwd: displayedCwd,
-        };
-    }, [theme, columns, props.version, currentModel, currentProvider, displayedCwd]);
-    const printHistoryItems = useCallback((items, options) => {
-        if (!props.terminalHistoryPrinter || items.length === 0)
-            return;
-        props.terminalHistoryPrinter.print(items, terminalHistoryContextRef.current, {
-            ...options,
-            write: writeStdout,
-        });
-    }, [props.terminalHistoryPrinter, writeStdout]);
-    const pendingHistoryFlushRef = useRef([]);
-    const streamedAssistantFlushRef = useRef({
-        flushedChars: 0,
-        text: "",
+        },
+        writeStdout,
+        sessionPathRef,
+        sessionManagerRef,
+        sessionStore,
+        history,
+        setHistory,
+        setLiveItems,
     });
-    const [historyFlushGeneration, setHistoryFlushGeneration] = useState(0);
-    const queueFlush = useCallback((items) => {
-        const flushed = trimFlushedItems(items);
-        if (flushed.length === 0)
-            return;
-        pendingHistoryFlushRef.current = [...pendingHistoryFlushRef.current, ...flushed];
-        if (sessionStore) {
-            const queuedIds = new Set(items.map((item) => item.id));
-            sessionStore.liveItems = removeItemsWithIds(uniqueItemsById(sessionStore.liveItems ?? []), queuedIds);
-        }
-        setHistoryFlushGeneration((generation) => generation + 1);
-    }, [sessionStore]);
-    const finalizeSubmittedUserItem = useCallback((item) => {
-        streamedAssistantFlushRef.current = { flushedChars: 0, text: "" };
-        setLiveItems((prev) => {
-            if (prev.length > 0)
-                queueFlush(prev);
-            queueFlush([item]);
-            return [];
-        });
-    }, [queueFlush]);
     // Mirror runtime state choices (model/provider/thinking) into renderApp's
     // closure so unmount/remount preserves them.
     const onRuntimeStateChange = props.onRuntimeStateChange;
@@ -455,28 +273,6 @@ export function App(props) {
             thinking: thinkingLevel,
         });
     }, [thinkingLevel, onRuntimeStateChange]);
-    useEffect(() => {
-        printHistoryItems(history);
-    }, [history, printHistoryItems]);
-    useEffect(() => {
-        const flushed = pendingHistoryFlushRef.current;
-        if (flushed.length === 0)
-            return;
-        pendingHistoryFlushRef.current = [];
-        printHistoryItems(flushed);
-        const flushedIds = new Set(flushed.map((item) => item.id));
-        setLiveItems((prev) => prev.filter((item) => !flushedIds.has(item.id)));
-        setHistory((prev) => {
-            const existingIds = new Set(prev.map((item) => item.id));
-            const nextItems = flushed.filter((item) => !existingIds.has(item.id));
-            if (nextItems.length === 0)
-                return prev;
-            const next = compactHistory([...prev, ...nextItems]);
-            if (sessionStore)
-                sessionStore.history = next;
-            return next;
-        });
-    }, [historyFlushGeneration, printHistoryItems, sessionStore]);
     // Mirror session state into renderApp's closure so resetUI() can re-seed
     // the conversation on remount. Each panel that previously did a bare ANSI
     // screen clear (overlay open/close, plan accept/reject, /clear)
@@ -522,6 +318,14 @@ export function App(props) {
         if (sessionStore)
             sessionStore.goalMode = goalMode;
     }, [goalMode, sessionStore]);
+    useEffect(() => {
+        if (sessionStore)
+            sessionStore.planMode = planMode;
+    }, [planMode, sessionStore]);
+    useEffect(() => {
+        if (sessionStore)
+            sessionStore.sessionStats = sessionStatsRef.current;
+    }, [sessionStore]);
     // pendingAction is consumed via a useEffect AFTER agentLoop is created
     // — see below where useAgentLoop is set up.
     const pendingActionConsumedRef = useRef(false);
@@ -593,6 +397,11 @@ export function App(props) {
             props.goalModeRef.current = goalMode;
         }
     }, [goalMode, props.goalModeRef]);
+    useEffect(() => {
+        planModeStateRef.current = planMode;
+        if (props.planModeRef)
+            props.planModeRef.current = planMode;
+    }, [planMode, props.planModeRef]);
     const setActiveGoalReferences = useCallback((references) => {
         if (props.goalReferencesRef)
             props.goalReferencesRef.current = references;
@@ -601,7 +410,7 @@ export function App(props) {
         const approvedPlanPath = options?.clearApprovedPlan
             ? undefined
             : (options?.approvedPlanPath ?? approvedPlanPathRef.current);
-        return buildSystemPrompt(options?.cwd ?? cwdRef.current, props.skills, false, approvedPlanPath, (options?.tools ?? currentToolsRef.current).map((tool) => tool.name), options?.activeLanguages ?? injectedLanguagesRef.current, options?.goalMode ?? goalModeStateRef.current);
+        return buildSystemPrompt(options?.cwd ?? cwdRef.current, props.skills, options?.planMode ?? planModeStateRef.current, approvedPlanPath, (options?.tools ?? currentToolsRef.current).map((tool) => tool.name), options?.activeLanguages ?? injectedLanguagesRef.current, options?.goalMode ?? goalModeStateRef.current);
     }, [props.skills]);
     const replaceSystemPrompt = useCallback(async (options) => {
         const newPrompt = await rebuildSystemPrompt(options);
@@ -642,6 +451,15 @@ export function App(props) {
         setGoalMode(nextMode);
         await replaceSystemPrompt({ ...options, goalMode: nextMode });
     }, [props.goalModeRef, props.sessionStore, replaceSystemPrompt]);
+    const setPlanModeAndPrompt = useCallback(async (nextMode) => {
+        planModeStateRef.current = nextMode;
+        if (props.planModeRef)
+            props.planModeRef.current = nextMode;
+        if (props.sessionStore)
+            props.sessionStore.planMode = nextMode;
+        setPlanMode(nextMode);
+        await replaceSystemPrompt({ planMode: nextMode });
+    }, [props.planModeRef, props.sessionStore, replaceSystemPrompt]);
     const clearGoalModeIfIdle = useCallback(() => {
         setTimeout(() => {
             if (goalModeStateRef.current === "off")
@@ -756,9 +574,11 @@ export function App(props) {
             messages: compactedMessages,
         });
         sessionPathRef.current = session.path;
+        sessionStatsRef.current.sessionId = session.id;
         persistedIndexRef.current = compactedMessages.length;
         if (sessionStore) {
             sessionStore.sessionPath = session.path;
+            sessionStore.sessionId = session.id;
             sessionStore.messages = [...compactedMessages];
         }
         log("INFO", "compaction", "Persisted compacted session checkpoint", { path: session.path });
@@ -773,6 +593,7 @@ export function App(props) {
         if (sessionStore) {
             sessionStore.messages = [...allMsgs];
             sessionStore.sessionPath = sp;
+            sessionStore.sessionId = sessionStatsRef.current.sessionId;
         }
     }, [appendMessagesToSession, sessionStore]);
     /**
@@ -892,103 +713,46 @@ export function App(props) {
         contextWindowOptions,
         props.authStorage,
     ]);
-    const getRepoMapSignalCount = useCallback(() => {
-        return ((props.repoMapChangedFilesRef?.current.size ?? 0) +
-            (props.repoMapReadFilesRef?.current.size ?? 0));
-    }, [props.repoMapChangedFilesRef, props.repoMapReadFilesRef]);
-    const getRepoMapBudget = useCallback(() => {
-        return getRepoMapBudgetForContext({
-            messages: messagesRef.current,
-            readFileCount: props.repoMapReadFilesRef?.current.size ?? 0,
-        });
-    }, [props.repoMapReadFilesRef]);
-    const refreshRepoMap = useCallback(async (latestUserPrompt) => {
-        const rendered = await buildRepoMap({
-            cwd: cwdRef.current,
-            maxChars: getRepoMapBudget(),
-            changedFiles: [...(props.repoMapChangedFilesRef?.current ?? new Set())],
-            readFiles: [...(props.repoMapReadFilesRef?.current ?? new Set())],
-            focusTerms: latestUserPrompt ? [latestUserPrompt] : [],
-            cache: repoMapCacheRef.current,
-        });
-        repoMapMarkdownRef.current = rendered.markdown;
-        repoMapSnapshotRef.current = rendered.snapshot;
-        repoMapChangedCountRef.current = getRepoMapSignalCount();
-        repoMapDirtyRef.current = false;
-        return rendered.markdown;
-    }, [
-        getRepoMapBudget,
-        getRepoMapSignalCount,
-        props.repoMapChangedFilesRef,
-        props.repoMapReadFilesRef,
-    ]);
-    const stripRepoMapMessages = useCallback((messages) => {
-        return stripRepoMapContextMessages(messages);
-    }, []);
-    const injectRepoMapContext = useCallback(async (messages) => {
-        if (!repoMapInjectionEnabledRef.current)
-            return stripRepoMapMessages(messages);
-        const stripped = stripRepoMapMessages(messages);
-        const latestUserPrompt = getLatestUserText(stripped);
-        const signalCount = getRepoMapSignalCount();
-        if (signalCount !== repoMapChangedCountRef.current)
-            repoMapDirtyRef.current = true;
-        if (repoMapDirtyRef.current || !repoMapMarkdownRef.current) {
-            await refreshRepoMap(latestUserPrompt);
-        }
-        if (!repoMapMarkdownRef.current)
-            return stripped;
-        return injectRepoMapContextMessages(stripped, repoMapMarkdownRef.current);
-    }, [props.repoMapChangedFilesRef, props.repoMapReadFilesRef, refreshRepoMap, stripRepoMapMessages]);
     /**
      * transformContext callback for the agent loop.
      * Called before each LLM call and on context overflow.
-     * Compacts persistent chat only, then injects the dynamic repo map transiently.
      */
     const transformContext = useCallback(async (messages, options) => {
-        const stripped = stripRepoMapMessages(messages);
         const settings = settingsRef.current;
         const autoCompact = settings?.get("autoCompact") ?? true;
         const threshold = settings?.get("compactThreshold") ?? 0.8;
         // Force-compact on context overflow regardless of settings
         if (options?.force) {
-            const result = await compactConversation(stripped);
-            if (result !== stripped) {
+            const result = await compactConversation(messages);
+            if (result !== messages) {
                 messagesRef.current = result;
                 await persistCompactedSession(result);
             }
             lastCompactionTimeRef.current = Date.now();
-            return injectRepoMapContext(result);
+            return result;
         }
         if (!autoCompact)
-            return injectRepoMapContext(stripped);
+            return messages;
         // Time-based cooldown: skip if compaction ran within the last 30 seconds
         if (Date.now() - lastCompactionTimeRef.current < 30_000) {
             log("INFO", "compaction", `Skipping compaction — cooldown active`);
-            return injectRepoMapContext(stripped);
+            return messages;
         }
         const contextWindow = getContextWindow(currentModel, contextWindowOptions);
         const reserveTokens = getCompactionReserveTokens(props.maxTokens);
         const tokensFresh = lastActualTokensTimestampRef.current > lastCompactionTimeRef.current;
         const actualTokens = lastActualTokensRef.current > 0 && tokensFresh ? lastActualTokensRef.current : undefined;
-        if (shouldCompact(stripped, contextWindow, threshold, actualTokens, reserveTokens)) {
-            const result = await compactConversation(stripped);
-            if (result !== stripped) {
+        if (shouldCompact(messages, contextWindow, threshold, actualTokens, reserveTokens)) {
+            const result = await compactConversation(messages);
+            if (result !== messages) {
                 messagesRef.current = result;
                 await persistCompactedSession(result);
             }
             lastCompactionTimeRef.current = Date.now();
-            return injectRepoMapContext(result);
+            return result;
         }
-        return injectRepoMapContext(stripped);
-    }, [
-        currentModel,
-        compactConversation,
-        contextWindowOptions,
-        injectRepoMapContext,
-        persistCompactedSession,
-        stripRepoMapMessages,
-    ]);
+        return messages;
+    }, [currentModel, compactConversation, contextWindowOptions, persistCompactedSession]);
     // ── Background task bar state (external store) ──────────
     const { bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, } = useTaskBarStore();
     useTaskBarPolling(props.processManager);
@@ -1029,7 +793,6 @@ export function App(props) {
         transformContext,
     }, {
         onComplete: useCallback(() => {
-            messagesRef.current = stripRepoMapMessages(messagesRef.current);
             persistNewMessages();
             // Auto-clear plan progress and approved plan when all steps are completed
             const steps = planStepsRef.current;
@@ -1082,7 +845,6 @@ export function App(props) {
             }
         }, [
             persistNewMessages,
-            stripRepoMapMessages,
             props.cwd,
             props.skills,
             currentProvider,
@@ -1301,6 +1063,14 @@ export function App(props) {
             });
         }, []),
         onToolEnd: useCallback((toolCallId, name, result, isError, durationMs, details) => {
+            recordToolEnd(sessionStatsRef.current, name, isError, durationMs);
+            if (name === "edit" && !isError) {
+                const diff = details?.diff ?? result;
+                addLinesChanged(sessionStatsRef.current, {
+                    added: (diff.match(/^\+[^+]/gm) ?? []).length,
+                    removed: (diff.match(/^-[^-]/gm) ?? []).length,
+                });
+            }
             // Language-pack detection — gated on `write`/`bash` inside the
             // helper; cheap to call unconditionally. Fire-and-forget; the next
             // LLM turn picks up the swapped system prompt automatically.
@@ -1408,6 +1178,7 @@ export function App(props) {
             }
         }, []),
         onServerToolCall: useCallback((id, name, input, stream) => {
+            recordServerToolCall(sessionStatsRef.current);
             log("INFO", "server_tool", `Server tool call: ${name}`, { id });
             const startedAt = Date.now();
             const animateUntil = startedAt + RUNNING_INDICATOR_ANIMATION_MS;
@@ -1481,6 +1252,7 @@ export function App(props) {
             });
         }, [queueFlush]),
         onTurnEnd: useCallback((turn, stopReason, usage) => {
+            recordTurnEnd(sessionStatsRef.current, usage);
             log("INFO", "turn", `Turn ${turn} ended`, {
                 stopReason,
                 inputTokens: String(usage.inputTokens),
@@ -1790,6 +1562,24 @@ export function App(props) {
             return () => clearTimeout(timer);
         }
     }, [agentLoop.isRunning, sessionStore, props.resetUI]);
+    const showSessionSummaryAndExit = useCallback(() => {
+        const summary = buildSessionSummary({
+            stats: sessionStatsRef.current,
+            provider: currentProvider,
+            model: currentModel,
+            cwd: displayedCwd,
+            footer: sessionStatsRef.current.sessionId
+                ? `To resume this session: ggcoder --resume ${sessionStatsRef.current.sessionId}`
+                : undefined,
+        });
+        setDoneStatus(null);
+        setExitPending(false);
+        setOverlay(null);
+        setLiveItems([]);
+        setQuittingSummary(summary);
+        writeStdout("\x1b[2J\x1b[3J\x1b[H");
+        setTimeout(() => process.exit(0), 150);
+    }, [currentModel, currentProvider, displayedCwd, writeStdout]);
     // Consume pending post-remount work once on mount. Set by resetUI options
     // for paths that remount AND immediately drive work (plan accept/reject,
     // pixel fix, Goal approval). The work survives the unmount because
@@ -1847,227 +1637,101 @@ export function App(props) {
             // has not grown.
             await applyLanguageDetectionRef.current("input");
         }
-        // Handle /model directly — open inline selector
-        if (trimmed === "/model" || trimmed === "/m" || trimmed === "/models") {
-            setOverlay("model");
-            return;
-        }
-        // Handle /compact — compact conversation
-        if (trimmed === "/compact" || trimmed === "/c") {
-            const ac = new AbortController();
-            compactionAbortRef.current = ac;
-            const compacted = await compactConversation(messagesRef.current, ac.signal);
-            if (!ac.signal.aborted && compacted !== messagesRef.current) {
-                messagesRef.current = compacted;
-                await persistCompactedSession(compacted);
-            }
-            if (compactionAbortRef.current === ac)
-                compactionAbortRef.current = null;
-            return;
-        }
-        // Handle /quit — exit the agent
-        if (trimmed === "/quit" || trimmed === "/q" || trimmed === "/exit") {
-            process.exit(0);
-        }
-        // Handle /clear — tear down the entire Ink instance and rebuild fresh.
-        // Avoid direct ANSI terminal clears here; they can erase scrollback.
-        // Runtime state (model, provider, thinking) survives via renderApp's
-        // closure-held `runtimeState`, mirrored from React state via the
-        // useEffects above.
-        if (trimmed === "/clear") {
-            if (props.resetUI) {
+        if (await handleUiSlashCommand(trimmed, {
+            openModelSelector: () => setOverlay("model"),
+            compactConversation: async () => {
+                const ac = new AbortController();
+                compactionAbortRef.current = ac;
+                const compacted = await compactConversation(messagesRef.current, ac.signal);
+                if (!ac.signal.aborted && compacted !== messagesRef.current) {
+                    messagesRef.current = compacted;
+                    await persistCompactedSession(compacted);
+                }
+                if (compactionAbortRef.current === ac)
+                    compactionAbortRef.current = null;
+            },
+            quit: showSessionSummaryAndExit,
+            clearSession: () => {
+                if (props.resetUI) {
+                    void (async () => {
+                        const newPrompt = await rebuildSystemPrompt({ clearApprovedPlan: true });
+                        props.resetUI?.({
+                            wipeSession: true,
+                            messages: [{ role: "system", content: newPrompt }],
+                        });
+                    })();
+                    return;
+                }
+                clearPendingHistory();
+                setHistory([{ kind: "banner", id: "banner" }]);
+                setLiveItems([]);
+                setDoneStatus(null);
+                approvedPlanPathRef.current = undefined;
+                planStepsRef.current = [];
+                setPlanSteps([]);
                 void (async () => {
                     const newPrompt = await rebuildSystemPrompt({ clearApprovedPlan: true });
-                    props.resetUI?.({
-                        wipeSession: true,
-                        messages: [{ role: "system", content: newPrompt }],
-                    });
+                    messagesRef.current = [{ role: "system", content: newPrompt }];
+                    persistedIndexRef.current = messagesRef.current.length;
                 })();
-                return;
-            }
-            // Fallback path (resetUI not wired — e.g. tests). Best-effort: clear
-            // React state in place without touching terminal scrollback.
-            pendingHistoryFlushRef.current = [];
-            props.terminalHistoryPrinter?.clear();
-            setHistory([{ kind: "banner", id: "banner" }]);
-            setLiveItems([]);
-            setDoneStatus(null);
-            approvedPlanPathRef.current = undefined;
-            planStepsRef.current = [];
-            setPlanSteps([]);
-            void (async () => {
-                const newPrompt = await rebuildSystemPrompt({ clearApprovedPlan: true });
-                messagesRef.current = [{ role: "system", content: newPrompt }];
-                persistedIndexRef.current = messagesRef.current.length;
-            })();
-            agentLoop.reset();
-            setSessionTitle(undefined);
-            sessionTitleGeneratedRef.current = false;
-            setLiveItems([{ kind: "info", text: "Session cleared.", id: getId() }]);
-            return;
-        }
-        // Handle /theme — open theme selector overlay
-        if (trimmed === "/theme" || trimmed === "/t") {
-            setOverlay("theme");
-            return;
-        }
-        // Handle /markdown — Gemini-style rendered/raw markdown toggle
-        if (trimmed === "/markdown" || trimmed === "/md") {
-            setRenderMarkdown((prev) => {
-                const next = !prev;
-                setLiveItems([
-                    {
-                        kind: "info",
-                        text: next ? "Rendered markdown mode." : "Raw markdown mode.",
-                        id: getId(),
-                    },
-                ]);
-                return next;
-            });
-            return;
-        }
-        // Handle /clearplan — dismiss the approved plan
-        if (trimmed === "/clearplan") {
-            approvedPlanPathRef.current = undefined;
-            planStepsRef.current = [];
-            setPlanSteps([]);
-            // Rebuild system prompt without the plan
-            void replaceSystemPrompt({ clearApprovedPlan: true });
-            setLiveItems([{ kind: "plan_event", event: "dismissed", id: getId() }]);
-            return;
-        }
-        // Handle /map — show, refresh, or toggle dynamic repo map injection
-        if (trimmed === "/map" ||
-            trimmed === "/map refresh" ||
-            trimmed === "/map on" ||
-            trimmed === "/map off") {
-            const action = trimmed.slice("/map".length).trim();
-            if (action === "on") {
-                repoMapInjectionEnabledRef.current = true;
-                repoMapDirtyRef.current = true;
-                setLiveItems((prev) => [
-                    ...prev,
-                    { kind: "info", text: "Dynamic repo map injection is on.", id: getId() },
-                ]);
-                return;
-            }
-            if (action === "off") {
-                repoMapInjectionEnabledRef.current = false;
-                messagesRef.current = stripRepoMapMessages(messagesRef.current);
-                setLiveItems((prev) => [
-                    ...prev,
-                    {
-                        kind: "info",
-                        text: "Dynamic repo map injection is off for this session.",
-                        id: getId(),
-                    },
-                ]);
-                return;
-            }
-            if (action === "refresh")
-                repoMapDirtyRef.current = true;
-            const markdown = await refreshRepoMap(getLatestUserText(messagesRef.current));
-            setLiveItems((prev) => [
-                ...prev,
-                {
-                    kind: "info",
-                    text: formatRepoMapCommandOutput(repoMapInjectionEnabledRef.current, markdown, action === "refresh"),
-                    id: getId(),
-                },
-            ]);
-            return;
-        }
-        // Handle /goals — open the input-area goal picker.
-        if (trimmed === "/goals") {
-            setGoalPickerGoals(loadGoalRunsSync(displayedCwd));
-            setTaskPickerOpen(false);
-            setGoalPickerOpen(true);
+                agentLoop.reset();
+                setSessionTitle(undefined);
+                sessionTitleGeneratedRef.current = false;
+                setLiveItems([{ kind: "info", text: "Session cleared.", id: getId() }]);
+            },
+            openThemeSelector: () => setOverlay("theme"),
+            toggleMarkdown: () => {
+                setRenderMarkdown((prev) => {
+                    const next = !prev;
+                    setLiveItems([
+                        {
+                            kind: "info",
+                            text: next ? "Rendered markdown mode." : "Raw markdown mode.",
+                            id: getId(),
+                        },
+                    ]);
+                    return next;
+                });
+            },
+            clearApprovedPlan: () => {
+                approvedPlanPathRef.current = undefined;
+                planStepsRef.current = [];
+                setPlanSteps([]);
+                void replaceSystemPrompt({ clearApprovedPlan: true });
+                setLiveItems([{ kind: "plan_event", event: "dismissed", id: getId() }]);
+            },
+            openGoalsPicker: () => {
+                taskPicker.close();
+                goalPicker.openPicker();
+            },
+        })) {
             return;
         }
-        // Handle prompt-template commands (built-in + custom from .gg/commands/)
-        const promptCommandRoute = routePromptCommandInput(trimmed, PROMPT_COMMANDS, customCommands);
-        if (promptCommandRoute) {
-            const { cmdName, cmdArgs, fullPrompt } = promptCommandRoute;
-            log("INFO", "command", `Prompt command: /${cmdName}${cmdArgs ? ` (args: ${cmdArgs})` : ""}`);
-            const hasImages = inputImages.length > 0;
-            const isGoalSetupCommand = isGoalPromptCommandName(cmdName);
-            let promptForAgent = fullPrompt;
-            if (isGoalSetupCommand) {
-                const referenceContext = await buildGoalReferenceContext({
-                    cwd: props.cwd,
-                    originalGoalPrompt: fullPrompt,
-                    attachments: inputImages,
-                });
-                setActiveGoalReferences(referenceContext.references);
-                promptForAgent = referenceContext.promptSection
-                    ? `${fullPrompt}\n\n${referenceContext.promptSection}`
-                    : fullPrompt;
-            }
-            const modelInfo = getModel(currentModel);
-            const modelSupportsImages = modelInfo?.supportsImages ?? true;
-            const userContent = buildUserContentWithAttachments(promptForAgent, inputImages, modelSupportsImages);
-            // Show the typed command as the user message
-            const userItem = {
-                kind: "user",
-                text: trimmed,
-                imageCount: hasImages ? inputImages.length : undefined,
-                id: getId(),
-            };
-            setLastUserMessage(trimmed);
-            setDoneStatus(null);
-            finalizeSubmittedUserItem(userItem);
-            // Send the full prompt to the agent, with user args appended if provided
-            try {
-                if (isGoalSetupCommand) {
-                    goalSetupPanePendingRef.current = true;
-                    await runGoalPromptSetupSequence({
-                        userContent,
-                        fullPrompt: promptForAgent,
-                        messagesRef,
-                        setGoalModeAndPrompt,
-                        runAgent: (content) => agentLoop.run(content),
-                        onStage: appendGoalAgentTransition,
-                    });
-                }
-                else {
-                    await agentLoop.run(userContent);
-                }
-            }
-            catch (err) {
-                const msg = err instanceof Error ? err.message : String(err);
-                log("ERROR", "error", msg);
-                const isAbort = msg.includes("aborted") || msg.includes("abort");
-                if (isGoalSetupCommand)
-                    goalSetupPanePendingRef.current = false;
-                setLiveItems((prev) => [
-                    ...prev,
-                    isAbort
-                        ? { kind: "stopped", text: "Request was stopped.", id: getId() }
-                        : toErrorItem(err, getId()),
-                ]);
-            }
-            finally {
-                if (isGoalSetupCommand) {
-                    setActiveGoalReferences(undefined);
-                    const paneTransition = getGoalSetupPaneTransitionAfterRun({
-                        isGoalSetupCommand,
-                        setupPanePending: goalSetupPanePendingRef.current,
-                    });
-                    goalSetupPanePendingRef.current = false;
-                    if (goalModeStateRef.current !== "off") {
-                        await setGoalModeAndPrompt("off");
-                    }
-                    if (paneTransition) {
-                        goalAutoExpandRef.current = false;
-                        setGoalAutoExpand(false);
-                        setPlanAutoExpand(false);
-                        setGoalPickerGoals(loadGoalRunsSync(displayedCwd));
-                        setGoalPickerOpen(true);
-                    }
-                }
-            }
-            // Reload custom commands in case a setup command created new ones
-            reloadCustomCommands();
+        if (await submitPromptCommand({
+            trimmed,
+            inputImages,
+            cwd: props.cwd,
+            currentModel,
+            customCommands,
+            messagesRef,
+            goalSetupPanePendingRef,
+            goalModeStateRef,
+            goalAutoExpandRef,
+            setActiveGoalReferences,
+            setLastUserMessage,
+            setDoneStatus,
+            finalizeSubmittedUserItem,
+            setGoalModeAndPrompt,
+            runAgent: (content) => agentLoop.run(content),
+            appendGoalAgentTransition,
+            setLiveItems,
+            getId,
+            setGoalAutoExpand,
+            setPlanAutoExpand,
+            closeTaskPicker: taskPicker.close,
+            openGoalPicker: goalPicker.openPicker,
+            reloadCustomCommands,
+        })) {
             return;
         }
         // Check slash commands
@@ -2149,14 +1813,13 @@ export function App(props) {
         props.resetUI,
         props.sessionStore,
         rebuildSystemPrompt,
-        refreshRepoMap,
+        showSessionSummaryAndExit,
         reloadCustomCommands,
         replaceSystemPrompt,
         setActiveGoalReferences,
         setGoalModeAndPrompt,
-        stripRepoMapMessages,
     ]);
-    const handleDoubleExit = useDoublePress(setExitPending, () => process.exit(0));
+    const handleDoubleExit = useDoublePress(setExitPending, showSessionSummaryAndExit);
     const handleAbort = useCallback(() => {
         if (agentLoop.isRunning) {
             agentLoop.clearQueue();
@@ -2343,115 +2006,21 @@ export function App(props) {
             },
         ];
     }, [customCommands]);
-    const normalizeStatusText = (text) => text.replace(/\\n/g, "\n").replace(/^\n+|\n+$/g, "");
-    const renderStatusMessage = (key, glyph, content, glyphColor = theme.commandColor, options = {}) => (_jsxs(Box, { flexDirection: "row", paddingLeft: 1, marginTop: 1, flexShrink: 1, children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { color: glyphColor, bold: options.bold ?? true, children: glyph }) }), _jsx(Box, { flexDirection: "column", flexGrow: 1, children: _jsx(Text, { color: options.muted ? theme.textDim : theme.commandColor, bold: options.bold, wrap: "wrap", children: content }) })] }, key));
-    const renderItem = (item, index, items) => {
-        const previousLiveItem = index > 0 ? items[index - 1] : undefined;
-        const shouldTopSpacePrintedBoundary = shouldTopSpaceAfterPrintedAgentBoundary({
-            currentKind: item.kind,
-            previousLiveItem,
-            lastPendingHistoryItem: pendingHistoryFlushRef.current.at(-1),
-            lastHistoryItem: history.at(-1),
-        });
-        const assistantMarginTop = item.kind === "assistant" &&
-            (shouldTopSpacePrintedBoundary ||
-                shouldTopSpaceAssistantAfterToolBoundary({
-                    text: item.text,
-                    previousLiveItem,
-                    lastPendingHistoryItem: pendingHistoryFlushRef.current.at(-1),
-                    lastHistoryItem: history.at(-1),
-                }))
-            ? 1
-            : 0;
-        const withPrintedBoundarySpacing = (node) => shouldTopSpacePrintedBoundary ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: node }, `${item.id}-printed-boundary`)) : (node);
-        switch (item.kind) {
-            case "tombstone":
-                return null;
-            case "banner":
-                return (_jsx(Banner, { version: props.version, model: currentModel, provider: currentProvider, cwd: displayedCwd }, item.id));
-            case "user":
-                return (_jsx(UserMessage, { text: item.text, imageCount: item.imageCount, pasteInfo: item.pasteInfo }, item.id));
-            case "goal":
-                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);
-                const hasBody = !!item.detail ||
-                    (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, 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 (_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 (_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":
-                return withPrintedBoundarySpacing(_jsx(ToolExecution, { status: "running", name: item.name, args: item.args, progressOutput: item.progressOutput, animateUntil: item.animateUntil }, item.id));
-            case "tool_done":
-                return withPrintedBoundarySpacing(_jsx(ToolExecution, { status: "done", name: item.name, args: item.args, result: item.result, isError: item.isError, details: item.details }, item.id));
-            case "tool_group":
-                return withPrintedBoundarySpacing(_jsx(ToolGroupExecution, { tools: item.tools }, item.id));
-            case "server_tool_start":
-                return withPrintedBoundarySpacing(_jsx(ServerToolExecution, { status: "running", name: item.name, input: item.input, startedAt: item.startedAt, animateUntil: item.animateUntil }, item.id));
-            case "server_tool_done":
-                return withPrintedBoundarySpacing(_jsx(ServerToolExecution, { status: "done", name: item.name, input: item.input, durationMs: item.durationMs, resultType: item.resultType }, item.id));
-            case "error": {
-                const showMessage = item.message && item.message !== item.headline;
-                return (_jsxs(Box, { flexDirection: "row", paddingLeft: 1, marginTop: 1, flexShrink: 1, children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { color: theme.error, bold: true, children: "✗ " }) }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [_jsx(Text, { color: theme.error, wrap: "wrap", children: item.headline }), showMessage && (_jsx(Text, { color: theme.textDim, wrap: "wrap", children: item.message })), _jsx(Text, { color: theme.textDim, wrap: "wrap", children: `→ ${item.guidance}` })] })] }, item.id));
-            }
-            case "info":
-                return renderStatusMessage(item.id, "○ ", item.text, theme.commandColor, { muted: true });
-            case "update_notice":
-                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, `${BLACK_CIRCLE} `, normalizeStatusText(item.text), theme.commandColor, { bold: true });
-            case "goal_agent_transition":
-                return renderStatusMessage(item.id, `${BLACK_CIRCLE} `, normalizeStatusText(item.text), theme.commandColor, { bold: true });
-            case "task":
-                return withPrintedBoundarySpacing(renderStatusMessage(item.id, "▸ ", _jsxs(_Fragment, { children: [_jsx(Text, { color: theme.textDim, children: "Task: " }), _jsx(Text, { color: theme.commandColor, bold: true, children: item.title })] }), 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":
-                return renderStatusMessage(item.id, "◐ ", _jsxs(_Fragment, { children: [_jsx(Text, { color: theme.textDim, children: "Theme switched to " }), _jsx(Text, { color: theme.commandColor, bold: true, children: item.themeName })] }), theme.commandColor, { bold: true });
-            case "plan_event": {
-                // Plan-domain status changes (approve / reject / dismiss). Use the
-                // command accent so transient TUI status rows share one purple voice.
-                const label = item.event === "approved"
-                    ? "Plan approved"
-                    : item.event === "rejected"
-                        ? "Plan rejected"
-                        : "Plan dismissed";
-                return renderStatusMessage(item.id, "○ ", _jsxs(_Fragment, { children: [_jsx(Text, { children: label }), item.detail ? _jsx(Text, { color: theme.textDim, children: ` — "${item.detail}"` }) : null] }), theme.commandColor, { bold: true });
-            }
-            case "stopped":
-                // Cancellation / abort acknowledgement (ESC, auto-setup cancel, etc.).
-                // Muted dim treatment — this is an ack, not a state change worth a
-                // 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, { 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" : ""})`
-                    : "";
-                return withPrintedBoundarySpacing(_jsxs(Box, { flexDirection: "row", paddingLeft: 1, marginTop: 1, flexShrink: 1, children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { color: theme.warning, bold: true, children: "• " }) }), _jsx(Box, { flexDirection: "column", flexGrow: 1, children: _jsxs(Text, { color: theme.text, wrap: "wrap", children: [_jsx(Text, { color: theme.textDim, children: "Queued: " }), item.text || "(empty)", suffix] }) })] }, item.id));
-            }
-            case "compacting":
-                return _jsx(CompactionSpinner, { staticDisplay: true }, item.id);
-            case "compacted":
-                return (_jsx(CompactionDone, { originalCount: item.originalCount, newCount: item.newCount, tokensBefore: item.tokensBefore, tokensAfter: item.tokensAfter }, item.id));
-            case "duration":
-                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));
-        }
-    };
+    const renderItem = (item, index, items) => renderTranscriptItem({
+        item,
+        index,
+        items,
+        pendingHistoryFlushLastItem: pendingHistoryFlushRef.current.at(-1),
+        historyLastItem: history.at(-1),
+        version: props.version,
+        currentModel,
+        currentProvider,
+        displayedCwd,
+        columns,
+        theme,
+        renderMarkdown,
+        measuredLiveAreaRows,
+    });
     const openOverlay = useCallback((kind) => {
         if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
             props.sessionStore.overlay = kind;
@@ -2536,6 +2105,10 @@ export function App(props) {
                 return;
             }
             const decision = decideGoalNextAction(latestRun);
+            if (!shouldKeepGoalRunTrackedAfterDecision(decision)) {
+                runningGoalIdsRef.current.delete(runId);
+                clearGoalModeIfIdle();
+            }
             if (decision.kind === "wait")
                 return;
             const choiceKey = getGoalContinuationChoiceKey({ runId: latestRun.id, decision });
@@ -2640,23 +2213,25 @@ export function App(props) {
             workerId: completion.worker.id,
             status: completion.status,
         });
+        const taskProgress = goalTaskProgress(run, run.tasks.find((task) => task.id === completion.worker.goalTaskId));
         upsertGoalStatusEntry({
             runId: run.id,
-            label: taskTitle,
+            label: run.title,
             phase: completion.status === "done" ? "reviewing" : "failed",
             startedAt: Date.now(),
             detail: completion.status === "done" ? "reviewing result" : "task failed",
             workerId: completion.worker.id,
             goalNumber: goalNumberForRun(run.id),
+            ...taskProgress,
         });
         runGoalSyntheticEvent(eventText);
         void (async () => {
-            if (listGoalWorkers(completion.worker.cwd).some((worker) => worker.status === "running"))
+            if (listGoalWorkers(completion.worker.projectPath).some((worker) => worker.status === "running"))
                 return;
             if (activeVerifierRunIdsRef.current.size > 0)
                 return;
-            const runs = await loadGoalRuns(completion.worker.cwd);
-            const queued = runs.find((item) => item.continueRequestedAt && !goalHasBlockingPrerequisites(item));
+            const runs = await loadGoalRuns(completion.worker.projectPath);
+            const queued = runs.find((item) => goalRunNeedsExplicitContinuationAfterWorker(item));
             if (queued)
                 setTimeout(() => continueGoalRun(queued.id), 750);
         })().catch((err) => log("ERROR", "goal", err instanceof Error ? err.message : String(err)));
@@ -2670,7 +2245,7 @@ export function App(props) {
     useEffect(() => {
         return subscribeGoalWorkerCompletions((completion) => {
             void (async () => {
-                const latestRun = (await loadGoalRuns(completion.worker.cwd)).find((item) => item.id === completion.worker.goalRunId) ?? null;
+                const latestRun = (await loadGoalRuns(completion.worker.projectPath)).find((item) => item.id === completion.worker.goalRunId) ?? null;
                 if (!latestRun) {
                     log("WARN", "goal", `Worker completion for unknown Goal ${completion.worker.goalRunId}`);
                     return;
@@ -2724,6 +2299,9 @@ export function App(props) {
             }
             const decision = decideGoalNextAction(checkedRun);
             await appendGoalDecision(props.cwd, checkedRun.id, decision);
+            if (!shouldKeepGoalRunTrackedAfterDecision(decision)) {
+                runningGoalIdsRef.current.delete(checkedRun.id);
+            }
             if (decision.kind === "terminal") {
                 const terminalProgress = formatGoalTerminalProgress(checkedRun);
                 if (terminalProgress) {
@@ -2741,8 +2319,10 @@ export function App(props) {
                     phase: "worker_started",
                     title: decision.workerId
                         ? `Goal working: ${checkedRun.title}`
-                        : `Goal active: ${checkedRun.title}`,
-                    detail: decision.reason,
+                        : `Goal needs orchestration: ${checkedRun.title}`,
+                    detail: decision.workerId
+                        ? decision.reason
+                        : `${decision.reason} Asking the orchestrator to unblock or revise the Goal plan.`,
                     workerId: decision.workerId,
                 });
                 upsertGoalStatusEntry({
@@ -2754,6 +2334,14 @@ export function App(props) {
                     workerId: decision.workerId,
                     goalNumber: goalNumberForRun(checkedRun.id),
                 });
+                if (!decision.workerId) {
+                    const eventText = `Goal continuation is waiting with no active worker for Goal ${checkedRun.id} (${checkedRun.title}).\n` +
+                        `Reason: ${decision.reason}\n\n` +
+                        `Inspect the durable Goal state with the goals tool, resolve blocked dependencies by creating or updating concrete worker tasks, and then continue the Goal. If no local/free action can proceed, record an explicit blocker with exact user instructions. Do not stop after only explaining the state.`;
+                    setLastUserMessage("");
+                    setDoneStatus(null);
+                    await agentLoop.run(eventText);
+                }
                 return;
             }
             if (decision.kind === "complete") {
@@ -2775,14 +2363,38 @@ export function App(props) {
                 return;
             }
             if (decision.kind === "create_task") {
+                const latestRunBeforeCreate = (await loadGoalRuns(props.cwd)).find((item) => item.id === checkedRun.id) ?? checkedRun;
+                const existingSameTitleTask = latestRunBeforeCreate.tasks.find((item) => item.title === decision.title);
+                if (existingSameTitleTask) {
+                    const runWithExistingTask = await upsertGoalRun(props.cwd, {
+                        ...latestRunBeforeCreate,
+                        status: "ready",
+                    });
+                    appendGoalProgress({
+                        kind: "goal_progress",
+                        phase: "continuing",
+                        title: `Goal task already exists: ${decision.title}`,
+                        detail: "Reusing the existing Goal task instead of creating a duplicate.",
+                        status: "ready",
+                    });
+                    startGoalRunRef.current(runWithExistingTask);
+                    return;
+                }
                 await updateGoalTask(props.cwd, checkedRun.id, `auto-${Date.now()}`, {
                     title: decision.title,
                     prompt: decision.prompt,
                     status: "pending",
                 });
                 const latestRun = (await loadGoalRuns(props.cwd)).find((item) => item.id === checkedRun.id) ?? checkedRun;
-                await upsertGoalRun(props.cwd, { ...latestRun, status: "ready" });
-                setTimeout(() => continueGoalRun(checkedRun.id), 250);
+                const runWithTask = await upsertGoalRun(props.cwd, { ...latestRun, status: "ready" });
+                appendGoalProgress({
+                    kind: "goal_progress",
+                    phase: "continuing",
+                    title: `Goal task created: ${decision.title}`,
+                    detail: "Starting the new Goal task now.",
+                    status: "ready",
+                });
+                startGoalRunRef.current(runWithTask);
                 return;
             }
             if (decision.kind === "blocked") {
@@ -2844,6 +2456,7 @@ export function App(props) {
                 goalTaskId: decision.task.id,
                 taskTitle: decision.task.title,
                 prompt: buildGoalTaskPromptWithReferences(checkedRun, decision.task.prompt),
+                isolateWorktree: shouldRunGoalTaskInMainCheckout(decision.task.title) ? false : undefined,
             });
             const latestRun = (await loadGoalRuns(props.cwd)).find((item) => item.id === checkedRun.id) ??
                 runWithAttempt;
@@ -2866,17 +2479,39 @@ export function App(props) {
             });
             upsertGoalStatusEntry({
                 runId: checkedRun.id,
-                label: decision.task.title,
+                label: checkedRun.title,
                 phase: "worker",
                 startedAt: Date.now(),
                 detail: "background worker running",
                 workerId: worker.id,
                 goalNumber: goalNumberForRun(checkedRun.id),
+                ...goalTaskProgress(checkedRun, decision.task),
             });
-        })().catch((err) => {
+        })().catch(async (err) => {
             clearGoalStatusEntry(run.id);
             clearGoalModeIfIdle();
             log("ERROR", "goal", err instanceof Error ? err.message : String(err));
+            if (isGoalWorktreeDirtyError(err)) {
+                const latestRun = (await loadGoalRuns(props.cwd)).find((item) => item.id === run.id) ?? run;
+                const pausedRun = await upsertGoalRun(props.cwd, buildGoalDirtyWorktreePauseRun(latestRun, err));
+                runningGoalIdsRef.current.delete(pausedRun.id);
+                appendGoalProgress({
+                    kind: "goal_progress",
+                    phase: "terminal",
+                    title: `Goal paused: ${pausedRun.title}`,
+                    detail: "Working tree has uncommitted changes; waiting for the user to choose commit, stash, or pause.",
+                    status: "paused",
+                });
+                setLiveItems((prev) => [
+                    ...prev,
+                    { kind: "info", text: goalDirtyWorktreeInfoText(), id: getId() },
+                ]);
+                void agentLoop.run(buildGoalDirtyWorktreeUserPrompt(err)).catch((agentErr) => {
+                    log("ERROR", "goal", agentErr instanceof Error ? agentErr.message : String(agentErr));
+                    setLiveItems((prev) => [...prev, toErrorItem(agentErr, getId(), "Goal")]);
+                });
+                return;
+            }
             setLiveItems((prev) => [...prev, toErrorItem(err, getId(), "Goal")]);
         });
     }, [
@@ -2884,6 +2519,7 @@ export function App(props) {
         currentProvider,
         currentModel,
         thinkingLevel,
+        agentLoop,
         appendGoalProgress,
         clearGoalModeIfIdle,
         clearGoalStatusEntry,
@@ -2916,6 +2552,30 @@ export function App(props) {
             clearGoalModeIfIdle();
             return;
         }
+        const integration = await checkGoalWorktreeIntegration(props.cwd, run);
+        if (!integration.ok) {
+            const runWithEvidence = (await appendGoalEvidence(props.cwd, run.id, {
+                kind: "summary",
+                label: "Goal worktree integration required",
+                content: integration.summary,
+            })) ?? run;
+            await upsertGoalRun(props.cwd, {
+                ...runWithEvidence,
+                status: "blocked",
+                blockers: Array.from(new Set([...runWithEvidence.blockers, integration.summary])),
+            });
+            appendGoalProgress({
+                kind: "goal_progress",
+                phase: "terminal",
+                title: `Goal blocked before verifier: ${run.title}`,
+                detail: integration.summary,
+                status: "blocked",
+            });
+            runningGoalIdsRef.current.delete(run.id);
+            clearGoalStatusEntry(run.id);
+            clearGoalModeIfIdle();
+            return;
+        }
         activeVerifierRunIdsRef.current.add(run.id);
         await upsertGoalRun(props.cwd, {
             ...run,
@@ -2940,7 +2600,7 @@ export function App(props) {
             goalNumber: goalNumberForRun(run.id),
         });
         void runGoalVerifierCommand({
-            cwd: props.cwd,
+            cwd: run.verifier.cwd ?? props.cwd,
             runId: run.id,
             command: run.verifier.command,
             timeoutMs: verifierTimeoutMs,
@@ -2958,6 +2618,7 @@ export function App(props) {
                     ...latestRun.verifier,
                     description: latestRun.verifier?.description ?? "Goal verifier",
                     command: run.verifier?.command,
+                    ...(run.verifier?.cwd ? { cwd: run.verifier.cwd } : {}),
                     lastResult: verification,
                 },
                 ...(status === "pass"
@@ -2987,7 +2648,7 @@ export function App(props) {
             await appendGoalDecision(props.cwd, run.id, {
                 kind: `verifier_${status}`,
                 reason: `${failureClass}: verifier exited with code ${verification.exitCode ?? 1}.`,
-                content: `outputPath=${outputPath ?? ""}; durationMs=${durationMs}`,
+                content: `outputPath=${outputPath ?? ""}; cwd=${run.verifier?.cwd ?? props.cwd}; durationMs=${durationMs}`,
             });
             appendGoalProgress({
                 kind: "goal_progress",
@@ -3034,11 +2695,7 @@ export function App(props) {
             if (run.activeWorkerId)
                 await stopGoalWorker(run.activeWorkerId);
             const latestRun = (await loadGoalRuns(props.cwd)).find((item) => item.id === run.id) ?? run;
-            await upsertGoalRun(props.cwd, {
-                ...latestRun,
-                status: "paused",
-                activeWorkerId: undefined,
-            });
+            await upsertGoalRun(props.cwd, buildGoalUserPauseRun(latestRun));
             appendGoalProgress({
                 kind: "goal_progress",
                 phase: "terminal",
@@ -3088,8 +2745,7 @@ export function App(props) {
             })();
             return;
         }
-        pendingHistoryFlushRef.current = [];
-        props.terminalHistoryPrinter?.clear();
+        clearPendingHistory();
         setHistory([{ kind: "banner", id: "banner" }]);
         setLiveItems([]);
         messagesRef.current = messagesRef.current.slice(0, 1);
@@ -3142,13 +2798,6 @@ export function App(props) {
                     log("WARN", "pixel", `chdir failed: ${err.message}`);
                 }
                 cwdRef.current = prep.projectPath;
-                repoMapDirtyRef.current = true;
-                repoMapMarkdownRef.current = "";
-                repoMapSnapshotRef.current = undefined;
-                repoMapChangedCountRef.current = 0;
-                repoMapCacheRef.current = createRepoMapCache();
-                props.repoMapChangedFilesRef?.current.clear();
-                props.repoMapReadFilesRef?.current.clear();
                 setDisplayedCwd(prep.projectPath);
                 let toolsForPixelFix = currentToolsRef.current;
                 if (props.rebuildToolsForCwd) {
@@ -3172,8 +2821,7 @@ export function App(props) {
                 });
                 // Now that the cwd swap is committed, reset chat. Do not clear the
                 // terminal here; terminal clear sequences can erase saved scrollback.
-                pendingHistoryFlushRef.current = [];
-                props.terminalHistoryPrinter?.clear();
+                clearPendingHistory();
                 setHistory([{ kind: "banner", id: "banner" }]);
                 setLiveItems([]);
                 messagesRef.current = messagesRef.current.slice(0, 1);
@@ -3219,60 +2867,26 @@ export function App(props) {
     }, [runAllPixel, props.sessionStore]);
     const isSkillsView = overlay === "skills";
     const isPlanView = overlay === "plan";
-    const footerStatusLayout = getFooterStatusLayoutDecision({
+    const { footerStatusLayout, activityVisible, stallStatusVisible, statusSlotVisible, mainControlsRef, measuredLiveAreaRows, } = useChatLayoutMeasurements({
+        rows,
         columns,
         backgroundTaskCount: bgTasks.length,
         updatePending,
-    });
-    const activityVisible = agentLoop.isRunning && agentLoop.activityPhase !== "idle";
-    const stallStatusVisible = !activityVisible && !!agentLoop.stallError;
-    const doneStatusVisible = !activityVisible && !stallStatusVisible && !!doneStatus && !agentLoop.isRunning;
-    const statusSlotVisible = activityVisible || stallStatusVisible || doneStatusVisible;
-    const [controlsHeight, setControlsHeight] = useState(0);
-    const controlsObserverRef = useRef(null);
-    const mainControlsRef = useCallback((node) => {
-        if (controlsObserverRef.current) {
-            controlsObserverRef.current.disconnect();
-            controlsObserverRef.current = null;
-        }
-        if (!node || typeof ResizeObserver === "undefined")
-            return;
-        const observer = new ResizeObserver((entries) => {
-            const entry = entries[0];
-            if (!entry)
-                return;
-            const roundedHeight = Math.round(entry.contentRect.height);
-            setControlsHeight((prev) => (roundedHeight !== prev ? roundedHeight : prev));
-        });
-        observer.observe(node);
-        controlsObserverRef.current = observer;
-    }, []);
-    useEffect(() => () => controlsObserverRef.current?.disconnect(), []);
-    const footerFitsOnOneLine = doesFooterFitOnOneLine({
-        columns,
-        model: currentModel,
-        tokensIn: agentLoop.contextUsed,
+        agentRunning: agentLoop.isRunning,
+        activityPhase: agentLoop.activityPhase,
+        stallError: agentLoop.stallError,
+        doneStatus,
+        currentModel,
+        contextUsed: agentLoop.contextUsed,
         contextWindowOptions,
-        cwd: displayedCwd,
+        displayedCwd,
         gitBranch,
         thinkingLevel,
         goalMode,
-    });
-    const chatControlsLayout = getChatControlsLayoutDecision({
-        rows,
-        columns,
-        agentRunning: agentLoop.isRunning,
-        activityVisible,
-        doneStatusVisible,
-        stallStatusVisible,
         exitPending,
-        footerStatusLayout,
         taskBarExpanded,
         goalStatusEntryCount: goalStatusEntries.length,
-        footerFitsOnOneLine,
     });
-    const stableControlsRows = controlsHeight > 0 ? controlsHeight : chatControlsLayout.controlsRows;
-    const measuredLiveAreaRows = Math.max(MIN_LIVE_AREA_ROWS, rows - stableControlsRows - 1);
     const isPixelView = overlay === "pixel";
     const hasLiveAssistantItem = liveItems.some((item) => item.kind === "assistant");
     const rawVisibleStreamingText = goalModeStateRef.current === "planner" || hasLiveAssistantItem ? "" : agentLoop.streamingText;
@@ -3290,7 +2904,7 @@ export function App(props) {
             queueFlush([
                 {
                     kind: "assistant",
-                    text: split.flushedText,
+                    text: stripDoneMarkers(split.flushedText),
                     continuation: streamedAssistantFlushRef.current.flushedChars > 0,
                     id: getId(),
                 },
@@ -3306,13 +2920,20 @@ export function App(props) {
             text: rawVisibleStreamingText,
         };
     }, [rawVisibleStreamingText, queueFlush]);
-    const visibleStreamingText = rawVisibleStreamingText.slice(streamedAssistantFlushRef.current.flushedChars);
-    const shouldReserveStreamingSpacing = agentLoop.isRunning &&
-        !hasLiveAssistantItem &&
-        (visibleStreamingText.trim().length > 0 || liveItems.some(isAgentSpacingItem));
+    const visibleStreamingText = stripDoneMarkers(rawVisibleStreamingText.slice(streamedAssistantFlushRef.current.flushedChars));
     const lastLiveItem = liveItems.at(-1);
     const lastPendingHistoryItem = pendingHistoryFlushRef.current.at(-1);
     const lastHistoryItem = history.at(-1);
+    const previousTranscriptItem = lastPendingHistoryItem ?? lastHistoryItem;
+    const isAwaitingAssistantAfterUser = agentLoop.isRunning &&
+        !hasLiveAssistantItem &&
+        visibleStreamingText.trim().length === 0 &&
+        (lastLiveItem?.kind === "user" || (!lastLiveItem && previousTranscriptItem?.kind === "user"));
+    const shouldReserveStreamingSpacing = agentLoop.isRunning &&
+        !hasLiveAssistantItem &&
+        (visibleStreamingText.trim().length > 0 ||
+            liveItems.some(isTranscriptSpacingItem) ||
+            isAwaitingAssistantAfterUser);
     const shouldTopSpaceStreamingText = shouldTopSpaceStreamingAssistant({
         visibleStreamingText,
         lastLiveItem,
@@ -3328,215 +2949,285 @@ export function App(props) {
             lastPendingHistoryItem,
             lastHistoryItem,
         });
-    return (_jsx(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: isPixelView ? (_jsx(PixelOverlay, { version: props.version, agentRunning: agentLoop.isRunning, onClose: () => {
-                if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
-                    props.sessionStore.overlay = null;
-                    props.resetUI();
-                }
-                else {
-                    if (props.sessionStore) {
-                        props.sessionStore.overlay = null;
-                        if (agentLoop.isRunning)
-                            props.sessionStore.pendingResetUI = true;
-                    }
-                    setOverlay(null);
-                }
-            }, onFixOne: (entry) => {
-                setOverlay(null);
-                startPixelFix(entry.errorId);
-            }, onFixAll: (entries) => {
-                const first = entries.find((e) => e.status === "open") ?? entries[0];
-                if (!first)
-                    return;
-                setOverlay(null);
-                setRunAllPixel(true);
-                startPixelFix(first.errorId);
-            } })) : isSkillsView ? (_jsx(SkillsOverlay, { cwd: props.cwd, onClose: () => {
-                if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
-                    props.sessionStore.overlay = null;
-                    props.resetUI();
-                }
-                else {
-                    if (props.sessionStore) {
-                        props.sessionStore.overlay = null;
-                        if (agentLoop.isRunning)
-                            props.sessionStore.pendingResetUI = true;
-                    }
-                    setOverlay(null);
-                }
-            } })) : isPlanView ? (_jsx(PlanOverlay, { cwd: props.cwd, autoExpandNewest: planAutoExpand, onClose: () => {
-                planOverlayPendingRef.current = false;
-                if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
-                    props.sessionStore.overlay = null;
-                    props.sessionStore.planAutoExpand = false;
-                    props.resetUI();
-                }
-                else {
-                    if (props.sessionStore) {
-                        props.sessionStore.overlay = null;
-                        props.sessionStore.planAutoExpand = false;
-                        if (agentLoop.isRunning)
-                            props.sessionStore.pendingResetUI = true;
-                    }
-                    setPlanAutoExpand(false);
-                    setOverlay(null);
-                }
-            }, onApprove: (planPath) => {
-                log("INFO", "plan", "Plan approved — transitioning to implementation", {
-                    planPath,
+    const handleCloseRemountableOverlay = () => {
+        if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
+            props.sessionStore.overlay = null;
+            props.resetUI();
+            return;
+        }
+        if (props.sessionStore) {
+            props.sessionStore.overlay = null;
+            if (agentLoop.isRunning)
+                props.sessionStore.pendingResetUI = true;
+        }
+        setOverlay(null);
+    };
+    const handleEnterPlanMode = useCallback(async (reason) => {
+        await setPlanModeAndPrompt(true);
+        const detail = reason ? `Plan mode ON — ${reason}` : "Plan mode ON";
+        setLiveItems((prev) => [
+            ...prev,
+            { kind: "plan_transition", text: detail, id: getId(), active: true },
+        ]);
+    }, [setPlanModeAndPrompt]);
+    const handleExitPlanMode = useCallback(async (planPath) => {
+        await setPlanModeAndPrompt(false);
+        planOverlayPendingRef.current = true;
+        setPlanAutoExpand(true);
+        if (props.sessionStore) {
+            props.sessionStore.overlay = "plan";
+            props.sessionStore.planAutoExpand = true;
+        }
+        setOverlay("plan");
+        setLiveItems((prev) => [
+            ...prev,
+            {
+                kind: "plan_transition",
+                text: `Plan ready for review: ${planPath}`,
+                id: getId(),
+                active: false,
+            },
+        ]);
+        return "Plan submitted for user review. Wait for the user to approve, reject, or dismiss it before implementing.";
+    }, [props.sessionStore, setPlanModeAndPrompt]);
+    useEffect(() => {
+        if (!props.planCallbacks)
+            return;
+        props.planCallbacks.onEnterPlan = handleEnterPlanMode;
+        props.planCallbacks.onExitPlan = handleExitPlanMode;
+    }, [handleEnterPlanMode, handleExitPlanMode, props.planCallbacks]);
+    const handleClosePlanOverlay = () => {
+        planOverlayPendingRef.current = false;
+        if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
+            props.sessionStore.overlay = null;
+            props.sessionStore.planAutoExpand = false;
+            props.resetUI();
+            return;
+        }
+        if (props.sessionStore) {
+            props.sessionStore.overlay = null;
+            props.sessionStore.planAutoExpand = false;
+            if (agentLoop.isRunning)
+                props.sessionStore.pendingResetUI = true;
+        }
+        setPlanAutoExpand(false);
+        setOverlay(null);
+    };
+    const handlePixelFixOne = (entry) => {
+        setOverlay(null);
+        startPixelFix(entry.errorId);
+    };
+    const handlePixelFixAll = (entries) => {
+        const first = entries.find((entry) => entry.status === "open") ?? entries[0];
+        if (!first)
+            return;
+        setOverlay(null);
+        setRunAllPixel(true);
+        startPixelFix(first.errorId);
+    };
+    const handleApprovePlan = (planPath) => {
+        log("INFO", "plan", "Plan approved — transitioning to implementation", {
+            planPath,
+        });
+        planOverlayPendingRef.current = false;
+        void (async () => {
+            try {
+                // Read plan steps for progress tracking — handed to the new
+                // mount via sessionStore.planSteps below.
+                const planContent = await import("node:fs/promises").then(({ readFile }) => readFile(planPath, "utf-8"));
+                const steps = extractPlanSteps(planContent);
+                // Build the new system prompt with the approved plan baked in.
+                const newPrompt = await rebuildSystemPrompt({
+                    approvedPlanPath: planPath,
                 });
-                planOverlayPendingRef.current = false;
-                void (async () => {
-                    try {
-                        // Read plan steps for progress tracking — handed to the new
-                        // mount via sessionStore.planSteps below.
-                        const planContent = await import("node:fs/promises").then(({ readFile }) => readFile(planPath, "utf-8"));
-                        const steps = extractPlanSteps(planContent);
-                        // Build the new system prompt with the approved plan baked in.
-                        const newPrompt = await rebuildSystemPrompt({
-                            approvedPlanPath: planPath,
-                        });
-                        // Create a new session file BEFORE remount so the new tree
-                        // picks it up via sessionStore.sessionPath.
-                        let newSessionPath;
-                        const sm = sessionManagerRef.current;
-                        if (sm) {
-                            const s = await sm.create(props.cwd, currentProvider, currentModel);
-                            newSessionPath = s.path;
-                        }
-                        if (props.resetUI && props.sessionStore) {
-                            // Clear the overlay so the new mount lands on the chat,
-                            // not back inside the plan pane.
-                            props.sessionStore.overlay = null;
-                            props.sessionStore.planAutoExpand = false;
-                            props.resetUI({
-                                wipeSession: true,
-                                messages: [{ role: "system", content: newPrompt }],
-                                approvedPlanPath: planPath,
-                                planSteps: steps,
-                                sessionPath: newSessionPath,
-                                pendingAction: {
-                                    prompt: "The plan has been approved. Implement it now, following each step in order.",
-                                    planEvent: { event: "approved" },
-                                },
-                            });
-                            return;
-                        }
-                        // Fallback path (resetUI not wired — tests). Mutate in place.
-                        approvedPlanPathRef.current = planPath;
-                        planStepsRef.current = steps;
-                        setPlanSteps(steps);
-                        pendingHistoryFlushRef.current = [];
-                        props.terminalHistoryPrinter?.clear();
-                        setHistory([{ kind: "banner", id: "banner" }]);
-                        setLiveItems([]);
-                        setPlanAutoExpand(false);
-                        setOverlay(null);
-                        messagesRef.current = [{ role: "system", content: newPrompt }];
-                        agentLoop.reset();
-                        persistedIndexRef.current = messagesRef.current.length;
-                        if (newSessionPath)
-                            sessionPathRef.current = newSessionPath;
-                        setLiveItems([
-                            {
-                                kind: "info",
-                                text: "Plan approved — starting fresh session for implementation",
-                                id: getId(),
-                            },
-                        ]);
-                        setDoneStatus(null);
-                        await agentLoop.run("The plan has been approved. Implement it now, following each step in order.");
-                    }
-                    catch (err) {
-                        const errMsg = err instanceof Error ? err.message : String(err);
-                        log("ERROR", "error", errMsg);
-                        setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
-                    }
-                })();
-            }, onReject: (planPath, feedback) => {
-                planOverlayPendingRef.current = false;
-                const rejectionMsg = `The plan at ${planPath} was rejected.\n\nFeedback: ${feedback}\n\n` +
-                    `Please revise the plan based on this feedback.`;
+                // Create a new session file BEFORE remount so the new tree
+                // picks it up via sessionStore.sessionPath.
+                let newSessionPath;
+                const sm = sessionManagerRef.current;
+                if (sm) {
+                    const s = await sm.create(props.cwd, currentProvider, currentModel);
+                    newSessionPath = s.path;
+                }
                 if (props.resetUI && props.sessionStore) {
+                    // Clear the overlay so the new mount lands on the chat,
+                    // not back inside the plan pane.
                     props.sessionStore.overlay = null;
                     props.sessionStore.planAutoExpand = false;
-                    // No wipeSession — keep history and messages so the agent picks
-                    // up the rejection mid-conversation.
                     props.resetUI({
+                        wipeSession: true,
+                        messages: [{ role: "system", content: newPrompt }],
+                        approvedPlanPath: planPath,
+                        planSteps: steps,
+                        sessionPath: newSessionPath,
                         pendingAction: {
-                            prompt: rejectionMsg,
-                            planEvent: { event: "rejected", detail: feedback },
+                            prompt: "The plan has been approved. Implement it now, following each step in order.",
+                            planEvent: { event: "approved" },
                         },
                     });
                     return;
                 }
+                // Fallback path (resetUI not wired — tests). Mutate in place.
+                approvedPlanPathRef.current = planPath;
+                planStepsRef.current = steps;
+                setPlanSteps(steps);
+                clearPendingHistory();
+                setHistory([{ kind: "banner", id: "banner" }]);
+                setLiveItems([]);
                 setPlanAutoExpand(false);
                 setOverlay(null);
-                setDoneStatus(null);
-                setLiveItems((prev) => [
-                    ...prev,
-                    { kind: "info", text: `Plan rejected — "${feedback}"`, id: getId() },
+                messagesRef.current = [{ role: "system", content: newPrompt }];
+                agentLoop.reset();
+                persistedIndexRef.current = messagesRef.current.length;
+                if (newSessionPath)
+                    sessionPathRef.current = newSessionPath;
+                setLiveItems([
+                    {
+                        kind: "info",
+                        text: "Plan approved — starting fresh session for implementation",
+                        id: getId(),
+                    },
                 ]);
-                void agentLoop.run(rejectionMsg).catch((err) => {
-                    const errMsg = err instanceof Error ? err.message : String(err);
-                    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: [uniqueItemsById(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, onToggleTasks: () => {
-                                setGoalPickerOpen(false);
-                                setTaskPickerTasks(loadTasksSync(displayedCwd));
-                                setTaskPickerOpen((open) => !open);
-                            }, taskPickerOpen: taskPickerOpen, tasks: taskPickerTasks, onCloseTaskPicker: () => setTaskPickerOpen(false), onStartTask: (task) => {
-                                setTaskPickerOpen(false);
-                                markTaskInProgress(displayedCwd, task.id);
-                                setTaskPickerTasks(loadTasksSync(displayedCwd));
-                                startTask(task.title, task.prompt, task.id);
-                            }, onRunAllTasks: (task) => {
-                                setTaskPickerOpen(false);
-                                setRunAllTasks(true);
-                                const selected = task
-                                    ? {
-                                        id: task.id,
-                                        title: task.title,
-                                        prompt: task.prompt || task.text || task.title,
-                                    }
-                                    : getNextPendingTask(displayedCwd);
-                                if (selected) {
-                                    markTaskInProgress(displayedCwd, selected.id);
-                                    setTaskPickerTasks(loadTasksSync(displayedCwd));
-                                    startTask(selected.title, selected.prompt, selected.id);
-                                }
-                            }, onDeleteTask: (task) => {
-                                const nextTasks = loadTasksSync(displayedCwd).filter((candidate) => candidate.id !== task.id);
-                                saveTasksSync(displayedCwd, nextTasks);
-                                setTaskPickerTasks(nextTasks);
-                            }, goalPickerOpen: goalPickerOpen, goals: goalPickerGoals, onCloseGoalPicker: () => setGoalPickerOpen(false), onRunGoal: (run) => {
-                                setGoalPickerOpen(false);
-                                startGoalRun(run);
-                            }, onDeleteGoal: (run) => {
-                                const nextGoals = loadGoalRunsSync(displayedCwd).filter((candidate) => candidate.id !== run.id);
-                                saveGoalRunsSync(displayedCwd, nextGoals);
-                                setGoalPickerGoals(nextGoals);
-                            }, onPauseGoal: (run) => {
-                                setGoalPickerOpen(false);
-                                pauseGoalRun(run);
-                            }, onToggleGoal: () => {
-                                setTaskPickerOpen(false);
-                                setGoalPickerGoals(loadGoalRunsSync(displayedCwd));
-                                setGoalPickerOpen((open) => !open);
-                            }, onToggleSkills: () => {
-                                openOverlay("skills");
-                            }, onTogglePixel: () => {
-                                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: 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";
-    const prefix = refreshed
-        ? `Dynamic repo map refreshed · injection: ${status}`
-        : `Dynamic repo map · injection: ${status}`;
-    return `${prefix}\n\n${markdown}`;
+                setDoneStatus(null);
+                await agentLoop.run("The plan has been approved. Implement it now, following each step in order.");
+            }
+            catch (err) {
+                const errMsg = err instanceof Error ? err.message : String(err);
+                log("ERROR", "error", errMsg);
+                setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
+            }
+        })();
+    };
+    const handleRejectPlan = (planPath, feedback) => {
+        planOverlayPendingRef.current = false;
+        const rejectionMsg = `The plan at ${planPath} was rejected.\n\nFeedback: ${feedback}\n\n` +
+            `Please revise the plan based on this feedback.`;
+        if (props.resetUI && props.sessionStore) {
+            props.sessionStore.overlay = null;
+            props.sessionStore.planAutoExpand = false;
+            // No wipeSession — keep history and messages so the agent picks
+            // up the rejection mid-conversation.
+            props.resetUI({
+                pendingAction: {
+                    prompt: rejectionMsg,
+                    planEvent: { event: "rejected", detail: feedback },
+                },
+            });
+            return;
+        }
+        setPlanAutoExpand(false);
+        setOverlay(null);
+        setDoneStatus(null);
+        setLiveItems((prev) => [
+            ...prev,
+            { kind: "info", text: `Plan rejected — "${feedback}"`, id: getId() },
+        ]);
+        void agentLoop.run(rejectionMsg).catch((err) => {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            log("ERROR", "error", errMsg);
+            setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
+        });
+    };
+    const handleRunGoalFromPicker = (run) => {
+        setDoneStatus(null);
+        appendGoalProgress({
+            kind: "goal_progress",
+            phase: "continuing",
+            title: `Goal run requested: ${run.title}`,
+            detail: "Enter pressed in Ctrl+G; starting the Goal orchestrator.",
+            status: run.status,
+        });
+        log("INFO", "goal", `Goal run requested from Ctrl+G: ${run.title}`, { id: run.id });
+        void (async () => {
+            const latestRun = (await loadGoalRuns(props.cwd)).find((item) => item.id === run.id) ?? run;
+            const requestedAt = new Date().toISOString();
+            const runWithContinuation = await upsertGoalRun(props.cwd, {
+                ...latestRun,
+                status: latestRun.status === "running" || latestRun.status === "verifying"
+                    ? latestRun.status
+                    : "ready",
+                continueRequestedAt: requestedAt,
+                blockers: goalHasBlockingPrerequisites(latestRun) ? latestRun.blockers : [],
+                evidence: [
+                    ...latestRun.evidence,
+                    {
+                        id: `goal-rerun-${requestedAt}`,
+                        kind: "summary",
+                        label: "Goal rerun requested",
+                        content: "Continuation requested from Ctrl+G; the orchestrator will choose the next eligible Goal action.",
+                        createdAt: requestedAt,
+                    },
+                ],
+            });
+            startGoalRun(runWithContinuation);
+        })().catch((err) => {
+            log("ERROR", "goal", err instanceof Error ? err.message : String(err));
+            setLiveItems((prev) => [...prev, toErrorItem(err, getId(), "Goal")]);
+        });
+    };
+    const handleDeleteGoalSideEffects = async (run) => {
+        runningGoalIdsRef.current.delete(run.id);
+        const latestRun = (await loadGoalRuns(props.cwd)).find((item) => item.id === run.id) ?? run;
+        if (latestRun.activeWorkerId)
+            await stopGoalWorker(latestRun.activeWorkerId);
+        clearGoalStatusEntry(run.id);
+        clearGoalModeIfIdle();
+    };
+    const handleGoalPickerError = (err) => {
+        log("ERROR", "goal", err instanceof Error ? err.message : String(err));
+        setLiveItems((prev) => [...prev, toErrorItem(err, getId(), "Goal")]);
+    };
+    const goalPicker = useGoalPickerController({
+        cwd: props.cwd,
+        onRunGoal: handleRunGoalFromPicker,
+        onDeleteGoalSideEffects: handleDeleteGoalSideEffects,
+        onPauseGoal: pauseGoalRun,
+        onError: handleGoalPickerError,
+    });
+    const handleToggleTasks = () => {
+        goalPicker.close();
+        taskPicker.toggle();
+    };
+    const handleToggleGoalPicker = () => {
+        taskPicker.close();
+        goalPicker.toggle();
+    };
+    const fullScreenOverlay = isPixelView
+        ? "pixel"
+        : isSkillsView
+            ? "skills"
+            : isPlanView
+                ? "plan"
+                : null;
+    if (quittingSummary) {
+        return (_jsx(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: _jsx(SessionSummaryDisplay, { summary: quittingSummary }) }));
+    }
+    return (_jsx(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: fullScreenOverlay ? (_jsx(FullScreenOverlayRouter, { overlay: fullScreenOverlay, version: props.version, cwd: props.cwd, agentRunning: agentLoop.isRunning, planAutoExpand: planAutoExpand, onClosePixel: handleCloseRemountableOverlay, onPixelFixOne: handlePixelFixOne, onPixelFixAll: handlePixelFixAll, onCloseSkills: handleCloseRemountableOverlay, onClosePlan: handleClosePlanOverlay, onApprovePlan: handleApprovePlan, onRejectPlan: handleRejectPlan })) : (_jsx(ChatScreen, { columns: columns, liveItems: uniqueItemsById(liveItems), renderItem: renderItem, isRunning: agentLoop.isRunning, visibleStreamingText: visibleStreamingText, streamingThinking: agentLoop.streamingThinking, thinkingMs: agentLoop.thinkingMs, reserveStreamingSpacing: shouldReserveStreamingSpacing, renderMarkdown: renderMarkdown, measuredLiveAreaRows: measuredLiveAreaRows, assistantMarginTop: shouldTopSpaceStreamingText ? 1 : 0, streamingContinuation: streamedAssistantFlushRef.current.flushedChars > 0, controlsRef: mainControlsRef, hiddenQueuedCount: hiddenQueuedCount, queueIndicatorMarginTop: shouldTopSpaceQueueIndicator ? 2 : 1, theme: theme, statusSlotVisible: statusSlotVisible, activityVisible: activityVisible, stallStatusVisible: stallStatusVisible, doneStatus: doneStatus, activityPhase: agentLoop.activityPhase, elapsedMs: agentLoop.elapsedMs, runStartRef: agentLoop.runStartRef, isThinking: agentLoop.isThinking, thinkingLevel: thinkingLevel, tokenEstimate: agentLoop.streamedTokenEstimate, charCountRef: agentLoop.charCountRef, realTokensAccumRef: agentLoop.realTokensAccumRef, lastUserMessage: lastUserMessage, activeToolNames: agentLoop.activeToolCalls.map((tc) => tc.name), retryInfo: agentLoop.retryInfo, planDone: planSteps.filter((s) => s.completed).length, planTotal: planSteps.length, formatDuration: formatDuration, inputControls: {
+                onSubmit: handleSubmit,
+                onAbort: handleAbort,
+                inputActive: !taskBarFocused && !overlay,
+                onDownAtEnd: handleFocusTaskBar,
+                onShiftTab: handleToggleThinking,
+                onToggleTasks: handleToggleTasks,
+                onToggleGoal: handleToggleGoalPicker,
+                onToggleSkills: () => openOverlay("skills"),
+                onTogglePixel: () => openOverlay("pixel"),
+                onToggleMarkdown: () => setRenderMarkdown((prev) => !prev),
+                cwd: props.cwd,
+                commands: allCommands,
+            }, taskPicker: {
+                open: taskPicker.open,
+                tasks: taskPicker.tasks,
+                onClose: taskPicker.close,
+                onStart: taskPicker.start,
+                onRunAll: taskPicker.runAll,
+                onDelete: taskPicker.deleteTask,
+            }, goalPicker: {
+                open: goalPicker.open,
+                goals: goalPicker.goals,
+                onClose: goalPicker.close,
+                onRun: goalPicker.run,
+                onDelete: goalPicker.deleteGoal,
+                onPause: goalPicker.pause,
+            }, overlay: overlay, onModelSelect: handleModelSelect, onModelCancel: () => setOverlay(null), loggedInProviders: props.loggedInProviders ?? [currentProvider], currentModel: currentModel, currentProvider: currentProvider, onThemeSelect: handleThemeSelect, onThemeCancel: () => setOverlay(null), currentTheme: theme.name, contextUsed: agentLoop.contextUsed, contextWindowOptions: contextWindowOptions, displayedCwd: displayedCwd, gitBranch: gitBranch, goalMode: goalMode, planMode: planMode, exitPending: exitPending, goalStatusEntries: goalStatusEntries, footerStatusLayout: footerStatusLayout, backgroundTasks: bgTasks, taskBarFocused: taskBarFocused, taskBarExpanded: taskBarExpanded, selectedTaskIndex: selectedTaskIndex, onTaskBarExpand: handleTaskBarExpand, onTaskBarCollapse: handleTaskBarCollapse, onTaskKill: handleTaskKill, onTaskBarExit: handleTaskBarExit, onTaskNavigate: handleTaskNavigate })) }));
 }
 //# sourceMappingURL=App.js.map