From 78f0711ea68636f339d1eee1449aa7b37b1a183b Mon Sep 17 00:00:00 2001
From: Max Novich <maksymstepanenko1990@gmail.com>
Date: Fri, 18 Jul 2025 10:58:45 -0700
Subject: [PATCH] Alexhancock/reapply 3491 (#3515)

rust failures are not related
---
 .../src/components/ProgressiveMessageList.tsx |  4 +++-
 .../sessions/SessionHistoryView.tsx           | 23 +------------------
 ui/desktop/src/hooks/useChatEngine.ts         | 23 +------------------
 3 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/ui/desktop/src/components/ProgressiveMessageList.tsx b/ui/desktop/src/components/ProgressiveMessageList.tsx
index 5c84cc65..4386f38e 100644
--- a/ui/desktop/src/components/ProgressiveMessageList.tsx
+++ b/ui/desktop/src/components/ProgressiveMessageList.tsx
@@ -62,6 +62,8 @@ export default function ProgressiveMessageList({
   const [isLoading, setIsLoading] = useState(() => messages.length > showLoadingThreshold);
   const timeoutRef = useRef<number | null>(null);
   const mountedRef = useRef(true);
+  const hasOnlyToolResponses = (message: Message) =>
+    message.content.every((c) => c.type === 'toolResponse');
 
   // Try to use context manager, but don't require it for session history
   let hasContextHandlerContent: ((message: Message) => boolean) | undefined;
@@ -199,7 +201,7 @@ export default function ProgressiveMessageList({
                     }}
                   />
                 ) : (
-                  <UserMessage message={message} />
+                  !hasOnlyToolResponses(message) && <UserMessage message={message} />
                 )}
               </>
             ) : (
diff --git a/ui/desktop/src/components/sessions/SessionHistoryView.tsx b/ui/desktop/src/components/sessions/SessionHistoryView.tsx
index 58b40d21..c9b6b5e4 100644
--- a/ui/desktop/src/components/sessions/SessionHistoryView.tsx
+++ b/ui/desktop/src/components/sessions/SessionHistoryView.tsx
@@ -43,29 +43,8 @@ const isUserMessage = (message: Message): boolean => {
   return true;
 };
 
-// Filter messages for display (same logic as useChatEngine)
 const filterMessagesForDisplay = (messages: Message[]): Message[] => {
-  return messages.filter((message) => {
-    // Only filter out when display is explicitly false
-    if (message.display === false) return false;
-
-    // Keep all assistant messages and user messages that aren't just tool responses
-    if (message.role === 'assistant') return true;
-
-    // For user messages, check if they're only tool responses
-    if (message.role === 'user') {
-      const hasOnlyToolResponses = message.content.every((c) => c.type === 'toolResponse');
-      const hasTextContent = message.content.some((c) => c.type === 'text');
-      const hasToolConfirmation = message.content.every(
-        (c) => c.type === 'toolConfirmationRequest'
-      );
-
-      // Keep the message if it has text content or tool confirmation or is not just tool responses
-      return hasTextContent || !hasOnlyToolResponses || hasToolConfirmation;
-    }
-
-    return true;
-  });
+  return messages.filter((message) => message.display ?? true);
 };
 
 interface SessionHistoryViewProps {
diff --git a/ui/desktop/src/hooks/useChatEngine.ts b/ui/desktop/src/hooks/useChatEngine.ts
index e8b16d50..4f2613ab 100644
--- a/ui/desktop/src/hooks/useChatEngine.ts
+++ b/ui/desktop/src/hooks/useChatEngine.ts
@@ -326,29 +326,8 @@ export const useChatEngine = ({
     }
   }, [stop, messages, _setInput, setMessages]);
 
-  // Filter out standalone tool response messages for rendering
   const filteredMessages = useMemo(() => {
-    return [...ancestorMessages, ...messages].filter((message) => {
-      // Only filter out when display is explicitly false
-      if (message.display === false) return false;
-
-      // Keep all assistant messages and user messages that aren't just tool responses
-      if (message.role === 'assistant') return true;
-
-      // For user messages, check if they're only tool responses
-      if (message.role === 'user') {
-        const hasOnlyToolResponses = message.content.every((c) => c.type === 'toolResponse');
-        const hasTextContent = message.content.some((c) => c.type === 'text');
-        const hasToolConfirmation = message.content.every(
-          (c) => c.type === 'toolConfirmationRequest'
-        );
-
-        // Keep the message if it has text content or tool confirmation or is not just tool responses
-        return hasTextContent || !hasOnlyToolResponses || hasToolConfirmation;
-      }
-
-      return true;
-    });
+    return [...ancestorMessages, ...messages].filter((message) => message.display ?? true);
   }, [ancestorMessages, messages]);
 
   // Generate command history from filtered messages