bloby-bot 0.19.3 → 0.20.1

package/supervisor/bloby-agent.ts

@@ -11,6 +11,7 @@ import { WORKSPACE_DIR } from '../shared/paths.js';
 import type { SavedFile } from './file-saver.js';
 import { getClaudeAccessToken } from '../worker/claude-auth.js';
 import { assembleSystemPrompt } from '../worker/prompts/prompt-assembler.js';
+import { buildAgents } from './agents/index.js';
 
 export interface RecentMessage {
   role: 'user' | 'assistant';
@@ -19,6 +20,7 @@ export interface RecentMessage {
 
 interface ActiveQuery {
   abortController: AbortController;
+  queryHandle?: any; // SDK query handle for stopTask()
 }
 
 const activeQueries = new Map<string, ActiveQuery>();
@@ -109,6 +111,8 @@ export async function startBlobyAgentQuery(
   recentMessages?: RecentMessage[],
   /** Override system prompt (used for customer-facing channel messages via SUPPORT.md) */
   supportPrompt?: string,
+  /** Max agentic turns. Default 50. Orchestrator uses 5. */
+  maxTurns?: number,
 ): Promise<void> {
   const oauthToken = await getClaudeAccessToken();
   if (!oauthToken) {
@@ -140,14 +144,14 @@ export async function startBlobyAgentQuery(
         enrichedPrompt += `\n\n---\n# Channel Config\n\`\`\`json\n${JSON.stringify(channels, null, 2)}\n\`\`\``;
       }
     } catch {}
+
+    // Task board is now managed natively by the SDK via background agents
   }
 
   if (recentMessages?.length) {
     enrichedPrompt += `\n\n---\n# Recent Conversation\n${formatConversationHistory(recentMessages)}`;
   }
 
-  activeQueries.set(conversationId, { abortController });
-
   let fullText = '';
   const usedTools = new Set<string>();
   let stderrBuf = '';
@@ -187,6 +191,17 @@ export async function startBlobyAgentQuery(
       }
     } catch {}
 
+    const effectiveMaxTurns = maxTurns ?? 50;
+
+    // Build sub-agent definitions (only for orchestrator/admin, not customer support)
+    let agents: Record<string, any> | undefined;
+    if (!supportPrompt && effectiveMaxTurns <= 10) {
+      agents = buildAgents();
+      log.info(`[bloby-agent] Orchestrator mode — loaded ${Object.keys(agents).length} sub-agent(s): ${Object.keys(agents).join(', ')}`);
+    }
+
+    log.info(`[bloby-agent] Starting query: conv=${conversationId}, model=${model}, maxTurns=${effectiveMaxTurns}, agents=${agents ? Object.keys(agents).join(',') : 'none'}, promptLen=${enrichedPrompt.length}`);
+
     const claudeQuery = query({
       prompt: sdkPrompt,
       options: {
@@ -194,10 +209,12 @@ export async function startBlobyAgentQuery(
         cwd: WORKSPACE_DIR,
         permissionMode: 'bypassPermissions',
         allowDangerouslySkipPermissions: true,
-        maxTurns: 50,
+        maxTurns: effectiveMaxTurns,
         abortController,
         systemPrompt: enrichedPrompt,
         mcpServers,
+        ...(agents && { agents }),
+        ...(agents && { agentProgressSummaries: true }),
         stderr: (chunk: string) => { stderrBuf += chunk; },
         env: {
           ...process.env as Record<string, string>,
@@ -207,6 +224,9 @@ export async function startBlobyAgentQuery(
       },
     });
 
+    // Store query handle for stopTask() support
+    activeQueries.set(conversationId, { abortController, queryHandle: claudeQuery });
+
     onMessage('bot:typing', { conversationId });
 
     for await (const msg of claudeQuery) {
@@ -252,6 +272,51 @@ export async function startBlobyAgentQuery(
             status: 'running',
           });
           break;
+
+        // ── Background sub-agent events (SDK-managed) ──
+        case 'system': {
+          const sysMsg = msg as any;
+          if (sysMsg.subtype === 'task_started') {
+            log.info(`[bloby-agent] ──── SUB-AGENT STARTED ────`);
+            log.info(`[bloby-agent] Task ID: ${sysMsg.task_id}`);
+            log.info(`[bloby-agent] Description: ${sysMsg.description}`);
+            log.info(`[bloby-agent] Type: ${sysMsg.task_type || 'agent'}`);
+            onMessage('bot:task-created', {
+              conversationId,
+              taskId: sysMsg.task_id,
+              description: sysMsg.description,
+              type: sysMsg.task_type,
+            });
+          } else if (sysMsg.subtype === 'task_progress') {
+            const summary = sysMsg.summary || sysMsg.last_tool_name || 'working';
+            log.info(`[bloby-agent] Sub-agent ${sysMsg.task_id} | Progress: ${summary} | Tools: ${sysMsg.usage?.tool_uses || 0} | ${Math.round((sysMsg.usage?.duration_ms || 0) / 1000)}s`);
+            onMessage('bot:task-progress', {
+              conversationId,
+              taskId: sysMsg.task_id,
+              summary,
+              lastTool: sysMsg.last_tool_name,
+              usage: sysMsg.usage,
+            });
+          } else if (sysMsg.subtype === 'task_notification') {
+            log.info(`[bloby-agent] ──── SUB-AGENT ${sysMsg.status?.toUpperCase()} ────`);
+            log.info(`[bloby-agent] Task ID: ${sysMsg.task_id}`);
+            log.info(`[bloby-agent] Status: ${sysMsg.status}`);
+            log.info(`[bloby-agent] Summary: ${sysMsg.summary?.slice(0, 200)}`);
+            log.info(`[bloby-agent] Tokens: ${sysMsg.usage?.total_tokens || 0} | Tools: ${sysMsg.usage?.tool_uses || 0} | Duration: ${Math.round((sysMsg.usage?.duration_ms || 0) / 1000)}s`);
+            onMessage('bot:task-done', {
+              conversationId,
+              taskId: sysMsg.task_id,
+              status: sysMsg.status,
+              summary: sysMsg.summary,
+              usage: sysMsg.usage,
+            });
+            // If the sub-agent wrote files, flag it
+            if (sysMsg.status === 'completed') {
+              usedTools.add('Write'); // ensure backend restart
+            }
+          }
+          break;
+        }
       }
     }
 
@@ -282,3 +347,14 @@ export function stopBlobyAgentQuery(conversationId: string): void {
     activeQueries.delete(conversationId);
   }
 }
+
+/** Stop a specific background sub-agent task */
+export async function stopSubAgentTask(conversationId: string, taskId: string): Promise<void> {
+  const q = activeQueries.get(conversationId);
+  if (q?.queryHandle?.stopTask) {
+    log.info(`[bloby-agent] Stopping sub-agent task: ${taskId}`);
+    await q.queryHandle.stopTask(taskId);
+  } else {
+    log.warn(`[bloby-agent] Cannot stop task ${taskId} — no active query for ${conversationId}`);
+  }
+}

package/supervisor/channels/manager.ts

@@ -423,7 +423,7 @@ export class ChannelManager {
             waChunkBuf = '';
           }
 
-          // Save full response to DB
+          // Save response to DB
           workerApi(`/api/conversations/${convId}/messages`, 'POST', {
             role: 'assistant',
             content: eventData.content,
@@ -431,8 +431,8 @@ export class ChannelManager {
           }).catch(() => {});
         }
 
-        // Mirror streaming to chat clients
-        if (type === 'bot:token' || type === 'bot:response' || type === 'bot:typing' || type === 'bot:tool') {
+        // 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);
         }
 
@@ -444,6 +444,8 @@ export class ChannelManager {
       undefined,
       { botName, humanName },
       recentMessages,
+      undefined, // no supportPrompt
+      5,         // maxTurns: orchestrator mode
     );
   }
 

