diff options
| author | Taylor Mullen <[email protected]> | 2025-04-25 17:11:08 -0700 |
|---|---|---|
| committer | N. Taylor Mullen <[email protected]> | 2025-04-26 16:08:05 -0700 |
| commit | 5be89befeff9c4d4f3ab9f508f030bc153fdd06b (patch) | |
| tree | 9d4f679a0e7292132cab04fdd3c24062fcd66ce8 /packages/cli/src/ui/components/ConsolePatcher.tsx | |
| parent | aa65a4a1fc3f51589c7633217f9d3c8bd0141abb (diff) | |
feat: Fix flickering in iTerm + scrolling + performance issues.
- Refactors history display using Ink's <Static> component to prevent flickering and improve performance by rendering completed items statically.
- Introduces ConsolePatcher component to capture and display console.log, console.warn, and console.error output within the Ink UI, addressing native handling issues.
- Introduce a new content splitting mechanism to work better for static items. Basically when content gets too long we will now split content into multiple blocks for Gemini messages to ensure that we can statically cache larger pieces of history.
Fixes:
- https://b.corp.google.com/issues/411450097
- https://b.corp.google.com/issues/412716309
Diffstat (limited to 'packages/cli/src/ui/components/ConsolePatcher.tsx')
| -rw-r--r-- | packages/cli/src/ui/components/ConsolePatcher.tsx | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/packages/cli/src/ui/components/ConsolePatcher.tsx b/packages/cli/src/ui/components/ConsolePatcher.tsx new file mode 100644 index 00000000..7070fbe4 --- /dev/null +++ b/packages/cli/src/ui/components/ConsolePatcher.tsx @@ -0,0 +1,85 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import React, { useState, useEffect, Key } from 'react'; +import { Box, Text } from 'ink'; +import util from 'util'; + +interface ConsoleMessage { + id: Key; + type: 'log' | 'warn' | 'error'; + content: string; +} + +// Using a module-level counter for unique IDs. +// This ensures IDs are unique across messages. +let messageIdCounter = 0; + +export const ConsoleOutput: React.FC = () => { + const [messages, setMessages] = useState<ConsoleMessage[]>([]); + + useEffect(() => { + const originalConsoleLog = console.log; + const originalConsoleWarn = console.warn; + const originalConsoleError = console.error; + + const formatArgs = (args: unknown[]): string => util.format(...args); + const addMessage = (type: 'log' | 'warn' | 'error', args: unknown[]) => { + setMessages((prevMessages) => [ + ...prevMessages, + { + id: `console-msg-${messageIdCounter++}`, + type, + content: formatArgs(args), + }, + ]); + }; + + // It's patching time + console.log = (...args: unknown[]) => addMessage('log', args); + console.warn = (...args: unknown[]) => addMessage('warn', args); + console.error = (...args: unknown[]) => addMessage('error', args); + + return () => { + console.log = originalConsoleLog; + console.warn = originalConsoleWarn; + console.error = originalConsoleError; + }; + }, []); + + return ( + <Box flexDirection="column"> + {messages.map((msg) => { + const textProps: { color?: string } = {}; + let prefix = ''; + + switch (msg.type) { + case 'warn': + textProps.color = 'yellow'; + prefix = 'WARN: '; + break; + case 'error': + textProps.color = 'red'; + prefix = 'ERROR: '; + break; + case 'log': + default: + prefix = 'LOG: '; + break; + } + + return ( + <Box key={msg.id}> + <Text {...textProps}> + {prefix} + {msg.content} + </Text> + </Box> + ); + })} + </Box> + ); +}; |
