@kenkaiiii/ggcoder 4.3.227 → 4.3.229

package/dist/ui/App.js

@@ -14,7 +14,7 @@ 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 {} from "@kenkaiiii/gg-ai";
-import { extractImagePaths } from "../utils/image.js";
+import { downscaleForPreview, extractImagePaths } from "../utils/image.js";
 import { useAgentLoop } from "./hooks/useAgentLoop.js";
 import { useTranscriptHistory } from "./hooks/useTranscriptHistory.js";
 import { createWebSearchTool } from "../tools/web-search.js";
@@ -36,6 +36,7 @@ import { isFirstTimeSetup, markSetupAudited, getAnnouncedLanguages, markLanguage
 import { loadCustomCommands } from "../core/custom-commands.js";
 import { detectLanguages } from "../core/language-detector.js";
 import { detectVerifyCommands } from "../core/verify-commands.js";
+import { RewindOverlay } from "./components/RewindOverlay.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";
@@ -75,6 +76,23 @@ const AGGREGATABLE_TOOLS = new Set([
 ]);
 const RUNNING_INDICATOR_ANIMATION_MS = 1_200;
 // ── App Component ──────────────────────────────────────────
+/**
+ * Extract inline image previews carried on a tool result's `details` payload.
+ * Image-producing tools (e.g. screenshot) attach `{ imagePreviews: [...] }` so
+ * the terminal-history printer can render the captured pixels inline.
+ */
+function extractToolImagePreviews(details) {
+    if (!details || typeof details !== "object")
+        return undefined;
+    const previews = details.imagePreviews;
+    if (!Array.isArray(previews))
+        return undefined;
+    const valid = previews.filter((p) => typeof p === "object" &&
+        p !== null &&
+        typeof p.base64 === "string" &&
+        typeof p.mediaType === "string");
+    return valid.length > 0 ? valid : undefined;
+}
 export function App(props) {
     const theme = useTheme();
     const switchTheme = useSetTheme();
@@ -119,6 +137,10 @@ export function App(props) {
     const [overlay, setOverlay] = useState(props.sessionStore?.overlay ?? props.initialOverlay ?? null);
     const [goalStatusEntries, setGoalStatusEntries] = useState(props.sessionStore?.goalStatusEntries ?? []);
     const [updatePending, setUpdatePending] = useState(() => getPendingUpdate(props.version) !== null);
+    // Signal that pushes text into the InputArea composer (e.g. restoring queued
+    // messages after an interrupt). Bumping `nonce` triggers the injection even
+    // when the text is identical to a prior restore.
+    const [composerInject, setComposerInject] = useState(null);
     const agentRunningRef = useRef(false);
     const runningGoalIdsRef = useRef(new Set());
     const activeVerifierRunIdsRef = useRef(new Set());
@@ -134,6 +156,10 @@ export function App(props) {
     const startPixelFixRef = useRef(() => { });
     const cwdRef = useRef(props.cwd);
     const [displayedCwd, setDisplayedCwd] = useState(props.cwd);
+    // /rewind overlay: holds the checkpoint list while the picker is open.
+    const [rewindCheckpoints, setRewindCheckpoints] = useState(null);
+    // Monotonic user-turn counter keying per-turn checkpoints.
+    const rewindTurnRef = useRef(0);
     const taskPicker = useTaskPickerController({
         displayedCwd,
         onStartTask: (title, prompt, taskId) => startTaskRef.current(title, prompt, taskId),
@@ -971,6 +997,7 @@ export function App(props) {
                                 isError,
                                 durationMs,
                                 details,
+                                imagePreviews: extractToolImagePreviews(details),
                                 id: startItem.id,
                             };
                             updated = [...prev];
@@ -988,6 +1015,7 @@ export function App(props) {
                                     isError,
                                     durationMs,
                                     details,
+                                    imagePreviews: extractToolImagePreviews(details),
                                     id: getId(),
                                 },
                             ];
@@ -1478,6 +1506,31 @@ export function App(props) {
             // has not grown.
             await applyLanguageDetectionRef.current("input");
         }
+        // /rewind — open the checkpoint picker (needs React state + the store).
+        if (trimmed === "/rewind") {
+            const store = props.checkpointStore;
+            if (!store) {
+                setLiveItems((prev) => [
+                    ...prev,
+                    { kind: "info", text: "Checkpoints are not available in this session.", id: getId() },
+                ]);
+                return;
+            }
+            const cps = await store.listCheckpoints();
+            if (cps.length === 0) {
+                setLiveItems((prev) => [
+                    ...prev,
+                    {
+                        kind: "info",
+                        text: "No checkpoints yet \u2014 edit a file through ggcoder first.",
+                        id: getId(),
+                    },
+                ]);
+                return;
+            }
+            setRewindCheckpoints(cps);
+            return;
+        }
         if (await handleUiSlashCommand(trimmed, {
             openModelSelector: () => setOverlay("model"),
             compactConversation: async () => {
@@ -1591,7 +1644,7 @@ export function App(props) {
         // ── Queue message if agent is already running ──
         if (agentLoop.isRunning) {
             log("INFO", "queue", `Queued message: ${trimmed.length > 80 ? trimmed.slice(0, 80) + "..." : trimmed}`);
-            agentLoop.queueMessage(userContent);
+            agentLoop.queueMessage(userContent, input);
             let displayText = input;
             if (hasImages) {
                 const { cleanText } = await extractImagePaths(input, props.cwd);
@@ -1612,10 +1665,21 @@ export function App(props) {
             const { cleanText } = await extractImagePaths(input, props.cwd);
             displayText = cleanText;
         }
+        let imagePreviews;
+        if (hasImages) {
+            const built = await Promise.all(inputImages
+                .filter((img) => img.kind === "image")
+                .map(async (img) => {
+                const downscaled = await downscaleForPreview(Buffer.from(img.data, "base64"));
+                return { base64: downscaled.toString("base64"), mediaType: img.mediaType };
+            }));
+            imagePreviews = built.length > 0 ? built : undefined;
+        }
         const userItem = {
             kind: "user",
             text: displayText,
             imageCount: hasImages ? inputImages.length : undefined,
+            imagePreviews,
             pasteInfo,
             id: getId(),
         };
@@ -1628,6 +1692,17 @@ export function App(props) {
             setPlanSteps([]);
         }
         finalizeSubmittedUserItem(userItem);
+        // Open a per-turn checkpoint capturing the conversation position right
+        // before this exchange, so /rewind can restore pre-turn code/chat state.
+        if (props.checkpointStore) {
+            rewindTurnRef.current += 1;
+            await props.checkpointStore
+                .openCheckpoint({
+                turnIndex: rewindTurnRef.current,
+                messageIndex: messagesRef.current.length,
+            })
+                .catch(() => { });
+        }
         // Run agent
         try {
             await agentLoop.run(userContent);
@@ -1663,7 +1738,13 @@ export function App(props) {
     const handleDoubleExit = useDoublePress(setExitPending, showSessionSummaryAndExit);
     const handleAbort = useCallback(() => {
         if (agentLoop.isRunning) {
-            agentLoop.clearQueue();
+            // Restore any unsent queued messages to the composer instead of dropping
+            // them, so an interrupt never silently discards what the user typed.
+            const queuedText = agentLoop.drainQueuedText();
+            if (queuedText) {
+                setLiveItems((prev) => prev.filter((item) => item.kind !== "queued"));
+                setComposerInject({ text: queuedText, nonce: nextIdRef.current++ });
+            }
             agentLoop.abort();
         }
         else if (compactionAbortRef.current) {
@@ -1672,7 +1753,7 @@ export function App(props) {
         else {
             handleDoubleExit();
         }
-    }, [agentLoop, handleDoubleExit]);
+    }, [agentLoop, handleDoubleExit, setLiveItems]);
     const handleToggleThinking = useCallback(() => {
         setThinkingLevel((prev) => {
             const next = getNextThinkingLevel(currentProvider, currentModel, prev);
@@ -1834,6 +1915,12 @@ export function App(props) {
             { name: "compact", aliases: ["c"], description: "Compact context", sectionTitle: "built-in" },
             { name: "clear", aliases: [], description: "Clear session", sectionTitle: "built-in" },
             { name: "theme", aliases: ["t"], description: "Switch theme", sectionTitle: "built-in" },
+            {
+                name: "rewind",
+                aliases: [],
+                description: "Restore files/conversation to a checkpoint",
+                sectionTitle: "built-in",
+            },
             ...orderedPromptCommands,
             ...remainingPromptCommands,
             ...customCommands.map((cmd) => ({
@@ -2051,6 +2138,53 @@ export function App(props) {
             lastPendingHistoryItem,
             lastHistoryItem,
         });
+    const handleRewindCancel = useCallback(() => setRewindCheckpoints(null), []);
+    const handleRewindRestore = useCallback((id, mode) => {
+        const store = props.checkpointStore;
+        setRewindCheckpoints(null);
+        if (!store)
+            return;
+        void (async () => {
+            try {
+                const result = await store.restore(id, mode);
+                const turnNum = id.replace(/^cp-0*/, "") || id;
+                const detailParts = [];
+                if (mode === "code" || mode === "both") {
+                    detailParts.push(`${result.filesRestored} file${result.filesRestored === 1 ? "" : "s"} restored`);
+                }
+                if (mode === "conversation" || mode === "both")
+                    detailParts.push("conversation rewound");
+                const infoText = `Rewound to checkpoint #${turnNum} (${detailParts.join(", ")}).`;
+                if (mode === "conversation" || mode === "both") {
+                    const truncated = messagesRef.current.slice(0, Math.max(1, result.messageIndex));
+                    messagesRef.current = truncated;
+                    persistedIndexRef.current = truncated.length;
+                    agentLoop.reset();
+                    // Remount in lockstep so the banner + confirmation re-render cleanly
+                    // after the conversation context is truncated (CLAUDE.md pattern).
+                    if (props.resetUI) {
+                        props.resetUI({
+                            wipeSession: true,
+                            messages: truncated,
+                            history: [
+                                { kind: "banner", id: "banner" },
+                                { kind: "info", text: infoText, id: getId() },
+                            ],
+                        });
+                        return;
+                    }
+                }
+                setLiveItems((prev) => [...prev, { kind: "info", text: infoText, id: getId() }]);
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                setLiveItems((prev) => [
+                    ...prev,
+                    { kind: "info", text: `Rewind failed: ${msg}`, id: getId() },
+                ]);
+            }
+        })();
+    }, [props.checkpointStore, props.resetUI, agentLoop, messagesRef, persistedIndexRef]);
     const handleCloseRemountableOverlay = () => {
         if (props.resetUI && props.sessionStore && !agentLoop.isRunning) {
             props.sessionStore.overlay = null;
@@ -2293,9 +2427,10 @@ export function App(props) {
     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 || streamingContinuesFlushed ? 1 : 0, streamingContinuation: streamingContinuesFlushed, 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: {
+    return (_jsx(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: rewindCheckpoints ? (_jsx(RewindOverlay, { checkpoints: rewindCheckpoints, onRestore: handleRewindRestore, onCancel: handleRewindCancel })) : 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 || streamingContinuesFlushed ? 1 : 0, streamingContinuation: streamingContinuesFlushed, 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,
+                injectText: composerInject,
                 inputActive: !taskBarFocused && !overlay,
                 onDownAtEnd: handleFocusTaskBar,
                 onShiftTab: handleToggleThinking,