mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-07-11 02:20:48 -07:00
feat: add config and keybindings for new ink terminal buffer mode
test: update test utils and resolve snapshot differences for ink changes feat: refactor VirtualizedList to support static rendering and terminal buffers feat: wire up AppContainer mouse mode and recording state for ink buffer Fix stale ref in ScrollProvider breaking scrolling. The ScrollProvider was getting stuck with a stale reference because the `scrollables` Map was being registered and unregistered whenever the entry identity changed. The underlying `ScrollableList` component dynamically created a new ID which caused React remount cycles, while the `ScrollProvider` itself suffered from state lag where the event handler ref was one tick behind the actual registration. This commit resolves these issues by: 1. Adding a stable `id` and `key` to `ScrollableList` in `MainContent.tsx` 2. Making `scrollablesRef` synchronously update in `ScrollProvider.tsx` 3. Using a proxy entry in `useScrollable` to avoid constant re-registering. chore: add useEffect cleanup for ResizeObservers Checkpoint fixing terminal buffer support. Termina Serializer Optimization
This commit is contained in:
@@ -11,6 +11,7 @@ import {
|
||||
useEffect,
|
||||
useRef,
|
||||
useLayoutEffect,
|
||||
useContext,
|
||||
} from 'react';
|
||||
import {
|
||||
type DOMElement,
|
||||
@@ -19,6 +20,7 @@ import {
|
||||
useStdout,
|
||||
useStdin,
|
||||
type AppProps,
|
||||
AppContext as InkAppContext,
|
||||
} from 'ink';
|
||||
import { App } from './App.js';
|
||||
import { AppContext } from './contexts/AppContext.js';
|
||||
@@ -38,6 +40,8 @@ import {
|
||||
import { checkPermissions } from './hooks/atCommandProcessor.js';
|
||||
import { MessageType, StreamingState } from './types.js';
|
||||
import { ToolActionsProvider } from './contexts/ToolActionsContext.js';
|
||||
import { MouseProvider } from './contexts/MouseContext.js';
|
||||
import { ScrollProvider } from './contexts/ScrollProvider.js';
|
||||
import {
|
||||
type StartupWarning,
|
||||
type EditorType,
|
||||
@@ -209,12 +213,30 @@ export const AppContainer = (props: AppContainerProps) => {
|
||||
const { reset } = useOverflowActions()!;
|
||||
const notificationsEnabled = isNotificationsEnabled(settings);
|
||||
|
||||
const { setOptions, dumpCurrentFrame, startRecording, stopRecording } =
|
||||
useContext(InkAppContext);
|
||||
const recordingFilenameRef = useRef<string | null>(null);
|
||||
const historyManager = useHistory({
|
||||
chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
|
||||
});
|
||||
|
||||
useMemoryMonitor(historyManager);
|
||||
const isAlternateBuffer = config.getUseAlternateBuffer();
|
||||
const [mouseMode, setMouseMode] = useState(() =>
|
||||
config.getUseAlternateBuffer(),
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
setOptions({
|
||||
stickyHeadersInBackbuffer: mouseMode,
|
||||
});
|
||||
if (mouseMode) {
|
||||
enableMouseEvents();
|
||||
} else {
|
||||
disableMouseEvents();
|
||||
}
|
||||
}, [mouseMode, setOptions]);
|
||||
|
||||
const [corgiMode, setCorgiMode] = useState(false);
|
||||
const [forceRerenderKey, setForceRerenderKey] = useState(0);
|
||||
const [debugMessage, setDebugMessage] = useState<string>('');
|
||||
@@ -613,11 +635,11 @@ export const AppContainer = (props: AppContainerProps) => {
|
||||
});
|
||||
|
||||
const refreshStatic = useCallback(() => {
|
||||
if (!isAlternateBuffer) {
|
||||
if (!isAlternateBuffer && !config.getUseTerminalBuffer()) {
|
||||
stdout.write(ansiEscapes.clearTerminal);
|
||||
setHistoryRemountKey((prev) => prev + 1);
|
||||
}
|
||||
setHistoryRemountKey((prev) => prev + 1);
|
||||
}, [setHistoryRemountKey, isAlternateBuffer, stdout]);
|
||||
}, [setHistoryRemountKey, isAlternateBuffer, stdout, config]);
|
||||
|
||||
const shouldUseAlternateScreen = shouldEnterAlternateScreen(
|
||||
isAlternateBuffer,
|
||||
@@ -1426,6 +1448,14 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
!copyModeEnabled;
|
||||
|
||||
const observerRef = useRef<ResizeObserver | null>(null);
|
||||
|
||||
useEffect(
|
||||
() => () => {
|
||||
observerRef.current?.disconnect();
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
const [controlsHeight, setControlsHeight] = useState(0);
|
||||
const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = useState(0);
|
||||
|
||||
@@ -1724,6 +1754,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
setShortcutsHelpVisible(false);
|
||||
}
|
||||
|
||||
if (keyMatchers[Command.TOGGLE_MOUSE_MODE](key)) {
|
||||
setMouseMode((prev) => !prev);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (isAlternateBuffer && keyMatchers[Command.TOGGLE_COPY_MODE](key)) {
|
||||
setCopyModeEnabled(true);
|
||||
disableMouseEvents();
|
||||
@@ -1746,6 +1781,32 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
return true;
|
||||
} else if (keyMatchers[Command.SUSPEND_APP](key)) {
|
||||
handleSuspend();
|
||||
} else if (keyMatchers[Command.DUMP_FRAME](key)) {
|
||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
||||
const filename = `snapshot-${timestamp}.json`;
|
||||
if (dumpCurrentFrame) {
|
||||
dumpCurrentFrame(filename);
|
||||
debugLogger.log(`Dumped frame to: ${filename}`);
|
||||
}
|
||||
return true;
|
||||
} else if (keyMatchers[Command.START_RECORDING](key)) {
|
||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
||||
const filename = `recording-${timestamp}.json`;
|
||||
if (startRecording) {
|
||||
startRecording(filename);
|
||||
recordingFilenameRef.current = filename;
|
||||
debugLogger.log(`Started recording to: ${filename}`);
|
||||
}
|
||||
return true;
|
||||
} else if (keyMatchers[Command.STOP_RECORDING](key)) {
|
||||
if (stopRecording) {
|
||||
stopRecording();
|
||||
debugLogger.log(
|
||||
`Stopped recording, saved to: ${recordingFilenameRef.current ?? 'unknown'}`,
|
||||
);
|
||||
recordingFilenameRef.current = null;
|
||||
}
|
||||
return true;
|
||||
} else if (
|
||||
keyMatchers[Command.TOGGLE_COPY_MODE](key) &&
|
||||
!isAlternateBuffer
|
||||
@@ -1932,6 +1993,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
historyManager.history,
|
||||
pendingHistoryItems,
|
||||
toggleAllExpansion,
|
||||
dumpCurrentFrame,
|
||||
startRecording,
|
||||
stopRecording,
|
||||
],
|
||||
);
|
||||
|
||||
@@ -1951,7 +2015,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
}
|
||||
|
||||
setCopyModeEnabled(false);
|
||||
enableMouseEvents();
|
||||
if (mouseMode) {
|
||||
enableMouseEvents();
|
||||
}
|
||||
return true;
|
||||
},
|
||||
{
|
||||
@@ -2268,6 +2334,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
editorError,
|
||||
isEditorDialogOpen,
|
||||
showPrivacyNotice,
|
||||
mouseMode,
|
||||
corgiMode,
|
||||
debugMessage,
|
||||
quittingMessages,
|
||||
@@ -2394,6 +2461,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
editorError,
|
||||
isEditorDialogOpen,
|
||||
showPrivacyNotice,
|
||||
mouseMode,
|
||||
corgiMode,
|
||||
debugMessage,
|
||||
quittingMessages,
|
||||
@@ -2694,7 +2762,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
|
||||
toggleAllExpansion={toggleAllExpansion}
|
||||
>
|
||||
<ShellFocusContext.Provider value={isFocused}>
|
||||
<App key={`app-${forceRerenderKey}`} />
|
||||
<MouseProvider mouseEventsEnabled={mouseMode}>
|
||||
<ScrollProvider>
|
||||
<App key={`app-${forceRerenderKey}`} />
|
||||
</ScrollProvider>
|
||||
</MouseProvider>
|
||||
</ShellFocusContext.Provider>
|
||||
</ToolActionsProvider>
|
||||
</AppContext.Provider>
|
||||
|
||||
Reference in New Issue
Block a user