@matt82198/aesop 0.1.0-beta.4 → 0.1.0-rc.1

package/bin/cli.js

@@ -3,10 +3,73 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const readline = require('readline');
+const { execSync } = require('child_process');
 
 const args = process.argv.slice(2);
 const helpFlag = args.includes('--help') || args.includes('-h');
 const forceFlag = args.includes('--force');
+const yesFlag = args.includes('--yes');
+
+// Check for runtime subcommands (doctor, watch, dash, status)
+const runtimeCommands = ['doctor', 'watch', 'dash', 'status'];
+const isRuntimeCommand = runtimeCommands.includes(args[0]);
+
+if (isRuntimeCommand) {
+  const commandMap = {
+    'doctor': '../tools/doctor.js',
+    'watch': '../tools/watch.js',
+    'dash': '../tools/dash.js',
+    'status': '../tools/status.js'
+  };
+  // Load and run the appropriate runtime module
+  // These modules run async code that sets process.exitCode and will cause Node to exit
+  require(commandMap[args[0]]);
+  // Return immediately to prevent further CLI scaffolding logic from running
+  return;
+}
+
+// Detect if stdin is a TTY (interactive terminal)
+function isInteractive() {
+  return process.stdin.isTTY && process.stdout.isTTY;
+}
+
+// Discover git repositories under a base directory (non-recursive first level)
+function discoverRepos(baseDir) {
+  const repos = [];
+  try {
+    if (!fs.existsSync(baseDir)) return repos;
+    const entries = fs.readdirSync(baseDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory() && !entry.name.startsWith('.')) {
+        const fullPath = path.join(baseDir, entry.name);
+        const gitDir = path.join(fullPath, '.git');
+        if (fs.existsSync(gitDir)) {
+          repos.push({ name: entry.name, path: fullPath });
+        }
+      }
+    }
+  } catch (e) {
+    // Silently ignore discovery errors
+  }
+  return repos;
+}
+
+// Interactive prompt via readline (exported for testing)
+async function promptUser(rl, prompt, defaultValue) {
+  return new Promise((resolve) => {
+    const displayPrompt = defaultValue ? `${prompt} (${defaultValue}): ` : `${prompt}: `;
+    rl.question(displayPrompt, (answer) => {
+      resolve(answer.trim() || defaultValue || '');
+    });
+  });
+}
+
+// Validate port is a number
+function validatePort(port) {
+  const p = parseInt(port, 10);
+  return !isNaN(p) && p > 0 && p < 65536 ? p : null;
+}
 
 // Parse named flags
 function getFlag(flagName) {
@@ -23,6 +86,18 @@ aesop — Multi-agent orchestration template scaffolder
 
 Usage:
   npx @matt82198/aesop [target-dir] [options]
+  npx @matt82198/aesop wizard [options]
+  npx @matt82198/aesop doctor
+  npx @matt82198/aesop watch
+  npx @matt82198/aesop dash
+  npx @matt82198/aesop status
+
+Commands:
+  doctor                  Preflight readiness check (Node.js, Python, git, config, dirs, hook, port)
+  watch                   Launch the watchdog daemon (spawns daemons/run-watchdog.sh)
+  dash                    Launch the web dashboard (spawns python3 ui/serve.py or python fallback)
+  status                  One-shot fleet status snapshot (heartbeats, dashboard port, git branch)
+  wizard                  Interactive onboarding (prompts for project name, repos, port)
 
 Arguments:
   target-dir    Directory to scaffold the template into (default: "aesop-fleet")
@@ -30,13 +105,20 @@ Arguments:
 Options:
   --help, -h              Show this help message
   --force                 Replace any existing .git/hooks/pre-push during scaffold
+  --yes                   Skip interactive prompts, use defaults (CI-safe)
   --name <name>           Project name (for headless scaffolding; generates CLAUDE.md + aesop.config.json)
   --domains <list>        Comma-separated domain list (e.g., "api,worker,monitoring")
   --repos <paths>         Comma-separated repo paths (e.g., "/path/to/repo1,/path/to/repo2")
+  --repo-urls <urls>      Comma-separated repo URLs (e.g., "https://github.com/user/repo1.git,https://github.com/user/repo2.git")
 
 Examples:
+  npx @matt82198/aesop doctor                               # Run preflight checks before starting
+  npx @matt82198/aesop watch                                # Launch watchdog daemon
+  npx @matt82198/aesop dash                                 # Launch web dashboard (default localhost:8770)
+  npx @matt82198/aesop status                               # Show fleet status (heartbeats, port, git)
   npx @matt82198/aesop                                      # Creates ./aesop-fleet/ with template
   npx @matt82198/aesop my-fleet                             # Creates ./my-fleet/ with template
+  npx @matt82198/aesop wizard                               # Interactive onboarding (60-second setup)
   npx @matt82198/aesop my-fleet --force                     # Re-scaffold and replace hooks
   npx @matt82198/aesop orchestrator --name "my-service"     # Headless: generates CLAUDE.md + config
 
@@ -46,19 +128,46 @@ Examples:
   Full headless with domains and repos (PowerShell):
     npx @matt82198/aesop orchestrator --name "api" --domains "server,worker" --repos "C:\path\to\api"
 
-After scaffolding with --name, cd into the directory and:
+Interactive wizard flow:
+  1. Run: npx @matt82198/aesop wizard
+  2. Answer prompts (press Enter for defaults): project name, repos to watch, port, brain root
+  3. Scaffolds template, writes aesop.config.json, prints next steps
+  4. Optionally runs watchdog smoke test
+
+After scaffolding, cd into the directory and:
   1. Review CLAUDE.md (pre-filled with your project info)
   2. Review aesop.config.json (pre-configured for your repos)
-  3. Run: bash daemons/run-watchdog.sh --once
-  4. Launch dashboard: python ui/serve.py
+  3. Run: aesop watch (or bash daemons/run-watchdog.sh)
+  4. Launch dashboard: aesop dash (or python3 ui/serve.py)
 `);
   process.exit(0);
 }
 
+// Check if wizard mode is requested (either as first arg or after targetDir)
+// e.g., "aesop wizard" or "aesop my-dir wizard"
+let wizardModeRequested = false;
+let wizardArgIndex = -1;
+
+// Check if 'wizard' is in the args
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === 'wizard') {
+    wizardModeRequested = true;
+    wizardArgIndex = i;
+    break;
+  }
+}
+
+const wizardMode = wizardModeRequested || (args.length === 0 && isInteractive());
+
+// Handle wizard mode by removing 'wizard' from args
+if (wizardModeRequested && wizardArgIndex >= 0) {
+  args.splice(wizardArgIndex, 1);
+}
+
 // Extract targetDir (first non-flag argument, excluding flag values)
-// Build set of indices consumed as flag values (tokens after --name/--domains/--repos)
+// Build set of indices consumed as flag values (tokens after --name/--domains/--repos/--repo-urls)
 const consumedIndices = new Set();
-const flagsWithValues = ['--name', '--domains', '--repos'];
+const flagsWithValues = ['--name', '--domains', '--repos', '--repo-urls'];
 for (let i = 0; i < args.length; i++) {
   if (flagsWithValues.includes(args[i]) && i + 1 < args.length) {
     consumedIndices.add(i + 1);
@@ -75,12 +184,13 @@ const targetDir = args.find((arg, idx) =>
 const projectName = getFlag('--name');
 const domainsStr = getFlag('--domains');
 const reposStr = getFlag('--repos');
+const repoUrlsStr = getFlag('--repo-urls');
 
 // Validate target directory doesn't exist or is empty (except for .git and aesop files)
 if (fs.existsSync(targetDir)) {
   const contents = fs.readdirSync(targetDir);
   // Allow .git and aesop scaffolded files to already exist (for idempotency)
-  const aesopDirs = ['daemons', 'dash', 'monitor', 'tools', 'ui', 'docs', '.git', 'state'];
+  const aesopDirs = ['daemons', 'dash', 'monitor', 'tools', 'ui', 'docs', 'state_store', 'skills', 'mcp', 'scan', 'hooks', '.git', 'state'];
   const aesopFiles = [
     'aesop.config.example.json',
     'aesop.config.json',
@@ -133,6 +243,11 @@ const filesToCopy = [
   'tools',
   'ui',
   'docs',
+  'state_store',
+  'skills',
+  'mcp',
+  'scan',
+  'hooks',
   'aesop.config.example.json',
   'README.md',
   'LICENSE',
@@ -199,7 +314,7 @@ function substituteTemplate(templateContent, projectName, domainsStr, reposStr)
   return result;
 }
 
-function generateConfigJson(targetDir, templateRoot, projectName, reposStr) {
+function generateConfigJson(targetDir, templateRoot, projectName, reposStr, repoUrlsStr) {
   // Read example config
   const exampleConfigPath = path.join(templateRoot, 'aesop.config.example.json');
   let exampleConfig;
@@ -214,6 +329,7 @@ function generateConfigJson(targetDir, templateRoot, projectName, reposStr) {
       brain_root: path.join(os.homedir(), '.claude'),
       scripts_root: path.join(os.homedir(), 'scripts'),
       temp_root: path.join(os.tmpdir()),
+      fleet_root: os.homedir(),
       repos: [],
       watchdog: {
         cycle_seconds: 150,
@@ -249,23 +365,190 @@ function generateConfigJson(targetDir, templateRoot, projectName, reposStr) {
   exampleConfig.brain_root = '~/.claude';
   exampleConfig.scripts_root = '~/scripts';
   exampleConfig.temp_root = '~/.aesop-temp';
+  exampleConfig.fleet_root = os.homedir();
   exampleConfig._generated_note = 'This config uses portable ~ paths which expand at runtime on all platforms. Config loaders in ui/config.py (Python) and monitor/collect-signals.mjs (Node.js) automatically expand ~ paths to your home directory.';
 
   // Parse repos if provided
   if (reposStr) {
     const repos = reposStr.split(',').map(r => r.trim()).filter(r => r);
+    const repoUrls = repoUrlsStr ? repoUrlsStr.split(',').map(u => u.trim()).filter(u => u) : [];
+
     exampleConfig.repos = repos.map((repoPath, idx) => ({
       path: repoPath,
       name: path.basename(repoPath),
-      url: `https://github.com/user/${path.basename(repoPath)}.git`,
+      url: repoUrls[idx] || `https://github.com/user/${path.basename(repoPath)}.git`,
       primary_branch: 'main',
       backup_branch: 'backup/wip'
     }));