package/supervisor/chat/OnboardWizard.tsx

@@ -203,6 +203,7 @@ export default function OnboardWizard({ onComplete, isInitialSetup = false, onSa
   const [portalCopied, setPortalCopied] = useState(false);
   const [portalExists, setPortalExists] = useState(false);
   const [showPassAllSet, setShowPassAllSet] = useState(false);
+  const [acceptedTerms, setAcceptedTerms] = useState(false);
 
   // Portal old password (for changing existing credentials)
   const [portalOldPass, setPortalOldPass] = useState('');
@@ -2309,8 +2310,25 @@ export default function OnboardWizard({ onComplete, isInitialSetup = false, onSa
                   </div>
                 </div>
 
+                {/* Terms & Privacy checkbox */}
+                <label className="flex items-start gap-2.5 mt-6 cursor-pointer text-left select-none">
+                  <input
+                    type="checkbox"
+                    checked={acceptedTerms}
+                    onChange={(e) => setAcceptedTerms(e.target.checked)}
+                    className="mt-0.5 h-4 w-4 rounded border-white/20 bg-white/5 accent-emerald-500 shrink-0"
+                  />
+                  <span className="text-[12px] text-white/50 leading-relaxed">
+                    I accept the{' '}
+                    <a href="https://www.bloby.bot/terms" target="_blank" rel="noopener noreferrer" className="text-white/70 underline hover:text-white/90">terms</a>
+                    {' '}and{' '}
+                    <a href="https://www.bloby.bot/privacy" target="_blank" rel="noopener noreferrer" className="text-white/70 underline hover:text-white/90">privacy policy</a>
+                  </span>
+                </label>
+
                 {/* Redirect / done button */}
                 <button
+                  disabled={!acceptedTerms}
                   onClick={() => {
                     if (isPrivate) {
                       (window.top || window).location.href = '/';
@@ -2318,7 +2336,7 @@ export default function OnboardWizard({ onComplete, isInitialSetup = false, onSa
                       (window.top || window).location.href = finalUrlFull;
                     }
                   }}
-                  className="w-full mt-6 py-3 bg-gradient-brand hover:opacity-90 text-white text-[14px] font-semibold rounded-full transition-colors flex items-center justify-center gap-2"
+                  className={`w-full mt-4 py-3 text-white text-[14px] font-semibold rounded-full transition-colors flex items-center justify-center gap-2 ${acceptedTerms ? 'bg-gradient-brand hover:opacity-90' : 'bg-white/10 cursor-not-allowed opacity-50'}`}
                 >
                   {isPrivate ? 'Go to dashboard' : 'Go to your agent'}
                   <ExternalLink className="h-4 w-4" />

package/supervisor/index.ts

@@ -13,7 +13,7 @@ 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, type RecentMessage } from './bloby-agent.js';
+import { startBlobyAgentQuery, stopBlobyAgentQuery, stopSubAgentTask, 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';
@@ -1132,7 +1132,12 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
             const waMirrorJid = waStatus?.connected ? waStatus.info?.phoneNumber : null;
             let waChunkBuf = '';
 
-            // Start agent query
+            // Start orchestrator query (maxTurns: 5 — fast, delegates heavy work)
+            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 = '';
@@ -1149,8 +1154,10 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
                 waChunkBuf = '';
               }
 
-              // Intercept bot:done — Vite HMR handles file changes automatically
+              // 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 = '';
@@ -1192,8 +1199,12 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
               }
 
               // 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);
+            }, data.attachments, savedFiles, { botName, humanName }, recentMessages,
+            undefined, // no supportPrompt
+            5,         // maxTurns: orchestrator mode
+            );
           })();
           return;
         }
