fluxy-bot 0.8.9 → 0.9.0

package/supervisor/fluxy-agent.ts

@@ -3,11 +3,7 @@
  * Fresh context per turn — memory files and conversation history are injected into the system prompt.
  */
 
-import {
-    query,
-    type SDKMessage,
-    type SDKUserMessage
-} from '@anthropic-ai/claude-agent-sdk';
+import { query, type SDKMessage, type SDKUserMessage } from '@anthropic-ai/claude-agent-sdk';
 import fs from 'fs';
 import path from 'path';
 import { log } from '../shared/logger.js';
@@ -15,128 +11,102 @@ import { PKG_DIR, WORKSPACE_DIR } from '../shared/paths.js';
 import type { SavedFile } from './file-saver.js';
 import { getClaudeAccessToken } from '../worker/claude-auth.js';
 
-const PROMPT_FILE = path.join(
-    import.meta.dirname,
-    '..',
-    'worker',
-    'prompts',
-    'fluxy-system-prompt.txt'
-);
+const PROMPT_FILE = path.join(import.meta.dirname, '..', 'worker', 'prompts', 'fluxy-system-prompt.txt');
 
 export interface RecentMessage {
-    role: 'user' | 'assistant';
-    content: string;
+  role: 'user' | 'assistant';
+  content: string;
 }
 
 interface ActiveQuery {
-    abortController: AbortController;
+  abortController: AbortController;
 }
 
 const activeQueries = new Map<string, ActiveQuery>();
 
 export interface AgentAttachment {
-    type: 'image' | 'file';
-    name: string;
-    mediaType: string;
-    data: string; // base64
+  type: 'image' | 'file';
+  name: string;
+  mediaType: string;
+  data: string; // base64
 }
 
 /** Read a memory file from workspace, returning '(empty)' if missing or empty */
 function readMemoryFile(filename: string): string {
-    try {
-        const content = fs
-            .readFileSync(path.join(WORKSPACE_DIR, filename), 'utf-8')
-            .trim();
-        return content || '(empty)';
-    } catch {
-        return '(empty)';
-    }
+  try {
+    const content = fs.readFileSync(path.join(WORKSPACE_DIR, filename), 'utf-8').trim();
+    return content || '(empty)';
+  } catch {
+    return '(empty)';
+  }
 }
 
 /** Read all memory + config files and return their contents */