+
+    // Add _repos_note if URLs weren't provided (user must edit them)
+    if (!repoUrlsStr) {
+      exampleConfig._repos_note = 'Repository URLs are currently placeholders (https://github.com/user/<name>.git). Update each repo.url in the repos array with the actual repository URL. This is a required manual step before the daemon can clone repositories.';
+    }
   }
 
   return exampleConfig;
 }
 
+// Print next steps and optionally run watchdog (returns a Promise)
+async function printNextStepsAndWatchdog(rl, targetDir, configPath, port) {
+  console.log('\n🎯 Next 3 commands to get started:\n');
+  console.log(`  1. cd ${targetDir}`);
+  console.log('  2. bash daemons/run-watchdog.sh --once  (one-time watchdog smoke test)');
+  console.log(`  3. python3 ui/serve.py  (or python as fallback; launch dashboard on localhost:${port})`);
+  console.log('\n📖 After that, review:');
+  console.log('  • CLAUDE.md (pre-filled with your project info)');
+  console.log('  • aesop.config.json (pre-configured for your repos)');
+  console.log('  • docs/MEMORY-TEMPLATE.md (edit ~/.claude/MEMORY.md with your facts)\n');
+
+  return new Promise((resolve) => {
+    rl.question('Run watchdog --once now? (y/N): ', (answer) => {
+      if (answer.toLowerCase() === 'y') {
+        console.log('\nRunning watchdog smoke test...');
+        try {
+          const watchdogScript = path.join(targetDir, 'daemons', 'run-watchdog.sh');
+          if (fs.existsSync(watchdogScript)) {
+            // Use bash to run the script
+            execSync(`bash "${watchdogScript}" --once`, { stdio: 'inherit', cwd: targetDir });
+            console.log('\n✓ Watchdog smoke test completed');
+          }
+        } catch (e) {
+          console.error('\n⚠ Watchdog test failed (this is OK, continue manually)');
+        }
+      }
+      rl.close();
+      resolve();
+    });
+  });
+}
+
+function installPreCommitWaveguard(targetDir, templateRoot) {
+  // Install the pre-commit waveguard hook to prevent commits during a wave
+  // Try to locate .git directory
+  const gitDir = path.join(targetDir, '.git');
+  if (!fs.existsSync(gitDir)) {
+    // No git repo, skip hook installation silently
+    return;
+  }
+
+  // SECURITY: Check if .git itself is a symlink/junction (refuse to follow it outside targetDir)
+  try {
+    const gitDirLstat = fs.lstatSync(gitDir);
+    if (gitDirLstat.isSymbolicLink()) {
+      console.warn('⚠ Warning: .git is a symlink (security risk)');
+      console.warn('  Skipping pre-commit hook installation. Please remove the symlink and re-run scaffold.');
+      return;
+    }
+  } catch (e) {
+    // lstat failed; proceed (may be a permission issue)
+  }
+
+  // Ensure hooks directory exists
+  const gitHooksDir = path.join(gitDir, 'hooks');
+  if (!fs.existsSync(gitHooksDir)) {
+    fs.mkdirSync(gitHooksDir, { recursive: true });
+  }
+
+  // SECURITY: Check if gitHooksDir is a symlink (refuse to install through symlinked dir)
+  try {
+    const hooksLstat = fs.lstatSync(gitHooksDir);
+    if (hooksLstat.isSymbolicLink()) {
+      console.warn('⚠ Warning: .git/hooks directory is a symlink (security risk)');
+      console.warn('  Skipping pre-commit hook installation. Please remove the symlink and re-run scaffold.');
+      return;
+    }
+  } catch (e) {
+    // lstat failed; proceed (may be a permission issue)
+  }
+
+  const waveguardSource = path.join(templateRoot, 'hooks', 'pre-commit-waveguard.sh');
+  const preCommitDest = path.join(gitHooksDir, 'pre-commit');
+
+  if (!fs.existsSync(waveguardSource)) {
+    // Waveguard source doesn't exist, skip
+    return;
+  }
+
+  // Check if pre-commit hook already exists
+  if (fs.existsSync(preCommitDest)) {
+    // SECURITY: Check if existing pre-commit is a symlink (refuse to follow it)
+    try {
+      const destLstat = fs.lstatSync(preCommitDest);
+      if (destLstat.isSymbolicLink()) {
+        console.warn('⚠ Warning: Existing .git/hooks/pre-commit is a symlink (security risk)');
+        console.warn('  Skipping pre-commit hook installation. Please remove the symlink and re-run scaffold.');
+        return;
+      }
+    } catch (e) {
+      // lstat failed; proceed
+    }
+
+    // Backup existing pre-commit hook
+    const backupPath = path.join(gitHooksDir, 'pre-commit.waveguard-backup');
+    if (!fs.existsSync(backupPath)) {
+      // Only backup if we haven't already
+      try {
+        const existingContent = fs.readFileSync(preCommitDest, 'utf8');
+        // Check if waveguard is already in the hook
+        if (existingContent.includes('pre-commit-waveguard')) {
+          console.log('✓ Pre-commit waveguard already installed (no changes)');
+          return;
+        }
+        // Backup the existing hook
+        fs.copyFileSync(preCommitDest, backupPath);
+        console.log('✓ Backed up existing pre-commit hook to .git/hooks/pre-commit.waveguard-backup');
+      } catch (e) {
+        // Failed to backup, still try to install
+      }
+    }
+  }
+
+  // Create wrapper script that calls the waveguard hook
+  const wrapperScript = `#!/usr/bin/env bash
+set -uo pipefail
+
+repo_root=$(git rev-parse --show-toplevel 2>/dev/null || echo "")
+if [ -z "$repo_root" ]; then
+  exit 1
+fi
+
+waveguard_hook="$repo_root/hooks/pre-commit-waveguard.sh"
+if [ -f "$waveguard_hook" ]; then
+  bash "$waveguard_hook"
+  waveguard_exit=$?
+  if [ $waveguard_exit -ne 0 ]; then
+    exit $waveguard_exit
+  fi
+fi
+
+backup_hook="$repo_root/.git/hooks/pre-commit.waveguard-backup"
+if [ -f "$backup_hook" ] && [ -x "$backup_hook" ]; then
+  bash "$backup_hook"
+  exit $?
+fi
+
+exit 0
+`;
+
+  // Install the hook using copyFileSync (not symlink) to avoid dangling links
+  if (fs.existsSync(preCommitDest)) {
+    fs.unlinkSync(preCommitDest);
+  }
+  fs.writeFileSync(preCommitDest, wrapperScript);
+  console.log('✓ Installed pre-commit waveguard hook to .git/hooks/pre-commit');
+
+  // Ensure hook is executable
+  try {
+    fs.chmodSync(preCommitDest, 0o755);
+  } catch (e) {
+    // On Windows, chmod fails harmlessly; on POSIX, warn the user to chmod manually
+    if (process.platform !== 'win32') {
+      console.warn('⚠ Warning: Failed to chmod +x the pre-commit hook. Please run manually:');
+      console.warn(`  chmod +x "${preCommitDest}"`);
+    }
+  }
+}
+
 function installPrePushHook(targetDir, templateRoot) {
   // Try to locate .git directory
   const gitDir = path.join(targetDir, '.git');
@@ -350,107 +633,208 @@ function installPrePushHook(targetDir, templateRoot) {
   }
 
   // Install the hook
-  if (process.platform === 'win32') {
-    // Windows: copy the file
-    fs.copyFileSync(hookSource, hookDest);
-    console.log('✓ Copied pre-push policy hook to .git/hooks/pre-push');
-  } else {
-    // Unix: symlink for easy updates
-    // First remove if exists
-    if (fs.existsSync(hookDest)) {
-      fs.unlinkSync(hookDest);
-    }
-    // Create symlink relative to .git/hooks/
-    const relPath = path.relative(gitHooksDir, hookSource);
-    fs.symlinkSync(relPath, hookDest);
-    console.log('✓ Symlinked pre-push policy hook to .git/hooks/pre-push');
+  // Use copyFileSync on all platforms to avoid dangling symlinks after npx cache clean
+  // which would disable branch protection and the secret gate
+  if (fs.existsSync(hookDest)) {
+    fs.unlinkSync(hookDest);
   }
+  fs.copyFileSync(hookSource, hookDest);
+  console.log('✓ Copied pre-push policy hook to .git/hooks/pre-push');
 
   // Ensure hook is executable
   try {
     fs.chmodSync(hookDest, 0o755);
   } catch (e) {
-    // On Windows, chmod may fail; that's okay
+    // On Windows, chmod fails harmlessly; on POSIX, warn the user to chmod manually
+    if (process.platform !== 'win32') {
+      console.warn('⚠ Warning: Failed to chmod +x the pre-push hook. Please run manually:');
+      console.warn(`  chmod +x "${hookDest}"`);
+    }
   }
 }
 
-try {
-  filesToCopy.forEach(item => {
-    const src = path.join(templateRoot, item);
-    const dest = path.join(targetDir, item);
-    if (fs.existsSync(src)) {
-      copyRecursive(src, dest);
-      console.log(`✓ Copied ${item}`);
+// Main execution function (skip if runtime command detected)
+if (!isRuntimeCommand) {
+  (async () => {
+    try {
+      let finalProjectName = projectName;
+    let finalReposStr = reposStr;
+    let finalDomainsStr = domainsStr;
+    let finalRepoUrlsStr = repoUrlsStr;
+    let finalTargetDir = targetDir;
+    let configPath = path.join(targetDir, 'aesop.config.json');
+    let dashboardPort = 8770;
+
+    let wizardRl = null;
+
+    // Handle wizard mode
+    if (wizardMode && isInteractive() && !yesFlag) {
+      wizardRl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+
+      console.log('\n🪄 Aesop interactive onboarding wizard');
+      console.log('═'.repeat(50));
+      console.log('Answer these 4 questions to set up your fleet in 60 seconds.');
+      console.log('Press Enter to accept defaults (shown in parentheses).\n');
+
+      // Q1: Project name
+      finalProjectName = await promptUser(wizardRl, 'Project name', 'my-fleet');
+
+      // Q2: Repos to watch
+      console.log('\nDiscovering git repos in your home directory...');
+      const discoveredRepos = discoverRepos(os.homedir());
+      let selectedRepos = '';
+
+      if (discoveredRepos.length > 0) {
+        console.log(`Found ${discoveredRepos.length} git repo(s):\n`);
+        discoveredRepos.forEach((repo, i) => {
+          console.log(`  ${i + 1}. ${repo.name} (${repo.path})`);
+        });
+        console.log('\nEnter repo paths to watch (comma-separated), or press Enter to skip:');
+        selectedRepos = await promptUser(wizardRl, 'Repos', '');
+        if (!selectedRepos && discoveredRepos.length > 0) {
+          // Auto-select the first discovered repo if user presses Enter
+          selectedRepos = discoveredRepos[0].path;
+          console.log(`  → Using: ${selectedRepos}`);
+        }
+      } else {
+        selectedRepos = await promptUser(wizardRl, 'Repos to watch (paths, comma-separated)', '');
+      }
+      finalReposStr = selectedRepos;
+
+      // Q3: Dashboard port
+      let port = '';
+      while (!port) {
+        port = await promptUser(wizardRl, 'Dashboard port', '8770');
+        const validPort = validatePort(port);
+        if (!validPort) {
+          console.log('  ✗ Invalid port. Must be a number between 1 and 65535.');
+          port = '';
+        } else {
+          dashboardPort = validPort;
+        }
+      }
+
+      // Q4: Brain root
+      const brainRoot = await promptUser(wizardRl, 'Brain root directory', '~/.claude');
+
+      console.log('\n✨ Scaffolding your fleet...\n');
+
+      // Update config path for wizard-generated config
+      configPath = path.join(finalTargetDir, 'aesop.config.json');
+    } else if (yesFlag && wizardMode) {
+      // Non-interactive defaults for wizard mode with --yes
+      finalProjectName = 'my-fleet';
+      finalReposStr = '';
+      dashboardPort = 8770;
+      console.log('🪄 Running onboarding wizard with defaults (--yes)');
     }
-  });
 
-  // Create state/ directory
-  const stateDir = path.join(targetDir, 'state');
-  if (!fs.existsSync(stateDir)) {
-    fs.mkdirSync(stateDir, { recursive: true });
-    console.log('✓ Created state/ directory');
-  }
+    // Copy template files
+    filesToCopy.forEach(item => {
+      const src = path.join(templateRoot, item);
+      const dest = path.join(finalTargetDir, item);
+      if (fs.existsSync(src)) {
+        copyRecursive(src, dest);
+        console.log(`✓ Copied ${item}`);
+      }
+    });
 
-  // If --name provided, generate CLAUDE.md and aesop.config.json
-  if (projectName) {
-    // Generate CLAUDE.md from template
-    const templatePath = path.join(targetDir, 'CLAUDE-TEMPLATE.md');
-    const claudeMdPath = path.join(targetDir, 'CLAUDE.md');
-    if (fs.existsSync(templatePath)) {
-      const templateContent = fs.readFileSync(templatePath, 'utf8');
-      const claudeContent = substituteTemplate(templateContent, projectName, domainsStr, reposStr);
-      fs.writeFileSync(claudeMdPath, claudeContent);
-      console.log('✓ Generated CLAUDE.md (from template with substitutions)');
+    // Create state/ directory
+    const stateDir = path.join(finalTargetDir, 'state');
+    if (!fs.existsSync(stateDir)) {
+      fs.mkdirSync(stateDir, { recursive: true });
+      console.log('✓ Created state/ directory');
     }
 
-    // Generate aesop.config.json
-    const configPath = path.join(targetDir, 'aesop.config.json');
-    const config = generateConfigJson(targetDir, templateRoot, projectName, reposStr);
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-    console.log('✓ Generated aesop.config.json (configured for your repos)');
-  }
+    // If --name or wizard provided, generate CLAUDE.md and aesop.config.json
+    if (finalProjectName) {
+      // Generate CLAUDE.md from template
+      const templatePath = path.join(finalTargetDir, 'CLAUDE-TEMPLATE.md');
+      const claudeMdPath = path.join(finalTargetDir, 'CLAUDE.md');
+      if (fs.existsSync(templatePath)) {
+        const templateContent = fs.readFileSync(templatePath, 'utf8');
+        const claudeContent = substituteTemplate(templateContent, finalProjectName, finalDomainsStr, finalReposStr);
+        fs.writeFileSync(claudeMdPath, claudeContent);
+        console.log('✓ Generated CLAUDE.md (from template with substitutions)');
+      }
 
-  // Copy MEMORY-TEMPLATE.md as MEMORY-SEED.md
-  const memoryTemplatePath = path.join(templateRoot, 'docs', 'MEMORY-TEMPLATE.md');
-  const memorySeedPath = path.join(targetDir, 'MEMORY-SEED.md');
-  if (fs.existsSync(memoryTemplatePath) && !fs.existsSync(memorySeedPath)) {
-    fs.copyFileSync(memoryTemplatePath, memorySeedPath);
-    console.log('✓ Copied MEMORY-SEED.md (template for your facts)');
-  }
+      // Check if aesop.config.json already exists (for wizard mode)
+      if (fs.existsSync(configPath) && wizardMode && isInteractive()) {
+        // This should not happen in wizard mode since we're creating a new targetDir
+        // But if it does, warn and skip
+        console.warn(`⚠ Warning: aesop.config.json already exists at ${configPath}`);
+      } else {
+        // Generate aesop.config.json
+        const config = generateConfigJson(finalTargetDir, templateRoot, finalProjectName, finalReposStr, finalRepoUrlsStr);
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        console.log('✓ Generated aesop.config.json (configured for your repos)');
+      }
+    }
 
-  // Install the pre-push hook
-  installPrePushHook(targetDir, templateRoot);
-
-  console.log(`\n✅ Scaffolded aesop template into "${targetDir}" (${copiedCount} files)`);
-
-  if (projectName) {
-    console.log('\nHeadless scaffolding complete! Next steps:');
-    console.log(`  1. cd ${targetDir}`);
-    console.log('  2. Review CLAUDE.md (pre-filled with your project info)');
-    console.log('  3. Review aesop.config.json (pre-configured for your repos)');
-    console.log('\nInitialize your brain (Claude Code team memory):');
-    console.log('  4. mkdir -p ~/.claude/memory');
-    console.log(`  5. cp ${targetDir}/CLAUDE.md ~/.claude/CLAUDE.md  (or review existing ~/.claude/CLAUDE.md)`);
-    console.log(`  6. cp ${targetDir}/MEMORY-SEED.md ~/.claude/MEMORY.md  (then add your facts)`);
-    console.log('\nRun the daemon and dashboard:');
-    console.log('  7. bash daemons/run-watchdog.sh --once  (test run)');
-    console.log('  8. python ui/serve.py  (launch dashboard on localhost:8770)');
-  } else {
-    console.log('\nConfiguration steps:');
-    console.log(`  1. cd ${targetDir}`);
-    console.log('  2. cp aesop.config.example.json aesop.config.json');
-    console.log('  3. Edit aesop.config.json with your configuration');
-    console.log('\nInitialize your brain (Claude Code team memory):');
-    console.log('  4. mkdir -p ~/.claude/memory');
-    console.log(`  5. cp ${targetDir}/CLAUDE-TEMPLATE.md ~/.claude/CLAUDE.md  (then edit domains/team info)`);
-    console.log(`  6. cp ${targetDir}/MEMORY-SEED.md ~/.claude/MEMORY.md  (then add your facts)`);
-    console.log('\nRun the daemon and dashboard:');
-    console.log('  7. bash daemons/run-watchdog.sh --once  (test run)');
-    console.log('  8. python ui/serve.py  (launch dashboard on localhost:8770)');
-  }
-  console.log('\nFor full documentation, see the README.md in the scaffolded directory.');
-  process.exit(0);
-} catch (err) {
-  console.error(`Error scaffolding template: ${err.message}`);
-  process.exit(1);
+    // Copy MEMORY-TEMPLATE.md as MEMORY-SEED.md
+    const memoryTemplatePath = path.join(templateRoot, 'docs', 'MEMORY-TEMPLATE.md');
+    const memorySeedPath = path.join(finalTargetDir, 'MEMORY-SEED.md');
+    if (fs.existsSync(memoryTemplatePath) && !fs.existsSync(memorySeedPath)) {
+      fs.copyFileSync(memoryTemplatePath, memorySeedPath);
+      console.log('✓ Copied MEMORY-SEED.md (template for your facts)');
+    }
+
+    // Install the pre-push hook
+    installPrePushHook(finalTargetDir, templateRoot);
+
+    // Install the pre-commit waveguard hook
+    installPreCommitWaveguard(finalTargetDir, templateRoot);
+
+    console.log(`\n✅ Scaffolded aesop template into "${finalTargetDir}" (${copiedCount} files)`);
+
+    if (wizardMode && wizardRl) {
+      // Wizard mode: print next steps and offer to run watchdog
+      await printNextStepsAndWatchdog(wizardRl, finalTargetDir, configPath, dashboardPort);
+      process.exit(0);
+    } else if (wizardMode) {
+      // Wizard mode with --yes flag (non-interactive)
+      console.log('\n🎯 Next 3 commands to get started:\n');
+      console.log(`  1. cd ${finalTargetDir}`);
+      console.log('  2. bash daemons/run-watchdog.sh --once  (one-time watchdog smoke test)');
+      console.log(`  3. python3 ui/serve.py  (or python as fallback; launch dashboard on localhost:${dashboardPort})`);
+      console.log('\n📖 After that, review:');
+      console.log('  • CLAUDE.md (pre-filled with your project info)');
+      console.log('  • aesop.config.json (pre-configured for your repos)');
+      console.log('  • docs/MEMORY-TEMPLATE.md (edit ~/.claude/MEMORY.md with your facts)');
+      process.exit(0);
+    } else if (finalProjectName) {
+      console.log('\nHeadless scaffolding complete! Next steps:');
+      console.log(`  1. cd ${finalTargetDir}`);
+      console.log('  2. Review CLAUDE.md (pre-filled with your project info)');
+      console.log('  3. Review aesop.config.json (pre-configured for your repos)');
+      console.log('\nInitialize your brain (Claude Code team memory):');
+      console.log('  4. mkdir -p ~/.claude/memory');
+      console.log(`  5. cp ${finalTargetDir}/CLAUDE.md ~/.claude/CLAUDE.md  (or review existing ~/.claude/CLAUDE.md)`);
+      console.log(`  6. cp ${finalTargetDir}/MEMORY-SEED.md ~/.claude/MEMORY.md  (then add your facts)`);
+      console.log('\nRun the daemon and dashboard:');
+      console.log('  7. bash daemons/run-watchdog.sh --once  (test run)');
+      console.log('  8. python3 ui/serve.py  (or python as fallback; launch dashboard on localhost:8770)');
+    } else {
+      console.log('\nConfiguration steps:');
+      console.log(`  1. cd ${finalTargetDir}`);
+      console.log('  2. cp aesop.config.example.json aesop.config.json');
+      console.log('  3. Edit aesop.config.json with your configuration');
+      console.log('\nInitialize your brain (Claude Code team memory):');
+      console.log('  4. mkdir -p ~/.claude/memory');
+      console.log(`  5. cp ${finalTargetDir}/CLAUDE-TEMPLATE.md ~/.claude/CLAUDE.md  (then edit domains/team info)`);
+      console.log(`  6. cp ${finalTargetDir}/MEMORY-SEED.md ~/.claude/MEMORY.md  (then add your facts)`);
+      console.log('\nRun the daemon and dashboard:');
+      console.log('  7. bash daemons/run-watchdog.sh --once  (test run)');
+      console.log('  8. python3 ui/serve.py  (or python as fallback; launch dashboard on localhost:8770)');
+    }
+    console.log('\nFor full documentation, see the README.md in the scaffolded directory.');
+    process.exit(0);
+    } catch (err) {
+      console.error(`Error scaffolding template: ${err.message}`);
+      process.exit(1);
+    }
+  })();
 }