refactor(cli): address code review feedback

- Abstracted hardcoded padding, margin, and width calculations in `DenseToolMessage` into explicit constants to improve readability.
- Made `terminalWidth` a required property on `DenseToolMessageProps` to ensure consistent layout calculations, simplifying internal ternary checks.
- Updated `DenseToolMessage` tests to provide the now-required `terminalWidth` prop.
- Removed expensive `node:crypto` usage in `DiffRenderer` key generation, opting for a simpler optional key.
- Simplified terminal refresh logic in `AppContainer` by removing `setTimeout` from the "show more lines" handler, as it was redundant.
- Streamlined `staticHeight` calculation loop in `ToolGroupMessage` to use layout constants.
- Removed redundant `height={0}` properties on Box borders in `ToolGroupMessage`.
- Simplified `effectiveMaxHeight` assignment in `ToolResultDisplay` by using the pre-calculated `availableHeight` directly.
- Restore tool message padding by moving `paddingTop={1}` from `ToolMessage` and `ShellToolMessage` content boxes back to `paddingBottom={1}` in `StickyHeader`.
- Restore `ToolConfirmationQueue` layout.
- Removed excluded file information from ReadManyFiles tool's compact output

Author: jwhelangoog

docs/reference/configuration.md

@@ -2402,7 +2402,7 @@ conventions and context.
     loaded, allowing you to verify the hierarchy and content being used by the
     AI.
   - See the [Commands documentation](./commands.md#memory) for full details on
-    the `/memory` command and its sub-commands (`show` and `refresh`).
+    the `/memory` command and its sub-commands (`show` and `reload`).
 
 By understanding and utilizing these configuration layers and the hierarchical
 nature of context files, you can effectively manage the AI's memory and tailor

packages/cli/src/ui/AppContainer.tsx

@@ -1757,7 +1757,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       }
 
       const toggleLastTurnTools = () => {
-        // If the user manually collapses/expands the view, show the hint and reset the x-second timer.
         triggerExpandHint(true);
 
         const targetToolCallIds = getLastTurnToolCallIds(
@@ -1824,13 +1823,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       ) {
         setConstrainHeight(false);
         toggleLastTurnTools();
-
-        // Force layout refresh after a short delay to allow the terminal layout to settle.
-        // Minimize "blank screen" issue after any async subview updates are complete.
-        setTimeout(() => {
-          refreshStatic();
-        }, 250);
-
+        refreshStatic();
         return true;
       } else if (
         (keyMatchers[Command.FOCUS_SHELL_INPUT](key) ||

packages/cli/src/ui/components/StickyHeader.tsx

@@ -67,6 +67,7 @@ export const StickyHeader: React.FC<StickyHeaderProps> = ({
       borderLeft={true}
       borderRight={true}
       paddingX={1}
+      paddingBottom={1}
       paddingTop={isFirst ? 0 : 1}
     >
       {children}

packages/cli/src/ui/components/ToolConfirmationQueue.tsx

@@ -66,9 +66,9 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
 
   // ToolConfirmationMessage needs to know the height available for its OWN content.
   // We subtract the lines used by the Queue wrapper:
-  // - 2 lines for the rounded border (top/bottom)
+  // - 2 lines for the rounded border
   // - 2 lines for the Header (text + margin)
-  // - 2 lines for Tool Identity (text + margin) if shown
+  // - 2 lines for Tool Identity (text + margin)
   const availableContentHeight = constrainHeight
     ? Math.max(maxHeight - (hideToolIdentity ? 4 : 6), 4)
     : undefined;
@@ -83,7 +83,10 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
       >
         <Box flexDirection="column" width={mainAreaWidth - 4}>
           {/* Header */}
-          <Box marginBottom={1} justifyContent="space-between">
+          <Box
+            marginBottom={hideToolIdentity ? 0 : 1}
+            justifyContent="space-between"
+          >
             <Text color={borderColor} bold>
               {getConfirmationHeader(tool.confirmationDetails)}
             </Text>
@@ -95,7 +98,7 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
           </Box>
 
           {!hideToolIdentity && (
-            <Box marginBottom={1}>
+            <Box>
               <ToolStatusIndicator status={tool.status} name={tool.name} />
               <ToolInfo
                 name={tool.name}

packages/cli/src/ui/components/messages/DenseToolMessage.test.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -31,6 +31,7 @@ describe('DenseToolMessage', () => {
     status: CoreToolCallStatus.Success,
     resultDisplay: 'Success result' as ToolResultDisplay,
     confirmationDetails: undefined,
+    terminalWidth: 80,
   };
 
   it('renders correctly for a successful string result', async () => {

packages/cli/src/ui/components/messages/DenseToolMessage.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -18,7 +18,11 @@ import {
   isListResult,
   isReadManyFilesResult,
 } from '@google/gemini-cli-core';
-import { type IndividualToolCallDisplay, isTodoList } from '../../types.js';
+import {
+  type IndividualToolCallDisplay,
+  type ToolResultDisplay,
+  isTodoList,
+} from '../../types.js';
 import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
 import { ToolStatusIndicator } from './ToolShared.js';
 import { theme } from '../../semantic-colors.js';
@@ -36,8 +40,13 @@ import { colorizeCode } from '../../utils/CodeColorizer.js';
 import { useToolActions } from '../../contexts/ToolActionsContext.js';
 import { getFileExtension } from '../../utils/fileUtils.js';
 
+const PAYLOAD_MARGIN_LEFT = 6;
+const PAYLOAD_BORDER_CHROME_WIDTH = 4; // paddingX=1 (2 cols) + borders (2 cols)
+const PAYLOAD_SCROLL_GUTTER = 4;
+const PAYLOAD_MAX_WIDTH = 120 + PAYLOAD_SCROLL_GUTTER;
+
 interface DenseToolMessageProps extends IndividualToolCallDisplay {
-  terminalWidth?: number;
+  terminalWidth: number;
   availableTerminalHeight?: number;
 }
 
@@ -63,10 +72,6 @@ const hasPayload = (res: unknown): res is PayloadResult => {
   return typeof value === 'string';
 };
 
-/**
- * --- RENDER HELPERS ---
- */
-
 const RenderItemsList: React.FC<{
   items?: string[];
   maxVisible?: number;
@@ -88,17 +93,13 @@ const RenderItemsList: React.FC<{
   );
 };
 
-/**
- * --- SCENARIO LOGIC (Pure Functions) ---
- */
-
 function getFileOpData(
   diff: FileDiff,
   status: CoreToolCallStatus,
-  resultDisplay: unknown,
-  terminalWidth?: number,
-  availableTerminalHeight?: number,
-  isClickable?: boolean,
+  resultDisplay: ToolResultDisplay | undefined,
+  terminalWidth: number,
+  availableTerminalHeight: number | undefined,
+  isClickable: boolean,
 ): ViewParts {
   const added =
     (diff.diffStat?.model_added_lines ?? 0) +
@@ -177,7 +178,7 @@ function getFileOpData(
     <DiffRenderer
       diffContent={diff.fileDiff}
       filename={diff.fileName}
-      terminalWidth={terminalWidth ? terminalWidth - 6 : 80}
+      terminalWidth={terminalWidth - PAYLOAD_MARGIN_LEFT}
       availableTerminalHeight={availableTerminalHeight}
       disableColor={status === CoreToolCallStatus.Cancelled}
     />
@@ -201,26 +202,12 @@ function getReadManyFilesData(result: ReadManyFilesResult): ViewParts {
     skippedCount > 0 ? ` (${skippedCount} ignored)` : ''
   }`;
   const summary = <Text color={theme.text.accent}>→ {summaryStr}</Text>;
-
-  const excludedText =
-    result.excludes && result.excludes.length > 0
-      ? `Excluded patterns: ${result.excludes.slice(0, 3).join(', ')}${
-          result.excludes.length > 3 ? '...' : ''
-        }`
-      : undefined;
-
   const hasItems = items.length > 0;
-  const payload =
-    hasItems || excludedText ? (
-      <Box flexDirection="column" marginLeft={2}>
-        {hasItems && <RenderItemsList items={items} maxVisible={maxVisible} />}
-        {excludedText && (
-          <Text color={theme.text.secondary} dimColor>
-            {excludedText}
-          </Text>
-        )}
-      </Box>
-    ) : undefined;
+  const payload = hasItems ? (
+    <Box flexDirection="column" marginLeft={2}>
+      {hasItems && <RenderItemsList items={items} maxVisible={maxVisible} />}
+    </Box>
+  ) : undefined;
 
   return { description, summary, payload };
 }
@@ -309,10 +296,6 @@ function getGenericSuccessData(
   return { description, summary, payload };
 }
 
-/**
- * --- MAIN COMPONENT ---
- */
-
 export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
   const {
     callId,
@@ -339,7 +322,7 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
   const [isFocused, setIsFocused] = useState(false);
   const toggleRef = useRef<DOMElement>(null);
 
-  // 1. Unified File Data Extraction (Safely bridge resultDisplay and confirmationDetails)
+  // Unified File Data Extraction (Safely bridge resultDisplay and confirmationDetails)
   const diff = useMemo((): FileDiff | undefined => {
     if (isFileDiff(resultDisplay)) return resultDisplay;
     if (confirmationDetails?.type === 'edit') {
@@ -375,7 +358,7 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
     isActive: isAlternateBuffer && !!diff,
   });
 
-  // 2. State-to-View Coordination
+  // State-to-View Coordination
   const viewParts = useMemo((): ViewParts => {
     if (diff) {
       return getFileOpData(
@@ -459,7 +442,7 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
       return colorizeCode({
         code: addedContent,
         language: fileExtension,
-        maxWidth: terminalWidth ? terminalWidth - 6 : 80,
+        maxWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
         settings,
         disableColor: status === CoreToolCallStatus.Cancelled,
         returnLines: true,
@@ -468,7 +451,7 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
       return renderDiffLines({
         parsedLines,
         filename: diff.fileName,
-        terminalWidth: terminalWidth ? terminalWidth - 6 : 80,
+        terminalWidth: terminalWidth - PAYLOAD_MARGIN_LEFT,
         disableColor: status === CoreToolCallStatus.Cancelled,
       });
     }
@@ -502,7 +485,6 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
     <Box minHeight={1}>{item}</Box>
   );
 
-  // 3. Final Layout
   return (
     <Box flexDirection="column">
       <Box marginLeft={2} flexDirection="row" flexWrap="wrap">
@@ -529,7 +511,7 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
 
       {showPayload && isAlternateBuffer && diffLines.length > 0 && (
         <Box
-          marginLeft={6}
+          marginLeft={PAYLOAD_MARGIN_LEFT}
           marginTop={1}
           marginBottom={1}
           paddingX={1}
@@ -541,30 +523,36 @@ export const DenseToolMessage: React.FC<DenseToolMessageProps> = (props) => {
           borderStyle="round"
           borderColor={theme.border.default}
           borderDimColor={true}
-          maxWidth={terminalWidth ? Math.min(124, terminalWidth - 6) : 124}
+          maxWidth={Math.min(
+            PAYLOAD_MAX_WIDTH,
+            terminalWidth - PAYLOAD_MARGIN_LEFT,
+          )}
         >
           <ScrollableList
             data={diffLines}
             renderItem={renderItem}
             keyExtractor={keyExtractor}
             estimatedItemHeight={() => 1}
             hasFocus={isFocused}
-            width={
-              // adjustment: 6 margin - 4 padding/border - 4 right-scroll-gutter
-              terminalWidth ? Math.min(120, terminalWidth - 6 - 4 - 4) : 70
-            }
+            width={Math.min(
+              PAYLOAD_MAX_WIDTH,
+              terminalWidth -
+                PAYLOAD_MARGIN_LEFT -
+                PAYLOAD_BORDER_CHROME_WIDTH -
+                PAYLOAD_SCROLL_GUTTER,
+            )}
           />
         </Box>
       )}
 
       {showPayload && (!isAlternateBuffer || !diff) && viewParts.payload && (
-        <Box marginLeft={6} marginTop={1} marginBottom={1}>
+        <Box marginLeft={PAYLOAD_MARGIN_LEFT} marginTop={1} marginBottom={1}>
           {viewParts.payload}
         </Box>
       )}
 
       {showPayload && outputFile && (
-        <Box marginLeft={6} marginTop={1} marginBottom={1}>
+        <Box marginLeft={PAYLOAD_MARGIN_LEFT} marginTop={1} marginBottom={1}>
           <Text color={theme.text.secondary}>
             (Output saved to: {outputFile})
           </Text>

packages/cli/src/ui/components/messages/DiffRenderer.tsx

@@ -7,7 +7,6 @@
 import type React from 'react';
 import { useMemo } from 'react';
 import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import crypto from 'node:crypto';
 import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme as semanticTheme } from '../../semantic-colors.js';
@@ -165,9 +164,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
         disableColor,
       });
     } else {
-      const key = filename
-        ? `diff-box-${filename}`
-        : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`;
+      const key = filename ? `diff-box-${filename}` : undefined;
 
       return (
         <MaxSizedBox

packages/cli/src/ui/components/messages/ShellToolMessage.tsx

@@ -190,7 +190,6 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
         borderLeft={true}
         borderRight={true}
         paddingX={1}
-        paddingTop={1}
         flexDirection="column"
       >
         <ToolResultDisplay