@kenkaiiii/ggcoder 4.3.162 → 4.3.164

package/dist/ui/App.js

@@ -54,7 +54,6 @@ import { detectVerifyCommands } from "../core/verify-commands.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 { Buddy } from "./buddy/Buddy.js";
 // ── Provider Error Hints ──────────────────────────────────
 /** Detect provider-side errors and return a user-facing hint. */
 function getProviderErrorHint(message) {
@@ -320,10 +319,12 @@ export function App(props) {
     const [taskCount, setTaskCount] = useState(() => getTaskCount(props.cwd));
     const [eyesCount, setEyesCount] = useState(() => isEyesActive(props.cwd) ? journalCount({ status: "open" }, props.cwd) : undefined);
     const [updatePending, setUpdatePending] = useState(() => getPendingUpdate(props.version) !== null);
-    const [runAllTasks, setRunAllTasks] = useState(false);
-    const runAllTasksRef = useRef(false);
+    // Seed from sessionStore so "Run All" chaining survives the resetUI()
+    // remount that startTask() triggers between tasks.
+    const [runAllTasks, setRunAllTasks] = useState(props.sessionStore?.runAllTasks ?? false);
+    const runAllTasksRef = useRef(props.sessionStore?.runAllTasks ?? false);
     const startTaskRef = useRef(() => { });
-    const runAllPixelRef = useRef(false);
+    const runAllPixelRef = useRef(props.sessionStore?.runAllPixel ?? false);
     const currentPixelFixRef = useRef(null);
     const startPixelFixRef = useRef(() => { });
     const cwdRef = useRef(props.cwd);
@@ -342,7 +343,22 @@ export function App(props) {
     const approvedPlanPathRef = useRef(props.sessionStore?.approvedPlanPath);
     const planStepsRef = useRef(props.sessionStore?.planSteps ?? []);
     const [planSteps, setPlanSteps] = useState(props.sessionStore?.planSteps ?? []);
-    const nextIdRef = useRef(0);
+    // Seed the per-item ID counter so it doesn't collide with IDs already in
+    // sessionStore.history (which survives remount). Without this, a remount
+    // (resize, overlay toggle, etc.) starts the counter at 0 and new items
+    // generate ids "0", "1", "2"… that collide with the same ids from the
+    // previous mount, triggering React's duplicate-key warning and causing
+    // duplicate/omitted renders.
+    const nextIdRef = useRef((() => {
+        const hist = props.sessionStore?.history ?? props.initialHistory ?? [];
+        let max = -1;
+        for (const item of hist) {
+            const n = Number(item.id);
+            if (Number.isFinite(n) && n > max)
+                max = n;
+        }
+        return max + 1;
+    })());
     const sessionManagerRef = useRef(props.sessionsDir ? new SessionManager(props.sessionsDir) : null);
     const sessionPathRef = useRef(props.sessionStore?.sessionPath ?? props.sessionPath);
     const persistedIndexRef = useRef(messagesRef.current.length);
@@ -648,15 +664,13 @@ export function App(props) {
         await applyLanguageDetectionRef.current("tool");
     };
     // ── Compaction ─────────────────────────────────────────
-    // Load settings for auto-compaction + buddy
+    // Load settings for auto-compaction
     const settingsRef = useRef(null);
-    const [buddyEnabled, setBuddyEnabled] = useState(false);
     useEffect(() => {
         if (props.settingsFile) {
             const sm = new SettingsManager(props.settingsFile);
             sm.load().then(() => {
                 settingsRef.current = sm;
-                setBuddyEnabled(sm.get("buddyEnabled") ?? false);
             });
         }
     }, [props.settingsFile]);
@@ -1367,7 +1381,7 @@ export function App(props) {
                     }
                     return item;
                 });
-                return [...next, { kind: "info", text: "Request was stopped.", id: getId() }];
+                return [...next, { kind: "stopped", text: "Request was stopped.", id: getId() }];
             });
         }, []),
         onQueuedStart: useCallback((content) => {
@@ -1431,7 +1445,7 @@ export function App(props) {
             setLiveItems((prev) => [
                 ...prev,
                 isAbort
-                    ? { kind: "info", text: "Auto-setup cancelled.", id: getId() }
+                    ? { kind: "stopped", text: "Auto-setup cancelled.", id: getId() }
                     : { kind: "error", message: msg, id: getId() },
             ]);
         }
@@ -1454,6 +1468,29 @@ export function App(props) {
     useEffect(() => {
         setTitleRunning(agentLoop.isRunning);
     }, [agentLoop.isRunning]);
+    // Mirror agent running state into sessionStore so renderApp's resize
+    // handler and overlay toggles can skip their unmount/remount while the
+    // agent is in flight (unmounting fires useAgentLoop's cleanup which
+    // aborts the in-flight request). On the running→idle transition,
+    // consume any pendingResetUI flag set during the run by scheduling a
+    // deferred resetUI to clean up accumulated log-update drift. The 100ms
+    // setTimeout lets onDone's two-phase flush commit to sessionStore.history
+    // first, so the chat isn't lost. The cleanup also bails if the user
+    // started a new run before the timer fires, to avoid aborting it.
+    useEffect(() => {
+        if (!sessionStore)
+            return;
+        sessionStore.isAgentRunning = agentLoop.isRunning;
+        if (!agentLoop.isRunning && sessionStore.pendingResetUI) {
+            sessionStore.pendingResetUI = false;
+            const timer = setTimeout(() => {
+                if (sessionStore.isAgentRunning)
+                    return;
+                props.resetUI?.();
+            }, 100);
+            return () => clearTimeout(timer);
+        }
+    }, [agentLoop.isRunning, sessionStore, props.resetUI]);
     // Consume sessionStore.pendingAction once on mount. Set by resetUI options
     // for paths that remount AND immediately drive the agent (plan accept,
     // plan reject, startTask, pixel fix). The action survives the unmount
@@ -1467,7 +1504,14 @@ export function App(props) {
         pendingActionConsumedRef.current = true;
         if (sessionStore)
             sessionStore.pendingAction = undefined;
-        if (action.infoText) {
+        if (action.planEvent) {
+            const ev = action.planEvent;
+            setLiveItems((prev) => [
+                ...prev,
+                { kind: "plan_event", event: ev.event, detail: ev.detail, id: getId() },
+            ]);
+        }
+        else if (action.infoText) {
             setLiveItems((prev) => [
                 ...prev,
                 { kind: "info", text: action.infoText, id: getId() },
@@ -1626,37 +1670,23 @@ export function App(props) {
                     messagesRef.current[0] = { role: "system", content: newPrompt };
                 }
             })();
-            setLiveItems([{ kind: "info", text: "Approved plan dismissed.", id: getId() }]);
-            return;
-        }
-        // Handle /buddy — toggle companion
-        if (trimmed === "/buddy") {
-            const next = !buddyEnabled;
-            setBuddyEnabled(next);
-            if (settingsRef.current) {
-                settingsRef.current.set("buddyEnabled", next);
-            }
-            setLiveItems((items) => [
-                ...items,
-                {
-                    kind: "info",
-                    text: next
-                        ? "Buddy enabled! Your companion will appear near the prompt."
-                        : "Buddy disabled.",
-                    id: getId(),
-                },
-            ]);
+            setLiveItems([{ kind: "plan_event", event: "dismissed", id: getId() }]);
             return;
         }
         // Handle /plans — open plan pane
         if (trimmed === "/plans") {
-            if (props.resetUI && props.sessionStore) {
+            if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                 props.sessionStore.overlay = "plan";
                 props.sessionStore.planAutoExpand = false;
                 props.resetUI();
             }
             else {
-                stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                if (props.sessionStore) {
+                    props.sessionStore.overlay = "plan";
+                    props.sessionStore.planAutoExpand = false;
+                    if (agentLoop.isRunning)
+                        props.sessionStore.pendingResetUI = true;
+                }
                 setPlanAutoExpand(false);
                 setOverlay("plan");
             }
@@ -1698,7 +1728,7 @@ export function App(props) {
                     setLiveItems((prev) => [
                         ...prev,
                         isAbort
-                            ? { kind: "info", text: "Request was stopped.", id: getId() }
+                            ? { kind: "stopped", text: "Request was stopped.", id: getId() }
                             : { kind: "error", message: msg, id: getId() },
                     ]);
                 }
@@ -1822,7 +1852,7 @@ export function App(props) {
             setLiveItems((prev) => [
                 ...prev,
                 isAbort
-                    ? { kind: "info", text: "Request was stopped.", id: getId() }
+                    ? { kind: "stopped", text: "Request was stopped.", id: getId() }
                     : { kind: "error", message: msg, id: getId() },
             ]);
         }
@@ -1843,7 +1873,7 @@ export function App(props) {
             log("INFO", "thinking", `Thinking ${next ? "enabled" : "disabled"}`);
             setLiveItems((items) => [
                 ...items,
-                { kind: "info", text: `Thinking ${next ? "on" : "off"}`, id: getId() },
+                { kind: "thinking_transition", active: next, id: getId() },
             ]);
             if (props.settingsFile) {
                 const sm = new SettingsManager(props.settingsFile);
@@ -1919,7 +1949,7 @@ export function App(props) {
         const displayName = modelInfo?.name ?? newModelId;
         setLiveItems((prev) => [
             ...prev,
-            { kind: "info", text: `Switched to ${displayName}`, id: getId() },
+            { kind: "model_transition", modelName: displayName, id: getId() },
         ]);
         // Persist model selection for next CLI launch
         if (props.settingsFile) {
@@ -1940,10 +1970,7 @@ export function App(props) {
             const sm = new SettingsManager(props.settingsFile);
             sm.load().then(() => sm.set("theme", name));
         }
-        setLiveItems((prev) => [
-            ...prev,
-            { kind: "info", text: `Theme switched to: ${name}`, id: getId() },
-        ]);
+        setLiveItems((prev) => [...prev, { kind: "theme_transition", themeName: name, id: getId() }]);
     }, [switchTheme, props.settingsFile]);
     // All available slash commands for the command palette — ordered by how
     // commonly they're used and grouped by purpose; /quit stays dead last.
@@ -2032,6 +2059,49 @@ export function App(props) {
                 return (_jsx(Box, { marginTop: 1, flexShrink: 1, borderStyle: "round", borderColor: theme.success, paddingX: 1, children: _jsxs(Text, { color: theme.success, bold: true, wrap: "wrap", children: ["✨ ", item.text] }) }, item.id));
             case "plan_transition":
                 return (_jsx(Box, { marginTop: 1, flexShrink: 1, children: _jsxs(Text, { color: theme.planPrimary, bold: true, wrap: "wrap", children: [item.active ? "● " : "● ", item.text] }) }, item.id));
+            case "thinking_transition": {
+                // Borderless. While in liveItems the glyph color cycles through the
+                // shared TRANSITION_COLORS gradient (~500ms per color). Once the item
+                // flushes to <Static>, its last-rendered color sticks — re-renders
+                // don't propagate into scrollback. Cheap: the animation timer is
+                // already running for the activity indicator.
+                const glyphFrame = item.active
+                    ? deriveFrame(animTick, 500, THINKING_BORDER_COLORS.length)
+                    : 0;
+                const glyphColor = item.active ? THINKING_BORDER_COLORS[glyphFrame] : theme.textDim;
+                return (_jsxs(Box, { marginTop: 1, flexShrink: 1, children: [_jsx(Text, { color: glyphColor, bold: true, children: "✻ " }), _jsx(Text, { color: item.active ? theme.accent : theme.textDim, bold: true, children: item.active ? "Thinking ON" : "Thinking OFF" })] }, item.id));
+            }
+            case "model_transition": {
+                // Same animated-gradient pattern as thinking_transition, distinct
+                // glyph (▸) and primary-blue model name so the two transitions read
+                // as related but different.
+                const glyphFrame = deriveFrame(animTick, 500, THINKING_BORDER_COLORS.length);
+                const glyphColor = THINKING_BORDER_COLORS[glyphFrame];
+                return (_jsxs(Box, { marginTop: 1, flexShrink: 1, children: [_jsx(Text, { color: glyphColor, bold: true, children: "▸ " }), _jsx(Text, { color: theme.textDim, children: "Switched to " }), _jsx(Text, { color: theme.primary, bold: true, children: item.modelName })] }, item.id));
+            }
+            case "theme_transition": {
+                // Same family as model/thinking transitions. The ◐ glyph (half-filled
+                // circle) reads as the light/dark dichotomy.
+                const glyphFrame = deriveFrame(animTick, 500, THINKING_BORDER_COLORS.length);
+                const glyphColor = THINKING_BORDER_COLORS[glyphFrame];
+                return (_jsxs(Box, { marginTop: 1, flexShrink: 1, children: [_jsx(Text, { color: glyphColor, bold: true, children: "◐ " }), _jsx(Text, { color: theme.textDim, children: "Theme switched to " }), _jsx(Text, { color: theme.primary, bold: true, children: item.themeName })] }, item.id));
+            }
+            case "plan_event": {
+                // Plan-domain status changes (approve / reject / dismiss). Uses
+                // theme.planPrimary to match the existing plan_transition family,
+                // distinct from the model/thinking gradient.
+                const label = item.event === "approved"
+                    ? "Plan approved"
+                    : item.event === "rejected"
+                        ? "Plan rejected"
+                        : "Plan dismissed";
+                return (_jsxs(Box, { marginTop: 1, flexShrink: 1, children: [_jsxs(Text, { color: theme.planPrimary, bold: true, children: ["○ ", label] }), item.detail ? _jsx(Text, { color: theme.textDim, children: ` — "${item.detail}"` }) : null] }, item.id));
+            }
+            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 (_jsx(Box, { marginTop: 1, flexShrink: 1, children: _jsxs(Text, { color: theme.textDim, bold: true, children: ["⊘ ", item.text] }) }, item.id));
             case "step_done":
                 return (_jsx(Box, { marginTop: 1, flexShrink: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.success, bold: true, children: "✓ " }), _jsx(Text, { color: theme.success, bold: true, children: `Step ${item.stepNum} done` }), item.description ? (_jsx(Text, { color: theme.textDim, children: ` — ${item.description}` })) : null] }) }, item.id));
             case "queued":
@@ -2115,7 +2185,7 @@ export function App(props) {
                 setLiveItems((prev) => [
                     ...prev,
                     isAbort
-                        ? { kind: "info", text: "Request was stopped.", id: getId() }
+                        ? { kind: "stopped", text: "Request was stopped.", id: getId() }
                         : { kind: "error", message: msg, id: getId() },
                 ]);
                 setRunAllTasks(false);
@@ -2134,7 +2204,9 @@ export function App(props) {
     startTaskRef.current = startTask;
     useEffect(() => {
         runAllTasksRef.current = runAllTasks;
-    }, [runAllTasks]);
+        if (props.sessionStore)
+            props.sessionStore.runAllTasks = runAllTasks;
+    }, [runAllTasks, props.sessionStore]);
     const startPixelFix = useCallback((errorId) => {
         void (async () => {
             try {
@@ -2210,25 +2282,32 @@ export function App(props) {
         })();
     }, [props.cwd, stdout, agentLoop, currentProvider, currentModel]);
     startPixelFixRef.current = startPixelFix;
-    const [runAllPixel, setRunAllPixel] = useState(false);
+    // Seed from sessionStore so "Fix All" chaining survives a deferred
+    // resetUI() if it fires between pixel fixes (e.g. user toggled a pane).
+    const [runAllPixel, setRunAllPixel] = useState(props.sessionStore?.runAllPixel ?? false);
     useEffect(() => {
         runAllPixelRef.current = runAllPixel;
-    }, [runAllPixel]);
+        if (props.sessionStore)
+            props.sessionStore.runAllPixel = runAllPixel;
+    }, [runAllPixel, props.sessionStore]);
     const isTaskView = overlay === "tasks";
     const isSkillsView = overlay === "skills";
     const isPlanView = overlay === "plan";
     const isEyesView = overlay === "eyes";
     const isPixelView = overlay === "pixel";
     const isOverlayView = isTaskView || isSkillsView || isPlanView || isEyesView || isPixelView;
-    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(Static, { items: isOverlayView ? [] : 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: () => {
-                    if (props.resetUI && props.sessionStore) {
+    return (_jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(Static, { items: isOverlayView && !agentLoop.isRunning ? [] : 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: () => {
+                    if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                         props.sessionStore.overlay = null;
                         props.resetUI();
                     }
                     else {
-                        stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                        if (props.sessionStore) {
+                            props.sessionStore.overlay = null;
+                            if (agentLoop.isRunning)
+                                props.sessionStore.pendingResetUI = true;
+                        }
                         setTaskCount(getTaskCount(props.cwd));
-                        setStaticKey((k) => k + 1);
                         setOverlay(null);
                     }
                 }, onWorkOnTask: (title, prompt, taskId) => {
@@ -2243,13 +2322,16 @@ export function App(props) {
                         startTask(next.title, next.prompt, next.id);
                     }
                 } })) : isPixelView ? (_jsx(PixelOverlay, { version: props.version, agentRunning: agentLoop.isRunning, onClose: () => {
-                    if (props.resetUI && props.sessionStore) {
+                    if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                         props.sessionStore.overlay = null;
                         props.resetUI();
                     }
                     else {
-                        stdout?.write("\x1b[2J\x1b[3J\x1b[H");
-                        setStaticKey((k) => k + 1);
+                        if (props.sessionStore) {
+                            props.sessionStore.overlay = null;
+                            if (agentLoop.isRunning)
+                                props.sessionStore.pendingResetUI = true;
+                        }
                         setOverlay(null);
                     }
                 }, onFixOne: (entry) => {
@@ -2263,38 +2345,48 @@ export function App(props) {
                     setRunAllPixel(true);
                     startPixelFix(first.errorId);
                 } })) : isSkillsView ? (_jsx(SkillsOverlay, { cwd: props.cwd, onClose: () => {
-                    if (props.resetUI && props.sessionStore) {
+                    if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                         props.sessionStore.overlay = null;
                         props.resetUI();
                     }
                     else {
-                        stdout?.write("\x1b[2J\x1b[3J\x1b[H");
-                        setStaticKey((k) => k + 1);
+                        if (props.sessionStore) {
+                            props.sessionStore.overlay = null;
+                            if (agentLoop.isRunning)
+                                props.sessionStore.pendingResetUI = true;
+                        }
                         setOverlay(null);
                     }
                 } })) : isEyesView ? (_jsx(EyesOverlay, { cwd: props.cwd, onClose: () => {
-                    if (props.resetUI && props.sessionStore) {
+                    if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                         props.sessionStore.overlay = null;
                         props.resetUI();
                     }
                     else {
-                        stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                        if (props.sessionStore) {
+                            props.sessionStore.overlay = null;
+                            if (agentLoop.isRunning)
+                                props.sessionStore.pendingResetUI = true;
+                        }
                         setEyesCount(isEyesActive(props.cwd) ? journalCount({ status: "open" }, props.cwd) : undefined);
-                        setStaticKey((k) => k + 1);
                         setOverlay(null);
                     }
                 }, onQueueMessage: (msg) => {
                     agentLoop.queueMessage(msg);
                 } })) : isPlanView ? (_jsx(PlanOverlay, { cwd: props.cwd, autoExpandNewest: planAutoExpand, onClose: () => {
                     planOverlayPendingRef.current = false;
-                    if (props.resetUI && props.sessionStore) {
+                    if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                         props.sessionStore.overlay = null;
                         props.sessionStore.planAutoExpand = false;
                         props.resetUI();
                     }
                     else {
-                        stdout?.write("\x1b[2J\x1b[3J\x1b[H");
-                        setStaticKey((k) => k + 1);
+                        if (props.sessionStore) {
+                            props.sessionStore.overlay = null;
+                            props.sessionStore.planAutoExpand = false;
+                            if (agentLoop.isRunning)
+                                props.sessionStore.pendingResetUI = true;
+                        }
                         setPlanAutoExpand(false);
                         setOverlay(null);
                     }
@@ -2332,7 +2424,7 @@ export function App(props) {
                                     sessionPath: newSessionPath,
                                     pendingAction: {
                                         prompt: "The plan has been approved. Implement it now, following each step in order.",
-                                        infoText: "Plan approved — starting fresh session for implementation",
+                                        planEvent: { event: "approved" },
                                     },
                                 });
                                 return;
@@ -2380,7 +2472,7 @@ export function App(props) {
                         props.resetUI({
                             pendingAction: {
                                 prompt: rejectionMsg,
-                                infoText: `Plan rejected — "${feedback}"`,
+                                planEvent: { event: "rejected", detail: feedback },
                             },
                         });
                         return;
@@ -2403,30 +2495,48 @@ export function App(props) {
                             ? THINKING_BORDER_COLORS[thinkingBorderFrame]
                             : "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, 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 }) })) : 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: () => {
-                            if (props.resetUI && props.sessionStore) {
+                            // 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
+                            // closes, the history is still there (banner included).
+                            if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                                 props.sessionStore.overlay = "tasks";
                                 props.resetUI();
                             }
                             else {
-                                stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                                if (props.sessionStore) {
+                                    props.sessionStore.overlay = "tasks";
+                                    if (agentLoop.isRunning)
+                                        props.sessionStore.pendingResetUI = true;
+                                }
                                 setOverlay("tasks");
                             }
                         }, onToggleSkills: () => {
-                            if (props.resetUI && props.sessionStore) {
+                            if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                                 props.sessionStore.overlay = "skills";
                                 props.resetUI();
                             }
                             else {
-                                stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                                if (props.sessionStore) {
+                                    props.sessionStore.overlay = "skills";
+                                    if (agentLoop.isRunning)
+                                        props.sessionStore.pendingResetUI = true;
+                                }
                                 setOverlay("skills");
                             }
                         }, onTogglePixel: () => {
-                            if (props.resetUI && props.sessionStore) {
+                            if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
                                 props.sessionStore.overlay = "pixel";
                                 props.resetUI();
                             }
                             else {
-                                stdout?.write("\x1b[2J\x1b[3J\x1b[H");
+                                if (props.sessionStore) {
+                                    props.sessionStore.overlay = "pixel";
+                                    if (agentLoop.isRunning)
+                                        props.sessionStore.pendingResetUI = true;
+                                }
                                 setOverlay("pixel");
                             }
                         }, onTogglePlanMode: () => {
@@ -2442,6 +2552,6 @@ export function App(props) {
                                     id: getId(),
                                 },
                             ]);
-                        }, cwd: props.cwd, commands: allCommands, eyesCount: eyesCount }), 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 })) : (_jsx(Footer, { model: currentModel, tokensIn: agentLoop.contextUsed, cwd: displayedCwd, gitBranch: gitBranch, thinkingEnabled: thinkingEnabled, planMode: planMode, exitPending: exitPending })), buddyEnabled && _jsx(Buddy, { phase: agentLoop.activityPhase }), (bgTasks.length > 0 || (eyesCount !== undefined && eyesCount > 0) || updatePending) && (_jsxs(Box, { children: [bgTasks.length > 0 && (_jsx(BackgroundTasksBar, { tasks: bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, onExpand: handleTaskBarExpand, onCollapse: handleTaskBarCollapse, onKill: handleTaskKill, onExit: handleTaskBarExit, onNavigate: handleTaskNavigate })), eyesCount !== undefined && eyesCount > 0 && (_jsx(Box, { paddingLeft: bgTasks.length > 0 ? 2 : 1, paddingRight: 1, children: _jsx(Text, { color: theme.accent, bold: true, children: `${eyesCount} eyes signal${eyesCount === 1 ? "" : "s"} · Run /eyes-improve to enhance GG Coder` }) })), updatePending && (_jsx(Box, { paddingLeft: bgTasks.length > 0 || (eyesCount !== undefined && eyesCount > 0) ? 2 : 1, paddingRight: 1, children: _jsx(Text, { color: theme.success, bold: true, children: "\u2728 Update ready \u00B7 restart to apply" }) }))] }))] }))] }));
+                        }, cwd: props.cwd, commands: allCommands, eyesCount: eyesCount }), 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 })) : (_jsx(Footer, { model: currentModel, tokensIn: agentLoop.contextUsed, cwd: displayedCwd, gitBranch: gitBranch, thinkingEnabled: thinkingEnabled, planMode: planMode, exitPending: exitPending })), (bgTasks.length > 0 || (eyesCount !== undefined && eyesCount > 0) || updatePending) && (_jsxs(Box, { children: [bgTasks.length > 0 && (_jsx(BackgroundTasksBar, { tasks: bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, onExpand: handleTaskBarExpand, onCollapse: handleTaskBarCollapse, onKill: handleTaskKill, onExit: handleTaskBarExit, onNavigate: handleTaskNavigate })), eyesCount !== undefined && eyesCount > 0 && (_jsx(Box, { paddingLeft: bgTasks.length > 0 ? 2 : 1, paddingRight: 1, children: _jsx(Text, { color: theme.accent, bold: true, children: `${eyesCount} eyes signal${eyesCount === 1 ? "" : "s"} · Run /eyes-improve to enhance GG Coder` }) })), updatePending && (_jsx(Box, { paddingLeft: bgTasks.length > 0 || (eyesCount !== undefined && eyesCount > 0) ? 2 : 1, paddingRight: 1, children: _jsx(Text, { color: theme.success, bold: true, children: "\u2728 Update ready \u00B7 restart to apply" }) }))] }))] }))] }));
 }
 //# sourceMappingURL=App.js.map