Skip to content

fix(ui): preventing empty history items from being added #19014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacob314 merged 11 commits into from
Feb 18, 2026
Merged

fix(ui): preventing empty history items from being added #19014

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
95fe9ad
Filtered out empty history items from being rendered
devr0306 Feb 13, 2026
9d375f1
Merge branch 'main' into remove-extra-space
devr0306 Feb 13, 2026
9d2059c
Created filteredHistory memo to make code readable
devr0306 Feb 13, 2026
c2b3faa
Merge branch 'remove-extra-space' of https://github.com/google-gemini…
devr0306 Feb 13, 2026
f12f17b
Merged main changes
devr0306 Feb 13, 2026
1bb8f39
Merge branch 'main' into remove-extra-space
devr0306 Feb 17, 2026
742af2d
Fixed code snippet logic where empty strings were being added to the …
devr0306 Feb 17, 2026
522ec3d
Merge branch 'main' into remove-extra-space
devr0306 Feb 18, 2026
e13ecb9
Removed trim() so that only empty strings are filtered out
devr0306 Feb 18, 2026
dd52d7d
Merge branch 'remove-extra-space' of https://github.com/google-gemini…
devr0306 Feb 18, 2026
821a337
Fixed test
devr0306 Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/cli/src/ui/components/MainContent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,25 @@ describe('MainContent', () => {

expect(output).toMatchSnapshot();
});
it('does not render empty history items', async () => {
const uiStateWithEmptyItems = {
...defaultMockUiState,
history: [
...defaultMockUiState.history,
{ id: 3, type: 'gemini_content', text: '' },
{ id: 4, type: 'gemini_content', text: 'Non-empty content' },
],
};

const { lastFrame } = renderWithProviders(<MainContent />, {
uiState: uiStateWithEmptyItems as Partial<UIState>,
});
await waitFor(() => expect(lastFrame()).toContain('Non-empty content'));
const output = lastFrame();

expect(output).toContain('Non-empty content');
expect(output).toMatchSnapshot();
});

describe('MainContent Tool Output Height Logic', () => {
const testCases = [
Expand Down
28 changes: 16 additions & 12 deletions packages/cli/src/ui/components/MainContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,19 @@ export const MainContent = () => {

const historyItems = useMemo(
() =>
uiState.history.map((h) => (
<MemoizedHistoryItemDisplay
terminalWidth={mainAreaWidth}
availableTerminalHeight={staticAreaMaxItemHeight}
availableTerminalHeightGemini={MAX_GEMINI_MESSAGE_LINES}
key={h.id}
item={h}
isPending={false}
commands={uiState.slashCommands}
/>
)),
uiState.history
.filter((h) => !(h.type === 'gemini_content' && !h.text))
Comment thread
devr0306 marked this conversation as resolved.
Resolved
.map((h) => (
<MemoizedHistoryItemDisplay
terminalWidth={mainAreaWidth}
availableTerminalHeight={staticAreaMaxItemHeight}
availableTerminalHeightGemini={MAX_GEMINI_MESSAGE_LINES}
key={h.id}
item={h}
isPending={false}
commands={uiState.slashCommands}
/>
)),
[
uiState.history,
mainAreaWidth,
Expand Down Expand Up @@ -116,7 +118,9 @@ export const MainContent = () => {
const virtualizedData = useMemo(
() => [
{ type: 'header' as const },
...uiState.history.map((item) => ({ type: 'history' as const, item })),
...uiState.history
.filter((h) => !(h.type === 'gemini_content' && !h.text))
.map((item) => ({ type: 'history' as const, item })),
{ type: 'pending' as const },
],
[uiState.history],
Expand Down
14 changes: 14 additions & 0 deletions packages/cli/src/ui/components/__snapshots__/MainContent.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,17 @@ AppHeader
ShowMoreLines
"
`;

exports[`MainContent > does not render empty history items 1`] = `
"AppHeader
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
> Hello
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
✦ Hi there

ShowMoreLines
Non-empty content

ShowMoreLines
"
`;
2 changes: 1 addition & 1 deletion packages/cli/src/ui/utils/MarkdownDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
const RESERVED_LINES = 2; // Lines reserved for the message itself and potential padding

// When not in alternate buffer mode we need to be careful that we don't
// trigger flicker when the pending code is to long to fit in the terminal
// trigger flicker when the pending code is too long to fit in the terminal
if (
!isAlternateBuffer &&
isPending &&
Expand Down