MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-10 14:10:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fix DialogFooter layout within ToolConfirmationMessage and update snapshots

Browse Source
This commit is contained in:
Jarrod Whelan
2026-03-10 12:29:53 -07:00
parent 31dc6f630a
commit 20d4b1d9f4
6 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/cli/src/ui/__snapshots__/App.test.tsx.snap
View File

@@ -130,9 +130,11 @@ HistoryItemDisplay
│ Allow execution of: 'ls'? │
│ │
│ ● 1. Allow once │
│ 2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel │
│ 2. Allow for this session │
│ 3. No, suggest changes (esc) │
│ │
│ Enter to select · ↑/↓ to navigate · Esc to cancel │
│ │
╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
@@ -144,8 +146,6 @@ HistoryItemDisplay
Notifications
Composer
"

24
packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue.test.tsx.snap
View File

@@ -11,10 +11,12 @@ exports[`ToolConfirmationQueue > calculates availableContentHeight based on avai
│ Apply this change? │
│ │
│ ● 1. Allow once │
│ 2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to │
│ 3. Modify with external edi…cancel │
│ 2. Allow for this session │
│ 3. Modify with external editor │
│ 4. No, suggest changes (esc) │
│ │
│ Enter to select · ↑/↓ to navigate · Esc to cancel │
│ │
╰──────────────────────────────────────────────────────────────────────────────╯
Press Ctrl+O to show more lines
"
@@ -34,10 +36,12 @@ exports[`ToolConfirmationQueue > does not render expansion hint when constrainHe
│ Apply this change? │
│ │
│ ● 1. Allow once │
│ 2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to │
│ 3. Modify with external edi…cancel │
│ 2. Allow for this session │
│ 3. Modify with external editor │
│ 4. No, suggest changes (esc) │
│ │
│ Enter to select · ↑/↓ to navigate · Esc to cancel │
│ │
╰──────────────────────────────────────────────────────────────────────────────╯
"
`;
@@ -102,10 +106,12 @@ exports[`ToolConfirmationQueue > renders expansion hint when content is long and
│ Apply this change? │
│ │
│ ● 1. Allow once │
│ 2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to │
│ 3. Modify with external edi…cancel │
│ 2. Allow for this session │
│ 3. Modify with external editor │
│ 4. No, suggest changes (esc) │
│ │
│ Enter to select · ↑/↓ to navigate · Esc to cancel │
│ │
╰──────────────────────────────────────────────────────────────────────────────╯
Press Ctrl+O to show more lines
"
@@ -121,8 +127,10 @@ exports[`ToolConfirmationQueue > renders the confirming tool with progress indic
│ Allow execution of: 'ls'? │
│ │
│ ● 1. Allow once │
│ 2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to │
│ 3. No, suggest changes (e… cancel │
│ 2. Allow for this session │
│ 3. No, suggest changes (esc) │
│ │
│ Enter to select · ↑/↓ to navigate · Esc to cancel │
│ │
╰──────────────────────────────────────────────────────────────────────────────╯
"

2
packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
View File

@@ -741,7 +741,7 @@ export const ToolConfirmationMessage: React.FC<
<Text color={theme.text.primary}>{question}</Text>
</Box>
<Box flexShrink={0}>
<Box flexShrink={0} flexDirection="column">
<RadioButtonSelect
items={options}
onSelect={handleSelect}

6
packages/cli/src/ui/components/messages/__snapshots__/RedirectionConfirmation.test.tsx.snap
View File

@@ -7,8 +7,10 @@ Note: Command contains redirection which can be undesirable.
Tip: Toggle auto-edit (Shift+Tab) to allow redirection in the future.
Allow execution of: 'echo, redirection (>)'?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;

8
packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage-ToolConfirmationMessage-should-render-multiline-shell-scripts-with-correct-newlines-and-syntax-highlighting-SVG-snapshot-.snap.svg
View File

@@ -1,8 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="920" height="173" viewBox="0 0 920 173">
<svg xmlns="http://www.w3.org/2000/svg" width="920" height="207" viewBox="0 0 920 207">
<style>
text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
</style>
<rect width="920" height="173" fill="#000000" />
<rect width="920" height="207" fill="#000000" />
<g transform="translate(10, 10)">
<text x="0" y="2" fill="#00cdcd" textLength="36" lengthAdjust="spacingAndGlyphs">echo</text>
<text x="45" y="2" fill="#cdcd00" textLength="63" lengthAdjust="spacingAndGlyphs">&quot;hello&quot;</text>
@@ -23,11 +23,11 @@
<rect x="36" y="102" width="9" height="17" fill="#001a00" />
<rect x="45" y="102" width="90" height="17" fill="#001a00" />
<text x="45" y="104" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs">Allow once</text>
<rect x="135" y="102" width="135" height="17" fill="#001a00" />
<rect x="135" y="102" width="765" height="17" fill="#001a00" />
<text x="18" y="121" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
<text x="45" y="121" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">Allow for this session</text>
<text x="270" y="121" fill="#afafaf" textLength="441" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · Esc to cancel</text>
<text x="18" y="138" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>
<text x="45" y="138" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">No, suggest changes (esc)</text>
<text x="0" y="172" fill="#afafaf" textLength="441" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · Esc to cancel</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

82
packages/cli/src/ui/components/messages/__snapshots__/ToolConfirmationMessage.test.tsx.snap
View File

@@ -8,11 +8,13 @@ exports[`ToolConfirmationMessage > enablePermanentToolApproval setting > should
╰──────────────────────────────────────────────────────────────────────────────╯
Apply this change?
● 1. Allow once
● 1. Allow once
2. Allow for this session
3. Allow for this file in all future sessions
4. Modify with external editor
5. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -24,9 +26,11 @@ ls -la
whoami
Allow execution of 3 commands?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -37,9 +41,11 @@ URLs to fetch:
- https://raw.githubusercontent.com/google/gemini-react/main/README.md
Do you want to proceed?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -47,9 +53,11 @@ exports[`ToolConfirmationMessage > should not display urls if prompt and url are
"https://example.com
Do you want to proceed?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -60,9 +68,11 @@ for i in 1 2 3; do
done
Allow execution of: 'echo'?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -71,10 +81,12 @@ exports[`ToolConfirmationMessage > should strip BiDi characters from MCP tool an
Tool: testtool
Allow execution of MCP tool "testtool" from server "testserver"?
● 1. Allow once
2. Allow tool for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow tool for this session
3. Allow all server tools for this session
4. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -86,9 +98,11 @@ exports[`ToolConfirmationMessage > with folder trust > 'for edit confirmations'
╰──────────────────────────────────────────────────────────────────────────────╯
Apply this change?
● 1. Allow once
2. Modify with external editorEnter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Modify with external editor
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -100,10 +114,12 @@ exports[`ToolConfirmationMessage > with folder trust > 'for edit confirmations'
╰──────────────────────────────────────────────────────────────────────────────╯
Apply this change?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. Modify with external editor
4. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -111,8 +127,10 @@ exports[`ToolConfirmationMessage > with folder trust > 'for exec confirmations'
"echo "hello"
Allow execution of: 'echo'?
● 1. Allow once
2. No, suggest changes (esc)Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -120,9 +138,11 @@ exports[`ToolConfirmationMessage > with folder trust > 'for exec confirmations'
"echo "hello"
Allow execution of: 'echo'?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -130,8 +150,10 @@ exports[`ToolConfirmationMessage > with folder trust > 'for info confirmations'
"https://example.com
Do you want to proceed?
● 1. Allow once
2. No, suggest changes (esc)Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -139,9 +161,11 @@ exports[`ToolConfirmationMessage > with folder trust > 'for info confirmations'
"https://example.com
Do you want to proceed?
● 1. Allow once
2. Allow for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow for this session
3. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -150,8 +174,10 @@ exports[`ToolConfirmationMessage > with folder trust > 'for mcp confirmations' >
Tool: test-tool
Allow execution of MCP tool "test-tool" from server "test-server"?
● 1. Allow once
2. No, suggest changes (esc)Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
@@ -160,9 +186,11 @@ exports[`ToolConfirmationMessage > with folder trust > 'for mcp confirmations' >
Tool: test-tool
Allow execution of MCP tool "test-tool" from server "test-server"?
● 1. Allow once
2. Allow tool for this session Enter to select · ↑/↓ to navigate · Esc to cancel
● 1. Allow once
2. Allow tool for this session
3. Allow all server tools for this session
4. No, suggest changes (esc)
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;