@kenkaiiii/ggcoder 4.3.206 → 4.3.208

package/dist/ui/App.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useState, useRef, useCallback, useEffect, useMemo } from "react";
-import { Box, Text, Static, useStdout } from "ink";
+import { Box, Text, Static } from "ink";
 import { useTerminalSize } from "./hooks/useTerminalSize.js";
 import { useDoublePress } from "./hooks/useDoublePress.js";
 import { useTaskBarStore, useTaskBarPolling, focusTaskBar, exitTaskBar, expandTaskBar, collapseTaskBar, navigateTaskBar, killTask, } from "./stores/taskbar-store.js";
@@ -96,6 +96,64 @@ function toErrorItem(err, id, contextPrefix) {
         id,
     };
 }
+export function routePromptCommandInput(input, promptCommands = PROMPT_COMMANDS, customCommands = []) {
+    const trimmed = input.trim();
+    if (!trimmed.startsWith("/"))
+        return null;
+    const parts = trimmed.slice(1).split(" ");
+    const cmdName = parts[0];
+    const cmdArgs = parts.slice(1).join(" ").trim();
+    const builtinCmd = promptCommands.find((c) => c.name === cmdName || c.aliases.includes(cmdName));
+    const customCmd = !builtinCmd ? customCommands.find((c) => c.name === cmdName) : undefined;
+    const promptText = builtinCmd?.prompt ?? customCmd?.prompt;
+    if (!promptText)
+        return null;
+    return {
+        cmdName,
+        cmdArgs,
+        promptText,
+        fullPrompt: cmdArgs ? `${promptText}\n\n## User Instructions\n\n${cmdArgs}` : promptText,
+    };
+}
+export function buildUserContentWithAttachments(text, inputImages, modelSupportsImages) {
+    if (inputImages.length === 0)
+        return text;
+    const parts = [];
+    if (text) {
+        parts.push({ type: "text", text });
+    }
+    for (const img of inputImages) {
+        if (img.kind === "text") {
+            parts.push({
+                type: "text",
+                text: `<file name="${img.fileName}">\n${img.data}\n</file>`,
+            });
+        }
+        else if (modelSupportsImages) {
+            parts.push({ type: "image", mediaType: img.mediaType, data: img.data });
+        }
+        else {
+            // GLM models: save image to temp file and instruct model to use vision MCP tool
+            const ext = img.mediaType.split("/")[1] ?? "png";
+            const tmpPath = `/tmp/ggcoder-img-${Date.now()}.${ext}`;
+            try {
+                writeFileSync(tmpPath, Buffer.from(img.data, "base64"));
+                parts.push({
+                    type: "text",
+                    text: `[User attached an image saved at: ${tmpPath} — use the image_analysis tool to view and analyze it]`,
+                });
+            }
+            catch {
+                parts.push({
+                    type: "text",
+                    text: `[User attached an image but it could not be saved for analysis]`,
+                });
+            }
+        }
+    }
+    // If only text parts remain after stripping images, simplify to plain string
+    return parts.length === 1 && parts[0].type === "text" ? parts[0].text : parts;
+}
 /** Tools that get aggregated into a single compact group when concurrent. */
 const AGGREGATABLE_TOOLS = new Set(["read", "grep", "find", "ls"]);
 const RUNNING_INDICATOR_ANIMATION_MS = 1_200;
@@ -135,6 +193,64 @@ function formatGoalWorkerFinishedTitle(taskTitle, status) {
         ? `Worker finished: ${taskTitle}. Reporting back.`
         : `Worker failed: ${taskTitle}. Reporting back.`;
 }
