@kenkaiiii/ggcoder 4.3.196 → 4.3.198

package/dist/ui/App.js

@@ -4,7 +4,7 @@ import { Box, Text, Static, useStdout } from "ink";
 import { useTerminalSize } from "./hooks/useTerminalSize.js";
 import { useDoublePress } from "./hooks/useDoublePress.js";
 import { useTaskBarStore, useTaskBarPolling, focusTaskBar, exitTaskBar, expandTaskBar, collapseTaskBar, navigateTaskBar, killTask, } from "./stores/taskbar-store.js";
-import crypto, { createHash } from "node:crypto";
+import { createHash } from "node:crypto";
 import { readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -40,6 +40,7 @@ import { useTerminalTitle } from "./hooks/useTerminalTitle.js";
 import { getGitBranch } from "../utils/git.js";
 import { getModel, getContextWindow, getMaxThinkingLevel } from "../core/model-registry.js";
 import { SessionManager } from "../core/session-manager.js";
+import { appendMessagesToSession as appendSessionMessages, createCompactedSessionCheckpoint, } from "../core/session-compaction.js";
 import { log } from "../core/logger.js";
 import { getPendingUpdate, startPeriodicUpdateCheck, stopPeriodicUpdateCheck, } from "../core/auto-update.js";
 import { generateSessionTitle } from "../utils/session-title.js";
@@ -455,6 +456,7 @@ export function App(props) {
     const activeApiKey = currentCreds?.accessToken ?? props.apiKey;
     const activeAccountId = currentCreds?.accountId ?? props.accountId;
     const activeBaseUrl = currentCreds?.baseUrl ?? props.baseUrl;
+    const contextWindowOptions = useMemo(() => ({ provider: currentProvider, accountId: activeAccountId }), [currentProvider, activeAccountId]);
     // Load git branch — re-runs whenever the displayed cwd changes (e.g. when
     // a pixel fix moves the agent into a different project root).
     useEffect(() => {
@@ -639,27 +641,42 @@ export function App(props) {
             };
         }
     }, [props.onExitPlanRef, replaceSystemPrompt, stdout]);
-    const persistNewMessages = useCallback(async () => {
+    const appendMessagesToSession = useCallback(async (sessionPath, messages, startIndex) => {
+        const sm = sessionManagerRef.current;
+        if (!sm)
+            return;
+        await appendSessionMessages(sm, sessionPath, messages, startIndex);
+    }, []);
+    const persistCompactedSession = useCallback(async (compactedMessages) => {
         const sm = sessionManagerRef.current;
+        if (!sm)
+            return;
+        const session = await createCompactedSessionCheckpoint(sm, {
+            cwd: cwdRef.current,
+            provider: currentProvider,
+            model: currentModel,
+            messages: compactedMessages,
+        });
+        sessionPathRef.current = session.path;
+        persistedIndexRef.current = compactedMessages.length;
+        if (sessionStore) {
+            sessionStore.sessionPath = session.path;
+            sessionStore.messages = [...compactedMessages];
+        }
+        log("INFO", "compaction", "Persisted compacted session checkpoint", { path: session.path });
+    }, [currentModel, currentProvider, sessionStore]);
+    const persistNewMessages = useCallback(async () => {
         const sp = sessionPathRef.current;
-        if (!sm || !sp)
+        if (!sp)
             return;
         const allMsgs = messagesRef.current;
-        for (let i = persistedIndexRef.current; i < allMsgs.length; i++) {
-            const msg = allMsgs[i];
-            if (msg.role === "system")
-                continue;
-            const entry = {
-                type: "message",
-                id: crypto.randomUUID(),
-                parentId: null,
-                timestamp: new Date().toISOString(),
-                message: msg,
-            };
-            await sm.appendEntry(sp, entry);
-        }
+        await appendMessagesToSession(sp, allMsgs, persistedIndexRef.current);
         persistedIndexRef.current = allMsgs.length;
-    }, []);
+        if (sessionStore) {
+            sessionStore.messages = [...allMsgs];
+            sessionStore.sessionPath = sp;
+        }
+    }, [appendMessagesToSession, sessionStore]);
     /**
      * Run the language detector against the current cwd. If the detected set is a
      * strict superset of what's already injected, rebuild the system prompt with
@@ -695,7 +712,7 @@ export function App(props) {
         }
     }, [props.settingsFile]);
     const compactConversation = useCallback(async (messages) => {
-        const contextWindow = getContextWindow(currentModel);
+        const contextWindow = getContextWindow(currentModel, contextWindowOptions);
         const tokensBefore = estimateConversationTokens(messages);
         const spinId = getId();
         log("INFO", "compaction", `Running compaction`, {
@@ -708,14 +725,20 @@ export function App(props) {
         try {
             // Resolve fresh credentials for compaction too
             let compactApiKey = activeApiKey;
+            let compactAccountId = activeAccountId;
+            let compactBaseUrl = activeBaseUrl;
             if (props.authStorage) {
                 const creds = await props.authStorage.resolveCredentials(currentProvider);
                 compactApiKey = creds.accessToken;
+                compactAccountId = creds.accountId;
+                compactBaseUrl = creds.baseUrl ?? compactBaseUrl;
             }
             const result = await compact(messages, {
                 provider: currentProvider,
                 model: currentModel,
                 apiKey: compactApiKey,
+                accountId: compactAccountId,
+                baseUrl: compactBaseUrl,
                 contextWindow,
                 signal: undefined,
                 approvedPlanPath: approvedPlanPathRef.current,
@@ -747,7 +770,15 @@ export function App(props) {
             setLiveItems((prev) => prev.map((item) => item.id === spinId ? toErrorItem(err, spinId, "Compaction failed") : item));
             return messages; // Return unchanged on failure
         }
-    }, [currentModel, currentProvider, activeApiKey]);
+    }, [
+        currentModel,
+        currentProvider,
+        activeApiKey,
+        activeAccountId,
+        activeBaseUrl,
+        contextWindowOptions,
+        props.authStorage,
+    ]);
     const getRepoMapSignalCount = useCallback(() => {
         return ((props.repoMapChangedFilesRef?.current.size ?? 0) +
             (props.repoMapReadFilesRef?.current.size ?? 0));
@@ -812,6 +843,10 @@ export function App(props) {
         // Force-compact on context overflow regardless of settings
         if (options?.force) {
             const result = await compactConversation(stripped);
+            if (result !== stripped) {
+                messagesRef.current = result;
+                await persistCompactedSession(result);
+            }
             lastCompactionTimeRef.current = Date.now();
             return injectRepoMapContext(result);
         }
@@ -822,18 +857,29 @@ export function App(props) {
             log("INFO", "compaction", `Skipping compaction — cooldown active`);
             return injectRepoMapContext(stripped);
         }
-        const contextWindow = getContextWindow(currentModel);
+        const contextWindow = getContextWindow(currentModel, contextWindowOptions);
         const modelInfo = getModel(currentModel);
         const reserveTokens = (modelInfo?.maxOutputTokens ?? 0) + 5_000;
         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) {
+                messagesRef.current = result;
+                await persistCompactedSession(result);
+            }
             lastCompactionTimeRef.current = Date.now();
             return injectRepoMapContext(result);
         }
         return injectRepoMapContext(stripped);
-    }, [currentModel, compactConversation, injectRepoMapContext, stripRepoMapMessages]);
+    }, [
+        currentModel,
+        compactConversation,
+        contextWindowOptions,
+        injectRepoMapContext,
+        persistCompactedSession,
+        stripRepoMapMessages,
+    ]);
     // ── Background task bar state (external store) ──────────
     const { bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, } = useTaskBarStore();
     useTaskBarPolling(props.processManager);
@@ -1644,7 +1690,7 @@ export function App(props) {
             const compacted = await compactConversation(messagesRef.current);
             if (compacted !== messagesRef.current) {
                 messagesRef.current = compacted;
-                persistedIndexRef.current = 0; // Re-persist after compaction
+                await persistCompactedSession(compacted);
             }
             return;
         }
@@ -2709,7 +2755,7 @@ 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, thinkingLevel: thinkingEnabled ? getMaxThinkingLevel(currentModel) : undefined, 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" }) }))] }))] }))] }));
+                        }, 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, contextWindowOptions: contextWindowOptions, cwd: displayedCwd, gitBranch: gitBranch, thinkingLevel: thinkingEnabled ? getMaxThinkingLevel(currentModel) : undefined, 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" }) }))] }))] }))] }));
 }
 function formatRepoMapCommandOutput(enabled, markdown, refreshed) {
     const status = enabled ? "on" : "off";