-function readMemoryFiles(): {
-    myself: string;
-    myhuman: string;
-    memory: string;
-    pulse: string;
-    crons: string;
-} {
-    return {
-        myself: readMemoryFile('MYSELF.md'),
-        myhuman: readMemoryFile('MYHUMAN.md'),
-        memory: readMemoryFile('MEMORY.md'),
-        pulse: readMemoryFile('PULSE.json'),
-        crons: readMemoryFile('CRONS.json')
-    };
+function readMemoryFiles(): { myself: string; myhuman: string; memory: string; pulse: string; crons: string } {
+  return {
+    myself: readMemoryFile('MYSELF.md'),
+    myhuman: readMemoryFile('MYHUMAN.md'),
+    memory: readMemoryFile('MEMORY.md'),
+    pulse: readMemoryFile('PULSE.json'),
+    crons: readMemoryFile('CRONS.json'),
+  };
 }
 
 /** Format recent messages as conversation history text */
 function formatConversationHistory(messages: RecentMessage[]): string {
-    if (!messages.length) return '';
-    return messages.map(m => `${m.role}: ${m.content}`).join('\n\n');
+  if (!messages.length) return '';
+  return messages.map((m) => `${m.role}: ${m.content}`).join('\n\n');
 }
 
 /** Build a multi-part prompt with attachments for the SDK */
-function buildMultiPartPrompt(
-    text: string,
-    attachments: AgentAttachment[],
-    savedFiles?: SavedFile[]
-): AsyncIterable<SDKUserMessage> {
-    return (async function* () {
-        const content: any[] = [];
-
-        for (const att of attachments) {
-            if (att.type === 'image') {
-                content.push({
-                    type: 'image',
-                    source: {
-                        type: 'base64',
-                        media_type: att.mediaType,
-                        data: att.data
-                    }
-                });
-            } else {
-                content.push({
-                    type: 'document',
-                    source: {
-                        type: 'base64',
-                        media_type: att.mediaType,
-                        data: att.data
-                    }
-                });
-            }
-        }
+function buildMultiPartPrompt(text: string, attachments: AgentAttachment[], savedFiles?: SavedFile[]): AsyncIterable<SDKUserMessage> {
+  return (async function* () {
+    const content: any[] = [];
+
+    for (const att of attachments) {
+      if (att.type === 'image') {
+        content.push({
+          type: 'image',
+          source: { type: 'base64', media_type: att.mediaType, data: att.data },
+        });
+      } else {
+        content.push({
+          type: 'document',
+          source: { type: 'base64', media_type: att.mediaType, data: att.data },
+        });
+      }
+    }
 
-        // Append local file paths so Claude can reference them with tools
-        let promptText = text || '(attached files)';
-        if (savedFiles?.length) {
-            const lines = savedFiles.map(f => `- ${f.name} -> ${f.relPath}`);
-            promptText += `\n\n[Attached files saved to disk]\n${lines.join('\n')}\nYou can read or reference these files using the paths above (relative to your cwd).`;
-        }
+    // Append local file paths so Claude can reference them with tools
+    let promptText = text || '(attached files)';
+    if (savedFiles?.length) {
+      const lines = savedFiles.map((f) => `- ${f.name} -> ${f.relPath}`);
+      promptText += `\n\n[Attached files saved to disk]\n${lines.join('\n')}\nYou can read or reference these files using the paths above (relative to your cwd).`;
+    }
 
-        content.push({ type: 'text', text: promptText });
+    content.push({ type: 'text', text: promptText });
 
-        yield {
-            type: 'user' as const,
-            message: { role: 'user' as const, content },
-            parent_tool_use_id: null
-        } as SDKUserMessage;
-    })();
+    yield {
+      type: 'user' as const,
+      message: { role: 'user' as const, content },
+      parent_tool_use_id: null,
+    } as SDKUserMessage;
+  })();
 }
 
 /** Read the custom system prompt, replacing $BOT and $HUMAN placeholders */
 function readSystemPrompt(botName = 'Fluxy', humanName = 'Human'): string {
-    try {
-        const raw = fs.readFileSync(PROMPT_FILE, 'utf-8').trim();
-        if (!raw) {
-            log.warn('System prompt file is empty — using minimal fallback');
-            return `You are ${botName}, a helpful AI agent. Your human is ${humanName}.`;
-        }
-        return raw.replace(/\$BOT/g, botName).replace(/\$HUMAN/g, humanName);
-    } catch {
-        log.warn('System prompt file not found — using minimal fallback');
-        return `You are ${botName}, a helpful AI agent. Your human is ${humanName}.`;
+  try {
+    const raw = fs.readFileSync(PROMPT_FILE, 'utf-8').trim();
+    if (!raw) {
+      log.warn('System prompt file is empty — using minimal fallback');
+      return `You are ${botName}, a helpful AI agent. Your human is ${humanName}.`;
     }
+    return raw.replace(/\$BOT/g, botName).replace(/\$HUMAN/g, humanName);
+  } catch {
+    log.warn('System prompt file not found — using minimal fallback');
+    return `You are ${botName}, a helpful AI agent. Your human is ${humanName}.`;
+  }
 }
 
 /**
@@ -144,223 +114,174 @@ function readSystemPrompt(botName = 'Fluxy', humanName = 'Human'): string {
  * Fresh context each turn — memory files and history are injected into the system prompt.
  */
 export async function startFluxyAgentQuery(
-    conversationId: string,
-    prompt: string,
-    model: string,
-    onMessage: (type: string, data: any) => void,
-    attachments?: AgentAttachment[],
-    savedFiles?: SavedFile[],
-    names?: { botName: string; humanName: string },
-    recentMessages?: RecentMessage[]
+  conversationId: string,
+  prompt: string,
+  model: string,
+  onMessage: (type: string, data: any) => void,
+  attachments?: AgentAttachment[],
+  savedFiles?: SavedFile[],
+  names?: { botName: string; humanName: string },
+  recentMessages?: RecentMessage[],
 ): Promise<void> {
-    const oauthToken = await getClaudeAccessToken();
-    if (!oauthToken) {
-        onMessage('bot:error', {
-            conversationId,
-            error: 'Claude OAuth token not found. Please authenticate via the dashboard.'
-        });
-        return;
-    }
+  const oauthToken = await getClaudeAccessToken();
+  if (!oauthToken) {
+    onMessage('bot:error', { conversationId, error: 'Claude OAuth token not found. Please authenticate via the dashboard.' });
+    return;
+  }
 
-    const abortController = new AbortController();
-    const basePrompt = readSystemPrompt(names?.botName, names?.humanName);
-    const memoryFiles = readMemoryFiles();
+  const abortController = new AbortController();
+  const basePrompt = readSystemPrompt(names?.botName, names?.humanName);
+  const memoryFiles = readMemoryFiles();
 
-    // Build enriched system prompt with memory files and conversation history
-    let enrichedPrompt = basePrompt;
+  // Build enriched system prompt with memory files and conversation history
+  let enrichedPrompt = basePrompt;
 
-    enrichedPrompt += `\n\n---\n# Your Memory Files\n\n## MYSELF.md\n${memoryFiles.myself}\n\n## MYHUMAN.md\n${memoryFiles.myhuman}\n\n## MEMORY.md\n${memoryFiles.memory}\n\n---\n# Your Config Files\n\n## PULSE.json\n${memoryFiles.pulse}\n\n## CRONS.json\n${memoryFiles.crons}`;
+  enrichedPrompt += `\n\n---\n# Your Memory Files\n\n## MYSELF.md\n${memoryFiles.myself}\n\n## MYHUMAN.md\n${memoryFiles.myhuman}\n\n## MEMORY.md\n${memoryFiles.memory}\n\n---\n# Your Config Files\n\n## PULSE.json\n${memoryFiles.pulse}\n\n## CRONS.json\n${memoryFiles.crons}`;
 
-    if (recentMessages?.length) {
-        enrichedPrompt += `\n\n---\n# Recent Conversation\n${formatConversationHistory(recentMessages)}`;
-    }
+  if (recentMessages?.length) {
+    enrichedPrompt += `\n\n---\n# Recent Conversation\n${formatConversationHistory(recentMessages)}`;
+  }
 
-    activeQueries.set(conversationId, { abortController });
+  activeQueries.set(conversationId, { abortController });
 
-    let fullText = '';
-    const usedTools = new Set<string>();
-    let stderrBuf = '';
+  let fullText = '';
+  const usedTools = new Set<string>();
+  let stderrBuf = '';
 
-    // If there are saved files but no inline attachments, append path info to plain text prompt
-    let plainPrompt = prompt;
-    if (savedFiles?.length && !attachments?.length) {
-        const lines = savedFiles.map(f => `- ${f.name} -> ${f.relPath}`);
-        plainPrompt += `\n\n[Attached files saved to disk]\n${lines.join('\n')}\nYou can read or reference these files using the paths above (relative to your cwd).`;
-    }
+  // If there are saved files but no inline attachments, append path info to plain text prompt
+  let plainPrompt = prompt;
+  if (savedFiles?.length && !attachments?.length) {
+    const lines = savedFiles.map((f) => `- ${f.name} -> ${f.relPath}`);
+    plainPrompt += `\n\n[Attached files saved to disk]\n${lines.join('\n')}\nYou can read or reference these files using the paths above (relative to your cwd).`;
+  }
 
-    const sdkPrompt: string | AsyncIterable<SDKUserMessage> =
-        attachments?.length
-            ? buildMultiPartPrompt(prompt, attachments, savedFiles)
-            : plainPrompt;
+  const sdkPrompt: string | AsyncIterable<SDKUserMessage> =
+    attachments?.length ? buildMultiPartPrompt(prompt, attachments, savedFiles) : plainPrompt;
 
+  try {
+    // Auto-discover all skill plugins in workspace/skills/ — any folder with a valid plugin.json is loaded
+    const skillsDir = path.join(PKG_DIR, 'workspace', 'skills');
+    const plugins: { type: 'local'; path: string }[] = [];
     try {
-        // Auto-discover all skill plugins in workspace/skills/ — any folder with a valid plugin.json is loaded
-        const skillsDir = path.join(WORKSPACE_DIR, 'skills');
-        const plugins: { type: 'local'; path: string }[] = [];
-        try {
-            for (const entry of fs.readdirSync(skillsDir, {
-                withFileTypes: true
-            })) {
-                if (
-                    entry.isDirectory() &&
-                    fs.existsSync(
-                        path.join(
-                            skillsDir,
-                            entry.name,
-                            '.claude-plugin',
-                            'plugin.json'
-                        )
-                    )
-                ) {
-                    plugins.push({
-                        type: 'local' as const,
-                        path: path.join(skillsDir, entry.name)
-                    });
-                }
-            }
-        } catch {}
-
-        // Load MCP server config from workspace/MCP.json if it exists
-        // Format: { "server-name": { command, args, env }, ... } (object, not array)
-        let mcpServers: Record<string, any> | undefined;
-        try {
-            const mcpConfigPath = path.join(WORKSPACE_DIR, 'MCP.json');
-            const mcpConfig = JSON.parse(
-                fs.readFileSync(mcpConfigPath, 'utf-8')
-            );
-            if (
-                mcpConfig &&
-                typeof mcpConfig === 'object' &&
-                !Array.isArray(mcpConfig) &&
-                Object.keys(mcpConfig).length
-            ) {
-                // Already in correct format: { "name": { command, args, env } }
-                mcpServers = mcpConfig;
-            } else if (Array.isArray(mcpConfig) && mcpConfig.length) {
-                // Legacy array format: merge all entries into a single object
-                mcpServers = Object.assign({}, ...mcpConfig);
-            }
-            if (mcpServers) {
-                const names = Object.keys(mcpServers).join(', ');
-                log.info(`Loaded MCP server(s): [${names}]`);
-            }
-        } catch {}
-
-        const claudeQuery = query({
-            prompt: sdkPrompt,
-            options: {
-                model,
-                cwd: WORKSPACE_DIR,
-                permissionMode: 'bypassPermissions',
-                allowDangerouslySkipPermissions: true,
-                maxTurns: 50,
-                abortController,
-                systemPrompt: enrichedPrompt,
-                plugins: plugins.length ? plugins : undefined,
-                mcpServers,
-                stderr: (chunk: string) => {
-                    stderrBuf += chunk;
-                },
-                env: {
-                    ...(process.env as Record<string, string>),
-                    CLAUDE_CODE_OAUTH_TOKEN: oauthToken,
-                    CLAUDE_CODE_BUBBLEWRAP: '1'
-                }
-            }
-        });
+      for (const entry of fs.readdirSync(skillsDir, { withFileTypes: true })) {
+        if (entry.isDirectory() && fs.existsSync(path.join(skillsDir, entry.name, '.claude-plugin', 'plugin.json'))) {
+          plugins.push({ type: 'local' as const, path: path.join(skillsDir, entry.name) });
+        }
+      }
+    } catch {}
 
-        onMessage('bot:typing', { conversationId });
-
-        for await (const msg of claudeQuery) {
-            if (abortController.signal.aborted) break;
-
-            switch (msg.type) {
-                case 'assistant': {
-                    const assistantMsg = msg.message;
-                    if (!assistantMsg?.content) break;
-
-                    for (const block of assistantMsg.content) {
-                        if (block.type === 'text' && block.text) {
-                            // Add separator between text from different assistant turns
-                            if (fullText && !fullText.endsWith('\n')) {
-                                fullText += '\n\n';
-                                onMessage('bot:token', {
-                                    conversationId,
-                                    token: '\n\n'
-                                });
-                            }
-                            fullText += block.text;
-                            onMessage('bot:token', {
-                                conversationId,
-                                token: block.text
-                            });
-                        } else if (block.type === 'tool_use') {
-                            usedTools.add(block.name);
-                            onMessage('bot:tool', {
-                                conversationId,
-                                name: block.name,
-                                input: block.input
-                            });
-                        }
-                    }
-                    break;
-                }
-
-                case 'result': {
-                    if (fullText) {
-                        onMessage('bot:response', {
-                            conversationId,
-                            content: fullText
-                        });
-                        fullText = ''; // prevent duplicate
-                    } else if (msg.subtype?.startsWith('error')) {
-                        const errorText =
-                            (msg as any).errors?.join('; ') ||
-                            'Agent query failed';
-                        onMessage('bot:error', {
-                            conversationId,
-                            error: errorText
-                        });
-                    }
-                    break;
-                }
-
-                case 'tool_progress':
-                    onMessage('bot:tool', {
-                        conversationId,
-                        name: (msg as any).tool_name || 'working',
-                        status: 'running'
-                    });
-                    break;
+    // Load MCP server config from workspace/MCP.json if it exists
+    // Format: { "server-name": { command, args, env }, ... } (object, not array)
+    let mcpServers: Record<string, any> | undefined;
+    try {
+      const mcpConfigPath = path.join(WORKSPACE_DIR, 'MCP.json');
+      const mcpConfig = JSON.parse(fs.readFileSync(mcpConfigPath, 'utf-8'));
+      if (mcpConfig && typeof mcpConfig === 'object' && !Array.isArray(mcpConfig) && Object.keys(mcpConfig).length) {
+        // Already in correct format: { "name": { command, args, env } }
+        mcpServers = mcpConfig;
+      } else if (Array.isArray(mcpConfig) && mcpConfig.length) {
+        // Legacy array format: merge all entries into a single object
+        mcpServers = Object.assign({}, ...mcpConfig);
+      }
+      if (mcpServers) {
+        const names = Object.keys(mcpServers).join(', ');
+        log.info(`Loaded MCP server(s): [${names}]`);
+      }
+    } catch {}
+
+    const claudeQuery = query({
+      prompt: sdkPrompt,
+      options: {
+        model,
+        cwd: path.join(PKG_DIR, 'workspace'),
+        permissionMode: 'bypassPermissions',
+        allowDangerouslySkipPermissions: true,
+        maxTurns: 50,
+        abortController,
+        systemPrompt: enrichedPrompt,
+        plugins: plugins.length ? plugins : undefined,
+        mcpServers,
+        stderr: (chunk: string) => { stderrBuf += chunk; },
+        env: {
+          ...process.env as Record<string, string>,
+          CLAUDE_CODE_OAUTH_TOKEN: oauthToken,
+          CLAUDE_CODE_BUBBLEWRAP: '1',
+        },
+      },
+    });
+
+    onMessage('bot:typing', { conversationId });
+
+    for await (const msg of claudeQuery) {
+      if (abortController.signal.aborted) break;
+
+      switch (msg.type) {
+        case 'assistant': {
+          const assistantMsg = msg.message;
+          if (!assistantMsg?.content) break;
+
+          for (const block of assistantMsg.content) {
+            if (block.type === 'text' && block.text) {
+              // Add separator between text from different assistant turns
+              if (fullText && !fullText.endsWith('\n')) {
+                fullText += '\n\n';
+                onMessage('bot:token', { conversationId, token: '\n\n' });
+              }
+              fullText += block.text;
+              onMessage('bot:token', { conversationId, token: block.text });
+            } else if (block.type === 'tool_use') {
+              usedTools.add(block.name);
+              onMessage('bot:tool', { conversationId, name: block.name, input: block.input });
             }
+          }
+          break;
         }
 
-        // If we accumulated text but didn't hit a result message, send what we have
-        if (fullText && !abortController.signal.aborted) {
+        case 'result': {
+          if (fullText) {
             onMessage('bot:response', { conversationId, content: fullText });
+            fullText = ''; // prevent duplicate
+          } else if (msg.subtype?.startsWith('error')) {
+            const errorText = (msg as any).errors?.join('; ') || 'Agent query failed';
+            onMessage('bot:error', { conversationId, error: errorText });
+          }
+          break;
         }
-    } catch (err: any) {
-        if (!abortController.signal.aborted) {
-            const detail = stderrBuf.trim();
-            const msg = detail
-                ? `${err.message}\n\nCLI stderr:\n${detail}`
-                : err.message;
-            log.warn(`Fluxy agent error (${conversationId}): ${msg}`);
-            onMessage('bot:error', { conversationId, error: msg });
-        }
-    } finally {
-        activeQueries.delete(conversationId);
-        const FILE_TOOLS = ['Write', 'Edit'];
-        const usedFileTools = FILE_TOOLS.some(t => usedTools.has(t));
-        onMessage('bot:done', { conversationId, usedFileTools });
+
+        case 'tool_progress':
+          onMessage('bot:tool', {
+            conversationId,
+            name: (msg as any).tool_name || 'working',
+            status: 'running',
+          });
+          break;
+      }
     }
+
+    // If we accumulated text but didn't hit a result message, send what we have
+    if (fullText && !abortController.signal.aborted) {
+      onMessage('bot:response', { conversationId, content: fullText });
+    }
+  } catch (err: any) {
+    if (!abortController.signal.aborted) {
+      const detail = stderrBuf.trim();
+      const msg = detail ? `${err.message}\n\nCLI stderr:\n${detail}` : err.message;
+      log.warn(`Fluxy agent error (${conversationId}): ${msg}`);
+      onMessage('bot:error', { conversationId, error: msg });
+    }
+  } finally {
+    activeQueries.delete(conversationId);
+    const FILE_TOOLS = ['Write', 'Edit'];
+    const usedFileTools = FILE_TOOLS.some((t) => usedTools.has(t));
+    onMessage('bot:done', { conversationId, usedFileTools });
+  }
 }
 
 /** Stop an in-flight query */
 export function stopFluxyAgentQuery(conversationId: string): void {
-    const q = activeQueries.get(conversationId);
-    if (q) {
-        q.abortController.abort();
-        activeQueries.delete(conversationId);
-    }
+  const q = activeQueries.get(conversationId);
+  if (q) {
+    q.abortController.abort();
+    activeQueries.delete(conversationId);
+  }
 }