From 9c46acc793df3573e6fbcf53ac3e46663494e410 Mon Sep 17 00:00:00 2001 From: Taylor Mullen Date: Thu, 15 May 2025 22:56:03 -0700 Subject: Refactor: Improve UI rendering and address code review comments This commit addresses several code review comments primarily focused on improving the rendering and stability of the CLI UI. Key changes include: - Passing `isPending` and `availableTerminalHeight` props to `MarkdownDisplay` to enable more intelligent rendering of content, especially for pending messages and code blocks. - Adjusting height calculations in `ToolGroupMessage` and `ToolMessage` to more accurately reflect available space. - Refining the logic in `App.tsx` for measuring and utilizing terminal height, including renaming `footerRef` to `mainControlsRef` for clarity. - Ensuring consistent prop drilling for `isPending` and `availableTerminalHeight` through `HistoryItemDisplay`, `GeminiMessage`, and `GeminiMessageContent`. - In `MarkdownDisplay`, when `isPending` is true and content exceeds `availableTerminalHeight`, the code block will now be truncated with a "... generating more ..." message. If there's insufficient space even for the message, a simpler "... code is being written ..." will be shown. --- packages/cli/src/ui/components/messages/GeminiMessage.tsx | 14 ++++++++++++-- .../src/ui/components/messages/GeminiMessageContent.tsx | 10 +++++++++- .../cli/src/ui/components/messages/ToolGroupMessage.tsx | 3 +-- packages/cli/src/ui/components/messages/ToolMessage.tsx | 9 ++++++--- 4 files changed, 28 insertions(+), 8 deletions(-) (limited to 'packages/cli/src/ui/components/messages') diff --git a/packages/cli/src/ui/components/messages/GeminiMessage.tsx b/packages/cli/src/ui/components/messages/GeminiMessage.tsx index b2c816a9..df8d0a87 100644 --- a/packages/cli/src/ui/components/messages/GeminiMessage.tsx +++ b/packages/cli/src/ui/components/messages/GeminiMessage.tsx @@ -11,9 +11,15 @@ import { Colors } from '../../colors.js'; interface GeminiMessageProps { text: string; + isPending: boolean; + availableTerminalHeight: number; } -export const GeminiMessage: React.FC = ({ text }) => { +export const GeminiMessage: React.FC = ({ + text, + isPending, + availableTerminalHeight, +}) => { const prefix = '✦ '; const prefixWidth = prefix.length; @@ -23,7 +29,11 @@ export const GeminiMessage: React.FC = ({ text }) => { {prefix} - + ); diff --git a/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx b/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx index b9b85dc7..da6e468a 100644 --- a/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx +++ b/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx @@ -10,6 +10,8 @@ import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js'; interface GeminiMessageContentProps { text: string; + isPending: boolean; + availableTerminalHeight: number; } /* @@ -20,13 +22,19 @@ interface GeminiMessageContentProps { */ export const GeminiMessageContent: React.FC = ({ text, + isPending, + availableTerminalHeight, }) => { const originalPrefix = '✦ '; const prefixWidth = originalPrefix.length; return ( - + ); }; diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx index 33460405..d0ad1c5f 100644 --- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx @@ -29,7 +29,6 @@ export const ToolGroupMessage: React.FC = ({ const borderColor = hasPending ? Colors.AccentYellow : Colors.SubtleComment; const staticHeight = /* border */ 2 + /* marginBottom */ 1; - availableTerminalHeight -= staticHeight; return ( = ({ resultDisplay={tool.resultDisplay} status={tool.status} confirmationDetails={tool.confirmationDetails} - availableTerminalHeight={availableTerminalHeight} + availableTerminalHeight={availableTerminalHeight - staticHeight} /> {tool.status === ToolCallStatus.Confirming && tool.confirmationDetails && ( diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx index 220578de..091785f2 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx @@ -26,7 +26,6 @@ export const ToolMessage: React.FC = ({ const statusIndicatorWidth = 3; const hasResult = resultDisplay && resultDisplay.toString().trim().length > 0; const staticHeight = /* Header */ 1; - availableTerminalHeight -= staticHeight; let displayableResult = resultDisplay; let hiddenLines = 0; @@ -37,7 +36,7 @@ export const ToolMessage: React.FC = ({ const lines = resultDisplay.split('\n'); // Estimate available height for this specific tool message content area // This is a rough estimate; ideally, we'd have a more precise measurement. - const contentHeightEstimate = availableTerminalHeight - 5; // Subtracting lines for tool name, status, padding etc. + const contentHeightEstimate = availableTerminalHeight - staticHeight - 5; // Subtracting lines for tool name, status, padding etc. if (lines.length > contentHeightEstimate && contentHeightEstimate > 0) { displayableResult = lines.slice(0, contentHeightEstimate).join('\n'); hiddenLines = lines.length - contentHeightEstimate; @@ -83,7 +82,11 @@ export const ToolMessage: React.FC = ({ {typeof displayableResult === 'string' && ( - + )} {typeof displayableResult === 'object' && ( -- cgit v1.2.3