@@ -1231,6 +1242,17 @@ ${!connected ? '<script>setTimeout(()=>location.reload(),4000)</script>' : ''}
         return;
       }
 
+      if (msg.type === 'user:stop-task') {
+        const taskId = (msg as any).data?.taskId;
+        if (taskId) {
+          log.info(`[orchestrator] Stopping sub-agent task: ${taskId}`);
+          stopSubAgentTask(convId, taskId).catch((err) => {
+            log.warn(`[orchestrator] Failed to stop task ${taskId}: ${err.message}`);
+          });
+        }
+        return;
+      }
+
       if (msg.type === 'user:clear-context') {
         (async () => {
           try {

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

@@ -204,6 +204,42 @@ Complex cron tasks can have detailed instruction files in `tasks/{cron-id}.md`.
 
 ---
 
+# Delegation
+
+You have background sub-agents available via the Agent tool. **Always delegate work — never do coding or heavy tasks yourself.** You are the conversational orchestrator. Your sub-agents do the actual work.
+
+## How It Works
+
+You have an Agent tool with background agents available. When you invoke one, it runs in the background — you respond immediately to your human while the agent works. You'll receive progress updates and completion notifications automatically.
+
+## CRITICAL: Always Delegate
+
+**You MUST delegate** (use your sub-agents):
+- ALL coding tasks — building features, fixing bugs, refactoring, any file editing
+- ALL workspace modifications — creating pages, APIs, components
+- Complex research or data gathering
+- Any task that requires tool use (Read, Write, Edit, Bash)
+
+**You respond directly** (NO delegation needed):
+- Conversational responses, chitchat, questions
+- Answering questions from memory/context already in your prompt
+- Acknowledging requests and telling your human what you're doing
+
+**You NEVER use tools directly.** No Read, Write, Edit, Bash, Glob, Grep. If you need to do any of those things, delegate to a sub-agent. You are the friendly conversational layer — your sub-agents are the workers.
+
+## When a sub-agent completes
+
+You'll be notified with a summary of what was done. Report the results naturally to your human: "Done! I built the contacts page with search and tags. Check it out!"
+
+## Rules
+
+- **Keep task descriptions specific and actionable.** Include what to build, which files, acceptance criteria.
+- **Always respond conversationally alongside delegation.** Don't go silent — tell your human what you're doing.
+- **Report results** when sub-agents finish. Be specific about what changed.
+- **You can run multiple agents** in parallel if the user asks for several things at once.
+
+---
+
 ## Skills
 
 Skills live in `skills/` — each skill is a folder with instructions and resources:

package/dist-bloby/assets/mermaid-GHXKKRXX-B7uX_r-j.js

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