+function countGoalTasksByStatus(tasks, status) {
+    return tasks.filter((task) => task.status === status).length;
+}
+function firstText(values) {
+    return values.find((value) => value !== undefined && value.trim().length > 0)?.trim();
+}
+function truncateGoalSummary(value, maxLength = 90) {
+    const normalized = value.replace(/\s+/g, " ").trim();
+    if (normalized.length <= maxLength)
+        return normalized;
+    return `${normalized.slice(0, maxLength - 1)}…`;
+}
+export function buildGoalSummaryRows(run) {
+    const rows = [];
+    const doneTasks = countGoalTasksByStatus(run.tasks, "done");
+    const failedTasks = countGoalTasksByStatus(run.tasks, "failed");
+    const blockedTasks = countGoalTasksByStatus(run.tasks, "blocked");
+    const taskSuffix = [
+        failedTasks > 0 ? `${failedTasks} failed` : undefined,
+        blockedTasks > 0 ? `${blockedTasks} blocked` : undefined,
+    ].filter((item) => item !== undefined);
+    rows.push({
+        label: "Tasks",
+        value: run.tasks.length > 0 ? `${doneTasks}/${run.tasks.length} done` : "none",
+        ...(taskSuffix.length > 0 ? { detail: taskSuffix.join(", ") } : {}),
+    });
+    const verifierResult = run.verifier?.lastResult;
+    const verifierDetail = firstText([verifierResult?.outputPath, run.verifier?.command]);
+    rows.push({
+        label: "Verifier",
+        value: verifierResult?.status ?? (run.verifier?.command ? "ready" : "missing"),
+        ...(verifierDetail ? { detail: truncateGoalSummary(verifierDetail) } : {}),
+    });
+    const latestEvidence = run.evidence.at(-1);
+    rows.push({
+        label: "Evidence",
+        value: `${run.evidence.length} recorded`,
+        ...(latestEvidence
+            ? { detail: truncateGoalSummary(latestEvidence.path ?? latestEvidence.label) }
+            : {}),
+    });
+    if (run.status === "blocked" || run.status === "paused" || run.blockers.length > 0) {
+        rows.push({
+            label: run.status === "paused" ? "Paused on" : "Blocked on",
+            value: truncateGoalSummary(goalHasBlockingPrerequisites(run)
+                ? formatGoalBlockingPrerequisites(run)
+                : (run.blockers[0] ?? "manual review"), 110),
+        });
+    }
+    else if (run.successCriteria.length > 0) {
+        rows.push({
+            label: "Criteria",
+            value: `${run.successCriteria.length} checked`,
+            detail: truncateGoalSummary(run.successCriteria[0] ?? "", 80),
+        });
+    }
+    return rows.slice(0, 4);
+}
 export function formatGoalTerminalProgress(run) {
     switch (run.status) {
         case "passed":
@@ -143,6 +259,7 @@ export function formatGoalTerminalProgress(run) {
                 phase: "terminal",
                 title: `Goal passed: ${run.title}`,
                 detail: "Verifier evidence is recorded; auto-continuation stopped.",
+                summaryRows: buildGoalSummaryRows(run),
                 status: run.status,
             };
         case "failed":
@@ -151,6 +268,7 @@ export function formatGoalTerminalProgress(run) {
                 phase: "terminal",
                 title: `Goal failed: ${run.title}`,
                 detail: "Auto-continuation stopped. Check Goal tasks for the failing step.",
+                summaryRows: buildGoalSummaryRows(run),
                 status: run.status,
             };
         case "blocked":
@@ -161,6 +279,7 @@ export function formatGoalTerminalProgress(run) {
                 detail: goalHasBlockingPrerequisites(run)
                     ? formatGoalBlockingPrerequisites(run)
                     : (run.blockers[0] ?? "A prerequisite or missing verifier blocked progress."),
+                summaryRows: buildGoalSummaryRows(run),
                 status: run.status,
             };
         case "paused":
@@ -169,6 +288,7 @@ export function formatGoalTerminalProgress(run) {
                 phase: "terminal",
                 title: `Goal paused: ${run.title}`,
                 detail: run.blockers[0] ?? "Auto-continuation paused.",
+                summaryRows: buildGoalSummaryRows(run),
                 status: run.status,
             };
         case "draft":
@@ -178,19 +298,31 @@ export function formatGoalTerminalProgress(run) {
             return null;
     }
 }
-export function shouldHideHistoryForOverlayView(isOverlayView, isAgentRunning) {
-    // Overlay panes should be clean, full-screen views like Tasks/Plans/Skills.
-    // When the agent is idle, pane open/close goes through resetUI(), so history
-    // remains in sessionStore and is reprinted after the pane closes. While the
-    // agent is running we keep Static mounted because resetUI would abort the run.
-    return isOverlayView && !isAgentRunning;
+export function shouldHideHistoryForOverlayView(_isOverlayView, _isAgentRunning) {
+    // Ink Static is append-only. Passing [] for overlay panes rewrites the Static
+    // accumulator and can destroy scrollback when the pane closes. Keep history
+    // mounted and let overlays render below it.
+    return false;
+}
+export function shouldStabilizeOverlayPaneRerender({ overlayPane, isAgentRunning, }) {
+    return isAgentRunning && (overlayPane === "goal" || overlayPane === "plan");
 }
-export function getScrollStabilizationDecision({ isUserScrolled, hasNewOutput, }) {
+export function shouldHideStaticItemsForOverlayView({ shouldHideHistoryForOverlay, stabilizeOverlayPaneRerender, }) {
+    return shouldHideHistoryForOverlay && !stabilizeOverlayPaneRerender;
+}
+export function getScrollStabilizationDecision({ isUserScrolled, hasNewOutput, hasTallLiveUserMessage = false, }) {
+    const shouldStabilize = isUserScrolled || hasTallLiveUserMessage;
     return {
-        preserveStatic: isUserScrolled && hasNewOutput,
-        autoFollow: !isUserScrolled,
+        preserveStatic: shouldStabilize && hasNewOutput,
+        autoFollow: !shouldStabilize,
     };
 }
+export function isTallLiveUserMessage(text, rows) {
+    return text.split("\n").length > Math.max(8, Math.floor(rows * 0.6));
+}
+export function getStaticHistoryKey({ resizeKey }) {
+    return `${resizeKey}`;
+}
 // flushOnTurnText, flushOnTurnEnd are imported from ./live-item-flush.ts
 /** Check whether an item is still active (running spinner, pending result). */
 function isActiveItem(item) {
@@ -352,7 +484,6 @@ function markTaskInProgress(cwd, taskId) {
 export function App(props) {
     const theme = useTheme();
     const switchTheme = useSetTheme();
-    const { stdout } = useStdout();
     const { columns, resizeKey } = useTerminalSize();
     // Hoisted before terminal title hook so it can reference them
     const [lastUserMessage, setLastUserMessage] = useState("");
@@ -414,8 +545,7 @@ export function App(props) {
     const startPixelFixRef = useRef(() => { });
     const cwdRef = useRef(props.cwd);
     const [displayedCwd, setDisplayedCwd] = useState(props.cwd);
-    const [staticKey, setStaticKey] = useState(0);
-    const [doneStatus, setDoneStatus] = useState(null);
+    const [doneStatus, setDoneStatus] = useState(props.sessionStore?.doneStatus ?? null);
     // Suppress "done" status when a plan overlay is about to open
     const planOverlayPendingRef = useRef(false);
     const [gitBranch, setGitBranch] = useState(null);
@@ -552,6 +682,10 @@ export function App(props) {
         if (sessionStore)
             sessionStore.liveItems = liveItems;
     }, [liveItems, sessionStore]);
+    useEffect(() => {
+        if (sessionStore)
+            sessionStore.doneStatus = doneStatus;
+    }, [doneStatus, sessionStore]);
     useEffect(() => {
         if (sessionStore)
             sessionStore.planSteps = planSteps;
@@ -769,14 +903,6 @@ export function App(props) {
                 // premature "done" status that fires when the agent loop finishes
                 planOverlayPendingRef.current = true;
                 setTimeout(() => {
-                    // NOTE: this is the one open-overlay path that does NOT remount via
-                    // resetUI. It runs while the agent is still mid-turn (after the
-                    // exit_plan tool returned but before onDone fires), and unmounting
-                    // here would kill the in-flight agent stream. Keep the bare ANSI
-                    // clear; the drift bug is tolerable across just the agent's
-                    // wrap-up turn, and onApprove/onReject both remount cleanly via
-                    // resetUI when the user resolves the plan.
-                    stdout?.write("\x1b[2J\x1b[3J\x1b[H");
                     setPlanAutoExpand(true);
                     setOverlay("plan");
                     // Don't clear planOverlayPendingRef here — keep it true until
@@ -791,7 +917,7 @@ export function App(props) {
                     planPath);
             };
         }
-    }, [props.onExitPlanRef, replaceSystemPrompt, stdout]);
+    }, [props.onExitPlanRef, replaceSystemPrompt]);
     const appendMessagesToSession = useCallback(async (sessionPath, messages, startIndex) => {
         const sm = sessionManagerRef.current;
         if (!sm)
@@ -1908,14 +2034,10 @@ export function App(props) {
             process.exit(0);
         }
         // Handle /clear — tear down the entire Ink instance and rebuild fresh.
-        // Patching Ink's internal frame tracking in place (log-update reset,
-        // lastOutput cleared, fullStaticOutput dropped, staticKey bump) all
-        // looked correct for one frame but left the live area drifting on
-        // subsequent streaming responses — Ink's cursor math depends on
-        // terminal-state assumptions that ANSI clearing breaks. The reliable
-        // fix is unmount + render again. Runtime state (model, provider,
-        // thinking) survives via renderApp's closure-held `runtimeState`,
-        // mirrored from React state via the useEffects above.
+        // 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) {
                 void (async () => {
@@ -1928,8 +2050,7 @@ export function App(props) {
                 return;
             }
             // Fallback path (resetUI not wired — e.g. tests). Best-effort: clear
-            // React state in place. The Ink-internal drift bug remains here.
-            stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+            // React state in place without touching terminal scrollback.
             pendingFlushRef.current = [];
             setHistory([{ kind: "banner", id: "banner" }]);
             setLiveItems([]);
@@ -1945,7 +2066,6 @@ export function App(props) {
             agentLoop.reset();
             setSessionTitle(undefined);
             sessionTitleGeneratedRef.current = false;
-            setStaticKey((k) => k + 1);
             setLiveItems([{ kind: "info", text: "Session cleared.", id: getId() }]);
             return;
         }
@@ -2053,8 +2173,6 @@ export function App(props) {
                 props.resetUI();
             }
             else {
-                stdout?.write("\x1b[2J\x1b[3J\x1b[H");
-                setStaticKey((key) => key + 1);
                 if (props.sessionStore) {
                     props.sessionStore.overlay = "goal";
                     props.sessionStore.planAutoExpand = false;
@@ -2086,49 +2204,49 @@ export function App(props) {
             return;
         }
         // Handle prompt-template commands (built-in + custom from .gg/commands/)
-        if (trimmed.startsWith("/")) {
-            const parts = trimmed.slice(1).split(" ");
-            const cmdName = parts[0];
-            const cmdArgs = parts.slice(1).join(" ").trim();
-            const builtinCmd = getPromptCommand(cmdName);
-            const customCmd = !builtinCmd ? customCommands.find((c) => c.name === cmdName) : undefined;
-            const promptText = builtinCmd?.prompt ?? customCmd?.prompt;
-            if (promptText) {
-                log("INFO", "command", `Prompt command: /${cmdName}${cmdArgs ? ` (args: ${cmdArgs})` : ""}`);
-                // Move live items into history before starting
-                setLiveItems((prev) => {
-                    if (prev.length > 0) {
-                        pendingFlushRef.current = [...pendingFlushRef.current, ...prev];
-                    }
-                    return [];
-                });
-                // Show the command name as the user message
-                const userItem = { kind: "user", text: trimmed, id: getId() };
-                setLastUserMessage(trimmed);
-                setDoneStatus(null);
-                setLiveItems([userItem]);
-                // Send the full prompt to the agent, with user args appended if provided
-                const fullPrompt = cmdArgs
-                    ? `${promptText}\n\n## User Instructions\n\n${cmdArgs}`
-                    : promptText;
-                try {
-                    await agentLoop.run(fullPrompt);
-                }
-                catch (err) {
-                    const msg = err instanceof Error ? err.message : String(err);
-                    log("ERROR", "error", msg);
-                    const isAbort = msg.includes("aborted") || msg.includes("abort");
-                    setLiveItems((prev) => [
-                        ...prev,
-                        isAbort
-                            ? { kind: "stopped", text: "Request was stopped.", id: getId() }
-                            : toErrorItem(err, getId()),
-                    ]);
+        const promptCommandRoute = routePromptCommandInput(trimmed, PROMPT_COMMANDS, customCommands);
+        if (promptCommandRoute) {
+            const { cmdName, cmdArgs, fullPrompt } = promptCommandRoute;
+            log("INFO", "command", `Prompt command: /${cmdName}${cmdArgs ? ` (args: ${cmdArgs})` : ""}`);
+            // Move live items into history before starting
+            setLiveItems((prev) => {
+                if (prev.length > 0) {
+                    pendingFlushRef.current = [...pendingFlushRef.current, ...prev];
                 }
-                // Reload custom commands in case a setup command created new ones
-                reloadCustomCommands();
-                return;
+                return [];
+            });
+            const hasImages = inputImages.length > 0;
+            const modelInfo = getModel(currentModel);
+            const modelSupportsImages = modelInfo?.supportsImages ?? true;
+            const userContent = buildUserContentWithAttachments(fullPrompt, 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);
+            setLiveItems([userItem]);
+            // Send the full prompt to the agent, with user args appended if provided
+            try {
+                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");
+                setLiveItems((prev) => [
+                    ...prev,
+                    isAbort
+                        ? { kind: "stopped", text: "Request was stopped.", id: getId() }
+                        : toErrorItem(err, getId()),
+                ]);
             }
+            // Reload custom commands in case a setup command created new ones
+            reloadCustomCommands();
+            return;
         }
         // Check slash commands
         if (props.onSlashCommand && input.startsWith("/")) {
@@ -2142,47 +2260,7 @@ export function App(props) {
         const hasImages = inputImages.length > 0;
         const modelInfo = getModel(currentModel);
         const modelSupportsImages = modelInfo?.supportsImages ?? true;
-        let userContent;
-        if (hasImages) {
-            const parts = [];
-            if (trimmed) {
-                parts.push({ type: "text", text: trimmed });
-            }
-            for (const img of inputImages) {
-                if (img.kind === "text") {
-                    parts.push({
-                        type: "text",
-                        text: `<file name="${img.fileName}">\n${img.data}\n</file>`,
-                    });
-                }
-                else if (modelSupportsImages) {
-                    parts.push({ type: "image", mediaType: img.mediaType, data: img.data });
-                }
-                else {
-                    // GLM models: save image to temp file and instruct model to use vision MCP tool
-                    const ext = img.mediaType.split("/")[1] ?? "png";
-                    const tmpPath = `/tmp/ggcoder-img-${Date.now()}.${ext}`;
-                    try {
-                        writeFileSync(tmpPath, Buffer.from(img.data, "base64"));
-                        parts.push({
-                            type: "text",
-                            text: `[User attached an image saved at: ${tmpPath} — use the image_analysis tool to view and analyze it]`,
-                        });
-                    }
-                    catch {
-                        parts.push({
-                            type: "text",
-                            text: `[User attached an image but it could not be saved for analysis]`,
-                        });
-                    }
-                }
-            }
-            // If only text parts remain after stripping images, simplify to plain string
-            userContent = parts.length === 1 && parts[0].type === "text" ? parts[0].text : parts;
-        }
-        else {
-            userContent = input;
-        }
+        const userContent = buildUserContentWithAttachments(input, inputImages, modelSupportsImages);
         // ── Queue message if agent is already running ──
         if (agentLoop.isRunning) {
             log("INFO", "queue", `Queued message: ${trimmed.length > 80 ? trimmed.slice(0, 80) + "..." : trimmed}`);
@@ -2464,7 +2542,7 @@ export function App(props) {
                             ? "◆ "
                             : "! "
                         : "↻ ";
-                return (_jsxs(Box, { marginTop: 1, flexDirection: "column", flexShrink: 1, children: [_jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: color, bold: true, children: glyph }), _jsx(Text, { color: color, bold: true, children: item.title }), item.workerId ? _jsxs(Text, { color: theme.textDim, children: [" \u00B7 worker ", item.workerId] }) : null] }), item.detail ? (_jsx(Text, { color: theme.textDim, wrap: "wrap", children: `  ${item.detail}` })) : null] }, item.id));
+                return (_jsxs(Box, { marginTop: 1, flexDirection: "column", flexShrink: 1, children: [_jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: color, bold: true, children: glyph }), _jsx(Text, { color: color, bold: true, children: item.title }), item.workerId ? _jsxs(Text, { color: theme.textDim, children: [" \u00B7 worker ", item.workerId] }) : null] }), item.detail ? (_jsx(Text, { color: theme.textDim, wrap: "wrap", children: `  ${item.detail}` })) : null, item.summaryRows && item.summaryRows.length > 0 ? (_jsx(Box, { flexDirection: "column", marginTop: 1, marginLeft: 2, flexShrink: 1, children: item.summaryRows.map((row) => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: theme.textDim, children: row.label.padEnd(10) }), _jsx(Text, { color: theme.text, children: row.value }), row.detail ? _jsxs(Text, { color: theme.textDim, children: [" \u00B7 ", row.detail] }) : null] }, row.label))) })) : null] }, item.id));
             }
             case "style_pack": {
                 const names = item.added.map((id) => LANGUAGE_DISPLAY_NAMES[id]);
@@ -2578,7 +2656,6 @@ export function App(props) {
             return;
         }
         // Fallback path (resetUI not wired — tests).
-        stdout?.write("\x1b[2J\x1b[3J\x1b[H");
         setHistory([{ kind: "banner", id: "banner" }]);
         setLiveItems([]);
         messagesRef.current = messagesRef.current.slice(0, 1);
@@ -2612,15 +2689,7 @@ export function App(props) {
                 setRunAllTasks(false);
             }
         })();
