kernelbot 1.0.26 → 1.0.28

package/src/agent.js

@@ -1,23 +1,75 @@
 import { createProvider, PROVIDERS } from './providers/index.js';
-import { toolDefinitions, executeTool, checkConfirmation } from './tools/index.js';
-import { selectToolsForMessage, expandToolsForUsed } from './tools/categories.js';
-import { getSystemPrompt } from './prompts/system.js';
+import { orchestratorToolDefinitions, executeOrchestratorTool } from './tools/orchestrator-tools.js';
+import { getToolsForWorker } from './swarm/worker-registry.js';
+import { WORKER_TYPES } from './swarm/worker-registry.js';
+import { getOrchestratorPrompt } from './prompts/orchestrator.js';
+import { getWorkerPrompt } from './prompts/workers.js';
+import { getUnifiedSkillById } from './skills/custom.js';
+import { WorkerAgent } from './worker.js';
 import { getLogger } from './utils/logger.js';
 import { getMissingCredential, saveCredential, saveProviderToYaml } from './utils/config.js';
 
 const MAX_RESULT_LENGTH = 3000;
 const LARGE_FIELDS = ['stdout', 'stderr', 'content', 'diff', 'output', 'body', 'html', 'text', 'log', 'logs'];
 
-export class Agent {
-  constructor({ config, conversationManager }) {
+export class OrchestratorAgent {
+  constructor({ config, conversationManager, personaManager, jobManager, automationManager }) {
     this.config = config;
     this.conversationManager = conversationManager;
-    this.provider = createProvider(config);
-    this.systemPrompt = getSystemPrompt(config);
+    this.personaManager = personaManager;
+    this.jobManager = jobManager;
+    this.automationManager = automationManager || null;
     this._pending = new Map(); // chatId -> pending state
+    this._chatCallbacks = new Map(); // chatId -> { onUpdate, sendPhoto }
+
+    // Orchestrator always uses Anthropic (30s timeout — lean dispatch/summarize calls)
+    this.orchestratorProvider = createProvider({
+      brain: {
+        provider: 'anthropic',
+        model: config.orchestrator.model,
+        max_tokens: config.orchestrator.max_tokens,
+        temperature: config.orchestrator.temperature,
+        api_key: config.orchestrator.api_key || process.env.ANTHROPIC_API_KEY,
+        timeout: 30_000,
+      },
+    });
+
+    // Worker provider uses user's chosen brain
+    this.workerProvider = createProvider(config);
+
+    // Set up job lifecycle event listeners
+    this._setupJobListeners();
+  }
+
+  /** Build the orchestrator system prompt. */
+  _getSystemPrompt(chatId, user) {
+    const logger = getLogger();
+    const skillId = this.conversationManager.getSkill(chatId);
+    const skillPrompt = skillId ? getUnifiedSkillById(skillId)?.systemPrompt : null;
+
+    let userPersona = null;
+    if (this.personaManager && user?.id) {
+      userPersona = this.personaManager.load(user.id, user.username);
+    }
+
+    logger.debug(`Orchestrator building system prompt for chat ${chatId} | skill=${skillId || 'none'} | persona=${userPersona ? 'yes' : 'none'}`);
+    return getOrchestratorPrompt(this.config, skillPrompt || null, userPersona);
+  }
+
+  setSkill(chatId, skillId) {
+    this.conversationManager.setSkill(chatId, skillId);
+  }
+
+  clearSkill(chatId) {
+    this.conversationManager.clearSkill(chatId);
   }
 
-  /** Return current brain info for display. */
+  getActiveSkill(chatId) {
+    const skillId = this.conversationManager.getSkill(chatId);
+    return skillId ? getUnifiedSkillById(skillId) : null;
+  }
+
+  /** Return current worker brain info for display. */
   getBrainInfo() {
     const { provider, model } = this.config.brain;
     const providerDef = PROVIDERS[provider];
@@ -27,64 +79,65 @@ export class Agent {
     return { provider, providerName, model, modelLabel };
   }
 
-  /**
-   * Switch to a different provider/model at runtime.
-   * Resolves the API key from process.env automatically.
-   * Returns null on success, or an error string if the key is missing.
-   */
-  switchBrain(providerKey, modelId) {
+  /** Switch worker brain provider/model at runtime. */
+  async switchBrain(providerKey, modelId) {
     const logger = getLogger();
     const providerDef = PROVIDERS[providerKey];
     if (!providerDef) return `Unknown provider: ${providerKey}`;
 
     const envKey = providerDef.envKey;
     const apiKey = process.env[envKey];
-    if (!apiKey) {
-      return envKey; // caller handles prompting
+    if (!apiKey) return envKey;
+
+    try {
+      const testConfig = { ...this.config, brain: { ...this.config.brain, provider: providerKey, model: modelId, api_key: apiKey } };
+      const testProvider = createProvider(testConfig);
+      await testProvider.ping();
+
+      this.config.brain.provider = providerKey;
+      this.config.brain.model = modelId;
+      this.config.brain.api_key = apiKey;
+      this.workerProvider = testProvider;
+      saveProviderToYaml(providerKey, modelId);
+
+      logger.info(`Worker brain switched to ${providerDef.name} / ${modelId}`);
+      return null;
+    } catch (err) {
+      logger.error(`Brain switch failed for ${providerDef.name} / ${modelId}: ${err.message}`);
+      return { error: err.message };
     }
-
-    this.config.brain.provider = providerKey;
-    this.config.brain.model = modelId;
-    this.config.brain.api_key = apiKey;
-
-    // Recreate the provider instance
-    this.provider = createProvider(this.config);
-
-    // Persist to config.yaml
-    saveProviderToYaml(providerKey, modelId);
-
-    logger.info(`Brain switched to ${providerDef.name} / ${modelId}`);
-    return null;
   }
 
-  /**
-   * Finalize brain switch after API key was provided via chat.
-   */
-  switchBrainWithKey(providerKey, modelId, apiKey) {
+  /** Finalize brain switch after API key was provided via chat. */
+  async switchBrainWithKey(providerKey, modelId, apiKey) {
     const logger = getLogger();
     const providerDef = PROVIDERS[providerKey];
 
-    // Save the key
-    saveCredential(this.config, providerDef.envKey, apiKey);
-
-    this.config.brain.provider = providerKey;
-    this.config.brain.model = modelId;
-    this.config.brain.api_key = apiKey;
-
-    this.provider = createProvider(this.config);
-    saveProviderToYaml(providerKey, modelId);
-
-    logger.info(`Brain switched to ${providerDef.name} / ${modelId} (new key saved)`);
+    try {
+      const testConfig = { ...this.config, brain: { ...this.config.brain, provider: providerKey, model: modelId, api_key: apiKey } };
+      const testProvider = createProvider(testConfig);
+      await testProvider.ping();
+
+      saveCredential(this.config, providerDef.envKey, apiKey);
+      this.config.brain.provider = providerKey;
+      this.config.brain.model = modelId;
+      this.config.brain.api_key = apiKey;
+      this.workerProvider = testProvider;
+      saveProviderToYaml(providerKey, modelId);
+
+      logger.info(`Worker brain switched to ${providerDef.name} / ${modelId} (new key saved)`);
+      return null;
+    } catch (err) {
+      logger.error(`Brain switch failed for ${providerDef.name} / ${modelId}: ${err.message}`);
+      return { error: err.message };
+    }
   }
 
-  /**
-   * Truncate a tool result to stay within token budget.
-   */
+  /** Truncate a tool result. */
   _truncateResult(name, result) {
     let str = JSON.stringify(result);
     if (str.length <= MAX_RESULT_LENGTH) return str;
 
-    // Try truncating known large fields first
     if (result && typeof result === 'object') {
       const truncated = { ...result };
       for (const field of LARGE_FIELDS) {
@@ -96,217 +149,278 @@ export class Agent {
       if (str.length <= MAX_RESULT_LENGTH) return str;
     }
 
-    // Hard truncate
     return str.slice(0, MAX_RESULT_LENGTH) + `\n... [truncated, total ${str.length} chars]`;
   }
 
   async processMessage(chatId, userMessage, user, onUpdate, sendPhoto) {
     const logger = getLogger();
 
-    this._onUpdate = onUpdate || null;
-    this._sendPhoto = sendPhoto || null;
+    logger.info(`Orchestrator processing message for chat ${chatId} from ${user?.username || user?.id || 'unknown'}: "${userMessage.slice(0, 120)}"`);
+
+    // Store callbacks so workers can use them later
+    this._chatCallbacks.set(chatId, { onUpdate, sendPhoto });
 
     // Handle pending responses (confirmation or credential)
     const pending = this._pending.get(chatId);
     if (pending) {
       this._pending.delete(chatId);
+      logger.debug(`Orchestrator handling pending ${pending.type} response for chat ${chatId}`);
 
       if (pending.type === 'credential') {
-        return await this._handleCredentialResponse(chatId, userMessage, user, pending);
-      }
-
-      if (pending.type === 'confirmation') {
-        return await this._handleConfirmationResponse(chatId, userMessage, user, pending);
+        return await this._handleCredentialResponse(chatId, userMessage, user, pending, onUpdate);
       }
     }
 
-    const { max_tool_depth } = this.config.brain;
+    const { max_tool_depth } = this.config.orchestrator;
 
     // Add user message to persistent history
     this.conversationManager.addMessage(chatId, 'user', userMessage);
 
     // Build working messages from compressed history
     const messages = [...this.conversationManager.getSummarizedHistory(chatId)];
+    logger.debug(`Orchestrator conversation context: ${messages.length} messages, max_depth=${max_tool_depth}`);
 
-    // Select relevant tools based on user message
-    const tools = selectToolsForMessage(userMessage, toolDefinitions);
-    logger.debug(`Selected ${tools.length}/${toolDefinitions.length} tools for message`);
+    const reply = await this._runLoop(chatId, messages, user, 0, max_tool_depth);
 
-    return await this._runLoop(chatId, messages, user, 0, max_tool_depth, tools);
-  }
+    logger.info(`Orchestrator reply for chat ${chatId}: "${(reply || '').slice(0, 150)}"`);
 
-  _formatToolSummary(name, input) {
-    const key = {
-      execute_command: 'command',
-      read_file: 'path',
-      write_file: 'path',
-      list_directory: 'path',
-      git_clone: 'repo',
-      git_checkout: 'branch',
-      git_commit: 'message',
-      git_push: 'dir',
-      git_diff: 'dir',
-      github_create_pr: 'title',
-      github_create_repo: 'name',
-      github_list_prs: 'repo',
-      github_get_pr_diff: 'repo',
-      github_post_review: 'repo',
-      spawn_claude_code: 'prompt',
-      kill_process: 'pid',
-      docker_exec: 'container',
-      docker_logs: 'container',
-      docker_compose: 'action',
-      curl_url: 'url',
-      check_port: 'port',
-      screenshot_website: 'url',
-      send_image: 'file_path',
-      browse_website: 'url',
-      extract_content: 'url',
-      interact_with_page: 'url',
-    }[name];
-    const val = key && input[key] ? String(input[key]).slice(0, 120) : JSON.stringify(input).slice(0, 120);
-    return `${name}: ${val}`;
+    // Background persona extraction
+    this._extractPersonaBackground(userMessage, reply, user).catch(() => {});
+
+    return reply;
   }
 
-  async _sendUpdate(text) {
-    if (this._onUpdate) {
-      try { await this._onUpdate(text); } catch {}
+  async _sendUpdate(chatId, text, opts) {
+    const callbacks = this._chatCallbacks.get(chatId);
+    if (callbacks?.onUpdate) {
+      try { return await callbacks.onUpdate(text, opts); } catch {}
     }
+    return null;
   }
 
-  async _handleCredentialResponse(chatId, userMessage, user, pending) {
+  async _handleCredentialResponse(chatId, userMessage, user, pending, onUpdate) {
     const logger = getLogger();
     const value = userMessage.trim();
 
     if (value.toLowerCase() === 'skip' || value.toLowerCase() === 'cancel') {
       logger.info(`User skipped credential: ${pending.credential.envKey}`);
-      pending.toolResults.push({
-        type: 'tool_result',
-        tool_use_id: pending.block.id,
-        content: this._truncateResult(pending.block.name, { error: `${pending.credential.label} not provided. Operation skipped.` }),
-      });
-      return await this._resumeAfterPause(chatId, user, pending);
+      return 'Credential skipped. You can provide it later.';
     }
 
-    // Save the credential
     saveCredential(this.config, pending.credential.envKey, value);
     logger.info(`Saved credential: ${pending.credential.envKey}`);
+    return `Saved ${pending.credential.label}. You can now try the task again.`;
+  }
 
-    // Now execute the original tool
-    const result = await executeTool(pending.block.name, pending.block.input, {
-      config: this.config,
-      user,
-      onUpdate: this._onUpdate,
-      sendPhoto: this._sendPhoto,
-    });
+  /** Set up listeners for job lifecycle events. */
+  _setupJobListeners() {
+    const logger = getLogger();
+
+    this.jobManager.on('job:completed', async (job) => {
+      const chatId = job.chatId;
+      const workerDef = WORKER_TYPES[job.workerType] || {};
+      const label = workerDef.label || job.workerType;
+
+      logger.info(`[Orchestrator] Job completed event: ${job.id} [${job.workerType}] in chat ${chatId} (${job.duration}s) — result length: ${(job.result || '').length} chars`);
 
-    pending.toolResults.push({
-      type: 'tool_result',
-      tool_use_id: pending.block.id,
-      content: this._truncateResult(pending.block.name, result),
+      // 1. Store raw result in conversation history so orchestrator has full context
+      let resultText = job.result || 'Done.';
+      if (resultText.length > 3000) {
+        resultText = resultText.slice(0, 3000) + '\n\n... [result truncated]';
+      }
+      this.conversationManager.addMessage(chatId, 'user', `[Worker result: ${label} (${job.id}, ${job.duration}s)]\n\n${resultText}`);
+
+      // 2. IMMEDIATELY notify user (guarantees they see something regardless of summary LLM)
+      const notifyMsgId = await this._sendUpdate(chatId, `✅ ${label} finished! Preparing summary...`);
+
+      // 3. Try to summarize (provider timeout protects against hangs)
+      try {
+        const summary = await this._summarizeJobResult(chatId, job);
+        if (summary) {
+          this.conversationManager.addMessage(chatId, 'assistant', summary);
+          await this._sendUpdate(chatId, summary, { editMessageId: notifyMsgId });
+        }
+      } catch (err) {
+        logger.error(`[Orchestrator] Failed to summarize job ${job.id}: ${err.message}`);
+        await this._sendUpdate(chatId, `✅ ${label} finished (\`${job.id}\`, ${job.duration}s)! Ask me for the details.`, { editMessageId: notifyMsgId }).catch(() => {});
+      }
     });
 
-    return await this._resumeAfterPause(chatId, user, pending);
-  }
+    this.jobManager.on('job:failed', (job) => {
+      const chatId = job.chatId;
+      const workerDef = WORKER_TYPES[job.workerType] || {};
+      const label = workerDef.label || job.workerType;
 
-  async _handleConfirmationResponse(chatId, userMessage, user, pending) {
-    const logger = getLogger();
-    const lower = userMessage.toLowerCase().trim();
+      logger.error(`[Orchestrator] Job failed event: ${job.id} [${job.workerType}] in chat ${chatId} — ${job.error}`);
 
-    if (lower === 'yes' || lower === 'y' || lower === 'confirm') {
-      logger.info(`User confirmed dangerous tool: ${pending.block.name}`);
-      const result = await executeTool(pending.block.name, pending.block.input, { ...pending.context, onUpdate: this._onUpdate, sendPhoto: this._sendPhoto });
+      const msg = `❌ **${label} failed** (\`${job.id}\`): ${job.error}`;
+      this.conversationManager.addMessage(chatId, 'assistant', msg);
+      this._sendUpdate(chatId, msg);
+    });
 
-      pending.toolResults.push({
-        type: 'tool_result',
-        tool_use_id: pending.block.id,
-        content: this._truncateResult(pending.block.name, result),
-      });
-    } else {
-      logger.info(`User denied dangerous tool: ${pending.block.name}`);
-      pending.toolResults.push({
-        type: 'tool_result',
-        tool_use_id: pending.block.id,
-        content: this._truncateResult(pending.block.name, { error: 'User denied this operation.' }),
-      });
-    }
+    this.jobManager.on('job:cancelled', (job) => {
+      const chatId = job.chatId;
+      const workerDef = WORKER_TYPES[job.workerType] || {};
+      const label = workerDef.label || job.workerType;
+
+      logger.info(`[Orchestrator] Job cancelled event: ${job.id} [${job.workerType}] in chat ${chatId}`);
 
-    return await this._resumeAfterPause(chatId, user, pending);
+      const msg = `🚫 **${label} cancelled** (\`${job.id}\`)`;
+      this._sendUpdate(chatId, msg);
+    });
   }
 
-  async _resumeAfterPause(chatId, user, pending) {
-    // Process remaining blocks
-    for (const block of pending.remainingBlocks) {
-      if (block.type !== 'tool_use') continue;
+  /**
+   * Auto-summarize a completed job result via the orchestrator LLM.
+   * The orchestrator reads the worker's raw result and presents a clean summary.
+   * Protected by the provider's built-in timeout (30s) — no manual Promise.race needed.
+   * Returns the summary text, or null. Caller handles delivery.
+   */
+  async _summarizeJobResult(chatId, job) {
+    const logger = getLogger();
+    const workerDef = WORKER_TYPES[job.workerType] || {};
+    const label = workerDef.label || job.workerType;
+
+    logger.info(`[Orchestrator] Summarizing job ${job.id} [${job.workerType}] result for user`);
+
+    const history = this.conversationManager.getSummarizedHistory(chatId);
+
+    const response = await this.orchestratorProvider.chat({
+      system: this._getSystemPrompt(chatId, null),
+      messages: [
+        ...history,
+        {
+          role: 'user',
+          content: `The ${label} worker just finished job \`${job.id}\` (took ${job.duration}s). Present the results to the user in a clean, well-formatted way. Don't mention "worker" or technical job details — just present the findings naturally as if you did the work yourself.`,
+        },
+      ],
+    });
 
-      const pauseMsg = await this._checkPause(chatId, block, user, pending.toolResults, pending.remainingBlocks.filter((b) => b !== block), pending.messages);
-      if (pauseMsg) return pauseMsg;
+    const summary = response.text || '';
+    logger.info(`[Orchestrator] Job ${job.id} summary: "${summary.slice(0, 200)}"`);
 
-      const r = await executeTool(block.name, block.input, { config: this.config, user, onUpdate: this._onUpdate, sendPhoto: this._sendPhoto });
-      pending.toolResults.push({
-        type: 'tool_result',
-        tool_use_id: block.id,
-        content: this._truncateResult(block.name, r),
-      });
-    }
-
-    pending.messages.push({ role: 'user', content: pending.toolResults });
-    const { max_tool_depth } = this.config.brain;
-    return await this._runLoop(chatId, pending.messages, user, 0, max_tool_depth, pending.tools || toolDefinitions);
+    return summary || null;
   }
 
-  _checkPause(chatId, block, user, toolResults, remainingBlocks, messages) {
+  /**
+   * Spawn a worker for a job — called from dispatch_task handler.
+   * Creates smart progress reporting via editable Telegram message.
+   */
+  async _spawnWorker(job) {
     const logger = getLogger();
+    const chatId = job.chatId;
+    const callbacks = this._chatCallbacks.get(chatId) || {};
+    const onUpdate = callbacks.onUpdate;
+    const sendPhoto = callbacks.sendPhoto;
+
+    logger.info(`[Orchestrator] Spawning worker for job ${job.id} [${job.workerType}] in chat ${chatId} — task: "${job.task.slice(0, 120)}"`);
+
+    const workerDef = WORKER_TYPES[job.workerType] || {};
+    const abortController = new AbortController();
+
+    // Smart progress: editable Telegram message (same pattern as coder.js)
+    let statusMsgId = null;
+    let activityLines = [];
+    let flushTimer = null;
+    const MAX_VISIBLE = 10;
+
+    const buildStatusText = (finalState = null) => {
+      const visible = activityLines.slice(-MAX_VISIBLE);
+      const countInfo = activityLines.length > MAX_VISIBLE
+        ? `\n_... ${activityLines.length} operations total_\n`
+        : '';
+      const header = `${workerDef.emoji || '⚙️'} *${workerDef.label || job.workerType}* (\`${job.id}\`)`;
+      if (finalState === 'done') return `${header} — Done\n${countInfo}\n${visible.join('\n')}`;
+      if (finalState === 'error') return `${header} — Failed\n${countInfo}\n${visible.join('\n')}`;
+      if (finalState === 'cancelled') return `${header} — Cancelled\n${countInfo}\n${visible.join('\n')}`;
+      return `${header} — Working...\n${countInfo}\n${visible.join('\n')}`;
+    };
+
+    const flushStatus = async () => {
+      flushTimer = null;
+      if (!onUpdate || activityLines.length === 0) return;
+      try {
+        if (statusMsgId) {
+          await onUpdate(buildStatusText(), { editMessageId: statusMsgId });
+        } else {
+          statusMsgId = await onUpdate(buildStatusText());
+          job.statusMessageId = statusMsgId;
+        }
+      } catch {}
+    };
+
+    const addActivity = (line) => {
+      activityLines.push(line);
+      if (!statusMsgId && !flushTimer) {
+        flushStatus();
+      } else if (!flushTimer) {
+        flushTimer = setTimeout(flushStatus, 1000);
+      }
+    };
 
-    // Check missing credentials first
-    const missing = getMissingCredential(block.name, this.config);
-    if (missing) {
-      logger.warn(`Missing credential for ${block.name}: ${missing.envKey}`);
-      this._pending.set(chatId, {
-        type: 'credential',
-        block,
-        credential: missing,
-        context: { config: this.config, user },
-        toolResults,
-        remainingBlocks,
-        messages,
-      });
-      return `🔑 **${missing.label}** is required for this action.\n\nPlease send your token now (it will be saved to \`~/.kernelbot/.env\`).\n\nOr reply **skip** to cancel.`;
-    }
+    // Get scoped tools and skill
+    const tools = getToolsForWorker(job.workerType);
+    const skillId = this.conversationManager.getSkill(chatId);
+    logger.debug(`[Orchestrator] Worker ${job.id} config: ${tools.length} tools, skill=${skillId || 'none'}, brain=${this.config.brain.provider}/${this.config.brain.model}`);
 
-    // Check dangerous operation confirmation
-    const dangerLabel = checkConfirmation(block.name, block.input, this.config);
-    if (dangerLabel) {
-      logger.warn(`Dangerous tool detected: ${block.name} — ${dangerLabel}`);
-      this._pending.set(chatId, {
-        type: 'confirmation',
-        block,
-        context: { config: this.config, user },
-        toolResults,
-        remainingBlocks,
-        messages,
-      });
-      return `⚠️ This action will **${dangerLabel}**.\n\n\`${block.name}\`: \`${JSON.stringify(block.input)}\`\n\nConfirm? (yes/no)`;
-    }
+    const worker = new WorkerAgent({
+      config: this.config,
+      workerType: job.workerType,
+      jobId: job.id,
+      tools,
+      skillId,
+      callbacks: {
+        onProgress: (text) => addActivity(text),
+        onUpdate, // Real bot onUpdate for tools (coder.js smart output needs message_id)
+        onComplete: (result) => {
+          logger.info(`[Worker ${job.id}] Completed — result: "${(result || '').slice(0, 150)}"`);
+          // Final status message update
+          if (flushTimer) { clearTimeout(flushTimer); flushTimer = null; }
+          if (statusMsgId && onUpdate) {
+            onUpdate(buildStatusText('done'), { editMessageId: statusMsgId }).catch(() => {});
+          }
+          this.jobManager.completeJob(job.id, result);
+        },
+        onError: (err) => {
+          logger.error(`[Worker ${job.id}] Error — ${err.message || String(err)}`);
+          if (flushTimer) { clearTimeout(flushTimer); flushTimer = null; }
+          if (statusMsgId && onUpdate) {
+            onUpdate(buildStatusText('error'), { editMessageId: statusMsgId }).catch(() => {});
+          }
+          this.jobManager.failJob(job.id, err.message || String(err));
+        },
+        sendPhoto,
+      },
+      abortController,
+    });
 
-    return null;
+    // Store worker ref on job for cancellation
+    job.worker = worker;
+
+    // Start the job
+    this.jobManager.startJob(job.id);
+
+    // Fire and forget — return the promise so .catch() in orchestrator-tools works
+    return worker.run(job.task);
   }
 
-  async _runLoop(chatId, messages, user, startDepth, maxDepth, tools) {
+  async _runLoop(chatId, messages, user, startDepth, maxDepth) {
     const logger = getLogger();
-    let currentTools = tools || toolDefinitions;
 
     for (let depth = startDepth; depth < maxDepth; depth++) {
-      logger.debug(`Agent loop iteration ${depth + 1}/${maxDepth}`);
+      logger.info(`[Orchestrator] LLM call ${depth + 1}/${maxDepth} for chat ${chatId} — sending ${messages.length} messages`);
 
-      const response = await this.provider.chat({
-        system: this.systemPrompt,
+      const response = await this.orchestratorProvider.chat({
+        system: this._getSystemPrompt(chatId, user),
         messages,
-        tools: currentTools,
+        tools: orchestratorToolDefinitions,
       });
 
+      logger.info(`[Orchestrator] LLM response: stopReason=${response.stopReason}, text=${(response.text || '').length} chars, toolCalls=${(response.toolCalls || []).length}`);
+
       if (response.stopReason === 'end_turn') {
         const reply = response.text || '';
+        logger.info(`[Orchestrator] End turn — final reply: "${reply.slice(0, 200)}"`);
         this.conversationManager.addMessage(chatId, 'assistant', reply);
         return reply;
       }
@@ -314,40 +428,27 @@ export class Agent {
       if (response.stopReason === 'tool_use') {
         messages.push({ role: 'assistant', content: response.rawContent });
 
-        // Send thinking text to the user
         if (response.text && response.text.trim()) {
-          logger.info(`Agent thinking: ${response.text.slice(0, 200)}`);
-          await this._sendUpdate(`💭 ${response.text}`);
+          logger.info(`[Orchestrator] Thinking: "${response.text.slice(0, 200)}"`);
         }
 
         const toolResults = [];
-        const usedToolNames = [];
-
-        for (let i = 0; i < response.toolCalls.length; i++) {
-          const block = response.toolCalls[i];
-
-          // Build a block-like object for _checkPause (needs .type for remainingBlocks filter)
-          const blockObj = { type: 'tool_use', id: block.id, name: block.name, input: block.input };
-
-          // Check if we need to pause (missing cred or dangerous action)
-          const remaining = response.toolCalls.slice(i + 1).map((tc) => ({
-            type: 'tool_use', id: tc.id, name: tc.name, input: tc.input,
-          }));
-          const pauseMsg = this._checkPause(chatId, blockObj, user, toolResults, remaining, messages);
-          if (pauseMsg) return pauseMsg;
 
+        for (const block of response.toolCalls) {
           const summary = this._formatToolSummary(block.name, block.input);
-          logger.info(`Tool call: ${summary}`);
-          await this._sendUpdate(`🔧 \`${summary}\``);
+          logger.info(`[Orchestrator] Calling tool: ${block.name} — ${summary}`);
+          logger.debug(`[Orchestrator] Tool input: ${JSON.stringify(block.input).slice(0, 300)}`);
+          await this._sendUpdate(chatId, `⚡ ${summary}`);
 
-          const result = await executeTool(block.name, block.input, {
+          const result = await executeOrchestratorTool(block.name, block.input, {
+            chatId,
+            jobManager: this.jobManager,
             config: this.config,
-            user,
-            onUpdate: this._onUpdate,
-            sendPhoto: this._sendPhoto,
+            spawnWorker: (job) => this._spawnWorker(job),
+            automationManager: this.automationManager,
           });
 
-          usedToolNames.push(block.name);
+          logger.info(`[Orchestrator] Tool result for ${block.name}: ${JSON.stringify(result).slice(0, 200)}`);
 
           toolResults.push({
             type: 'tool_result',
@@ -356,15 +457,12 @@ export class Agent {
           });
         }
 
-        // Expand tools based on what was actually used
-        currentTools = expandToolsForUsed(usedToolNames, currentTools, toolDefinitions);
-
         messages.push({ role: 'user', content: toolResults });
         continue;
       }
 
       // Unexpected stop reason
-      logger.warn(`Unexpected stopReason: ${response.stopReason}`);
+      logger.warn(`[Orchestrator] Unexpected stopReason: ${response.stopReason}`);
       if (response.text) {
         this.conversationManager.addMessage(chatId, 'assistant', response.text);
         return response.text;
@@ -372,10 +470,87 @@ export class Agent {
       return 'Something went wrong — unexpected response from the model.';
     }
 
-    const depthWarning =
-      `Reached maximum tool depth (${maxDepth}). Stopping to prevent infinite loops. ` +
-      `Please try again with a simpler request.`;
+    logger.warn(`[Orchestrator] Reached max depth (${maxDepth}) for chat ${chatId}`);
+    const depthWarning = `Reached maximum orchestrator depth (${maxDepth}).`;
     this.conversationManager.addMessage(chatId, 'assistant', depthWarning);
     return depthWarning;
   }
+
+  _formatToolSummary(name, input) {
+    switch (name) {
+      case 'dispatch_task': {
+        const workerDef = WORKER_TYPES[input.worker_type] || {};
+        return `Dispatching ${workerDef.emoji || '⚙️'} ${workerDef.label || input.worker_type}: ${(input.task || '').slice(0, 60)}`;
+      }
+      case 'list_jobs':
+        return 'Checking job status';
+      case 'cancel_job':
+        return `Cancelling job ${input.job_id}`;
+      case 'create_automation':
+        return `Creating automation: ${(input.name || '').slice(0, 40)}`;
+      case 'list_automations':
+        return 'Listing automations';
+      case 'update_automation':
+        return `Updating automation ${input.automation_id}`;
+      case 'delete_automation':
+        return `Deleting automation ${input.automation_id}`;
+      default:
+        return name;
+    }
+  }
+
+  /** Background persona extraction. */
+  async _extractPersonaBackground(userMessage, reply, user) {
+    const logger = getLogger();
+
+    if (!this.personaManager || !user?.id) return;
+    if (!userMessage || userMessage.trim().length < 3) return;
+
+    const currentPersona = this.personaManager.load(user.id, user.username);
+
+    const system = [
+      'You are a user-profile extractor. Analyze the user\'s message and extract any NEW personal information.',
+      '',
+      'Look for: name, location, timezone, language, technical skills, expertise level,',
+      'projects they\'re working on, tool/framework preferences, job title, role, company,',
+      'interests, hobbies, communication style, or any other personal details.',
+      '',
+      'RULES:',
+      '- Only extract FACTUAL information explicitly stated or strongly implied',
+      '- Do NOT infer personality traits from a single message',
+      '- Do NOT add information already in the profile',
+      '- If there IS new info, return the COMPLETE updated profile in the EXACT same markdown format',
+      '- If there is NO new info, respond with exactly: NONE',
+    ].join('\n');
+
+    const userPrompt = [
+      'Current profile:',
+      '```',
+      currentPersona,
+      '```',
+      '',
+      `User's message: "${userMessage}"`,
+      '',
+      'Return the updated profile markdown or NONE.',
+    ].join('\n');
+
+    try {
+      const response = await this.orchestratorProvider.chat({
+        system,
+        messages: [{ role: 'user', content: userPrompt }],
+      });
+
+      const text = (response.text || '').trim();
+
+      if (text && text !== 'NONE' && text.includes('# User Profile')) {
+        this.personaManager.save(user.id, text);
+        logger.info(`Auto-extracted persona update for user ${user.id} (${user.username})`);
+      }
+    } catch (err) {
+      logger.debug(`Persona extraction skipped: ${err.message}`);
+    }
+  }
 }
+
+// Re-export as Agent for backward compatibility with bin/kernel.js import
+export { OrchestratorAgent as Agent };