beth-copilot 1.1.0 → 2.1.0

package/bin/cli.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 
 import { fileURLToPath } from 'url';
-import { dirname, join, relative } from 'path';
-import { existsSync, mkdirSync, readdirSync, statSync, copyFileSync, readFileSync, writeFileSync, unlinkSync } from 'fs';
+import { basename, dirname, join, relative } from 'path';
+import { existsSync, mkdirSync, readdirSync, statSync, copyFileSync, readFileSync, writeFileSync, unlinkSync, chmodSync, rmSync } from 'fs';
 import { createRequire } from 'module';
-import { execSync, spawn } from 'child_process';
-import { validateBeadsPath, validateBinaryPath } from './lib/pathValidation.js';
+import { execSync, execFileSync, spawn } from 'child_process';
 
 const require = createRequire(import.meta.url);
 const __filename = fileURLToPath(import.meta.url);
@@ -227,18 +226,12 @@ async function animateBethBanner() {
   console.log('"' + COLORS.reset);
   console.log('');
   
-  // Show version and quick help
+  // Show version line only — commands are shown after install completes
   console.log(`${COLORS.dim}v${CURRENT_VERSION}${COLORS.reset}                          ${COLORS.dim}AI Orchestrator for GitHub Copilot${COLORS.reset}`);
   console.log('');
-  console.log(`${COLORS.bright}Commands:${COLORS.reset}`);
-  console.log(`  ${COLORS.cyan}npx beth-copilot init${COLORS.reset}      Install Beth in your project`);
-  console.log(`  ${COLORS.cyan}npx beth-copilot help${COLORS.reset}      Show full documentation`);
-  console.log('');
-  console.log(`${COLORS.bright}After install:${COLORS.reset} Open VS Code → Copilot Chat → ${COLORS.cyan}@Beth${COLORS.reset}`);
-  console.log('');
 }
 
