From c551aef7fff2e7a6d61cba4e3abedd9087f5a5ae Mon Sep 17 00:00:00 2001
From: ibelick <julien.thibeaut@gmail.com>
Date: Sat, 14 Feb 2026 18:36:49 +0100
Subject: [PATCH] fix(chat): keep stream connection alive between sends

---
 apps/webclaw/src/screens/chat/chat-screen.tsx                | 3 +--
 apps/webclaw/src/screens/chat/hooks/use-chat-pending-send.ts | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/webclaw/src/screens/chat/chat-screen.tsx b/apps/webclaw/src/screens/chat/chat-screen.tsx
index 0d9b46e..338ef79 100644
--- a/apps/webclaw/src/screens/chat/chat-screen.tsx
+++ b/apps/webclaw/src/screens/chat/chat-screen.tsx
@@ -473,7 +473,7 @@ export function ChatScreen({
     )
   }, [gatewayError, handleGatewayRefetch, showGatewayNotice])
 
-  const { stopStream } = useChatStream({
+  useChatStream({
     activeFriendlyId,
     isNewChat,
     isRedirecting,
@@ -551,7 +551,6 @@ export function ChatScreen({
     resolvedSessionKey,
     setWaitingForResponse,
     setPinToTop,
-    streamStop: stopStream,
     sendMessage,
   })
 
diff --git a/apps/webclaw/src/screens/chat/hooks/use-chat-pending-send.ts b/apps/webclaw/src/screens/chat/hooks/use-chat-pending-send.ts
index 97ab279..6876ae2 100644
--- a/apps/webclaw/src/screens/chat/hooks/use-chat-pending-send.ts
+++ b/apps/webclaw/src/screens/chat/hooks/use-chat-pending-send.ts
@@ -19,7 +19,6 @@ type UseChatPendingSendInput = {
   resolvedSessionKey: string
   setWaitingForResponse: (value: boolean) => void
   setPinToTop: (value: boolean) => void
-  streamStop: () => void
   sendMessage: (
     sessionKey: string,
     friendlyId: string,
@@ -38,7 +37,6 @@ export function useChatPendingSend({
   resolvedSessionKey,
   setWaitingForResponse,
   setPinToTop,
-  streamStop,
   sendMessage,
 }: UseChatPendingSendInput) {
   const pendingStartRef = useRef(false)
@@ -53,9 +51,8 @@ export function useChatPendingSend({
       setPinToTop(true)
       return
     }
-    streamStop()
     setWaitingForResponse(false)
-  }, [activeFriendlyId, isNewChat, setPinToTop, setWaitingForResponse, streamStop])
+  }, [activeFriendlyId, isNewChat, setPinToTop, setWaitingForResponse])
 
   useLayoutEffect(() => {
     if (isNewChat) return