-    }, [
-        props.cwd,
-        props.resetUI,
-        props.sessionStore,
-        stdout,
-        agentLoop,
-        currentProvider,
-        currentModel,
-    ]);
+    }, [props.cwd, props.resetUI, props.sessionStore, agentLoop, currentProvider, currentModel]);
     const openOverlay = useCallback((kind) => {
         if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
             props.sessionStore.overlay = kind;
@@ -2633,14 +2702,15 @@ export function App(props) {
                 props.sessionStore.overlay = kind;
                 if (kind !== "plan")
                     props.sessionStore.planAutoExpand = false;
-                if (agentLoop.isRunning)
+                if (agentLoop.isRunning && kind !== "goal" && kind !== "plan") {
                     props.sessionStore.pendingResetUI = true;
+                }
             }
             if (kind !== "plan")
                 setPlanAutoExpand(false);
             setOverlay(kind);
         }
-    }, [agentLoop.isRunning, props, stdout]);
+    }, [agentLoop.isRunning, props]);
     const closeOverlay = useCallback(() => {
         if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
             props.sessionStore.overlay = null;
@@ -2649,12 +2719,10 @@ export function App(props) {
         else {
             if (props.sessionStore) {
                 props.sessionStore.overlay = null;
-                if (agentLoop.isRunning)
-                    props.sessionStore.pendingResetUI = true;
             }
             setOverlay(null);
         }
-    }, [agentLoop.isRunning, overlay, props, stdout]);
+    }, [agentLoop.isRunning, overlay, props]);
     const runGoalSyntheticEvent = useCallback((eventText) => {
         const eventInfo = parseGoalSyntheticEvent(eventText);
         const detail = eventInfo?.kind === "worker"
@@ -2954,6 +3022,7 @@ export function App(props) {
                 model: currentModel,
                 goalRunId: run.id,
                 goalTaskId: decision.task.id,
+                taskTitle: decision.task.title,
                 prompt: decision.task.prompt,
             });
             await upsertGoalRun(props.cwd, {
@@ -3267,14 +3336,10 @@ export function App(props) {
                     activeLanguages: detectedForPixelFix,
                     tools: toolsForPixelFix,
                 });
-                // Now that the cwd swap is committed, reset chat. Doing this BEFORE
-                // the chdir would print a banner with the old cwd, then bumping
-                // staticKey would print a second banner with the new cwd — leaving
-                // two banners stacked in the scrollback.
-                stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                // Now that the cwd swap is committed, reset chat. Do not clear the
+                // terminal here; terminal clear sequences can erase saved scrollback.
                 setHistory([{ kind: "banner", id: "banner" }]);
                 setLiveItems([]);
-                setStaticKey((k) => k + 1);
                 messagesRef.current = messagesRef.current.slice(0, 1);
                 agentLoop.reset();
                 persistedIndexRef.current = messagesRef.current.length;
@@ -3306,7 +3371,7 @@ export function App(props) {
                 setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
             }
         })();
