Fix shell output display (#24490)

packages/cli/src/ui/hooks/useExecutionLifecycle.test.tsx

@@ -101,6 +101,7 @@ import {
   type GeminiClient,
   type ShellExecutionResult,
   type ShellOutputEvent,
+  type AnsiOutput,
   CoreToolCallStatus,
 } from '@google/gemini-cli-core';
 import * as fs from 'node:fs';
@@ -521,6 +522,52 @@ describe('useExecutionLifecycle', () => {
     );
   });
 
+  it('should prepend warnings to AnsiOutput array', async () => {
+    const { result } = await renderProcessorHook();
+
+    act(() => {
+      result.current.handleShellCommand('ls', new AbortController().signal);
+    });
+    const execPromise = onExecMock.mock.calls[0][0];
+
+    const ansiOutput: AnsiOutput = [
+      [
+        {
+          text: 'ansi line 1',
+          fg: '',
+          bg: '',
+          bold: false,
+          dim: false,
+          italic: false,
+          underline: false,
+          inverse: false,
+        },
+      ],
+    ];
+
+    act(() => {
+      resolveExecutionPromise(
+        createMockServiceResult({
+          exitCode: 1,
+          output: 'ansi line 1',
+          ansiOutput,
+        }),
+      );
+    });
+    await act(async () => await execPromise);
+
+    expect(setPendingHistoryItemMock).toHaveBeenCalledWith(null);
+    expect(addItemToHistoryMock).toHaveBeenCalledTimes(2);
+
+    const historyCall = addItemToHistoryMock.mock.calls[1][0];
+    const display = historyCall.tools[0].resultDisplay;
+
+    expect(Array.isArray(display)).toBe(true);
+    expect(display.length).toBe(3); // Error line, empty line, original output
+    expect(display[0][0].text).toBe('Command exited with code 1.');
+    expect(display[2][0].text).toBe('ansi line 1');
+  });
+
   it('should handle promise rejection and show an error', async () => {
     const { result } = await renderProcessorHook();
     const testError = new Error('Unexpected failure');

packages/cli/src/ui/hooks/useExecutionLifecycle.ts

@@ -534,31 +534,68 @@ export const useExecutionLifecycle = (
               result.output.trim() || '(Command produced no output)';
           }
 
-          let finalOutput = mainContent;
+          let finalOutput: string | AnsiOutput =
+            result.ansiOutput && result.ansiOutput.length > 0
+              ? result.ansiOutput
+              : mainContent;
           let finalStatus = CoreToolCallStatus.Success;
 
+          const prependToAnsiOutput = (
+            output: AnsiOutput,
+            text: string,
+          ): AnsiOutput => {
+            const newLines: AnsiOutput = text.split('\n').map((line) => [
+              {
+                text: line,
+                fg: '',
+                bg: '',
+                dim: false,
+                bold: false,
+                italic: false,
+                underline: false,
+                inverse: false,
+              },
+            ]);
+            return [...newLines, [], ...output];
+          };
+
+          let prefix = '';
+
           if (result.error) {
             finalStatus = CoreToolCallStatus.Error;
-            finalOutput = `${result.error.message}\n${finalOutput}`;
+            prefix = result.error.message;
           } else if (result.aborted) {
             finalStatus = CoreToolCallStatus.Cancelled;
-            finalOutput = `Command was cancelled.\n${finalOutput}`;
+            prefix = 'Command was cancelled.';
           } else if (result.backgrounded) {
             finalStatus = CoreToolCallStatus.Success;
             finalOutput = `Command moved to background (PID: ${result.pid}). Output hidden. Press Ctrl+B to view.`;
+            mainContent = finalOutput;
           } else if (result.signal) {
             finalStatus = CoreToolCallStatus.Error;
-            finalOutput = `Command terminated by signal: ${result.signal}.\n${finalOutput}`;
+            prefix = `Command terminated by signal: ${result.signal}.`;
           } else if (result.exitCode !== 0) {
             finalStatus = CoreToolCallStatus.Error;
-            finalOutput = `Command exited with code ${result.exitCode}.\n${finalOutput}`;
+            prefix = `Command exited with code ${result.exitCode}.`;
+          }
+
+          if (prefix) {
+            finalOutput =
+              typeof finalOutput === 'string'
+                ? `${prefix}\n${finalOutput}`
+                : prependToAnsiOutput(finalOutput, prefix);
+            mainContent = `${prefix}\n${mainContent}`;
           }
 
           if (pwdFilePath && fs.existsSync(pwdFilePath)) {
             const finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
             if (finalPwd && finalPwd !== targetDir) {
               const warning = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.`;
-              finalOutput = `${warning}\n\n${finalOutput}`;
+              finalOutput =
+                typeof finalOutput === 'string'
+                  ? `${warning}\n\n${finalOutput}`
+                  : prependToAnsiOutput(finalOutput, warning);
+              mainContent = `${warning}\n\n${mainContent}`;
             }
           }
 
@@ -578,7 +615,7 @@ export const useExecutionLifecycle = (
             );
           }
 
-          addShellCommandToGeminiHistory(geminiClient, rawQuery, finalOutput);
+          addShellCommandToGeminiHistory(geminiClient, rawQuery, mainContent);
         } catch (err) {
           setPendingHistoryItem(null);
           const errorMessage = err instanceof Error ? err.message : String(err);