ft-scout 3.0.8 → 4.0.0

package/bin/src/commands/agent.js

@@ -9,6 +9,8 @@ import { renderMarkdown, safeNote } from '../utils/markdown.js';
 import { normalizeLanguage } from '../utils/language.js';
 import { createPullRequest } from '../engine/git.js';
 import { handleUndo } from './undo.js';
+import { AgentExecutionLoop } from '../engine/agentEngine.js';
+import { verifyAndSelfHealFiles } from '../engine/verifier.js';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 const execAsync = promisify(exec);
@@ -29,25 +31,34 @@ export function loadScanReport() {
         return [];
     }
 }
-export function extractCreateTargetFile(rawGoal) {
+export function extractCreateTargetFiles(rawGoal) {
     if (!rawGoal || !rawGoal.trim())
-        return undefined;
+        return [];
     const goalLower = rawGoal.toLowerCase().trim();
     const isCreateIntent = /^(?:create|generate|make|build|add|write|edit|modify|update|implement|populate|fill)\b/i.test(goalLower) ||
-        /\b(?:create|generate|make|build|add|new|edit|modify|update|implement)\s+(?:a\s+)?(?:new\s+)?(?:file|code|script)\b/i.test(goalLower) ||
-        /\b(?:in|into|to|called|named|file|edit|modify|update)\s+([a-zA-Z0-9_\-./]+\.[a-zA-Z0-9]+)\b/i.test(rawGoal);
+        /\b(?:create|generate|make|build|add|new|edit|modify|update|implement)\s+(?:a\s+)?(?:new\s+)?(?:file|files|code|script)\b/i.test(goalLower) ||
+        /\b(?:in|into|to|called|named|file|files|edit|modify|update)\s+([a-zA-Z0-9_\-./]+\.[a-zA-Z0-9]+)\b/i.test(rawGoal);
     if (!isCreateIntent)
-        return undefined;
-    const directMatch = rawGoal.match(/(?:create|generate|make|build|add|write|edit|modify|update|implement|populate|fill)\s+(?:a\s+)?(?:new\s+)?(?:file\s+)?(?:in\s+)?(?:the\s+)?(?:root\s+)?(?:repo\s+|repository\s+|dir\s+|directory\s+)?(?:called\s+|named\s+)?([a-zA-Z0-9_\-./]+\.[a-zA-Z0-9]+)\b/i);
-    if (directMatch && directMatch[1] && directMatch[1].toLowerCase() !== 'package.json') {
-        return directMatch[1].replace(/^\.\//, '');
-    }
-    const tokens = rawGoal.split(/\s+/).map((w) => w.replace(/["'(),;:!]/g, '').trim());
+        return [];
     const validExts = [
         'ts', 'js', 'py', 'java', 'cpp', 'c', 'h', 'cs', 'go', 'rs', 'php',
         'rb', 'html', 'css', 'json', 'md', 'sql', 'txt', 'sh', 'yaml', 'yml',
         'xml', 'jsx', 'tsx', 'vue', 'svelte'
     ];
+    const foundFiles = [];
+    const directMatches = rawGoal.matchAll(/(?:create|generate|make|build|add|write|edit|modify|update|implement|populate|fill|file|called|named)\s+(?:a\s+)?(?:new\s+)?(?:file\s+)?(?:in\s+)?(?:the\s+)?(?:root\s+)?(?:repo\s+|repository\s+|dir\s+|directory\s+)?(?:called\s+|named\s+)?([a-zA-Z0-9_\-./]+\.[a-zA-Z0-9]+)\b/gi);
+    for (const match of directMatches) {
+        if (match && match[1]) {
+            const file = match[1].replace(/^\.\//, '');
+            if (file.toLowerCase() !== 'package.json' && !foundFiles.includes(file)) {
+                const ext = path.extname(file).replace('.', '').toLowerCase();
+                if (validExts.includes(ext)) {
+                    foundFiles.push(file);
+                }
+            }
+        }
+    }
+    const tokens = rawGoal.split(/[\s,;]+/).map((w) => w.replace(/["'()]/g, '').trim());
     for (const token of tokens) {
         if (token.includes('.') &&
             !token.startsWith('.') &&
@@ -55,11 +66,18 @@ export function extractCreateTargetFile(rawGoal) {
             /^[a-zA-Z0-9_\-./]+\.[a-zA-Z0-9]+$/.test(token)) {
             const ext = path.extname(token).replace('.', '').toLowerCase();
             if (validExts.includes(ext) && token.toLowerCase() !== 'package.json') {
-                return token.replace(/^\.\//, '');
+                const cleanPath = token.replace(/^\.\//, '');
+                if (!foundFiles.includes(cleanPath)) {
+                    foundFiles.push(cleanPath);
+                }
             }
         }
     }
-    return undefined;
+    return foundFiles;
+}
+export function extractCreateTargetFile(rawGoal) {
+    const files = extractCreateTargetFiles(rawGoal);
+    return files.length > 0 ? files[0] : undefined;
 }
 export function parseUserPromptIntent(rawGoal, filesList) {
     if (!rawGoal || !rawGoal.trim()) {
@@ -75,7 +93,11 @@ export function parseUserPromptIntent(rawGoal, filesList) {
     if (!cleaned)
         cleaned = rawGoal.trim();
     const lowerCleaned = cleaned.toLowerCase();
-    let targetFile = extractCreateTargetFile(cleaned) || extractCreateTargetFile(rawGoal);
+    let targetFiles = extractCreateTargetFiles(cleaned);
+    if (targetFiles.length === 0) {
+        targetFiles = extractCreateTargetFiles(rawGoal);
+    }
+    let targetFile = targetFiles.length > 0 ? targetFiles[0] : undefined;
     if (!targetFile) {
         const tokens = cleaned.split(/\s+/).map((w) => w.replace(/["'(),;:!]/g, '').trim());
         const validExts = [
@@ -88,6 +110,7 @@ export function parseUserPromptIntent(rawGoal, filesList) {
                 const ext = path.extname(token).replace('.', '').toLowerCase();
                 if (validExts.includes(ext) && token.toLowerCase() !== 'package.json') {
                     targetFile = token.replace(/^\.\//, '');
+                    targetFiles = [targetFile];
                     break;
                 }
             }
@@ -97,33 +120,34 @@ export function parseUserPromptIntent(rawGoal, filesList) {
         const matchedFiles = findTargetFilesFromPrompt(cleaned, undefined, filesList);
         if (matchedFiles.length > 0) {
             targetFile = matchedFiles[0];
+            targetFiles = matchedFiles;
         }
     }
     const isScan = /\b(?:scan|bug scan|scan codebase|check for bugs|find bugs|security scan)\b/i.test(lowerCleaned);
     if (isScan)
-        return { cleanGoal: cleaned, intentType: 'scan', targetFile };
+        return { cleanGoal: cleaned, intentType: 'scan', targetFile, targetFiles };
     const isRun = /^(?:run|exec|execute|terminal)\b/i.test(lowerCleaned);
     if (isRun)
-        return { cleanGoal: cleaned, intentType: 'run', targetFile };
+        return { cleanGoal: cleaned, intentType: 'run', targetFile, targetFiles };
     const isPlan = /^(?:plan|roadmap|feasibility|design|architect)\b/i.test(lowerCleaned) || /^add\s+feature\b/i.test(lowerCleaned);
     if (isPlan)
-        return { cleanGoal: cleaned, intentType: 'plan', targetFile };
-    const creationKeywordsRegex = /\b(?:create|generate|make|build|add\s+file|new\s+file|write\s+file|edit\s+file|populate|write\s+code|implement\s+code|write\s+snippet|add\s+snippet)\b/i;
+        return { cleanGoal: cleaned, intentType: 'plan', targetFile, targetFiles };
+    const creationKeywordsRegex = /\b(?:create|generate|make|build|add\s+file|new\s+file|write\s+file|edit\s+file|populate|write\s+code|implement\s+code|write\s+snippet|add\s+snippet|all\s+necessary\s+files)\b/i;
     const actionVerbsRegex = /\b(?:create|generate|make|build|write|add|edit|modify|update|fix|refactor|change|delete|remove|patch|implement|populate|fill|code|put|setup)\b/i;
     const hasActionVerb = actionVerbsRegex.test(lowerCleaned);
-    const isCreationIntent = creationKeywordsRegex.test(lowerCleaned) || Boolean(targetFile && /\b(?:create|generate|make|build|write|add|edit|modify|update|populate|fill|implement|snippet|game|code)\b/i.test(lowerCleaned));
+    const isCreationIntent = creationKeywordsRegex.test(lowerCleaned) || Boolean(targetFiles.length > 0 && /\b(?:create|generate|make|build|write|add|edit|modify|update|populate|fill|implement|snippet|game|code)\b/i.test(lowerCleaned));
     const pureQuestionRegex = /^(?:what|why|where|who|explain|read|display|tell|describe|list|purpose\s+of|how\s+does|how\s+is|show\s+me\s+code)\b/i;
     const isPureQuestion = pureQuestionRegex.test(lowerCleaned) && !hasActionVerb;
     if (isPureQuestion) {
-        return { cleanGoal: cleaned, intentType: 'question', targetFile };
+        return { cleanGoal: cleaned, intentType: 'question', targetFile, targetFiles };
     }
-    if (isCreationIntent && targetFile) {
-        return { cleanGoal: cleaned, intentType: 'create', targetFile };
+    if (isCreationIntent) {
+        return { cleanGoal: cleaned, intentType: 'create', targetFile, targetFiles };
     }
     if (hasActionVerb || targetFile) {
-        return { cleanGoal: cleaned, intentType: 'modify', targetFile };
+        return { cleanGoal: cleaned, intentType: 'modify', targetFile, targetFiles };
     }
-    return { cleanGoal: cleaned, intentType: 'question', targetFile };
+    return { cleanGoal: cleaned, intentType: 'question', targetFile, targetFiles };
 }
 export function findTargetFilesFromPrompt(userPrompt, specifiedFile, filesList) {
     const norm = (p) => p.replace(/\\/g, '/').toLowerCase().trim();
@@ -210,11 +234,23 @@ export async function handleAgent(goalInput, options) {
     const projectName = existingContext?.projectName || path.basename(cwd) || 'Codebase';
     let initialGoal = goalInput || options?.goal;
     let isFirstRun = true;
+    const agentLoop = new AgentExecutionLoop({
+        autoApprove: options?.yes,
+        maxSteps: options?.maxRetries || 15,
+        language: targetLang,
+        projectName,
+    });
     const welcomeBanner = `
-${chalk.bold.cyan('🤖 Scout Autonomous AI Agent Session Active')} ${targetLang ? `(${targetLang})` : ''}
-${chalk.dim('Type your goal, task, or question. Press Ctrl+C or type "exit" to quit.')}
+${chalk.bold.cyan('🤖 Scout Autonomous AI Agent')} ${targetLang ? `(${targetLang})` : ''}
+${chalk.dim('Type your goal, or use slash commands:')}
+  ${chalk.cyan('/help')}    - Show agent tools & commands
+  ${chalk.cyan('/clear')}   - Reset conversation context
+  ${chalk.cyan('/undo')}    - Revert last file modifications
+  ${chalk.cyan('/scan')}    - Run vulnerability scan
+  ${chalk.cyan('/plan')}    - Generate implementation roadmap
+  ${chalk.cyan('/exit')}    - Exit session
   `.trim();
-    safeNote(welcomeBanner, '🤖 Scout Agent Session');
+    safeNote(welcomeBanner, '🤖 Scout Agent Active Session');
     while (true) {
         let rawGoal = undefined;
         if (isFirstRun && (initialGoal || options?.scan || options?.add || options?.plan || options?.run || options?.create || options?.issue)) {
@@ -225,18 +261,55 @@ ${chalk.dim('Type your goal, task, or question. Press Ctrl+C or type "exit" to q
             isFirstRun = false;
             const userGoalInput = await text({
                 message: chalk.bold('Agent Prompt:'),
-                placeholder: 'Ask question, fix bug, run command, scan issues, create file... (Ctrl+C / exit to quit)',
-                validate: (val) => (!val || !val.trim() ? 'Please enter a prompt or Ctrl+C / exit to quit' : undefined),
+                placeholder: 'Ask question, fix bug, run command, scan issues, create file... (/help /exit)',
+                validate: (val) => (!val || !val.trim() ? 'Please enter a prompt or /exit to quit' : undefined),
             });
             if (isCancel(userGoalInput)) {
                 safeNote(chalk.yellow('Exiting Scout Agent session. Goodbye!'), '👋 Scout Agent Ended');
                 break;
             }
             const trimmedInput = userGoalInput.trim();
-            if (['exit', 'quit', 'q', ':q'].includes(trimmedInput.toLowerCase())) {
+            if (['exit', 'quit', 'q', ':q', '/exit', '/quit'].includes(trimmedInput.toLowerCase())) {
                 safeNote(chalk.yellow('Exiting Scout Agent session. Goodbye!'), '👋 Scout Agent Ended');
                 break;
             }
+            if (trimmedInput.toLowerCase() === '/help') {
+                const helpText = `
+### 🛠️ Scout Agent Tools
+- **read_file**: Read content & line ranges of codebase files.
+- **write_file**: Create new files or overwrite existing code.
+- **edit_file**: Search-and-replace exact code snippets.
+- **run_command**: Execute shell commands live (\`npm test\`, \`build\`).
+- **grep_search**: Regex/string search across all files.
+- **glob_search**: Pattern search for workspace files.
+
+### ⚡ Slash Commands
+- \`/help\`: View this assistance screen.
+- \`/clear\` or \`/compact\`: Clear session context window.
+- \`/undo\`: Revert last changes applied by Scout Agent.
+- \`/scan\`: Perform read-only security & bug scan.
+- \`/plan <idea>\`: Generate feature feasibility roadmap.
+- \`/history\`: View recent Scout actions.
+- \`/exit\`: Quit Scout Agent session.
+        `.trim();
+                safeNote(renderMarkdown(helpText), '⚡ Scout Slash Commands & Tools');
+                continue;
+            }
+            if (['/clear', '/compact'].includes(trimmedInput.toLowerCase())) {
+                agentLoop.resetContext();
+                safeNote(chalk.green('Agent context reset successfully.'), '🧹 Session Context Cleared');
+                continue;
+            }
+            if (trimmedInput.toLowerCase() === '/undo') {
+                await handleUndo();
+                continue;
+            }
+            if (trimmedInput.toLowerCase() === '/history') {
+                const history = (await import('../utils/config.js')).loadHistory();
+                const historyMd = history.slice(0, 10).map((h) => `- **${h.timestamp}**: \`${h.command}\` — ${h.description}`).join('\n') || 'No action history recorded yet.';
+                safeNote(renderMarkdown(historyMd), '📜 Scout History Log');
+                continue;
+            }
             rawGoal = trimmedInput;
         }
         if (!rawGoal || !rawGoal.trim()) {
@@ -246,37 +319,6 @@ ${chalk.dim('Type your goal, task, or question. Press Ctrl+C or type "exit" to q
         const effectiveGoal = parsedIntent.cleanGoal || rawGoal;
         const goalLower = effectiveGoal.toLowerCase().trim();
         // -------------------------------------------------------------
-        // Mode 0: Q&A / Read-Only Question & File Content Inspection Mode
-        // -------------------------------------------------------------
-        if (parsedIntent.intentType === 'question' && !options?.create && !options?.file && !options?.run) {
-            const s = spinner();
-            s.start('🤖 Scout Agent analyzing query & inspecting codebase...');
-            const matchedFiles = findTargetFilesFromPrompt(rawGoal, undefined, filesList);
-            let readfileOutput = '';
-            if (matchedFiles.length > 0) {
-                for (const f of matchedFiles.slice(0, 3)) {
-                    const fullP = path.resolve(cwd, f);
-                    if (fs.existsSync(fullP) && fs.statSync(fullP).isFile()) {
-                        const fileContent = fs.readFileSync(fullP, 'utf-8');
-                        readfileOutput += `### 📄 File: \`${f}\`\n\`\`\`ts\n${fileContent.slice(0, 8000)}${fileContent.length > 8000 ? '\n... (truncated)' : ''}\n\`\`\`\n\n`;
-                    }
-                }
-            }
-            let manifestContent = '';
-            const pkgPath = path.join(cwd, 'package.json');
-            if (fs.existsSync(pkgPath)) {
-                try {
-                    manifestContent = fs.readFileSync(pkgPath, 'utf-8');
-                }
-                catch { }
-            }
-            const aiAnswer = await askRepoQuestion(rawGoal + (readfileOutput ? `\n\nReferenced File Content:\n${readfileOutput}` : ''), projectName, filesList, manifestContent, [], { language: targetLang, native: options?.native });
-            s.stop('Query analysis complete.');
-            const outputMd = readfileOutput ? `${readfileOutput}### 💡 AI Explanation & Answer\n${aiAnswer}` : aiAnswer;
-            safeNote(renderMarkdown(outputMd), '📖 Scout Agent Q&A Response');
-            continue;
-        }
-        // -------------------------------------------------------------
         // Mode 1: Codebase Scan Mode
         // -------------------------------------------------------------
         const isScanIntent = options?.scan || /\b(?:scan|bug scan|scan codebase|check for bugs|find bugs|security scan)\b/i.test(goalLower);
@@ -393,14 +435,17 @@ ${analysis.targetFileToFix ? `\n### 🎯 Suspected File\n\`${analysis.targetFile
         // -------------------------------------------------------------
         // Mode 4: Create File Generation Mode (--create)
         // -------------------------------------------------------------
-        const targetCreateFile = options?.create || (parsedIntent.intentType === 'create' ? parsedIntent.targetFile : extractCreateTargetFile(effectiveGoal));
-        if (targetCreateFile) {
-            const targetFilePath = targetCreateFile.trim();
+        const targetCreateFiles = options?.create
+            ? options.create.split(',').map((s) => s.trim()).filter(Boolean)
+            : (parsedIntent.intentType === 'create' && parsedIntent.targetFiles && parsedIntent.targetFiles.length > 0
+                ? parsedIntent.targetFiles
+                : extractCreateTargetFiles(effectiveGoal));
+        if (targetCreateFiles && targetCreateFiles.length > 0) {
             let finalPrompt = effectiveGoal;
             if (!finalPrompt || !finalPrompt.trim()) {
                 const userPromptInput = await text({
-                    message: chalk.bold(`What should Scout generate inside ${chalk.cyan(targetFilePath)}?`),
-                    placeholder: 'e.g. Create a utility module with functions for string formatting and timestamp parsing',
+                    message: chalk.bold(`What should Scout generate inside ${chalk.cyan(targetCreateFiles.join(', '))}?`),
+                    placeholder: 'e.g. Create source files with modules, styles, and logic',
                     validate: (val) => (!val || !val.trim() ? 'Please provide a prompt describing the file requirements' : undefined),
                 });
                 if (isCancel(userPromptInput)) {
@@ -409,9 +454,9 @@ ${analysis.targetFileToFix ? `\n### 🎯 Suspected File\n\`${analysis.targetFile
                 }
                 finalPrompt = userPromptInput.trim();
             }
-            const resolvedPath = path.resolve(cwd, targetFilePath);
-            const fileExists = fs.existsSync(resolvedPath);
-            const originalContent = fileExists ? fs.readFileSync(resolvedPath, 'utf-8') : '__FT_WAS_NEW__';
+            const createdFilesSummary = [];
+            const backups = [];
+            const affectedFiles = [];
             const git = simpleGit();
             const isRepo = await git.checkIsRepo();
             let currentBranch = 'main';
@@ -423,70 +468,87 @@ ${analysis.targetFileToFix ? `\n### 🎯 Suspected File\n\`${analysis.targetFile
                 catch { }
             }
             const s = spinner();
-            s.start(`🤖 Scout Agent: Generating code for ${targetFilePath}...`);
-            let genResult;
-            try {
-                genResult = await generateCodeFile(targetFilePath, finalPrompt, projectName, filesList, targetLang, options?.native);
-            }
-            catch (err) {
-                s.stop(chalk.red('Failed to generate code file.'));
-                safeNote(chalk.red(`Error: ${err?.message || String(err)}`), '⚠️ Code Generation Error');
-                continue;
-            }
-            if (!genResult.code || !genResult.code.trim()) {
-                s.stop(chalk.red('Failed to generate code file.'));
-                safeNote(chalk.yellow(`Scout AI returned empty code content for ${targetFilePath}. Please refine your prompt describing what code to write.`), '⚠️ Empty Code Generated');
-                continue;
-            }
-            const parentDir = path.dirname(resolvedPath);
-            if (!fs.existsSync(parentDir)) {
-                fs.mkdirSync(parentDir, { recursive: true });
-            }
-            try {
-                fs.writeFileSync(resolvedPath, genResult.code, 'utf-8');
+            s.start(`🤖 Scout Agent: Generating ${targetCreateFiles.length} file(s) (${targetCreateFiles.join(', ')})...`);
+            let hasError = false;
+            for (const targetFilePath of targetCreateFiles) {
+                const resolvedPath = path.resolve(cwd, targetFilePath);
+                const fileExists = fs.existsSync(resolvedPath);
+                const originalContent = fileExists ? fs.readFileSync(resolvedPath, 'utf-8') : '__FT_WAS_NEW__';
+                try {
+                    const contextPrompt = finalPrompt + (createdFilesSummary.length > 0 ? `\n\nContext of already generated files in this batch:\n` + createdFilesSummary.map(f => `--- File: ${f.path} ---\n${f.code.slice(0, 1000)}`).join('\n') : '');
+                    const genResult = await generateCodeFile(targetFilePath, contextPrompt, projectName, filesList, targetLang, options?.native);
+                    if (!genResult.code || !genResult.code.trim()) {
+                        continue;
+                    }
+                    const parentDir = path.dirname(resolvedPath);
+                    if (!fs.existsSync(parentDir)) {
+                        fs.mkdirSync(parentDir, { recursive: true });
+                    }
+                    fs.writeFileSync(resolvedPath, genResult.code, 'utf-8');
+                    backups.push({ filePath: targetFilePath, originalContent });
+                    affectedFiles.push(targetFilePath);
+                    createdFilesSummary.push({ path: targetFilePath, code: genResult.code, description: genResult.description });
+                }
+                catch (err) {
+                    hasError = true;
+                    s.stop(chalk.red(`Failed to generate code for ${targetFilePath}.`));
+                    safeNote(chalk.red(`Error: ${err?.message || String(err)}`), '⚠️ Code Generation Error');
+                    break;
+                }
             }
-            catch (writeErr) {
-                s.stop(chalk.red('Failed to write generated code to disk.'));
-                safeNote(chalk.red(`Write error: ${writeErr?.message || String(writeErr)}`), '⚠️ File Write Error');
+            if (hasError || createdFilesSummary.length === 0) {
+                if (!hasError) {
+                    s.stop(chalk.red('Failed to generate code files.'));
+                    safeNote(chalk.yellow(`Scout AI returned empty code content. Please refine your prompt describing what code to write.`), '⚠️ Empty Code Generated');
+                }
                 continue;
             }
             recordHistoryAction({
-                command: `scout agent --create "${targetFilePath}" "${finalPrompt}"`,
-                description: `Scout created file ${targetFilePath}`,
+                command: `scout agent --create "${affectedFiles.join(',')}" "${finalPrompt}"`,
+                description: `Scout created ${createdFilesSummary.length} file(s): ${affectedFiles.join(', ')}`,
                 previousBranch: currentBranch,
-                affectedFiles: [targetFilePath],
-                backups: [{ filePath: targetFilePath, originalContent }],
+                affectedFiles,
+                backups,
+            });
+            s.stop(chalk.green(`Successfully created ${createdFilesSummary.length} file(s)!`));
+            // Run automated syntax check and self-healing retries on created files
+            const healRes = await verifyAndSelfHealFiles(affectedFiles, cwd, projectName, filesList, {
+                verifyCmd: options?.verifyCmd,
+                maxRetries: options?.maxRetries || 3,
+                language: targetLang,
+                native: options?.native,
             });
-            s.stop(chalk.green(`File ${targetFilePath} created successfully!`));
+            if (healRes.verifiedFiles.length > 0) {
+                safeNote(chalk.green(`✓ Automated Verification Confirmed: ${healRes.verifiedFiles.length} file(s) syntax & build verified clean!`), '✅ Code Verification Clean');
+            }
+            if (healRes.remainingErrors.length > 0) {
+                safeNote(chalk.yellow(`⚠️ Remaining verification issues:\n${healRes.remainingErrors.join('\n')}`), '⚠️ Verification Warning');
+            }
+            const filePreviews = createdFilesSummary.map((f) => `#### 📄 \`${f.path}\`\n${f.description}\n\`\`\`\n${f.code.slice(0, 400)}${f.code.length > 400 ? '\n... (truncated)' : ''}\n\`\`\``).join('\n\n');
             const teardownContent = `
-### 📄 Created File
-\`${targetFilePath}\`
-
-### 💡 Description & Overview
-${genResult.description}
+### 📄 Created Files (${createdFilesSummary.length})
+${createdFilesSummary.map(f => ` • \`${f.path}\``).join('\n')}
 
-### 💻 Preview
-\`\`\`
-${genResult.code.slice(0, 500)}${genResult.code.length > 500 ? '\n... (truncated)' : ''}
-\`\`\`
+### 💡 Overview & Previews
+${filePreviews}
       `.trim();
             safeNote(renderMarkdown(teardownContent), '✨ Scout File Creation Teardown');
             if (options?.yes || !process.stdout.isTTY) {
-                safeNote(`${chalk.green('✓')} Saved ${chalk.bold.cyan(targetFilePath)} on branch ${chalk.bold.green(currentBranch)}.\n` +
+                safeNote(`${chalk.green('✓')} Saved ${chalk.bold.cyan(affectedFiles.length + ' file(s)')} on branch ${chalk.bold.green(currentBranch)}.\n` +
                     `💡 ${chalk.dim('You can revert this creation anytime by running:')} ${chalk.cyan('scout undo')}`, '✅ Creation Confirmed');
                 continue;
             }
             const actionChoice = await select({
-                message: chalk.bold('Review Scout Agent\'s generated file. What would you like to do?'),
+                message: chalk.bold('Review Scout Agent\'s generated file(s). What would you like to do?'),
                 options: [
-                    { value: 'keep', label: '✅ Keep File', hint: `Retain the newly created file directly on current branch (${currentBranch})` },
-                    { value: 'pr', label: '🔀 Create Pull Request', hint: 'Push created file to a new branch & open a Pull Request' },
-                    { value: 'revert', label: '↩️ Revert / Delete File', hint: 'Remove the created file immediately' },
+                    { value: 'keep', label: '✅ Keep Files', hint: `Retain newly created files directly on current branch (${currentBranch})` },
+                    { value: 'pr', label: '🔀 Create Pull Request', hint: 'Push created files to a new branch & open a Pull Request' },
+                    { value: 'revert', label: '↩️ Revert / Delete Files', hint: 'Remove created files immediately' },
                 ],
             });
             if (isCancel(actionChoice) || actionChoice === 'revert') {
                 const revSpinner = spinner();
-                revSpinner.start('Reverting Scout Agent\'s file creation...');
+                revSpinner.start('Reverting Scout Agent\'s file creations...');
                 await handleUndo();
                 revSpinner.stop('Creation reverted successfully.');
                 continue;
@@ -496,171 +558,40 @@ ${genResult.code.slice(0, 500)}${genResult.code.length > 500 ? '\n... (truncated
                 prSpinner.start('Creating Pull Request...');
                 const prRes = await createPullRequest({
                     branchPrefix: 'create',
-                    title: `feat: Add ${targetFilePath}`,
-                    affectedFiles: [targetFilePath],
-                    commitMessage: `feat: Create ${targetFilePath}`,
+                    title: `feat: Create ${affectedFiles.join(', ')}`,
+                    affectedFiles,
+                    commitMessage: `feat: Create ${affectedFiles.join(', ')}`,
                 });
                 prSpinner.stop('Pull Request workflow processed.');
                 safeNote(`${chalk.green('✓')} ${prRes.message}\n` +
                     `💡 ${chalk.dim('You remain on active branch:')} ${chalk.cyan(currentBranch)}`, '🔀 Pull Request Status');
                 continue;
             }
-            safeNote(`${chalk.green('✓')} Saved ${chalk.bold.cyan(targetFilePath)} on branch ${chalk.bold.green(currentBranch)}.\n` +
+            safeNote(`${chalk.green('✓')} Saved ${chalk.bold.cyan(affectedFiles.length + ' file(s)')} on branch ${chalk.bold.green(currentBranch)}.\n` +
                 `💡 ${chalk.dim('You can revert this creation anytime by running:')} ${chalk.cyan('scout undo')}`, '✅ Creation Confirmed');
             continue;
         }
         // -------------------------------------------------------------
-        // Mode 5: Autonomous Agent Loop & Code Fix Mode (Default)
+        // Mode 5: Autonomous ReAct Tool-Calling Agent Loop
         // -------------------------------------------------------------
         let finalGoal = effectiveGoal || rawGoal;
-        let specifiedTargetFile = options?.file || parsedIntent.targetFile;
         if (!finalGoal && options?.issue) {
             const report = loadScanReport();
             const issueId = Number(options.issue);
             const targetIssue = report.find((i) => i.id === issueId) || report[0];
             if (targetIssue) {
                 finalGoal = `Fix issue #${targetIssue.id}: ${targetIssue.title} — ${targetIssue.description}`;
-                specifiedTargetFile = targetIssue.file;
             }
         }
         if (!finalGoal || !finalGoal.trim()) {
             safeNote(chalk.yellow('No active goal specified.'), '🤖 Scout Agent');
             continue;
         }
-        // File Identification
-        let targetFiles = [];
-        if (specifiedTargetFile) {
-            targetFiles = findTargetFilesFromPrompt(finalGoal, specifiedTargetFile, filesList);
-            if (targetFiles.length === 0 && fs.existsSync(path.resolve(cwd, specifiedTargetFile))) {
-                targetFiles = [specifiedTargetFile];
-            }
-        }
-        if (targetFiles.length === 0) {
-            targetFiles = findTargetFilesFromPrompt(finalGoal, undefined, filesList);
-        }
-        if (targetFiles.length === 0) {
-            const sIdentify = spinner();
-            sIdentify.start(`🤖 Scout Agent initializing autonomous workflow for: "${finalGoal}"...`);
-            const aiMatched = await identifyTargetFiles(finalGoal, projectName, filesList, targetLang, options?.native);
-            sIdentify.stop('Target files identified.');
-            if (aiMatched.length > 0) {
-                targetFiles = aiMatched;
-            }
-        }
-        if (targetFiles.length === 0) {
-            let possibleNewFile = undefined;
-            if (specifiedTargetFile && specifiedTargetFile.trim()) {
-                const clean = specifiedTargetFile.trim();
-                if (!clean.startsWith('.') && !clean.startsWith('*') && clean.includes('.')) {
-                    possibleNewFile = clean;
-                }
-            }
-            if (!possibleNewFile && rawGoal) {
-                possibleNewFile = extractCreateTargetFile(rawGoal);
-            }
-            if (possibleNewFile) {
-                await handleAgent(finalGoal, { ...options, create: possibleNewFile });
-                continue;
-            }
-            safeNote(chalk.yellow(`Scout Agent could not identify specific files needing modification for goal: "${finalGoal}".\nPlease refine your request or specify target files with --file.`), '⚠️ Agent File Selection');
-            continue;
-        }
-        const s = spinner();
-        s.start(`🤖 Scout Agent processing: "${finalGoal}" across file(s): ${targetFiles.join(', ')}...`);
-        const targetFilesMap = {};
-        const backups = [];
-        const normKey = (p) => p.replace(/\\/g, '/').replace(/^\.\//, '').trim();
-        for (const tf of targetFiles) {
-            const fullPath = path.resolve(cwd, tf);
-            if (fs.existsSync(fullPath)) {
-                const content = fs.readFileSync(fullPath, 'utf-8');
-                targetFilesMap[normKey(tf)] = content;
-                backups.push({ filePath: normKey(tf), originalContent: content });
-            }
-        }
-        // Code Modification
-        s.message('Applying initial code modifications...');
-        let fixResult = await generateMultiCodeFix(finalGoal, projectName, filesList, targetFilesMap, targetLang, options?.native, (completed, total, file) => {
-            s.message(`Modifying files (${completed}/${total}): ${file}...`);
-        });
-        const modifiedFiles = [];
-        for (const item of fixResult.files) {
-            if (item.fixedCode !== undefined && item.fixedCode.trim().length > 0) {
-                let k = normKey(item.targetFile);
-                if (!(k in targetFilesMap) && targetFiles.length > 0) {
-                    const matchKey = Object.keys(targetFilesMap).find((tfKey) => tfKey.toLowerCase() === k.toLowerCase() || path.basename(tfKey).toLowerCase() === path.basename(k).toLowerCase());
-                    if (matchKey)
-                        k = matchKey;
-                    else if (targetFiles.length === 1)
-                        k = normKey(targetFiles[0]);
-                }
-                const fullPath = path.resolve(cwd, k);
-                const orig = targetFilesMap[k] ?? '';
-                const normalizedFixed = item.fixedCode.replace(/\r\n/g, '\n').trim();
-                const normalizedOrig = orig.replace(/\r\n/g, '\n').trim();
-                if (normalizedFixed !== normalizedOrig) {
-                    fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-                    fs.writeFileSync(fullPath, item.fixedCode, 'utf-8');
-                    modifiedFiles.push(k);
-                }
-            }
-        }
-        // Autonomous Verification & Self-Healing Loop
-        let verifyCommand = options?.verifyCmd;
-        if (!verifyCommand) {
-            const cmdInPromptMatch = finalGoal.match(/(?:deploy|verify|test|run|build)(?:\s+(?:by\s+running|with|using|and\s+run|via))?\s+['"`]([^'"`]+)['"`]/i) ||
-                finalGoal.match(/(?:deploy|verify|test|run)\s+(?:by\s+running|with|using)\s+(.+?)(?:$|\!|\.|\,)/i);
-            if (cmdInPromptMatch && cmdInPromptMatch[1]) {
-                verifyCommand = cmdInPromptMatch[1].trim();
-            }
-        }
-        if (!verifyCommand) {
-            const pkgPath = path.join(cwd, 'package.json');
-            if (fs.existsSync(pkgPath)) {
-                try {
-                    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-                    if (pkg.scripts?.test && pkg.scripts.test !== 'echo "Error: no test specified" && exit 1') {
-                        verifyCommand = 'npm test';
-                    }
-                    else if (pkg.scripts?.build) {
-                        verifyCommand = 'npm run build';
-                    }
-                }
-                catch { }
-            }
-        }
-        let verificationSuccess = true;
-        let attempts = 0;
-        const maxAttempts = options?.maxRetries || 3;
-        if (verifyCommand) {
-            s.message(`Running verification command: \`${verifyCommand}\`...`);
-            while (attempts < maxAttempts) {
-                attempts++;
-                try {
-                    await execAsync(verifyCommand, { cwd });
-                    verificationSuccess = true;
-                    s.message(`Verification command \`${verifyCommand}\` passed!`);
-                    break;
-                }
-                catch (cmdErr) {
-                    verificationSuccess = false;
-                    const output = (cmdErr.stdout || '') + '\n' + (cmdErr.stderr || '');
-                    s.message(`Attempt ${attempts}/${maxAttempts}: Command failed. Diagnosing & self-healing...`);
-                    const diagnosis = await analyzeCommandError(verifyCommand, cmdErr.code || 1, output, projectName, filesList, targetLang, options?.native);
-                    const fileToFix = diagnosis.targetFileToFix || targetFiles[0] || filesList[0] || '';
-                    if (fileToFix && fs.existsSync(path.resolve(cwd, fileToFix))) {
-                        const currentContent = fs.readFileSync(path.resolve(cwd, fileToFix), 'utf-8');
-                        const healPrompt = `Fix error running \`${verifyCommand}\`: ${diagnosis.rootCause}. Suggestion: ${diagnosis.suggestedFix}`;
-                        const healedRes = await generateMultiCodeFix(healPrompt, projectName, filesList, { [fileToFix]: currentContent }, targetLang, options?.native);
-                        if (healedRes.files[0]?.fixedCode) {
-                            fs.writeFileSync(path.resolve(cwd, fileToFix), healedRes.files[0].fixedCode, 'utf-8');
-                            if (!modifiedFiles.includes(fileToFix))
-                                modifiedFiles.push(fileToFix);
-                        }
-                    }
-                }
-            }
-        }
+        safeNote(`${chalk.bold.cyan('🤖 Scout Autonomous Execution Initialized')}\n` +
+            `${chalk.dim('Goal:')} ${finalGoal}`, '⚡ Scout Agent Execution');
+        const execResult = await agentLoop.executeGoal(finalGoal);
+        const modifiedFiles = agentLoop.getModifiedFiles();
+        const backups = agentLoop.getBackups();
         const git = simpleGit();
         const isRepo = await git.checkIsRepo();
         let currentBranch = 'main';
@@ -680,7 +611,6 @@ ${genResult.code.slice(0, 500)}${genResult.code.length > 500 ? '\n... (truncated
                 backups,
             });
         }
-        s.stop(chalk.green(`🤖 Scout Agent workflow completed for: "${finalGoal}"!`));
         const teardownMd = `
 ### 🎯 Agent Goal
 ${finalGoal}
@@ -688,21 +618,15 @@ ${finalGoal}
 ### 📄 Modified File(s)
 ${modifiedFiles.map((f) => ` • \`${f}\``).join('\n') || ' • None'}
 
-### 🔴 Problem Identified
-${fixResult.problem}
-
-### 🛠️ Solution Applied
-${fixResult.howFixed}
-
-### ✅ Verification Status
-${verifyCommand ? (verificationSuccess ? `\`${verifyCommand}\` PASSED 🎉` : `\`${verifyCommand}\` FAILED (max retries reached) ⚠️`) : 'No automated verification script detected'}
+### 💡 Execution Summary
+${execResult.summary}
     `.trim();
-        safeNote(renderMarkdown(teardownMd), '🤖 Scout Agent Autonomous Teardown');
+        safeNote(renderMarkdown(teardownMd), '🤖 Scout Agent Teardown Report');
         if (modifiedFiles.length === 0)
             continue;
         if (options?.yes || !process.stdout.isTTY) {
             safeNote(`${chalk.green('✓')} Agent changes retained on ${modifiedFiles.length} file(s) (Branch: ${chalk.bold.green(currentBranch)}).\n` +
-                `💡 ${chalk.dim('You can revert anytime by running:')} ${chalk.cyan('scout undo')}`, '✅ Agent Fix Confirmed');
+                `💡 ${chalk.dim('You can revert anytime by running:')} ${chalk.cyan('scout undo')}`, '✅ Agent Execution Confirmed');
             continue;
         }
         const actionChoice = await select({