diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
index 3a37f3ff5e..cfec822f9d 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -61,7 +61,9 @@ export const isCompactTool = (
   tool: IndividualToolCallDisplay,
   isCompactModeEnabled: boolean,
 ): boolean => {
-  const hasCompactOutputSupport = COMPACT_OUTPUT_ALLOWLIST.has(tool.name);
+  const hasCompactOutputSupport = COMPACT_OUTPUT_ALLOWLIST.has(
+    tool.originalRequestName || tool.name,
+  );
   const displayStatus = mapCoreStatusToDisplayStatus(tool.status);
   return (
     isCompactModeEnabled &&
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx
index d70c470408..25cf476512 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -116,6 +116,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
           emphasis={emphasis}
           progressMessage={progressMessage}
           originalRequestName={originalRequestName}
+          hideSummary={!display?.result && !!display?.resultSummary}
         />
         <FocusHint
           shouldShowFocusHint={shouldShowFocusHint}
diff --git a/packages/cli/src/ui/components/messages/ToolShared.tsx b/packages/cli/src/ui/components/messages/ToolShared.tsx
index 21157da2b3..deec44b962 100644
--- a/packages/cli/src/ui/components/messages/ToolShared.tsx
+++ b/packages/cli/src/ui/components/messages/ToolShared.tsx
@@ -196,6 +196,7 @@ type ToolInfoProps = {
   display?: ToolDisplay;
   progressMessage?: string;
   originalRequestName?: string;
+  hideSummary?: boolean;
 };
 
 export const ToolInfo: React.FC<ToolInfoProps> = ({
@@ -206,6 +207,7 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
   display,
   progressMessage: _progressMessage,
   originalRequestName,
+  hideSummary,
 }) => {
   const status = mapCoreStatusToDisplayStatus(coreStatus);
   const nameColor = React.useMemo<string>(() => {
@@ -228,7 +230,7 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
 
   const displayName = display?.name || name;
   const displayDescription = display?.description || description;
-  const displaySummary = display?.resultSummary;
+  const displaySummary = hideSummary ? undefined : display?.resultSummary;
 
   return (
     <Box overflow="hidden" height={1} flexGrow={1} flexShrink={1}>
diff --git a/packages/core/src/agent/tool-display-utils.ts b/packages/core/src/agent/tool-display-utils.ts
index ed0e6f6b76..53ca5eaf75 100644
--- a/packages/core/src/agent/tool-display-utils.ts
+++ b/packages/core/src/agent/tool-display-utils.ts
@@ -35,7 +35,7 @@ export function populateToolDisplay({
     description: invocation?.getDescription?.(),
   };
 
-  if (resultDisplay) {
+  if (resultDisplay !== undefined && display.result === undefined) {
     display.result = toolResultDisplayToDisplayContent(resultDisplay);
   }