-    }, [props.cwd, stdout, agentLoop, currentProvider, currentModel]);
+    }, [props.cwd, agentLoop, currentProvider, currentModel]);
     startPixelFixRef.current = startPixelFix;
     // Seed from sessionStore so "Fix All" chaining survives a deferred
     // resetUI() if it fires between pixel fixes (e.g. user toggled a pane).
@@ -3330,7 +3395,17 @@ export function App(props) {
     const isPixelView = overlay === "pixel";
     const isOverlayView = isTaskView || isGoalView || isSkillsView || isPlanView || isEyesView || isPixelView;
     const shouldHideHistoryForOverlay = shouldHideHistoryForOverlayView(isOverlayView, agentLoop.isRunning);
-    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(Static, { items: shouldHideHistoryForOverlay ? [] : history, style: { width: "100%" }, children: (item) => (_jsx(Box, { flexDirection: "column", paddingRight: 1, children: renderItem(item) }, item.id)) }, `${resizeKey}-${staticKey}`), isTaskView ? (_jsx(TaskOverlay, { cwd: props.cwd, agentRunning: agentLoop.isRunning, onClose: () => {
+    const stabilizeOverlayPaneRerender = shouldStabilizeOverlayPaneRerender({
+        overlayPane: overlay,
+        isAgentRunning: agentLoop.isRunning,
+    });
+    const staticItems = shouldHideStaticItemsForOverlayView({
+        shouldHideHistoryForOverlay,
+        stabilizeOverlayPaneRerender,
+    })
+        ? []
+        : history;
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(Static, { items: staticItems, style: { width: "100%" }, children: (item) => (_jsx(Box, { flexDirection: "column", paddingRight: 1, children: renderItem(item) }, item.id)) }, getStaticHistoryKey({ resizeKey })), isTaskView ? (_jsx(TaskOverlay, { cwd: props.cwd, agentRunning: agentLoop.isRunning, onClose: () => {
                     if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                         props.sessionStore.overlay = null;
                         props.resetUI();
@@ -3480,10 +3555,8 @@ export function App(props) {
                             approvedPlanPathRef.current = planPath;
                             planStepsRef.current = steps;
                             setPlanSteps(steps);
-                            stdout?.write("\x1b[2J\x1b[3J\x1b[H");
                             setHistory([{ kind: "banner", id: "banner" }]);
                             setLiveItems([]);
-                            setStaticKey((k) => k + 1);
                             setPlanAutoExpand(false);
                             setOverlay(null);
                             messagesRef.current = [{ role: "system", content: newPrompt }];
@@ -3524,8 +3597,6 @@ export function App(props) {
                         });
                         return;
                     }
-                    stdout?.write("\x1b[2J\x1b[3J\x1b[H");
-                    setStaticKey((k) => k + 1);
                     setPlanAutoExpand(false);
                     setOverlay(null);
                     setDoneStatus(null);
@@ -3540,8 +3611,6 @@ export function App(props) {
                     });
                 } })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, paddingRight: 1, children: [liveItems.map((item) => renderItem(item)), _jsx(StreamingArea, { isRunning: agentLoop.isRunning, streamingText: agentLoop.streamingText, streamingThinking: agentLoop.streamingThinking, thinkingMs: agentLoop.thinkingMs, planMode: planMode })] }), agentLoop.isRunning && agentLoop.activityPhase !== "idle" ? (_jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: agentLoop.activityPhase === "thinking" ? THINKING_BORDER_COLORS[0] : "transparent", paddingLeft: 1, paddingRight: 1, width: columns, children: _jsx(ActivityIndicator, { phase: agentLoop.activityPhase, elapsedMs: agentLoop.elapsedMs, runStartRef: agentLoop.runStartRef, thinkingMs: agentLoop.thinkingMs, isThinking: agentLoop.isThinking, thinkingEnabled: thinkingEnabled, tokenEstimate: agentLoop.streamedTokenEstimate, charCountRef: agentLoop.charCountRef, realTokensAccumRef: agentLoop.realTokensAccumRef, userMessage: lastUserMessage, activeToolNames: agentLoop.activeToolCalls.map((tc) => tc.name), planMode: planMode, retryInfo: agentLoop.retryInfo, planDone: planSteps.filter((s) => s.completed).length, planTotal: planSteps.length, staticDisplay: true }) })) : agentLoop.stallError ? (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: theme.warning, children: "⚠ API provider stream interrupted — retries exhausted." }), _jsx(Text, { color: theme.textDim, children: "  Your conversation is preserved. Send a message to continue." })] })) : (doneStatus &&
                         !agentLoop.isRunning && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.success, children: ["✻ ", doneStatus.verb, " ", formatDuration(doneStatus.durationMs)] }) }))), agentLoop.queuedCount > 0 && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.accent, children: ["⏳ ", agentLoop.queuedCount, " message", agentLoop.queuedCount > 1 ? "s" : "", " queued"] }) })), _jsx(InputArea, { onSubmit: handleSubmit, onAbort: handleAbort, disabled: agentLoop.isRunning, isActive: !taskBarFocused && !overlay, onDownAtEnd: handleFocusTaskBar, onShiftTab: handleToggleThinking, onToggleTasks: () => {
-                            // While the agent is running, skip the screen-clear + staticKey
-                            // bump that would otherwise wipe the chat history from scrollback.
                             // Just flip the overlay state — Ink's log-update handles the
                             // live-area transition (chat input → TaskOverlay) natively, and
                             // the chat history above stays in scrollback. When the overlay