bloby-bot 0.20.8 → 0.21.1

package/supervisor/channels/manager.ts

@@ -20,7 +20,7 @@ import path from 'path';
 import { loadConfig } from '../../shared/config.js';
 import { WORKSPACE_DIR } from '../../shared/paths.js';
 import { log } from '../../shared/logger.js';
-import { startBlobyAgentQuery, type RecentMessage } from '../bloby-agent.js';
+import { startBlobyAgentQuery, startConversation, pushMessage, hasConversation, type RecentMessage } from '../bloby-agent.js';
 import { WhatsAppChannel } from './whatsapp.js';
 import type { ChannelConfig, ChannelProvider, ChannelStatus, ChannelType, InboundMessage, InboundMessageAttachment, SenderRole } from './types.js';
 import type { AgentAttachment } from '../bloby-agent.js';
@@ -392,14 +392,14 @@ export class ChannelManager {
     // Show "typing..." while the agent processes
     this.startTyping(msg.channel, msg.rawSender);
 
-    // Track text chunks for WhatsApp — send intermediate chunks when agent pauses for tool use
+    // Track text chunks for WhatsApp — lives for the conversation lifetime
     let waChunkBuf = '';
 
-    startBlobyAgentQuery(
-      convId,
-      channelContext + msg.text,
-      model,
-      (type, eventData) => {
+    // Start a live conversation if one doesn't exist (shared with chat UI)
+    if (!hasConversation(convId)) {
+      log.info(`[channels] Starting live conversation for admin: ${convId}`);
+
+      await startConversation(convId, model, (type, eventData) => {
         // Accumulate text tokens
         if (type === 'bot:token' && eventData.token) {
           waChunkBuf += eventData.token;
@@ -414,7 +414,7 @@ export class ChannelManager {
         }
 
         if (type === 'bot:response' && eventData.content) {
-          // Send remaining text after the last tool use (or the full response if no tools were used)
+          // Send remaining text
           const remaining = waChunkBuf.trim();
           if (remaining) {
             this.sendMessage(msg.channel, msg.rawSender, remaining).catch((err) => {
@@ -431,22 +431,22 @@ export class ChannelManager {
           }).catch(() => {});
         }
 
-        // Mirror streaming + task events to chat clients
-        if (type === 'bot:token' || type === 'bot:response' || type === 'bot:typing' || type === 'bot:tool' || type.startsWith('bot:task-')) {
-          broadcastBloby(type, eventData);
-        }
-
-        if (type === 'bot:done' && eventData.usedFileTools) {
+        // Handle turn completion — restart backend if needed
+        if (type === 'bot:turn-complete' && eventData.usedFileTools) {
           this.opts.restartBackend();
         }
-      },
-      agentAttachments,
-      undefined,
-      { botName, humanName },
-      recentMessages,
-      undefined, // no supportPrompt
-      8,         // maxTurns: orchestrator mode
-    );
+
+        // Don't forward internal events to chat clients
+        if (type === 'bot:turn-complete' || type === 'bot:conversation-ended') return;
+
+        // Mirror streaming + task events to chat clients
+        broadcastBloby(type, eventData);
+      }, { botName, humanName }, recentMessages);
+    }
+
+    // Push the message into the live conversation
+    const channelContent = channelContext + msg.text;
+    pushMessage(convId, channelContent, agentAttachments);
   }
 
   /** Handle message from a customer — runs support agent in parallel with conversation context */

package/supervisor/chat/src/components/Chat/InputBar.tsx

@@ -441,7 +441,7 @@ export default function InputBar({ onSend, onStop, streaming, whisperEnabled, on
               <Camera className="h-4 w-4" />
             </button>
           </div>
-          {streaming ? (
+          {streaming && !hasText ? (
             <button
               onClick={onStop}
               className="flex items-center justify-center h-12 w-12 shrink-0 rounded-full bg-destructive text-destructive-foreground transition-colors"

package/supervisor/index.ts

@@ -13,7 +13,12 @@ import { createWorkerApp } from '../worker/index.js';
 import { closeDb, getSession, getSetting } from '../worker/db.js';
 import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, isBackendStopping, resetBackendRestarts } from './backend.js';
 import { updateTunnelUrl, startHeartbeat, stopHeartbeat, disconnect } from '../shared/relay.js';
-import { startBlobyAgentQuery, stopBlobyAgentQuery, stopSubAgentTask, type RecentMessage } from './bloby-agent.js';
+import {
+  startConversation, pushMessage, hasConversation, endConversation,
+  isConversationBusy, stopSubAgentTask,
+  startBlobyAgentQuery, stopBlobyAgentQuery,
+  type RecentMessage,
+} from './bloby-agent.js';
 import { ensureFileDirs, saveAttachment, type SavedFile } from './file-saver.js';
 import { startViteDevServers, stopViteDevServers } from './vite-dev.js';
 import { startScheduler, stopScheduler } from './scheduler.js';
@@ -1127,84 +1132,101 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
               }
             } catch {}
 
-            // Mirror chat responses to WhatsApp self-chat (if connected)
-            const waStatus = channelManager.getStatus('whatsapp');
-            const waMirrorJid = waStatus?.connected ? waStatus.info?.phoneNumber : null;
-            let waChunkBuf = '';
-
-            // Start orchestrator query (maxTurns: 8 — quick tasks direct, coding delegated)
             log.info(`[orchestrator] ──── USER MESSAGE ────`);
             log.info(`[orchestrator] Content: "${content.slice(0, 100)}..."`);
-            log.info(`[orchestrator] Model: ${freshConfig.ai.model}`);
             log.info(`[orchestrator] Conv: ${convId}`);
-            log.info(`[orchestrator] MaxTurns: 5 (orchestrator mode)`);
-            agentQueryActive = true;
-            currentStreamConvId = convId;
-            currentStreamBuffer = '';
-            startBlobyAgentQuery(convId, content, freshConfig.ai.model, (type, eventData) => {
-              // Track stream buffer for reconnecting clients
-              if (type === 'bot:token' && eventData.token) {
-                currentStreamBuffer += eventData.token;
-                if (waMirrorJid) waChunkBuf += eventData.token;
-              }
+            log.info(`[orchestrator] Live conversation exists: ${hasConversation(convId)}`);
 
-              // WhatsApp mirror: send intermediate chunk when agent pauses for tool use
-              if (type === 'bot:tool' && waMirrorJid && waChunkBuf.trim()) {
-                channelManager.sendMessage('whatsapp', `${waMirrorJid}@s.whatsapp.net`, waChunkBuf.trim()).catch(() => {});
-                waChunkBuf = '';
-              }
+            // Start a live conversation if one doesn't exist
+            if (!hasConversation(convId)) {
+              log.info(`[orchestrator] Starting new live conversation...`);
 
-              // Intercept bot:done — orchestrator turn finished
-              if (type === 'bot:done') {
-                log.info(`[orchestrator] ──── TURN COMPLETE ────`);
-                log.info(`[orchestrator] File tools used: ${eventData.usedFileTools}`);
-                agentQueryActive = false;
-                currentStreamConvId = null;
-                currentStreamBuffer = '';
-                // Restart if agent used file tools OR file watcher detected changes during the turn
-                if (eventData.usedFileTools || pendingBackendRestart) {
-                  console.log('[supervisor] Agent turn ended — restarting backend');
-                  pendingBackendRestart = false;
-                  if (backendRestartTimer) { clearTimeout(backendRestartTimer); backendRestartTimer = null; }
-                  resetBackendRestarts();
-                  stopBackend().then(() => spawnBackend(backendPort));
-                }
-                // Run deferred update if agent requested one
-                if (pendingUpdate) {
-                  pendingUpdate = false;
-                  runDeferredUpdate();
+              // WhatsApp mirror state — lives for the conversation lifetime
+              let waChunkBuf = '';
+
+              await startConversation(convId, freshConfig.ai.model, (type, eventData) => {
+                // Check WA mirror on each event (connection state may change)
+                const waStatus = channelManager.getStatus('whatsapp');
+                const waMirrorJid = waStatus?.connected ? waStatus.info?.phoneNumber : null;
+
+                // Track stream buffer for reconnecting clients
+                if (type === 'bot:typing') {
+                  currentStreamConvId = convId;
+                  currentStreamBuffer = '';
+                  agentQueryActive = true;
                 }
-                return; // don't forward bot:done to client
-              }
 
-              // Save assistant response to DB + clear stream state
-              if (type === 'bot:response') {
-                currentStreamBuffer = '';
+                if (type === 'bot:token' && eventData.token) {
+                  currentStreamBuffer += eventData.token;
+                  if (waMirrorJid) waChunkBuf += eventData.token;
+                }
 
-                // WhatsApp mirror: send remaining chunk
-                if (waMirrorJid && waChunkBuf.trim()) {
+                // WhatsApp mirror: send intermediate chunk when agent pauses for tool use
+                if (type === 'bot:tool' && waMirrorJid && waChunkBuf.trim()) {
                   channelManager.sendMessage('whatsapp', `${waMirrorJid}@s.whatsapp.net`, waChunkBuf.trim()).catch(() => {});
                   waChunkBuf = '';
                 }
 
-                (async () => {
-                  try {
-                    await workerApi(`/api/conversations/${convId}/messages`, 'POST', {
-                      role: 'assistant', content: eventData.content, meta: { model: freshConfig.ai.model },
-                    });
-                  } catch (err: any) {
-                    log.warn(`[bloby] DB persist bot response error: ${err.message}`);
+                // Agent finished a turn — handle backend restart + state cleanup
+                if (type === 'bot:turn-complete') {
+                  log.info(`[orchestrator] ──── TURN COMPLETE ────`);
+                  log.info(`[orchestrator] File tools used: ${eventData.usedFileTools}`);
+                  agentQueryActive = false;
+                  currentStreamConvId = null;
+                  currentStreamBuffer = '';
+
+                  if (eventData.usedFileTools || pendingBackendRestart) {
+                    log.info('[orchestrator] Restarting backend (file tools used)');
+                    pendingBackendRestart = false;
+                    if (backendRestartTimer) { clearTimeout(backendRestartTimer); backendRestartTimer = null; }
+                    resetBackendRestarts();
+                    stopBackend().then(() => spawnBackend(backendPort));
                   }
-                })();
-              }
+                  if (pendingUpdate) {
+                    pendingUpdate = false;
+                    runDeferredUpdate();
+                  }
+                  return; // don't forward to client
+                }
+
+                // Conversation ended (query loop exited)
+                if (type === 'bot:conversation-ended') {
+                  log.info(`[orchestrator] Conversation ended: ${convId}`);
+                  agentQueryActive = false;
+                  currentStreamConvId = null;
+                  currentStreamBuffer = '';
+                  return;
+                }
 
-              // Stream all events to every connected client
-              // (includes bot:task-created, bot:task-progress, bot:task-done from SDK)
-              broadcastBloby(type, eventData);
-            }, data.attachments, savedFiles, { botName, humanName }, recentMessages,
-            undefined, // no supportPrompt
-            8,         // maxTurns: orchestrator mode
-            );
+                // Save assistant response to DB
+                if (type === 'bot:response') {
+                  currentStreamBuffer = '';
+
+                  // WhatsApp mirror: send remaining chunk
+                  if (waMirrorJid && waChunkBuf.trim()) {
+                    channelManager.sendMessage('whatsapp', `${waMirrorJid}@s.whatsapp.net`, waChunkBuf.trim()).catch(() => {});
+                    waChunkBuf = '';
+                  }
+
+                  (async () => {
+                    try {
+                      await workerApi(`/api/conversations/${convId}/messages`, 'POST', {
+                        role: 'assistant', content: eventData.content, meta: { model: freshConfig.ai.model },
+                      });
+                    } catch (err: any) {
+                      log.warn(`[bloby] DB persist bot response error: ${err.message}`);
+                    }
+                  })();
+                }
+
+                // Stream all events to every connected client
+                broadcastBloby(type, eventData);
+              }, { botName, humanName }, recentMessages);
+            }
+
+            // Push the user message into the live conversation
+            log.info(`[orchestrator] Pushing message into live conversation`);
+            pushMessage(convId, content, data.attachments, savedFiles);
           })();
           return;
         }
@@ -1238,7 +1260,13 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
       }
 
       if (msg.type === 'user:stop') {
-        stopBlobyAgentQuery(convId);
+        // End the live conversation (if any) or stop a one-shot query
+        if (hasConversation(convId)) {
+          log.info(`[orchestrator] user:stop — ending live conversation ${convId}`);
+          endConversation(convId);
+        } else {
+          stopBlobyAgentQuery(convId);
+        }
         return;
       }
 
@@ -1256,6 +1284,11 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
       if (msg.type === 'user:clear-context') {
         (async () => {
           try {
+            // End the live conversation
+            if (hasConversation(convId)) {
+              log.info(`[orchestrator] clear-context — ending live conversation ${convId}`);
+              endConversation(convId);
+            }
             clientConvs.delete(ws);
             await workerApi('/api/context/clear', 'POST');
           } catch (err: any) {
@@ -1325,11 +1358,14 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
     }
   });
 
-  // Track whether an agent query is active — file watcher defers to bot:done during turns
+  // Track whether an agent is actively processing — file watcher defers restarts during active turns
   let agentQueryActive = false;
   let pendingBackendRestart = false; // Set when file watcher fires during agent turn
   let pendingUpdate = false; // Set when .update file is created during agent turn
 
+  // Note: with live conversations, agentQueryActive is true while the agent processes a message
+  // and false when it's idle (waiting for next message). The live conversation stays alive between messages.
+
   // Run bloby update as a child process.
   // BLOBY_SELF_UPDATE=1 tells bin/cli.js to skip daemon stop/restart —
   // the supervisor exits after the update finishes, and systemd (Restart=on-failure)

package/worker/prompts/bloby-system-prompt.txt

@@ -221,7 +221,7 @@ You handle two kinds of work differently:
 - Complex research or data gathering
 - Any coding task that touches workspace source files (client/, backend/)
 
-For quick tasks, use your tools directly — Read, Write, Edit, Bash. You have 5 turns, plenty for a config edit or memory write.
+For quick tasks, use your tools directly — Read, Write, Edit, Bash.
 
 For coding tasks, use the Agent tool. It runs in the background — you respond immediately while the work happens behind the scenes.
 

package/dist-bloby/assets/mermaid-GHXKKRXX-mjSiQkZC.js

@@ -1 +0,0 @@
-import{i as e}from"./bloby-C2KDOC_1.js";export{e as Mermaid};