fix(patch): cherry-pick 14b2f35 to release/v0.38.1-pr-24974 to patch version v0.38.1 and create version 0.38.2 (#25585)

Co-authored-by: Jarrod Whelan <150866123+jwhelangoog@users.noreply.github.com>

Author: gemini-cli-robot

packages/cli/src/ui/__snapshots__/ToolConfirmationFullFrame-Full-Terminal-Tool-Confirmation-Snapshot-renders-tool-confirmation-box-in-the-frame-of-the-entire-terminal.snap.svg

@@ -5,7 +5,7 @@ exports[`Full Terminal Tool Confirmation Snapshot > renders tool confirmation bo
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
 
 ╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ? Edit                                                                                          │
+│ ? Edit packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =>   return kittyProto…  │
 │ ╭─────────────────────────────────────────────────────────────────────────────────────────────╮ │
 │ │ ... first 42 lines hidden (Ctrl+O to show) ...                                              │ │
 │ │ 43   const line43 = true;                                                                   │ │

packages/cli/src/ui/__snapshots__/ToolConfirmationFullFrame.test.tsx.snap

@@ -66,6 +66,44 @@ describe('ToolConfirmationQueue', () => {
     vi.clearAllMocks();
   });
 
+  it('explicitly renders the tool description (containing filename) for edit confirmations', async () => {
+    const confirmingTool = {
+      tool: {
+        callId: 'call-1',
+        name: 'Edit',
+        description: 'Editing src/main.ts',
+        status: CoreToolCallStatus.AwaitingApproval,
+        confirmationDetails: {
+          type: 'edit' as const,
+          title: 'Confirm edit',
+          fileName: 'main.ts',
+          filePath: '/src/main.ts',
+          fileDiff: '--- a/main.ts\n+++ b/main.ts\n@@ -1 +1 @@\n-old\n+new',
+          originalContent: 'old',
+          newContent: 'new',
+        },
+      },
+      index: 1,
+      total: 1,
+    };
+
+    const { lastFrame, unmount } = await renderWithProviders(
+      <ToolConfirmationQueue
+        confirmingTool={confirmingTool as unknown as ConfirmingToolState}
+      />,
+      {
+        config: mockConfig,
+        uiState: {
+          terminalWidth: 80,
+        },
+      },
+    );
+
+    const output = lastFrame();
+    expect(output).toContain('Editing src/main.ts');
+    unmount();
+  });
+
   it('renders the confirming tool with progress indicator', async () => {
     const confirmingTool = {
       tool: {

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

@@ -98,9 +98,9 @@ export const ToolConfirmationQueue: React.FC<ToolConfirmationQueueProps> = ({
           <Box flexDirection="row" flexShrink={1} overflow="hidden">
             <Text color={theme.status.warning} bold>
               ? {toolLabel}
-              {!isEdit && !!tool.description && '  '}
+              {!!tool.description && '  '}
             </Text>
-            {!isEdit && !!tool.description && (
+            {!!tool.description && (
               <Box flexShrink={1} overflow="hidden">
                 <Text color={theme.text.primary} wrap="truncate-end">
                   {tool.description}

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

@@ -2,7 +2,7 @@
 
 exports[`ToolConfirmationQueue > calculates availableContentHeight based on availableTerminalHeight from UI state 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────╮
-│ ? replace                                                                    │
+│ ? replace  edit file                                                         │
 │ ╭──────────────────────────────────────────────────────────────────────────╮ │
 │ ╰─... 48 hidden (Ctrl+O) ...───────────────────────────────────────────────╯ │
 │ Apply this change?                                                           │
@@ -17,7 +17,7 @@ exports[`ToolConfirmationQueue > calculates availableContentHeight based on avai
 
 exports[`ToolConfirmationQueue > does not render expansion hint when constrainHeight is false 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────╮
-│ ? replace                                                                    │
+│ ? replace  edit file                                                         │
 │ ╭──────────────────────────────────────────────────────────────────────────╮ │
 │ │                                                                          │ │
 │ │  No changes detected.                                                    │ │
@@ -63,7 +63,7 @@ exports[`ToolConfirmationQueue > height allocation and layout > should handle se
 
 exports[`ToolConfirmationQueue > height allocation and layout > should render the full queue wrapper with borders and content for large edit diffs 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────╮
-│ ? replace                                                                    │
+│ ? replace  Replaces content in a file                                        │
 │ ╭──────────────────────────────────────────────────────────────────────────╮ │
 │ │ ... 13 hidden (Ctrl+O) ...                                               │ │
 │ │  7 + const newLine7 = true;                                              │ │

packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue-ToolConfirmationQueue-height-allocation-and-layout-should-render-the-full-queue-wrapper-with-borders-and-content-for-large-edit-diffs.snap.svg

@@ -34,6 +34,28 @@ describe('DenseToolMessage', () => {
     terminalWidth: 80,
   };
 
+  it('explicitly renders the filename in the header for FileDiff results', async () => {
+    const fileDiff: FileDiff = {
+      fileName: 'test-file.ts',
+      filePath: '/test-file.ts',
+      fileDiff:
+        '--- a/test-file.ts\n+++ b/test-file.ts\n@@ -1 +1 @@\n-old\n+new',
+      originalContent: 'old',
+      newContent: 'new',
+    };
+
+    const { lastFrame, waitUntilReady } = await renderWithProviders(
+      <DenseToolMessage
+        {...defaultProps}
+        name="Edit"
+        resultDisplay={fileDiff as unknown as ToolResultDisplay}
+      />,
+    );
+    await waitUntilReady();
+    const output = lastFrame();
+    expect(output).toContain('test-file.ts');
+  });
+
   it('renders correctly for a successful string result', async () => {
     const { lastFrame, waitUntilReady } = await renderWithProviders(
       <DenseToolMessage {...defaultProps} />,