-function showBethBannerStatic({ showQuickHelp = true } = {}) {
+function showBethBannerStatic() {
   const bethColors = [
     '\x1b[38;5;196m',
     '\x1b[38;5;202m',
@@ -277,17 +270,9 @@ function showBethBannerStatic({ showQuickHelp = true } = {}) {
   console.log(COLORS.cyan + COLORS.bright + '"' + tagline + '"' + COLORS.reset);
   console.log('');
   
-  // Show version and quick help (optional)
-  if (showQuickHelp) {
-    console.log(`${COLORS.dim}v${CURRENT_VERSION}${COLORS.reset}                          ${COLORS.dim}AI Orchestrator for GitHub Copilot${COLORS.reset}`);
-    console.log('');
-    console.log(`${COLORS.bright}Commands:${COLORS.reset}`);
-    console.log(`  ${COLORS.cyan}npx beth-copilot init${COLORS.reset}      Install Beth in your project`);
-    console.log(`  ${COLORS.cyan}npx beth-copilot help${COLORS.reset}      Show full documentation`);
-    console.log('');
-    console.log(`${COLORS.bright}After install:${COLORS.reset} Open VS Code → Copilot Chat → ${COLORS.cyan}@Beth${COLORS.reset}`);
-    console.log('');
-  }
+  // Show version (always)
+  console.log(`${COLORS.dim}v${CURRENT_VERSION}${COLORS.reset}                          ${COLORS.dim}AI Orchestrator for GitHub Copilot${COLORS.reset}`);
+  console.log('');
 }
 
 // Compact Beth portrait with colors
@@ -518,59 +503,6 @@ async function checkForUpdates() {
   }
 }
 
-function getBeadsPath() {
-  // Check if bd is available in PATH
-  try {
-    logDebug('Checking if bd is in PATH...');
-    execSync('bd --version', { stdio: 'ignore' });
-    logDebug('Found bd in PATH');
-    return 'bd';
-  } catch {
-    logDebug('bd not in PATH, checking common locations...');
-    // Check common installation paths based on platform
-    const homeDir = process.env.HOME || process.env.USERPROFILE || '';
-    const isWindows = process.platform === 'win32';
-    
-    const commonPaths = isWindows ? [
-      // Windows: npm global, Go bin, local apps
-      join(process.env.APPDATA || '', 'npm', 'bd.cmd'),
-      join(homeDir, 'AppData', 'Roaming', 'npm', 'bd.cmd'),
-      join(homeDir, 'AppData', 'Local', 'Microsoft', 'WindowsApps', 'bd.exe'),
-      join(homeDir, 'go', 'bin', 'bd.exe'),
-      join(process.env.GOPATH || join(homeDir, 'go'), 'bin', 'bd.exe'),
-    ] : [
-      // Unix: homebrew, npm global, go bin, local bin
-      '/opt/homebrew/bin/bd',
-      '/usr/local/bin/bd',
-      join(homeDir, '.local', 'bin', 'bd'),
-      join(homeDir, 'bin', 'bd'),
-      join(homeDir, '.npm-global', 'bin', 'bd'),
-      join(homeDir, 'go', 'bin', 'bd'),
-      join(process.env.GOPATH || join(homeDir, 'go'), 'bin', 'bd'),
-    ];
-    
-    for (const bdPath of commonPaths) {
-      logDebug(`Checking: ${bdPath}`);
-      if (existsSync(bdPath)) {
-        logDebug(`Found at: ${bdPath}`);
-        return bdPath;
-      }
-    }
-    
-    logDebug('bd not found in any common location');
-    return null;
-  }
-}
-
-function isBeadsInstalled() {
-  return getBeadsPath() !== null;
-}
-
-function isBeadsInitialized(cwd) {
-  // Check if .beads directory exists in the project
-  return existsSync(join(cwd, '.beads'));
-}
-
 async function promptYesNo(question) {
   const readline = await import('readline');
   const rl = readline.createInterface({
@@ -601,180 +533,6 @@ async function promptForInput(question) {
   });
 }
 
-/**
- * Installs the beads CLI globally via npm.
- * 
- * SECURITY NOTE - shell:true usage:
- * - Required for cross-platform npm execution (npm.cmd on Windows, npm on Unix)
- * - Arguments are HARDCODED - no user input is passed to the shell
- * - Command injection risk: NONE (no dynamic/user-supplied values)
- * 
- * Alternative considered: Using platform-specific binary names (npm.cmd vs npm)
- * would eliminate shell:true but adds complexity and edge cases for non-standard installs.
- * 
- * @returns {Promise<boolean>} True if installation succeeded and was verified
- */
-async function installBeads() {
-  const isWindows = process.platform === 'win32';
-  const isMac = process.platform === 'darwin';
-  
-  log('\nInstalling beads CLI via npm...', COLORS.cyan);
-  logInfo('npm install -g @beads/bd');
-  
-  // SECURITY: shell:true is required for cross-platform npm execution.
-  // All arguments are hardcoded constants - no user input reaches the shell.
-  return new Promise((resolve) => {
-    const child = spawn('npm', ['install', '-g', '@beads/bd'], {
-      stdio: 'inherit',
-      shell: true
-    });
-    
-    child.on('close', (code) => {
-      if (code === 0) {
-        // CRITICAL: Verify installation actually worked before claiming success
-        // npm can exit 0 even when the package isn't properly installed
-        const verifiedPath = getBeadsPath();
-        if (verifiedPath) {
-          logSuccess('beads CLI installed and verified!');
-          resolve(true);
-        } else {
-          logWarning('npm reported success but beads CLI not found in PATH.');
-          logInfo('This can happen if npm global bin is not in your PATH.');
-          if (globalThis.VERBOSE) {
-            showPathDiagnostics();
-          } else {
-            logInfo('Run with --verbose for PATH diagnostics.');
-          }
-          console.log('');
-          showBeadsAlternatives(isWindows, isMac);
-          resolve(false);
-        }
-      } else {
-        logError('npm install failed.');
-        console.log('');
-        showBeadsAlternatives(isWindows, isMac);
-        resolve(false);
-      }
-    });
-    
-    child.on('error', () => {
-      logError('Failed to run npm.');
-      logInfo('Make sure npm is installed and in your PATH.');
-      resolve(false);
-    });
-  });
-}
-
-function showBeadsAlternatives(isWindows, isMac) {
-  logInfo('Alternative installation methods:');
-  if (isWindows) {
-    logInfo('  PowerShell: irm https://raw.githubusercontent.com/steveyegge/beads/main/install.ps1 | iex');
-    logInfo('  Go:         go install github.com/steveyegge/beads/cmd/bd@latest');
-  } else {
-    if (isMac) {
-      logInfo('  Homebrew:   brew install beads');
-    }
-    logInfo('  Script:     curl -fsSL https://raw.githubusercontent.com/steveyegge/beads/main/scripts/install.sh | bash');
-    logInfo('  Go:         go install github.com/steveyegge/beads/cmd/bd@latest');
-  }
-  logInfo('');
-  logInfo('Learn more: https://github.com/steveyegge/beads');
-}
-
-/**
- * Initializes beads in the current project directory.
- * 
- * SECURITY NOTE - shell:true usage:
- * - bdPath is validated via getBeadsPath() which only returns paths that:
- *   1. Pass execSync('bd --version') verification, OR
- *   2. Exist on disk (verified via existsSync) from a HARDCODED list of paths
- * - Arguments are HARDCODED ('init') - no user input is passed to the shell
- * - Command injection risk: LOW (bdPath is validated, no user input in args)
- * 
- * The shell:true is used for PATH resolution consistency, though it could be
- * eliminated since we have an absolute path. Kept for consistency with other
- * spawn calls and to handle edge cases in shell script wrappers.
- * 
- * @param {string} cwd - Current working directory (validated by caller)
- * @returns {Promise<boolean>} True if initialization succeeded
- */
-async function initializeBeads(cwd) {
-  log('\nInitializing beads in project...', COLORS.cyan);
-  
-  const bdPath = getBeadsPath();
-  if (!bdPath) {
-    logWarning('Failed to initialize beads. Run manually: bd init');
-    return false;
-  }
-  
-  // SECURITY: bdPath is validated by getBeadsPath() (existsSync check).
-  // Only 'init' argument is passed - no user input reaches the shell.
-  return new Promise((resolve) => {
-    const child = spawn(bdPath, ['init'], {
-      stdio: 'inherit',
-      shell: true,
-      cwd
-    });
-    
-    child.on('close', (code) => {
-      if (code === 0) {
-        logSuccess('beads initialized successfully!');
-        resolve(true);
-      } else {
-        logWarning('Failed to initialize beads. Run manually: bd init');
-        resolve(false);
-      }
-    });
-    
-    child.on('error', () => {
-      logWarning('Failed to initialize beads. Run manually: bd init');
-      resolve(false);
-    });
-  });
-}
-
-/**
- * Runs `bd doctor` to verify beads configuration health.
- * 
- * SECURITY NOTE - shell:true usage:
- * - bdPath is validated via getBeadsPath() (same as initializeBeads)
- * - Arguments are HARDCODED ('doctor') - no user input is passed to the shell
- * - Command injection risk: LOW (bdPath is validated, no user input in args)
- * 
- * @returns {Promise<boolean>} True if bd doctor passed
- */
-async function runBeadsDoctor() {
-  log('\nRunning beads doctor to verify configuration...', COLORS.cyan);
-  
-  const bdPath = getBeadsPath();
-  if (!bdPath) {
-    logWarning('Cannot run beads doctor: bd not found.');
-    return false;
-  }
-  
-  return new Promise((resolve) => {
-    const child = spawn(bdPath, ['doctor'], {
-      stdio: 'inherit',
-      shell: true,
-    });
-    
-    child.on('close', (code) => {
-      if (code === 0) {
-        logSuccess('beads doctor passed!');
-        resolve(true);
-      } else {
-        logWarning('beads doctor reported issues. Run "bd doctor" manually to investigate.');
-        resolve(false);
-      }
-    });
-    
-    child.on('error', () => {
-      logWarning('Failed to run beads doctor. Run "bd doctor" manually.');
-      resolve(false);
-    });
-  });
-}
-
 const BETH_GUARD_BEGIN = '# --- BEGIN BETH GUARD ---';
 const BETH_GUARD_END = '# --- END BETH GUARD ---';
 
@@ -817,63 +575,48 @@ ${BETH_GUARD_END}
 `;
 }
 
-/**
- * Install the pre-push guard into .beads/hooks/pre-push.
- * Appends the guard section after the beads integration section.
- * Idempotent — skips if guard is already installed.
- *
- * @param {string} cwd - Project root directory
- */
-function installPrePushGuard(cwd) {
-  const hookPath = join(cwd, '.beads', 'hooks', 'pre-push');
-
-  if (!existsSync(hookPath)) {
-    logWarning('Pre-push hook not found (.beads/hooks/pre-push). Skipping guard installation.');
-    return;
-  }
-
-  const content = readFileSync(hookPath, 'utf-8');
-
-  // Already installed?
-  if (content.includes(BETH_GUARD_BEGIN)) {
-    logSuccess('Pre-push branch guard already installed');
-    return;
-  }
-
-  // Append guard after existing content
-  const guardScript = generateGuardScript();
-  writeFileSync(hookPath, content.trimEnd() + '\n' + guardScript, 'utf-8');
-  logSuccess('Installed pre-push branch guard (blocks direct pushes to main)');
-}
-
 function showHelp() {
-  showBethBannerStatic({ showQuickHelp: false });
+  showBethBannerStatic();
   console.log(`${COLORS.bright}Beth${COLORS.reset} - AI Orchestrator for GitHub Copilot
 
-${COLORS.bright}Usage:${COLORS.reset}
-  npx beth-copilot init [options]     Initialize Beth in current directory
-  npx beth-copilot doctor             Check system health and dependencies
-  npx beth-copilot close <id> [opts]   Close issue with dependency enforcement
-  npx beth-copilot land [opts]          Automated session completion (test, commit, push)
-  npx beth-copilot pre-push-guard      Run branch discipline checks (used by git hook)
-  npx beth-copilot quickstart         Run init + doctor + beads setup
-  npx beth-copilot help               Show this help message
-
-${COLORS.bright}Options:${COLORS.reset}
+${COLORS.bright}Commands:${COLORS.reset}
+  ${COLORS.cyan}npx beth-copilot init${COLORS.reset} [options]     Initialize Beth in current directory
+  ${COLORS.cyan}npx beth-copilot update${COLORS.reset} [options]   Update project files to latest templates
+  ${COLORS.cyan}npx beth-copilot doctor${COLORS.reset}             Check system health and dependencies
+  ${COLORS.cyan}npx beth-copilot land${COLORS.reset} [options]     Automated session completion (test, commit, push)
+  ${COLORS.cyan}npx beth-copilot quickstart${COLORS.reset}         Run init + doctor
+  ${COLORS.cyan}npx beth-copilot pre-push-guard${COLORS.reset}     Run branch discipline checks (used by git hook)
+  ${COLORS.cyan}npx beth-copilot uninstall${COLORS.reset}          Remove all Beth files from current project
+  ${COLORS.cyan}npx beth-copilot help${COLORS.reset}               Show this help message
+
+${COLORS.bright}Init Options:${COLORS.reset}
   --force                             Overwrite existing files
   --skip-backlog                      Don't create Backlog.md
   --skip-mcp                          Don't create mcp.json.example
-  --skip-beads                        Skip beads check (not recommended)
   --verbose                           Show detailed diagnostics on errors
 
+${COLORS.bright}Update Options:${COLORS.reset}
+  --check-only                        Report update status without modifying files
+  --force                             Overwrite user-modified files with templates
+  --verbose                           Show per-file detail
+
+${COLORS.bright}Land Options:${COLORS.reset}
+  --message, -m <msg>                 Custom commit message
+  --skip-tests                        Skip test execution (not recommended)
+  --force, -f                         Push even if tests fail (dangerous)
+  --dry-run                           Show what would happen without executing
+
 ${COLORS.bright}Examples:${COLORS.reset}
   npx beth-copilot init               Set up Beth in current project
   npx beth-copilot init --force       Overwrite existing Beth files
+  npx beth-copilot update             Update to latest templates
+  npx beth-copilot update --check-only See what changed without modifying
   npx beth-copilot doctor             Verify installation health
+  npx beth-copilot land -m "feat: new component"  Commit and push session work
 
 ${COLORS.bright}What gets installed:${COLORS.reset}
   .github/agents/                     7 specialized AI agents
-  .github/skills/                     8 domain knowledge modules
+  .github/skills/                     Domain knowledge modules
   .github/copilot-instructions.md     Copilot configuration
   .vscode/settings.json               Recommended VS Code settings
   AGENTS.md                           Workflow documentation
@@ -938,8 +681,46 @@ function copyDirRecursive(src, dest, options = {}) {
   return copiedFiles;
 }
 
+/**
+ * Derive a task prefix from the project name.
+ * Uses package.json "name" field, falls back to directory name.
+ * Takes the first segment (split on - _ . space), lowercased, up to 6 letters.
+ */
+function deriveTaskPrefix(cwd) {
+  let projectName = '';
+
+  // Try package.json name field
+  const pkgPath = join(cwd, 'package.json');
+  if (existsSync(pkgPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+      if (pkg.name && typeof pkg.name === 'string') {
+        projectName = pkg.name;
+      }
+    } catch {
+      // Ignore parse errors — fall through to directory name
+    }
+  }
+
+  // Fall back to directory name
+  if (!projectName) {
+    projectName = basename(cwd);
+  }
+
+  // Strip npm scope (e.g. @scope/package -> package)
+  projectName = projectName.replace(/^@[^/]+\//, '');
+
+  // Split on common delimiters, take first segment
+  const firstSegment = projectName.split(/[-_. ]+/)[0] || '';
+
+  // Lowercase, keep only letters, take up to 6
+  const prefix = firstSegment.toLowerCase().replace(/[^a-z]/g, '').slice(0, 6);
+
+  return prefix || 'task'; // fallback to 'task' if nothing usable
+}
+
 async function init(options = {}) {
-  const { force = false, skipBacklog = false, skipMcp = false, skipBeads = false } = options;
+  const { force = false, skipBacklog = false, skipMcp = false } = options;
   const cwd = process.cwd();
   
   // Check for updates
@@ -957,11 +738,9 @@ ${COLORS.yellow}╔════════════════════
   if (canAnimate()) {
     await animateBethBanner();
   } else {
-    showBethBannerStatic({ showQuickHelp: false });
+    showBethBannerStatic();
   }
   
-  log(`${COLORS.yellow}Tip: Run with --verbose for detailed diagnostics if you hit issues.${COLORS.reset}`);
-
   // Check if templates exist
   if (!existsSync(TEMPLATES_DIR)) {
     logError('Templates directory not found. Package may be corrupted.');
@@ -1044,151 +823,76 @@ ${COLORS.yellow}╔════════════════════
     }
   }
 
-  // Summary
-  console.log('');
-  if (copiedFiles.length > 0) {
-    logSuccess(`Installed ${copiedFiles.length} files:`);
-    copiedFiles.forEach(f => logInfo(f));
-  } else {
-    logWarning('No files were copied. Use --force to overwrite existing files.');
-  }
-
-  // Check for beads CLI (REQUIRED for Beth)
-  if (!skipBeads) {
-    console.log('');
-    log('Checking beads (required for task tracking)...', COLORS.cyan);
-    
-    let bdPath = getBeadsPath();
-    
-    // Loop until beads is installed
-    while (!bdPath) {
-      logWarning('beads CLI is not installed.');
-      logInfo('Beth requires beads for task tracking. Agents use it to coordinate work.');
-      logInfo('Learn more: https://github.com/steveyegge/beads');
-      console.log('');
-      
-      const shouldInstallBeads = await promptYesNo('Install beads CLI now? (required)');
-      if (shouldInstallBeads) {
-        const installed = await installBeads();
-        if (installed) {
-          // Re-check for beads after installation
-          bdPath = getBeadsPath();
-          if (!bdPath) {
-            console.log('');
-            logWarning('beads installed but not found in common paths.');
-            logInfo('The installer may have placed it in a custom location.');
-            console.log('');
-            logInfo('Please try one of these options:');
-            logInfo('  1. Open a NEW terminal and run: npx beth-copilot init');
-            logInfo('  2. Add ~/.local/bin to your PATH and retry');
-            logInfo('  3. Run: source ~/.bashrc (or ~/.zshrc) then retry');
-            console.log('');
-            
-            const retryCheck = await promptYesNo('Retry detection? (select No to enter path manually)');
-            if (retryCheck) {
-              bdPath = getBeadsPath();
-              continue;
-            }
-            
-            // Allow manual path entry
-            const customPath = await promptForInput('Enter full path to bd binary (or press Enter to retry installation):');
-            if (customPath) {
-              const validation = validateBeadsPath(customPath);
-              if (validation.valid) {
-                bdPath = validation.normalizedPath;
-                logSuccess(`Found beads at: ${bdPath}`);
-              } else {
-                logError(`Invalid path: ${validation.error}`);
-              }
-            }
-          }
-        } else {
-          console.log('');
-          logError('Installation script failed.');
-          logInfo('You can try installing manually:');
-          logInfo('  curl -fsSL https://raw.githubusercontent.com/steveyegge/beads/main/scripts/install.sh | bash');
-          console.log('');
-        }
-      } else {
-        console.log('');
-        logError('beads is REQUIRED for Beth to function.');
-        logInfo('Beth agents use beads to track tasks, dependencies, and coordinate work.');
-        logInfo('Without beads, the multi-agent workflow will not work correctly.');
-        console.log('');
-        
-        const tryAgain = await promptYesNo('Would you like to try installing beads?');
-        if (!tryAgain) {
-          logError('Cannot continue without beads. Exiting.');
-          logInfo('Install beads manually and run "npx beth-copilot init" again:');
-          logInfo('  npm install -g @beads/bd');
-          process.exit(1);
-        }
-      }
-    }
-    
-    // Show path info if not in standard PATH
-    if (bdPath && bdPath !== 'bd') {
-      logSuccess(`beads CLI found at: ${bdPath}`);
-      const isWindows = process.platform === 'win32';
-      if (isWindows) {
-        logInfo('Tip: Ensure npm global bin is in your PATH to use "bd" directly.');
-      } else {
-        logInfo('Tip: Add ~/.local/bin or npm global bin to your PATH to use "bd" directly.');
-      }
-    } else {
-      logSuccess('beads CLI is installed');
+  // Install .vscode/mcp.json with required MCP servers (unless --skip-mcp)
+  if (!skipMcp) {
+    const mcpJsonDest = join(cwd, '.vscode', 'mcp.json');
+    if (!existsSync(join(cwd, '.vscode'))) {
+      mkdirSync(join(cwd, '.vscode'), { recursive: true });
     }
     
-    // Initialize beads in the project if not already done
-    if (!isBeadsInitialized(cwd)) {
-      logInfo('beads not initialized in this project.');
-      let initialized = false;
-      
-      while (!initialized) {
-        const shouldInitBeads = await promptYesNo('Initialize beads now? (required)');
-        if (shouldInitBeads) {
-          initialized = await initializeBeads(cwd);
-          if (!initialized) {
-            logWarning('Initialization failed. Let\'s try again.');
-          }
+    if (existsSync(mcpJsonDest) && !force) {
+      // Verify existing mcp.json has the required servers
+      try {
+        const existing = JSON.parse(readFileSync(mcpJsonDest, 'utf-8'));
+        const missing = [];
+        if (!existing.servers?.playwright) missing.push('playwright');
+        if (!existing.servers?.backlog) missing.push('backlog');
+        
+        if (missing.length > 0) {
+          logWarning(`.vscode/mcp.json exists but missing required servers: ${missing.join(', ')}`);
+          logInfo('Add them manually or run with --force to overwrite');
         } else {
-          logError('beads must be initialized for Beth to work correctly.');
-          logInfo('The .beads directory stores task tracking data used by all agents.');
-          console.log('');
+          logSuccess('.vscode/mcp.json already has required MCP servers');
         }
+      } catch {
+        logWarning('.vscode/mcp.json exists but could not be parsed — verify it manually');
       }
     } else {
-      logSuccess('beads is initialized in this project');
+      const mcpTemplateSrc = join(TEMPLATES_DIR, 'mcp.json.example');
+      if (existsSync(mcpTemplateSrc)) {
+        copyFileSync(mcpTemplateSrc, mcpJsonDest);
+        copiedFiles.push('.vscode/mcp.json');
+      }
     }
-  } else {
-    logWarning('Skipped beads check (--skip-beads). Beth may not function correctly.');
   }
 
-  // Run bd doctor to verify beads configuration
-  if (!skipBeads && getBeadsPath() && isBeadsInitialized(cwd)) {
-    await runBeadsDoctor();
+  // Initialize Backlog.md project with derived task prefix (unless skipped)
+  if (!skipBacklog) {
+    const backlogConfigPath = join(cwd, 'backlog', 'config.yml');
+    if (!existsSync(backlogConfigPath) || force) {
+      const taskPrefix = deriveTaskPrefix(cwd);
+      const dirName = basename(cwd);
+      try {
+        execFileSync(
+          'backlog',
+          ['init', dirName, '--defaults', '--task-prefix', taskPrefix.toUpperCase(), '--integration-mode', 'mcp', '--auto-open-browser', 'false', '--bypass-git-hooks', 'true'],
+          { cwd, stdio: 'pipe', encoding: 'utf-8' }
+        );
+        logSuccess(`Initialized Backlog.md with task prefix: ${taskPrefix.toUpperCase()}`);
+        copiedFiles.push('backlog/config.yml');
+      } catch (err) {
+        logWarning('Could not initialize Backlog.md — is the backlog CLI installed?');
+        logInfo('Install with: npm install -g backlog-md');
+        logDebug(err.message || String(err));
+      }
+    } else {
+      logSuccess('Backlog.md already initialized (backlog/config.yml exists)');
+    }
   }
 
-  // Install pre-push guard hook
-  if (!skipBeads && isBeadsInitialized(cwd)) {
-    installPrePushGuard(cwd);
+  // Summary
+  console.log('');
+  if (copiedFiles.length > 0) {
+    logSuccess(`Installed ${copiedFiles.length} files:`);
+    copiedFiles.forEach(f => logInfo(f));
+  } else {
+    logWarning('No files were copied. Use --force to overwrite existing files.');
   }
 
   // Final verification
   console.log('');
   log('Verifying installation...', COLORS.cyan);
-  
-  const finalBeadsOk = skipBeads || getBeadsPath();
-  const finalBeadsInit = skipBeads || isBeadsInitialized(cwd);
-  
-  if (finalBeadsOk && finalBeadsInit) {
-    logSuccess('All dependencies installed and configured!');
-  } else {
-    if (!finalBeadsOk) logError('beads CLI not found');
-    if (!finalBeadsInit) logError('beads not initialized in project');
-    logError('Setup incomplete. Please resolve issues above and run init again.');
-    process.exit(1);
-  }
+  logSuccess('All files installed and configured!');
 
   // Next steps
   console.log(`
@@ -1197,25 +901,226 @@ ${COLORS.bright}Next steps:${COLORS.reset}
   2. Open Copilot Chat (${COLORS.cyan}Ctrl+Alt+I${COLORS.reset} / ${COLORS.cyan}Cmd+Alt+I${COLORS.reset})
   3. Type ${COLORS.cyan}@Beth${COLORS.reset} to start - she's your orchestrator
 
-${COLORS.bright}Pro tip:${COLORS.reset} Start every session with ${COLORS.cyan}@Beth${COLORS.reset} and let her route work to the right specialists.
+${COLORS.bright}Pro tip:${COLORS.reset} Start every session with ${COLORS.cyan}@Beth${COLORS.reset} and let her route work to the right specialists.`);
 
-${COLORS.bright}Documentation:${COLORS.reset}
-  https://github.com/stephschofield/beth
-
-${COLORS.cyan}"They broke my wings and forgot I had claws."${COLORS.reset}
+  // Commands at the bottom — easy to find and copy-paste
+  console.log(`
+${COLORS.bright}Commands:${COLORS.reset}
+  ${COLORS.cyan}npx beth-copilot update${COLORS.reset}     Update Beth to the latest templates
+  ${COLORS.cyan}npx beth-copilot doctor${COLORS.reset}     Check system health and dependencies
+  ${COLORS.cyan}npx beth-copilot land${COLORS.reset}       Automated session completion (test, commit, push)
+  ${COLORS.cyan}npx beth-copilot help${COLORS.reset}       Show all commands, options, and documentation
 `);
+
+  console.log(`${COLORS.dim}Tip: Run with --verbose for detailed diagnostics if you hit issues.${COLORS.reset}`);
+  console.log(`${COLORS.dim}Documentation: https://github.com/stephschofield/beth${COLORS.reset}`);
+  console.log(`${COLORS.cyan}"They broke my wings and forgot I had claws."${COLORS.reset}`);
+  console.log('');
+}
+
+/**
+ * Uninstall Beth from the current project.
+ * Removes all files/directories that init installed.
+ */
+async function uninstall() {
+  const cwd = process.cwd();
+  const args = process.argv.slice(3);
+  const forceFlag = args.includes('--force') || args.includes('-f');
+
+  showBethBannerStatic();
+
+  console.log(`${COLORS.bright}${COLORS.red}Uninstalling Beth...${COLORS.reset}\n`);
+
+  // Verify there's actually a Beth installation here
+  const githubDir = join(cwd, '.github');
+  const agentsDir = join(githubDir, 'agents');
+  const hasInstallation = existsSync(agentsDir) || existsSync(join(cwd, 'AGENTS.md'));
+
+  if (!hasInstallation) {
+    logWarning('No Beth installation detected in this directory.');
+    console.log('Are you in the right project? Beth installs into .github/agents/ and AGENTS.md.');
+    process.exit(0);
+  }
+
+  // --- Build the removal manifest ---
+  // Only remove files/dirs that Beth actually installs (from templates)
+
+  // Directories Beth owns entirely
+  const bethOwnedDirs = [
+    join(githubDir, 'agents'),
+    join(githubDir, 'skills'),
+    join(githubDir, 'hooks'),
+  ];
+
+  // Individual files Beth installs
+  const bethOwnedFiles = [
+    join(githubDir, 'copilot-instructions.md'),
+    join(githubDir, 'copilot-mcp-config.json'),
+    join(githubDir, 'pull_request_template.md'),
+    join(githubDir, 'dependabot.yml'),
+    join(cwd, 'AGENTS.md'),
+    join(cwd, 'Backlog.md'),
+    join(cwd, 'mcp.json.example'),
+    join(cwd, '.vscode', 'settings.json'),
+    join(cwd, '.vscode', 'mcp.json'),
+  ];
+
+  // Git pre-push hook (Beth appends a guard block)
+  const prePushHook = join(cwd, '.git', 'hooks', 'pre-push');
+
+  // Backlog.md directory (created by `backlog init`)
+  const backlogDir = join(cwd, 'backlog');
+
+  // --- Collect what actually exists ---
+  const dirsToRemove = bethOwnedDirs.filter(d => existsSync(d));
+  const filesToRemove = bethOwnedFiles.filter(f => existsSync(f));
+  const hasBacklogDir = existsSync(backlogDir);
+  const hasPrePushGuard = existsSync(prePushHook) && readFileSync(prePushHook, 'utf-8').includes(BETH_GUARD_BEGIN);
+
+  if (dirsToRemove.length === 0 && filesToRemove.length === 0 && !hasBacklogDir && !hasPrePushGuard) {
+    logWarning('Nothing to remove — Beth files have already been cleaned up.');
+    process.exit(0);
+  }
+
+  // --- Show what will be removed ---
+  console.log(`${COLORS.bright}The following will be removed:${COLORS.reset}\n`);
+
+  for (const dir of dirsToRemove) {
+    logInfo(`${relative(cwd, dir)}/  (directory)`);
+  }
+  for (const file of filesToRemove) {
+    logInfo(`${relative(cwd, file)}`);
+  }
+  if (hasBacklogDir) {
+    logInfo('backlog/  (directory — Backlog.md task data)');
+  }
+  if (hasPrePushGuard) {
+    logInfo('.git/hooks/pre-push  (Beth guard block will be removed)');
+  }
+
+  console.log('');
+
+  // --- Confirm unless --force ---
+  if (!forceFlag) {
+    const confirmed = await promptYesNo(`${COLORS.yellow}Are you sure you want to remove Beth from this project?${COLORS.reset}`);
+    if (!confirmed) {
+      console.log('\nUninstall cancelled. Beth lives to fight another day.');
+      process.exit(0);
+    }
+  }
+
+  console.log('');
+  const removed = [];
+
+  // --- Remove directories ---
+  for (const dir of dirsToRemove) {
+    try {
+      rmSync(dir, { recursive: true, force: true });
+      removed.push(relative(cwd, dir) + '/');
+      logSuccess(`Removed ${relative(cwd, dir)}/`);
+    } catch (err) {
+      logError(`Failed to remove ${relative(cwd, dir)}/: ${err.message}`);
+    }
+  }
+
+  // --- Remove files ---
+  for (const file of filesToRemove) {
+    try {
+      unlinkSync(file);
+      removed.push(relative(cwd, file));
+      logSuccess(`Removed ${relative(cwd, file)}`);
+    } catch (err) {
+      logError(`Failed to remove ${relative(cwd, file)}: ${err.message}`);
+    }
+  }
+
+  // --- Remove backlog directory ---
+  if (hasBacklogDir) {
+    try {
+      rmSync(backlogDir, { recursive: true, force: true });
+      removed.push('backlog/');
+      logSuccess('Removed backlog/');
+    } catch (err) {
+      logError(`Failed to remove backlog/: ${err.message}`);
+    }
+  }
+
+  // --- Clean pre-push hook ---
+  if (hasPrePushGuard) {
+    try {
+      const hookContent = readFileSync(prePushHook, 'utf-8');
+      const beginIdx = hookContent.indexOf(BETH_GUARD_BEGIN);
+      const endIdx = hookContent.indexOf(BETH_GUARD_END);
+
+      if (beginIdx !== -1 && endIdx !== -1) {
+        const cleaned = hookContent.slice(0, beginIdx) + hookContent.slice(endIdx + BETH_GUARD_END.length + 1);
+        const trimmed = cleaned.trim();
+
+        if (trimmed === '' || trimmed === '#!/bin/sh' || trimmed === '#!/bin/bash') {
+          // Hook is now empty — remove the whole file
+          unlinkSync(prePushHook);
+          logSuccess('Removed .git/hooks/pre-push (was Beth-only)');
+        } else {
+          writeFileSync(prePushHook, cleaned);
+          logSuccess('Removed Beth guard block from .git/hooks/pre-push');
+        }
+        removed.push('.git/hooks/pre-push (guard block)');
+      }
+    } catch (err) {
+      logError(`Failed to clean pre-push hook: ${err.message}`);
+    }
+  }
+
+  // --- Clean up empty parent directories ---
+  // If .github/ is now empty, remove it
+  if (existsSync(githubDir)) {
+    try {
+      const remaining = readdirSync(githubDir);
+      if (remaining.length === 0) {
+        rmSync(githubDir, { recursive: true, force: true });
+        logSuccess('Removed empty .github/');
+      }
+    } catch {
+      // Not critical
+    }
+  }
+
+  // If .vscode/ is now empty, remove it
+  const vscodeDir = join(cwd, '.vscode');
+  if (existsSync(vscodeDir)) {
+    try {
+      const remaining = readdirSync(vscodeDir);
+      if (remaining.length === 0) {
+        rmSync(vscodeDir, { recursive: true, force: true });
+        logSuccess('Removed empty .vscode/');
+      }
+    } catch {
+      // Not critical
+    }
+  }
+
+  // --- Summary ---
+  console.log('');
+  if (removed.length > 0) {
+    logSuccess(`Removed ${removed.length} items. Beth has left the building.`);
+    console.log(`\n${COLORS.dim}To reinstall: npx beth-copilot init${COLORS.reset}`);
+  } else {
+    logWarning('No items were removed. Check file permissions.');
+  }
+
+  console.log(`\n${COLORS.cyan}"I'm not leaving. I'm choosing to go."${COLORS.reset}\n`);
 }
 
 // Input validation constants
-const ALLOWED_COMMANDS = ['init', 'help', '--help', '-h', 'doctor', 'quickstart', 'close', 'pre-push-guard'];
-const ALLOWED_FLAGS = ['--force', '--skip-backlog', '--skip-mcp', '--skip-beads', '--verbose', '--reason', '-r', '-f', '--skip-tests', '--skip-backup', '--message', '-m', '--dry-run'];
+const ALLOWED_COMMANDS = ['init', 'help', '--help', '-h', 'doctor', 'quickstart', 'pre-push-guard', 'update', 'land', 'uninstall'];
+const ALLOWED_FLAGS = ['--force', '--skip-backlog', '--skip-mcp', '--verbose', '--reason', '-r', '-f', '--skip-tests', '--message', '-m', '--dry-run', '--check-only'];
 const MAX_ARG_LENGTH = 50;
 
 // Validate and sanitize input
 function validateArgs(args) {
-  // The 'close' and 'land' commands handle their own arg validation
+  // The 'land' and 'update' commands handle their own arg validation
   const command = args[0]?.toLowerCase();
-  if (command === 'close' || command === 'land') return;
+  if (command === 'land' || command === 'update' || command === 'uninstall') return;
 
   for (const arg of args) {
     // Prevent excessively long arguments (log injection, DoS)
@@ -1241,7 +1146,6 @@ const options = {
   force: args.includes('--force'),
   skipBacklog: args.includes('--skip-backlog'),
   skipMcp: args.includes('--skip-mcp'),
-  skipBeads: args.includes('--skip-beads'),
   verbose: args.includes('--verbose'),
 };
 
@@ -1249,8 +1153,8 @@ const options = {
 globalThis.VERBOSE = options.verbose;
 
 // Validate unknown flags (exclude --help which is handled as a command)
-// Skip for 'close' and 'land' commands which handle their own arg parsing
-if (command !== 'close' && command !== 'land') {
+// Skip for 'land' and 'update' commands which handle their own arg parsing
+if (command !== 'land' && command !== 'update' && command !== 'uninstall') {
   const unknownFlags = args.filter(arg => arg.startsWith('--') && !ALLOWED_FLAGS.includes(arg) && arg !== '--help');
   if (unknownFlags.length > 0) {
     logError(`Unknown flag: ${unknownFlags[0].slice(0, MAX_ARG_LENGTH)}`);
@@ -1283,14 +1187,6 @@ switch (command) {
       await quickstart(options);
     }
     break;
-  case 'close':
-    {
-      const { close } = await loadTsCommand('close');
-      // Pass raw args after 'close' — the command handles its own parsing
-      const closeArgs = process.argv.slice(3);
-      await close(closeArgs);
-    }
-    break;
   case 'land':
     {
       const { land } = await loadTsCommand('land');
@@ -1299,12 +1195,30 @@ switch (command) {
       await land(landArgs);
     }
     break;
+  case 'update':
+    {
+      const { update } = await loadTsCommand('update');
+      const updateArgs = process.argv.slice(3);
+      await update(updateArgs);
+    }
+    break;
   case 'pre-push-guard':
     {
       const { prePushGuard } = await loadTsCommand('pre-push-guard');
       await prePushGuard();
     }
     break;
+  case 'uninstall':
+    try {
+      await uninstall();
+    } catch (error) {
+      if (error instanceof UserError) {
+        showUserError(error);
+        process.exit(1);
+      }
+      throw error;
+    }
+    break;
   case 'help':
   case '--help':
   case '-h':