bloby-bot 0.21.1 → 0.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bloby-bot",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "releaseNotes": [
     "1. react router implemented",
     "2. new workspace design",

package/supervisor/chat/src/hooks/useChat.ts

@@ -37,6 +37,8 @@ export function useChat(ws: WsClient | null) {
   const [streamBuffer, setStreamBuffer] = useState('');
   const [tools, setTools] = useState<ToolActivity[]>([]);
   const loaded = useRef(false);
+  /** Count of user messages awaiting a bot response — keeps typing indicator alive across turns */
+  const pendingMessages = useRef(0);
 
   // Load current conversation from DB on mount
   useEffect(() => {
@@ -128,6 +130,8 @@ export function useChat(ws: WsClient | null) {
         setTools([]);
       }),
       ws.on('bot:token', (data: { token: string }) => {
+        // Auto-detect new turn — if tokens arrive after a response cleared streaming
+        setStreaming(true);
         setStreamBuffer((buf) => buf + data.token);
       }),
       ws.on('bot:tool', (data: { name: string; input?: any; status?: string }) => {
@@ -149,13 +153,20 @@ export function useChat(ws: WsClient | null) {
           },
         ]);
         setStreamBuffer('');
-        setStreaming(false);
         setTools([]);
+        // Only stop streaming when all pending messages have been answered
+        pendingMessages.current = Math.max(0, pendingMessages.current - 1);
+        if (pendingMessages.current === 0) {
+          setStreaming(false);
+        }
       }),
       ws.on('bot:error', (data: { error: string }) => {
         setStreamBuffer('');
-        setStreaming(false);
         setTools([]);
+        pendingMessages.current = Math.max(0, pendingMessages.current - 1);
+        if (pendingMessages.current === 0) {
+          setStreaming(false);
+        }
         setMessages((msgs) => [
           ...msgs,
           {
@@ -191,6 +202,7 @@ export function useChat(ws: WsClient | null) {
         attachments: optimisticAttachments,
       };
       setMessages((msgs) => [...msgs, userMsg]);
+      pendingMessages.current += 1;
 
       // Build WS payload
       const payload: any = { conversationId, content };
@@ -220,6 +232,7 @@ export function useChat(ws: WsClient | null) {
     setStreaming(false);
     setStreamBuffer('');
     setTools([]);
+    pendingMessages.current = 0;
   }, [ws, conversationId]);
 
   const clearContext = useCallback(() => {
@@ -228,6 +241,7 @@ export function useChat(ws: WsClient | null) {
     setStreamBuffer('');
     setStreaming(false);
     setTools([]);
+    pendingMessages.current = 0;
     prevConvId.current = null;
     loaded.current = false;
     fetch('/api/context/clear', { method: 'POST' }).catch(() => {});