Merge pull request #2965 from OtterMind/fix/ai-stream-status-settle

fix(ai): settle the stream status when a request ends without a terminal callback

Author: openai0229

chat2db-community-client/src/blocks/AI/index.tsx

@@ -550,6 +550,8 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
   const messagesRef = useRef<IChatItem[]>([]);
   const currentRoundUserMessageIdRef = useRef<string | null>(null);
   const statusRef = useRef<SSERequestStatus>(SSERequestStatus.IDLE);
+  // Kept in a ref because the chunk handler is memoized without the request controls as dependencies.
+  const stopRequestRef = useRef<(() => void) | null>(null);
   const inProgressSessionRef = useRef<IInProgressSessionSnapshot | null>(null);
   const chatInputRef = useRef<ChatInputPropsRef>(null);
   const messageListRef = useRef<HTMLDivElement>(null);
@@ -867,6 +869,9 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
         }
       }
       feedback.error(chunk.content || 'AI stream error');
+      // The error already arrived, so end the generation: otherwise the request stays in LOADING and the
+      // model logo keeps spinning next to the error message.
+      stopRequestRef.current?.();
     }
   }, []);
 
@@ -879,6 +884,10 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
     undefined,
   );
 
+  useEffect(() => {
+    stopRequestRef.current = stop;
+  }, [stop]);
+
   // Load the model list.
 
   const loadModelOptions = useCallback(async () => {

chat2db-community-client/src/hooks/useSSERequest.ts

@@ -75,6 +75,7 @@ const useSSERequest = <T = string>(
       let accumulatedContent = '';
       let requestHandle: SSERequestHandle | undefined;
       let callbackHandledError = false;
+      let terminalCallbackFired = false;
       const isActiveRequest = () => mountedRef.current && requestOwner.owns(generation, requestHandle);
 
       try {
@@ -83,10 +84,12 @@ const useSSERequest = <T = string>(
           guardSSERequestCallbacks<SSEOutput>(
             {
               onSuccess: () => {
+                terminalCallbackFired = true;
                 console.log('[useSSERequest] onSuccess, chunks count:', chunks.length);
                 setStatus(SSERequestStatus.FINISH);
               },
               onError: (err) => {
+                terminalCallbackFired = true;
                 callbackHandledError = true;
                 console.log('[useSSERequest] onError:', err);
                 setStatus(SSERequestStatus.ERROR);
@@ -117,6 +120,7 @@ const useSSERequest = <T = string>(
                 }
               },
               onStop: () => {
+                terminalCallbackFired = true;
                 console.log('[useSSERequest] onStop');
                 setStatus(SSERequestStatus.FINISH);
               },
@@ -136,6 +140,12 @@ const useSSERequest = <T = string>(
         setStatus(SSERequestStatus.ERROR);
         setError(error_ instanceof Error ? error_ : new Error('Unknown error'));
       } finally {
+        if (!terminalCallbackFired && mountedRef.current && requestOwner.isCurrentGeneration(generation)) {
+          // A stream can end without a terminal callback, for example when the backend answers with a
+          // business error payload. Never leave the request in LOADING, otherwise the UI keeps showing
+          // its generating state next to an error that already arrived.
+          setStatus(SSERequestStatus.ERROR);
+        }
         if (requestHandle) {
           requestOwner.release(generation, requestHandle);
         }