From de9a98c6b5ebc0fef82b9a281130bbfc81811d94 Mon Sep 17 00:00:00 2001
From: Michael Bleigh <bleigh@google.com>
Date: Mon, 13 Apr 2026 12:19:20 -0700
Subject: [PATCH] fix(ui): flatten multiline summaries in compact
 ToolGroupDisplay and fix populateToolDisplay merge logic

---
 packages/cli/src/ui/components/messages/ToolGroupDisplay.tsx | 5 ++++-
 .../messages/__snapshots__/ToolGroupDisplay.test.tsx.snap    | 2 +-
 packages/core/src/agent/tool-display-utils.ts                | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/ui/components/messages/ToolGroupDisplay.tsx b/packages/cli/src/ui/components/messages/ToolGroupDisplay.tsx
index 137e6391d4..df7bfadd21 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupDisplay.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupDisplay.tsx
@@ -179,7 +179,10 @@ const ToolDisplayMessage: React.FC<ToolDisplayMessageProps> = ({ tool }) => {
         </Text>
         {description && <Text color={theme.text.secondary}>{description}</Text>}
         {resultSummary && (
-          <Text color={theme.text.accent}> → {resultSummary}</Text>
+          <Text color={theme.text.accent}>
+            {' '}
+            → {resultSummary.replace(/\n/g, ' ')}
+          </Text>
         )}
       </Box>
     );
diff --git a/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupDisplay.test.tsx.snap b/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupDisplay.test.tsx.snap
index 56d8fb9dc7..e4d783d80b 100644
--- a/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupDisplay.test.tsx.snap
+++ b/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupDisplay.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`<ToolGroupDisplay /> > Border & Margin Logic > forces top border on box
 `;
 
 exports[`<ToolGroupDisplay /> > Golden Snapshots > renders error message when display info is missing 1`] = `
-"  ⊷   Error: Tool display missing
+"  ⊶   Error: Tool display missing
 "
 `;
 
diff --git a/packages/core/src/agent/tool-display-utils.ts b/packages/core/src/agent/tool-display-utils.ts
index 53ca5eaf75..070cd254d0 100644
--- a/packages/core/src/agent/tool-display-utils.ts
+++ b/packages/core/src/agent/tool-display-utils.ts
@@ -30,9 +30,9 @@ export function populateToolDisplay({
   display?: ToolDisplay;
 }): ToolDisplay {
   const display: ToolDisplay = {
-    ...prevDisplay,
     name: displayName || name,
     description: invocation?.getDescription?.(),
+    ...prevDisplay,
   };
 
   if (resultDisplay !== undefined && display.result === undefined) {