bloby-bot 0.21.5 → 0.21.6

package/package.json

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

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

@@ -37,11 +37,7 @@ 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);
-  /** ID of a partial assistant message committed early (when user sends while bot is streaming) */
-  const partialMsgId = useRef<string | null>(null);
-  /** Ref to current streamBuffer value (accessible in callbacks without stale closures) */
+  /** Ref to current streamBuffer (avoids stale closures in callbacks) */
   const streamBufferRef = useRef('');
 
   // Load current conversation from DB on mount
@@ -130,11 +126,12 @@ export function useChat(ws: WsClient | null) {
 
     const unsubs = [
       ws.on('bot:typing', () => {
+        console.log('[useChat] bot:typing → streaming=true');
         setStreaming(true);
         setTools([]);
       }),
       ws.on('bot:token', (data: { token: string }) => {
-        // Auto-detect new turn — if tokens arrive after a response cleared streaming
+        // Auto-detect new turn — tokens arriving means agent is working
         setStreaming(true);
         setStreamBuffer((buf) => {
           const next = buf + data.token;
@@ -150,44 +147,36 @@ export function useChat(ws: WsClient | null) {
         });
       }),
       ws.on('bot:response', (data: { conversationId: string; messageId?: string; content: string }) => {
+        console.log('[useChat] bot:response — adding message bubble');
         setConversationId(data.conversationId);
 
-        if (partialMsgId.current) {
-          // A partial message was committed — update it with the full response
-          const pid = partialMsgId.current;
-          partialMsgId.current = null;
-          setMessages((msgs) => msgs.map((m) =>
-            m.id === pid ? { ...m, content: data.content } : m,
-          ));
-        } else {
-          // Normal: add new message bubble
-          setMessages((msgs) => [
-            ...msgs,
-            {
-              id: data.messageId || Date.now().toString(),
-              role: 'assistant',
-              content: data.content,
-              timestamp: new Date().toISOString(),
-            },
-          ]);
-        }
+        // Always add as a new bubble
+        setMessages((msgs) => [
+          ...msgs,
+          {
+            id: data.messageId || Date.now().toString(),
+            role: 'assistant',
+            content: data.content,
+            timestamp: new Date().toISOString(),
+          },
+        ]);
 
         setStreamBuffer('');
         streamBufferRef.current = '';
         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);
-        }
+        // Don't clear streaming here — wait for bot:idle from the server
+      }),
+      ws.on('bot:idle', () => {
+        // Server confirmed agent is idle — safe to stop streaming
+        console.log('[useChat] bot:idle → streaming=false');
+        setStreaming(false);
       }),
       ws.on('bot:error', (data: { error: string }) => {
+        console.log('[useChat] bot:error');
         setStreamBuffer('');
+        streamBufferRef.current = '';
+        setStreaming(false);
         setTools([]);
-        pendingMessages.current = Math.max(0, pendingMessages.current - 1);
-        if (pendingMessages.current === 0) {
-          setStreaming(false);
-        }
         setMessages((msgs) => [
           ...msgs,
           {
@@ -222,28 +211,28 @@ export function useChat(ws: WsClient | null) {
         audioData: audioData ? (audioData.startsWith('data:') ? audioData : `data:audio/webm;base64,${audioData}`) : undefined,
         attachments: optimisticAttachments,
       };
-      // If bot is currently streaming, commit the partial response as a message
-      // so the user's new message appears BELOW the bot's in-progress text
-      if (streamBufferRef.current) {
-        const pid = 'partial-' + Date.now();
-        partialMsgId.current = pid;
-        const partialContent = streamBufferRef.current;
+
+      // If bot is currently streaming, commit the partial response as a completed message
+      // so the user's new message appears BELOW the bot's in-progress text (chronological order)
+      const partialContent = streamBufferRef.current;
+      if (partialContent) {
+        console.log('[useChat] Committing partial stream buffer as message before user send');
         setMessages((msgs) => [
           ...msgs,
           {
-            id: pid,
+            id: 'partial-' + Date.now(),
             role: 'assistant' as const,
             content: partialContent,
             timestamp: new Date().toISOString(),
           },
+          userMsg,
         ]);
         setStreamBuffer('');
         streamBufferRef.current = '';
+      } else {
+        setMessages((msgs) => [...msgs, userMsg]);
       }
 
-      setMessages((msgs) => [...msgs, userMsg]);
-      pendingMessages.current += 1;
-
       // Build WS payload
       const payload: any = { conversationId, content };
       if (audioData) {
@@ -273,8 +262,6 @@ export function useChat(ws: WsClient | null) {
     setStreamBuffer('');
     streamBufferRef.current = '';
     setTools([]);
-    pendingMessages.current = 0;
-    partialMsgId.current = null;
   }, [ws, conversationId]);
 
   const clearContext = useCallback(() => {
@@ -284,8 +271,6 @@ export function useChat(ws: WsClient | null) {
     streamBufferRef.current = '';
     setStreaming(false);
     setTools([]);
-    pendingMessages.current = 0;
-    partialMsgId.current = null;
     prevConvId.current = null;
     loaded.current = false;
     fetch('/api/context/clear', { method: 'POST' }).catch(() => {});

package/supervisor/index.ts

@@ -1167,7 +1167,7 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
                   waChunkBuf = '';
                 }
 
-                // Agent finished a turn — handle backend restart + state cleanup
+                // Agent finished a turn — handle backend restart + notify client
                 if (type === 'bot:turn-complete') {
                   log.info(`[orchestrator] ──── TURN COMPLETE ────`);
                   log.info(`[orchestrator] File tools used: ${eventData.usedFileTools}`);
@@ -1186,7 +1186,9 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
                     pendingUpdate = false;
                     runDeferredUpdate();
                   }
-                  return; // don't forward to client
+                  // Tell the client the agent is idle — streaming can stop
+                  broadcastBloby('bot:idle', { conversationId: convId });
+                  return;
                 }
 
                 // Conversation ended (query loop exited)