From 8f45596c99fa3001112adc274b4d00ad39dd2b12 Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Mon, 25 May 2026 02:13:00 +0300
Subject: [PATCH] fix: keep pinned chat following final summaries

---
 packages/ui/src/hooks/useChatAutoFollow.ts | 34 +++++++---------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/packages/ui/src/hooks/useChatAutoFollow.ts b/packages/ui/src/hooks/useChatAutoFollow.ts
index b22540d9..ad87006e 100644
--- a/packages/ui/src/hooks/useChatAutoFollow.ts
+++ b/packages/ui/src/hooks/useChatAutoFollow.ts
@@ -122,8 +122,6 @@ export const useChatAutoFollow = ({
     const [isFollowingProgrammatically, setIsFollowingProgrammatically] = React.useState(false);
 
     const stateRef = React.useRef<AutoFollowState>('following');
-    const sessionWorkingRef = React.useRef(sessionIsWorking);
-    sessionWorkingRef.current = sessionIsWorking;
     const sessionMessageCountRef = React.useRef(sessionMessageCount);
     sessionMessageCountRef.current = sessionMessageCount;
     const currentSessionIdRef = React.useRef(currentSessionId);
@@ -189,7 +187,7 @@ export const useChatAutoFollow = ({
             stopFollowLoop();
             return;
         }
-        if (stateRef.current !== 'following' || !sessionWorkingRef.current) {
+        if (stateRef.current !== 'following') {
             stopFollowLoop();
             return;
         }
@@ -224,7 +222,7 @@ export const useChatAutoFollow = ({
     const startFollowLoop = React.useCallback(() => {
         if (typeof window === 'undefined') return;
         if (followRafRef.current !== null) return;
-        if (stateRef.current !== 'following' || !sessionWorkingRef.current) return;
+        if (stateRef.current !== 'following') return;
         settledFramesRef.current = 0;
         setIsFollowingProgrammatically(true);
         followRafRef.current = window.requestAnimationFrame(tickFollow);
@@ -293,17 +291,13 @@ export const useChatAutoFollow = ({
         setStateValue('following');
         lastUserReleaseAtRef.current = 0;
         if (!container) return;
-        if (mode === 'smooth' && sessionWorkingRef.current) {
+        if (mode === 'smooth') {
             startFollowLoop();
             return;
         }
         const target = Math.max(0, container.scrollHeight - container.clientHeight);
         writeScrollTopInstant(target);
-        if (sessionWorkingRef.current) {
-            startFollowLoop();
-        } else {
-            startSettleBurst();
-        }
+        startSettleBurst();
     }, [setStateValue, startFollowLoop, startSettleBurst, writeScrollTopInstant]);
 
     const flushSave = React.useCallback(() => {
@@ -371,9 +365,7 @@ export const useChatAutoFollow = ({
             lastUserReleaseAtRef.current = 0;
             const target = Math.max(0, container.scrollHeight - container.clientHeight);
             writeScrollTopInstant(target);
-            if (sessionWorkingRef.current) {
-                startFollowLoop();
-            }
+            startFollowLoop();
             startSettleBurst();
             return false;
         }
@@ -413,12 +405,10 @@ export const useChatAutoFollow = ({
     }, [currentSessionId, flushSave, markProgrammaticWrite, stopFollowLoop, stopSettleBurst]);
 
     React.useEffect(() => {
-        if (!sessionIsWorking) {
-            stopFollowLoop();
-        } else if (stateRef.current === 'following') {
+        if (sessionIsWorking && stateRef.current === 'following') {
             startFollowLoop();
         }
-    }, [sessionIsWorking, startFollowLoop, stopFollowLoop]);
+    }, [sessionIsWorking, startFollowLoop]);
 
     // Replay a deferred restoreSnapshot once ChatViewport mounts.
     React.useEffect(() => {
@@ -471,9 +461,7 @@ export const useChatAutoFollow = ({
         const inGrace = (now - lastUserReleaseAtRef.current) < REPIN_GRACE_AFTER_RELEASE_MS;
         if (stateRef.current === 'released' && isNearBottom(container, isMobile) && !inGrace) {
             setStateValue('following');
-            if (sessionWorkingRef.current) {
-                startFollowLoop();
-            }
+            startFollowLoop();
         }
 
         queueSave();
@@ -564,7 +552,7 @@ export const useChatAutoFollow = ({
 
         const observer = new ResizeObserver(() => {
             updateOverflowAndButton();
-            if (stateRef.current === 'following' && sessionWorkingRef.current) {
+            if (stateRef.current === 'following') {
                 startFollowLoop();
             }
         });
@@ -583,7 +571,7 @@ export const useChatAutoFollow = ({
     const notifyContentChange = React.useCallback((_reason?: ContentChangeReason) => {
         void _reason;
         updateOverflowAndButton();
-        if (stateRef.current === 'following' && sessionWorkingRef.current) {
+        if (stateRef.current === 'following') {
             startFollowLoop();
         }
     }, [startFollowLoop, updateOverflowAndButton]);
@@ -595,7 +583,7 @@ export const useChatAutoFollow = ({
         if (cached) return cached;
 
         const kick = () => {
-            if (stateRef.current === 'following' && sessionWorkingRef.current) {
+            if (stateRef.current === 'following') {
                 startFollowLoop();
             }
         };