mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-06-12 12:26:57 -07:00
09a6667c35
- Refined height calculation logic in ToolGroupMessage to ensure consistent spacing between compact and standard tools. - Adjusted padding and margins in StickyHeader, ToolConfirmationQueue, ShellToolMessage, and ToolMessage for visual alignment. - Updated TOOL_RESULT_STANDARD_RESERVED_LINE_COUNT to account for internal layout changes. - Improved ToolResultDisplay height handling in alternate buffer mode. - Updated test snapshots to reflect layout and spacing corrections. refactor(cli): cleanup and simplify UI components - Reduced UI refresh delay in AppContainer.tsx for a more responsive user experience. - Reorder imports and hook definitions within AppContainer.tsx to reduce diff 'noise'. refactor(cli): enhance compact output robustness and visual regression testing Addressing automated review feedback to improve code maintainability and layout stability. 1. Robust File Extension Parsing: - Introduced getFileExtension utility in packages/cli/src/ui/utils/fileUtils.ts using node:path for reliable extension extraction. - Updated DenseToolMessage and DiffRenderer to use the new utility, replacing fragile string splitting. 2. Visual Regression Coverage: - Added SVG snapshot tests to DenseToolMessage.test.tsx to verify semantic color rendering and layout integrity in compact mode. fix(cli): resolve dense tool output code quality issues - Replaced manual string truncation with Ink's `wrap="truncate-end"` to adhere to UI guidelines. - Added `isReadManyFilesResult` type guard to `packages/core/src/tools/tools.ts` to improve typing for structured tool results. - Fixed an incomplete test case in `DenseToolMessage.test.tsx` to properly simulate expansion via context instead of missing mouse events.
478 lines
15 KiB
TypeScript
478 lines
15 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2025 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import type React from 'react';
|
|
import { useMemo, Fragment } from 'react';
|
|
import { Box, Text } from 'ink';
|
|
import type {
|
|
HistoryItem,
|
|
HistoryItemWithoutId,
|
|
IndividualToolCallDisplay,
|
|
} from '../../types.js';
|
|
import { ToolCallStatus, mapCoreStatusToDisplayStatus } from '../../types.js';
|
|
import { ToolMessage } from './ToolMessage.js';
|
|
import { ShellToolMessage } from './ShellToolMessage.js';
|
|
import { SubagentGroupDisplay } from './SubagentGroupDisplay.js';
|
|
import { DenseToolMessage } from './DenseToolMessage.js';
|
|
import { theme } from '../../semantic-colors.js';
|
|
import { useConfig } from '../../contexts/ConfigContext.js';
|
|
import { isShellTool } from './ToolShared.js';
|
|
import {
|
|
shouldHideToolCall,
|
|
CoreToolCallStatus,
|
|
Kind,
|
|
EDIT_DISPLAY_NAME,
|
|
GLOB_DISPLAY_NAME,
|
|
WEB_SEARCH_DISPLAY_NAME,
|
|
READ_FILE_DISPLAY_NAME,
|
|
LS_DISPLAY_NAME,
|
|
GREP_DISPLAY_NAME,
|
|
WEB_FETCH_DISPLAY_NAME,
|
|
WRITE_FILE_DISPLAY_NAME,
|
|
READ_MANY_FILES_DISPLAY_NAME,
|
|
isFileDiff,
|
|
isGrepResult,
|
|
isListResult,
|
|
} from '@google/gemini-cli-core';
|
|
import { useUIState } from '../../contexts/UIStateContext.js';
|
|
import { getToolGroupBorderAppearance } from '../../utils/borderStyles.js';
|
|
import { useSettings } from '../../contexts/SettingsContext.js';
|
|
|
|
const COMPACT_OUTPUT_ALLOWLIST = new Set([
|
|
EDIT_DISPLAY_NAME,
|
|
GLOB_DISPLAY_NAME,
|
|
WEB_SEARCH_DISPLAY_NAME,
|
|
READ_FILE_DISPLAY_NAME,
|
|
LS_DISPLAY_NAME,
|
|
GREP_DISPLAY_NAME,
|
|
WEB_FETCH_DISPLAY_NAME,
|
|
WRITE_FILE_DISPLAY_NAME,
|
|
READ_MANY_FILES_DISPLAY_NAME,
|
|
]);
|
|
|
|
// Helper to identify if a tool should use the compact view
|
|
export const isCompactTool = (
|
|
tool: IndividualToolCallDisplay,
|
|
isCompactModeEnabled: boolean,
|
|
): boolean => {
|
|
const hasCompactOutputSupport = COMPACT_OUTPUT_ALLOWLIST.has(tool.name);
|
|
const displayStatus = mapCoreStatusToDisplayStatus(tool.status);
|
|
return (
|
|
isCompactModeEnabled &&
|
|
hasCompactOutputSupport &&
|
|
displayStatus !== ToolCallStatus.Confirming
|
|
);
|
|
};
|
|
|
|
// Helper to identify if a compact tool has a payload (diff, list, etc.)
|
|
export const hasDensePayload = (tool: IndividualToolCallDisplay): boolean => {
|
|
if (tool.outputFile) return true;
|
|
const res = tool.resultDisplay;
|
|
if (!res) return false;
|
|
|
|
if (isFileDiff(res)) return true;
|
|
if (tool.confirmationDetails?.type === 'edit') return true;
|
|
if (isGrepResult(res) && res.matches.length > 0) return true;
|
|
|
|
// ReadManyFilesResult check (has 'include' and 'files')
|
|
if (isListResult(res) && 'include' in res) {
|
|
const includeProp = (res as { include?: unknown }).include;
|
|
if (Array.isArray(includeProp) && res.files.length > 0) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// Generic summary/payload pattern
|
|
if (
|
|
typeof res === 'object' &&
|
|
res !== null &&
|
|
'summary' in res &&
|
|
'payload' in res
|
|
) {
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
};
|
|
|
|
interface ToolGroupMessageProps {
|
|
item: HistoryItem | HistoryItemWithoutId;
|
|
toolCalls: IndividualToolCallDisplay[];
|
|
availableTerminalHeight?: number;
|
|
terminalWidth: number;
|
|
onShellInputSubmit?: (input: string) => void;
|
|
borderTop?: boolean;
|
|
borderBottom?: boolean;
|
|
isExpandable?: boolean;
|
|
}
|
|
|
|
// Main component renders the border and maps the tools using ToolMessage
|
|
const TOOL_MESSAGE_HORIZONTAL_MARGIN = 4;
|
|
|
|
export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
|
|
item,
|
|
toolCalls: allToolCalls,
|
|
availableTerminalHeight,
|
|
terminalWidth,
|
|
borderTop: borderTopOverride,
|
|
borderBottom: borderBottomOverride,
|
|
isExpandable,
|
|
}) => {
|
|
const settings = useSettings();
|
|
const isLowErrorVerbosity = settings.merged.ui?.errorVerbosity !== 'full';
|
|
const isCompactModeEnabled = settings.merged.ui?.compactToolOutput === true;
|
|
|
|
// Filter out tool calls that should be hidden (e.g. in-progress Ask User, or Plan Mode operations).
|
|
const visibleToolCalls = useMemo(
|
|
() =>
|
|
allToolCalls.filter((t) => {
|
|
// Hide internal errors unless full verbosity
|
|
if (
|
|
isLowErrorVerbosity &&
|
|
t.status === CoreToolCallStatus.Error &&
|
|
!t.isClientInitiated
|
|
) {
|
|
return false;
|
|
}
|
|
// Standard hiding logic (e.g. Plan Mode internal edits)
|
|
if (
|
|
shouldHideToolCall({
|
|
displayName: t.name,
|
|
status: t.status,
|
|
approvalMode: t.approvalMode,
|
|
hasResultDisplay: !!t.resultDisplay,
|
|
parentCallId: t.parentCallId,
|
|
})
|
|
) {
|
|
return false;
|
|
}
|
|
|
|
// We HIDE tools that are still in pre-execution states (Confirming, Pending)
|
|
// from the History log. They live in the Global Queue or wait for their turn.
|
|
// Only show tools that are actually running or finished.
|
|
const displayStatus = mapCoreStatusToDisplayStatus(t.status);
|
|
|
|
// We hide Confirming tools from the history log because they are
|
|
// currently being rendered in the interactive ToolConfirmationQueue.
|
|
// We show everything else, including Pending (waiting to run) and
|
|
// Canceled (rejected by user), to ensure the history is complete
|
|
// and to avoid tools "vanishing" after approval.
|
|
return displayStatus !== ToolCallStatus.Confirming;
|
|
}),
|
|
[allToolCalls, isLowErrorVerbosity],
|
|
);
|
|
|
|
const {
|
|
activePtyId,
|
|
embeddedShellFocused,
|
|
backgroundShells,
|
|
pendingHistoryItems,
|
|
} = useUIState();
|
|
|
|
const config = useConfig();
|
|
|
|
const { borderColor, borderDimColor } = useMemo(
|
|
() =>
|
|
getToolGroupBorderAppearance(
|
|
item,
|
|
activePtyId,
|
|
embeddedShellFocused,
|
|
pendingHistoryItems,
|
|
backgroundShells,
|
|
),
|
|
[
|
|
item,
|
|
activePtyId,
|
|
embeddedShellFocused,
|
|
pendingHistoryItems,
|
|
backgroundShells,
|
|
],
|
|
);
|
|
|
|
const groupedTools = useMemo(() => {
|
|
const groups: Array<
|
|
IndividualToolCallDisplay | IndividualToolCallDisplay[]
|
|
> = [];
|
|
for (const tool of visibleToolCalls) {
|
|
if (tool.kind === Kind.Agent) {
|
|
const lastGroup = groups[groups.length - 1];
|
|
if (Array.isArray(lastGroup)) {
|
|
lastGroup.push(tool);
|
|
} else {
|
|
groups.push([tool]);
|
|
}
|
|
} else {
|
|
groups.push(tool);
|
|
}
|
|
}
|
|
return groups;
|
|
}, [visibleToolCalls]);
|
|
|
|
const staticHeight = useMemo(() => {
|
|
let height = 0;
|
|
for (let i = 0; i < groupedTools.length; i++) {
|
|
const group = groupedTools[i];
|
|
const isFirst = i === 0;
|
|
const prevGroup = i > 0 ? groupedTools[i - 1] : null;
|
|
const prevIsCompact =
|
|
prevGroup &&
|
|
!Array.isArray(prevGroup) &&
|
|
isCompactTool(prevGroup, isCompactModeEnabled);
|
|
|
|
const isAgentGroup = Array.isArray(group);
|
|
const isCompact =
|
|
!isAgentGroup && isCompactTool(group, isCompactModeEnabled);
|
|
|
|
if (isFirst) {
|
|
height += (borderTopOverride ?? false) ? 1 : 0;
|
|
} else if (isCompact && prevIsCompact) {
|
|
height += 0;
|
|
} else if (isCompact || prevIsCompact) {
|
|
height += 1;
|
|
} else {
|
|
// Gap is provided by StickyHeader's paddingTop=1
|
|
height += 0;
|
|
}
|
|
|
|
const isFirstProp = !!(isFirst
|
|
? (borderTopOverride ?? true)
|
|
: prevIsCompact);
|
|
|
|
if (isAgentGroup) {
|
|
// Agent group
|
|
height += 1; // Header
|
|
height += group.length; // 1 line per agent
|
|
if (isFirstProp) height += 1; // Top border
|
|
} else {
|
|
if (isCompact) {
|
|
height += 1; // Base height for compact tool
|
|
} else {
|
|
// Static overhead for standard tool header:
|
|
// 1 line for header text
|
|
// 1 line for dark separator
|
|
// 1 line for tool body internal paddingTop=1
|
|
// 1 line for top border (if isFirstProp) OR StickyHeader paddingTop=1 (if !isFirstProp)
|
|
height += 3;
|
|
height += isFirstProp ? 1 : 1; // Either top border or paddingTop
|
|
}
|
|
}
|
|
}
|
|
return height;
|
|
}, [groupedTools, isCompactModeEnabled, borderTopOverride]);
|
|
|
|
let countToolCallsWithResults = 0;
|
|
for (const tool of visibleToolCalls) {
|
|
if (tool.kind !== Kind.Agent) {
|
|
if (isCompactTool(tool, isCompactModeEnabled)) {
|
|
if (hasDensePayload(tool)) {
|
|
countToolCallsWithResults++;
|
|
}
|
|
} else if (
|
|
tool.resultDisplay !== undefined &&
|
|
tool.resultDisplay !== ''
|
|
) {
|
|
countToolCallsWithResults++;
|
|
}
|
|
}
|
|
}
|
|
|
|
const availableTerminalHeightPerToolMessage = availableTerminalHeight
|
|
? Math.max(
|
|
Math.floor(
|
|
(availableTerminalHeight - staticHeight) /
|
|
Math.max(1, countToolCallsWithResults),
|
|
),
|
|
1,
|
|
)
|
|
: undefined;
|
|
|
|
const contentWidth = terminalWidth - TOOL_MESSAGE_HORIZONTAL_MARGIN;
|
|
|
|
// If all tools are filtered out (e.g., in-progress AskUser tools, low-verbosity
|
|
// internal errors, plan-mode hidden write/edit), we should not emit standalone
|
|
// border fragments. The only case where an empty group should render is the
|
|
// explicit "closing slice" (tools: []) used to bridge static/pending sections,
|
|
// and only if it's actually continuing an open box from above.
|
|
const isExplicitClosingSlice = allToolCalls.length === 0;
|
|
const shouldShowGroup =
|
|
visibleToolCalls.length > 0 ||
|
|
(isExplicitClosingSlice && borderBottomOverride === true);
|
|
|
|
if (!shouldShowGroup) {
|
|
return null;
|
|
}
|
|
|
|
const content = (
|
|
<Box
|
|
flexDirection="column"
|
|
/*
|
|
This width constraint is highly important and protects us from an Ink rendering bug.
|
|
Since the ToolGroup can typically change rendering states frequently, it can cause
|
|
Ink to render the border of the box incorrectly and span multiple lines and even
|
|
cause tearing.
|
|
*/
|
|
width={terminalWidth}
|
|
paddingRight={TOOL_MESSAGE_HORIZONTAL_MARGIN}
|
|
marginBottom={(borderBottomOverride ?? true) ? 1 : 0}
|
|
>
|
|
{visibleToolCalls.length === 0 &&
|
|
isExplicitClosingSlice &&
|
|
borderBottomOverride === true && (
|
|
<Box
|
|
height={0}
|
|
width={contentWidth}
|
|
borderLeft={true}
|
|
borderRight={true}
|
|
borderTop={false}
|
|
borderBottom={true}
|
|
borderColor={borderColor}
|
|
borderDimColor={borderDimColor}
|
|
borderStyle="round"
|
|
/>
|
|
)}
|
|
{groupedTools.map((group, index) => {
|
|
const isFirst = index === 0;
|
|
const isLast = index === groupedTools.length - 1;
|
|
|
|
const prevGroup = index > 0 ? groupedTools[index - 1] : null;
|
|
const prevIsCompact =
|
|
prevGroup &&
|
|
!Array.isArray(prevGroup) &&
|
|
isCompactTool(prevGroup, isCompactModeEnabled);
|
|
|
|
const nextGroup = !isLast ? groupedTools[index + 1] : null;
|
|
const nextIsCompact =
|
|
nextGroup &&
|
|
!Array.isArray(nextGroup) &&
|
|
isCompactTool(nextGroup, isCompactModeEnabled);
|
|
|
|
const isAgentGroup = Array.isArray(group);
|
|
const isCompact =
|
|
!isAgentGroup && isCompactTool(group, isCompactModeEnabled);
|
|
|
|
let marginTop = 0;
|
|
if (isFirst) {
|
|
marginTop = (borderTopOverride ?? false) ? 1 : 0;
|
|
} else if (isCompact && prevIsCompact) {
|
|
marginTop = 0;
|
|
} else if (isCompact || prevIsCompact) {
|
|
marginTop = 1;
|
|
} else {
|
|
// Subsequent standard tools: StickyHeader's paddingTop=1 provides the gap.
|
|
marginTop = 0;
|
|
}
|
|
|
|
const isFirstProp = !!(isFirst
|
|
? (borderTopOverride ?? true)
|
|
: prevIsCompact);
|
|
|
|
const showClosingBorder = !isCompact && (nextIsCompact || isLast);
|
|
|
|
if (isAgentGroup) {
|
|
return (
|
|
<Box
|
|
key={group[0].callId}
|
|
marginTop={marginTop}
|
|
flexDirection="column"
|
|
width={contentWidth}
|
|
>
|
|
<SubagentGroupDisplay
|
|
toolCalls={group}
|
|
availableTerminalHeight={availableTerminalHeight}
|
|
terminalWidth={contentWidth}
|
|
borderColor={borderColor}
|
|
borderDimColor={borderDimColor}
|
|
isFirst={isFirstProp}
|
|
isExpandable={isExpandable}
|
|
/>
|
|
{showClosingBorder && (
|
|
<Box
|
|
height={0}
|
|
width={contentWidth}
|
|
borderLeft={true}
|
|
borderRight={true}
|
|
borderTop={false}
|
|
borderBottom={isLast ? (borderBottomOverride ?? true) : true}
|
|
borderColor={borderColor}
|
|
borderDimColor={borderDimColor}
|
|
borderStyle="round"
|
|
/>
|
|
)}
|
|
</Box>
|
|
);
|
|
}
|
|
|
|
const tool = group;
|
|
const isShellToolCall = isShellTool(tool.name);
|
|
const commonProps = {
|
|
...tool,
|
|
availableTerminalHeight: availableTerminalHeightPerToolMessage,
|
|
terminalWidth: contentWidth,
|
|
emphasis: 'medium' as const,
|
|
isFirst: isCompact ? false : isFirstProp,
|
|
borderColor,
|
|
borderDimColor,
|
|
isExpandable,
|
|
};
|
|
|
|
return (
|
|
<Fragment key={tool.callId}>
|
|
<Box
|
|
flexDirection="column"
|
|
minHeight={1}
|
|
width={contentWidth}
|
|
marginTop={marginTop}
|
|
>
|
|
{isCompact ? (
|
|
<DenseToolMessage {...commonProps} />
|
|
) : isShellToolCall ? (
|
|
<ShellToolMessage {...commonProps} config={config} />
|
|
) : (
|
|
<ToolMessage {...commonProps} />
|
|
)}
|
|
{!isCompact && tool.outputFile && (
|
|
<Box
|
|
borderLeft={true}
|
|
borderRight={true}
|
|
borderTop={false}
|
|
borderBottom={false}
|
|
borderColor={borderColor}
|
|
borderDimColor={borderDimColor}
|
|
flexDirection="column"
|
|
borderStyle="round"
|
|
paddingLeft={1}
|
|
paddingRight={1}
|
|
>
|
|
<Box>
|
|
<Text color={theme.text.primary}>
|
|
Output too long and was saved to: {tool.outputFile}
|
|
</Text>
|
|
</Box>
|
|
</Box>
|
|
)}
|
|
</Box>
|
|
{showClosingBorder && (
|
|
<Box
|
|
height={0}
|
|
width={contentWidth}
|
|
borderLeft={true}
|
|
borderRight={true}
|
|
borderTop={false}
|
|
borderBottom={isLast ? (borderBottomOverride ?? true) : true}
|
|
borderColor={borderColor}
|
|
borderDimColor={borderDimColor}
|
|
borderStyle="round"
|
|
/>
|
|
)}
|
|
</Fragment>
|
|
);
|
|
})}
|
|
</Box>
|
|
);
|
|
|
|
return content;
|
|
};
|