beth-copilot 1.0.18 → 2.0.0

package/bin/cli.js

@@ -2,10 +2,9 @@
 
 import { fileURLToPath } from 'url';
 import { dirname, join, relative } from 'path';
-import { existsSync, mkdirSync, readdirSync, statSync, copyFileSync, readFileSync, writeFileSync, unlinkSync } from 'fs';
+import { existsSync, mkdirSync, readdirSync, statSync, copyFileSync, readFileSync, writeFileSync, unlinkSync, chmodSync } from 'fs';
 import { createRequire } from 'module';
 import { execSync, spawn } from 'child_process';
-import { validateBeadsPath, validateBinaryPath } from './lib/pathValidation.js';
 
 const require = createRequire(import.meta.url);
 const __filename = fileURLToPath(import.meta.url);
@@ -518,59 +517,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,178 +547,46 @@ 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');
-}
+const BETH_GUARD_BEGIN = '# --- BEGIN BETH GUARD ---';
+const BETH_GUARD_END = '# --- END BETH GUARD ---';
 
 /**
- * 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
+ * Generate the shell script to append to the pre-push hook.
+ * Pure shell — no Node dependency at hook time for speed.
  */
-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);
-    });
-  });
+function generateGuardScript() {
+  return `
+${BETH_GUARD_BEGIN}
+# Branch discipline enforcement — installed by beth-copilot
+# Bypass: BETH_SKIP_PUSH_GUARD=1 git push
+if [ "\$BETH_SKIP_PUSH_GUARD" = "1" ]; then
+  echo "⚠ Pre-push guard bypassed (BETH_SKIP_PUSH_GUARD=1)" >&2
+else
+  _beth_branch=\$(git branch --show-current 2>/dev/null)
+
+  # Block pushes from protected branches
+  case "\$_beth_branch" in
+    main|master)
+      echo "✗ Pushing from '\$_beth_branch' is blocked. Work on an epic branch." >&2
+      echo "  Set BETH_SKIP_PUSH_GUARD=1 to bypass." >&2
+      exit 1
+      ;;
+  esac
+
+  # Warn if not on an epic or release branch
+  case "\$_beth_branch" in
+    epic/*) ;;
+    release/*) ;;
+    "")
+      echo "⚠ Detached HEAD — no branch name. Proceeding anyway." >&2
+      ;;
+    *)
+      echo "⚠ Branch '\$_beth_branch' doesn't follow the epic/<id> convention." >&2
+      ;;
+  esac
+fi
+${BETH_GUARD_END}
+`;
 }
 
 function showHelp() {
@@ -782,65 +596,43 @@ function showHelp() {
 ${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 quickstart         Run init + doctor + beads setup
+  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 update [options]    Update project files to latest templates
+  npx beth-copilot quickstart         Run init + doctor
   npx beth-copilot help               Show this help message
 
 ${COLORS.bright}Options:${COLORS.reset}
   --force                             Overwrite existing files
   --skip-backlog                      Don't create Backlog.md
-  --skip-mcp                          Don't install MCP server configs
-  --skip-beads                        Skip beads check (not recommended)
+  --skip-mcp                          Don't create mcp.json.example
   --verbose                           Show detailed diagnostics on errors
-  --client <type>                     Skip interactive prompt. Values:
-                                        vscode, copilot-cli, claude-code, all
+  --check-only                        Check for updates without modifying files
 
 ${COLORS.bright}Examples:${COLORS.reset}
-  npx beth-copilot init               Set up Beth (interactive client selection)
-  npx beth-copilot init --client vscode         VS Code + Copilot only
-  npx beth-copilot init --client claude-code    Claude Code only
-  npx beth-copilot init --client all            All clients
+  npx beth-copilot init               Set up Beth in current project
   npx beth-copilot init --force       Overwrite existing Beth files
   npx beth-copilot doctor             Verify installation health
 
 ${COLORS.bright}What gets installed:${COLORS.reset}
-  ${COLORS.dim}Shared (all clients):${COLORS.reset}
-    .github/skills/                   Domain knowledge modules
-    AGENTS.md                         Workflow documentation
-    Backlog.md                        Task tracking file
-
-  ${COLORS.dim}VS Code + GitHub Copilot:${COLORS.reset}
-    .github/agents/                   7 specialized AI agents
-    .github/copilot-instructions.md   Copilot configuration
-    .vscode/settings.json             Recommended VS Code settings
-    .vscode/mcp.json                  MCP servers (beads, shadcn, playwright, deepwiki)
-
-  ${COLORS.dim}GitHub Copilot CLI:${COLORS.reset}
-    .github/copilot-instructions.md   Copilot configuration
-
-  ${COLORS.dim}Claude Code:${COLORS.reset}
-    CLAUDE.md                         Claude Code instructions
-
-${COLORS.bright}Supported clients:${COLORS.reset}
-  VS Code with GitHub Copilot         Full agent orchestration with MCP
-  GitHub Copilot CLI                  Terminal-based with bd CLI
-  Claude Code                         CLAUDE.md + bd setup claude hooks
+  .github/agents/                     7 specialized AI agents
+  .github/skills/                     8 domain knowledge modules
+  .github/copilot-instructions.md     Copilot configuration
+  .vscode/settings.json               Recommended VS Code settings
+  AGENTS.md                           Workflow documentation
+  Backlog.md                          Task tracking file
+  mcp.json.example                    Optional MCP server config
+
+${COLORS.bright}After installation:${COLORS.reset}
+  1. Open project in VS Code
+  2. Open Copilot Chat (Ctrl+Alt+I / Cmd+Alt+I)
+  3. Type @Beth to start working
 
 ${COLORS.bright}Documentation:${COLORS.reset}
   https://github.com/stephschofield/beth
 `);
 }
 
-/**
- * Persist client selection to .github/.beth-client.json
- * So quickstart and other commands know which client was configured.
- */
-function persistClientConfig(cwd, clients) {
-  const configDir = join(cwd, '.github');
-  const configPath = join(configDir, '.beth-client.json');
-  mkdirSync(configDir, { recursive: true });
-  writeFileSync(configPath, JSON.stringify(clients, null, 2) + '\n');
-}
-
 function copyDirRecursive(src, dest, options = {}) {
   const { force = false, copiedFiles = [] } = options;
   
@@ -889,149 +681,8 @@ function copyDirRecursive(src, dest, options = {}) {
   return copiedFiles;
 }
 
-/**
- * Prompt the user to select their AI coding client(s).
- * Returns an object with boolean flags for each client.
- */
-async function promptForClient() {
-  console.log('');
-  log('Which AI coding tool are you using?', COLORS.bright);
-  console.log('');
-  console.log(`  ${COLORS.cyan}[1]${COLORS.reset} VS Code with GitHub Copilot`);
-  console.log(`  ${COLORS.cyan}[2]${COLORS.reset} GitHub Copilot CLI (terminal)`);
-  console.log(`  ${COLORS.cyan}[3]${COLORS.reset} Claude Code`);
-  console.log(`  ${COLORS.cyan}[a]${COLORS.reset} All of the above`);
-  console.log('');
-  
-  const answer = await promptForInput('Enter selection (1/2/3/a, or comma-separated e.g. 1,3):');
-  
-  if (!answer || answer.toLowerCase() === 'a') {
-    return { vscode: true, copilotCli: true, claudeCode: true };
-  }
-  
-  const selections = answer.split(',').map(s => s.trim());
-  return {
-    vscode: selections.includes('1'),
-    copilotCli: selections.includes('2'),
-    claudeCode: selections.includes('3'),
-  };
-}
-
-/**
- * Parse --client flag value into client selection object.
- */
-function parseClientFlag(clientArg) {
-  if (!clientArg || clientArg === 'all') {
-    return { vscode: true, copilotCli: true, claudeCode: true };
-  }
-  return {
-    vscode: clientArg === 'vscode',
-    copilotCli: clientArg === 'copilot-cli',
-    claudeCode: clientArg === 'claude-code',
-  };
-}
-
-/**
- * Install beads-mcp (MCP server) for VS Code integration.
- * 
- * SECURITY NOTE - shell:true usage:
- * - Required for cross-platform uv/pip execution
- * - Arguments are HARDCODED - no user input is passed to the shell
- * - Command injection risk: NONE (no dynamic/user-supplied values)
- */
-async function installBeadsMcp() {
-  log('\nInstalling beads-mcp (MCP server for VS Code)...', COLORS.cyan);
-  
-  // Try uv first, then pip
-  const installers = [
-    { cmd: 'uv', args: ['tool', 'install', 'beads-mcp'], label: 'uv tool install beads-mcp' },
-    { cmd: 'pip', args: ['install', 'beads-mcp'], label: 'pip install beads-mcp' },
-  ];
-  
-  for (const installer of installers) {
-    try {
-      execSync(`${installer.cmd} --version`, { stdio: 'ignore' });
-    } catch {
-      logDebug(`${installer.cmd} not found, trying next installer...`);
-      continue;
-    }
-    
-    logInfo(installer.label);
-    
-    // SECURITY: All arguments are hardcoded constants.
-    return new Promise((resolve) => {
-      const child = spawn(installer.cmd, installer.args, {
-        stdio: 'inherit',
-        shell: true,
-      });
-      
-      child.on('close', (code) => {
-        if (code === 0) {
-          logSuccess('beads-mcp installed!');
-          resolve(true);
-        } else {
-          logWarning(`${installer.label} failed.`);
-          resolve(false);
-        }
-      });
-      
-      child.on('error', () => {
-        logWarning(`Failed to run ${installer.cmd}.`);
-        resolve(false);
-      });
-    });
-  }
-  
-  logWarning('Neither uv nor pip found. Install beads-mcp manually:');
-  logInfo('  uv tool install beads-mcp');
-  logInfo('  OR: pip install beads-mcp');
-  return false;
-}
-
-/**
- * Run `bd setup claude` to configure Claude Code integration.
- * 
- * SECURITY NOTE - shell:true usage:
- * - bdPath is validated via getBeadsPath()
- * - Arguments are HARDCODED ('setup', 'claude')
- * - Command injection risk: LOW (bdPath validated, no user input in args)
- */
-async function runBdSetupClaude() {
-  log('\nConfiguring beads for Claude Code...', COLORS.cyan);
-  
-  const bdPath = getBeadsPath();
-  if (!bdPath) {
-    logWarning('Cannot run bd setup claude: bd not found.');
-    logInfo('Run manually after installing beads: bd setup claude');
-    return false;
-  }
-  
-  // SECURITY: bdPath is validated, only hardcoded args.
-  return new Promise((resolve) => {
-    const child = spawn(bdPath, ['setup', 'claude'], {
-      stdio: 'inherit',
-      shell: true,
-    });
-    
-    child.on('close', (code) => {
-      if (code === 0) {
-        logSuccess('Claude Code integration configured!');
-        resolve(true);
-      } else {
-        logWarning('bd setup claude failed. Run manually: bd setup claude');
-        resolve(false);
-      }
-    });
-    
-    child.on('error', () => {
-      logWarning('Failed to run bd setup claude. Run manually: bd setup claude');
-      resolve(false);
-    });
-  });
-}
-
 async function init(options = {}) {
-  const { force = false, skipBacklog = false, skipMcp = false, skipBeads = false, client: clientArg } = options;
+  const { force = false, skipBacklog = false, skipMcp = false } = options;
   const cwd = process.cwd();
   
   // Check for updates
@@ -1054,27 +705,6 @@ ${COLORS.yellow}╔════════════════════
   
   log(`${COLORS.yellow}Tip: Run with --verbose for detailed diagnostics if you hit issues.${COLORS.reset}`);
 
-  // Determine which client(s) to configure
-  let clients;
-  if (clientArg) {
-    clients = parseClientFlag(clientArg);
-  } else {
-    clients = await promptForClient();
-  }
-  
-  // Validate at least one client selected
-  if (!clients.vscode && !clients.copilotCli && !clients.claudeCode) {
-    logWarning('No client selected. Defaulting to VS Code with GitHub Copilot.');
-    clients.vscode = true;
-  }
-  
-  const selectedNames = [];
-  if (clients.vscode) selectedNames.push('VS Code + Copilot');
-  if (clients.copilotCli) selectedNames.push('Copilot CLI');
-  if (clients.claudeCode) selectedNames.push('Claude Code');
-  log(`\nConfiguring for: ${COLORS.cyan}${selectedNames.join(', ')}${COLORS.reset}`);
-
-
   // Check if templates exist
   if (!existsSync(TEMPLATES_DIR)) {
     logError('Templates directory not found. Package may be corrupted.');
@@ -1083,15 +713,13 @@ ${COLORS.yellow}╔════════════════════
 
   const copiedFiles = [];
 
-  // === SHARED FILES (all clients) ===
-  
-  // Copy .github/skills/ (domain knowledge - useful for all clients)
-  const skillsSrc = join(TEMPLATES_DIR, '.github', 'skills');
-  const skillsDest = join(cwd, '.github', 'skills');
+  // Copy .github directory (agents, skills, copilot-instructions.md)
+  const githubSrc = join(TEMPLATES_DIR, '.github');
+  const githubDest = join(cwd, '.github');
   
-  if (existsSync(skillsSrc)) {
-    log('\nInstalling skills (domain knowledge)...');
-    copyDirRecursive(skillsSrc, skillsDest, { force, copiedFiles });
+  if (existsSync(githubSrc)) {
+    log('\nInstalling agents and skills...');
+    copyDirRecursive(githubSrc, githubDest, { force, copiedFiles });
   }
 
   // Copy AGENTS.md
@@ -1122,38 +750,33 @@ ${COLORS.yellow}╔════════════════════
     }
   }
 
-  // === VS CODE + COPILOT FILES ===
-  if (clients.vscode) {
-    log('\nInstalling VS Code + Copilot configuration...');
-    
-    // .github/agents/ (agent definitions with frontmatter)
-    const agentsSrc = join(TEMPLATES_DIR, '.github', 'agents');
-    const agentsDest = join(cwd, '.github', 'agents');
-    if (existsSync(agentsSrc)) {
-      copyDirRecursive(agentsSrc, agentsDest, { force, copiedFiles });
-    }
+  // Copy mcp.json.example (unless skipped)
+  if (!skipMcp) {
+    const mcpSrc = join(TEMPLATES_DIR, 'mcp.json.example');
+    const mcpDest = join(cwd, 'mcp.json.example');
     
-    // .github/copilot-instructions.md
-    const copilotInstructionsSrc = join(TEMPLATES_DIR, '.github', 'copilot-instructions.md');
-    const copilotInstructionsDest = join(cwd, '.github', 'copilot-instructions.md');
-    if (existsSync(copilotInstructionsSrc)) {
-      if (existsSync(copilotInstructionsDest) && !force) {
-        logWarning('Skipped (exists): .github/copilot-instructions.md');
+    if (existsSync(mcpSrc)) {
+      if (existsSync(mcpDest) && !force) {
+        logWarning('Skipped (exists): mcp.json.example');
       } else {
-        mkdirSync(join(cwd, '.github'), { recursive: true });
-        copyFileSync(copilotInstructionsSrc, copilotInstructionsDest);
-        copiedFiles.push('.github/copilot-instructions.md');
+        copyFileSync(mcpSrc, mcpDest);
+        copiedFiles.push('mcp.json.example');
       }
     }
-    
-    // .vscode/settings.json
-    const vscodeDest = join(cwd, '.vscode');
+  }
+
+  // Copy .vscode/settings.json (recommended settings for agent mode)
+  const vscodeSrc = join(TEMPLATES_DIR, '.vscode');
+  const vscodeDest = join(cwd, '.vscode');
+  
+  if (existsSync(vscodeSrc)) {
     if (!existsSync(vscodeDest)) {
       mkdirSync(vscodeDest, { recursive: true });
     }
     
-    const settingsSrc = join(TEMPLATES_DIR, '.vscode', 'settings.json');
+    const settingsSrc = join(vscodeSrc, 'settings.json');
     const settingsDest = join(vscodeDest, 'settings.json');
+    
     if (existsSync(settingsSrc)) {
       if (existsSync(settingsDest) && !force) {
         logWarning('Skipped (exists): .vscode/settings.json');
@@ -1162,61 +785,8 @@ ${COLORS.yellow}╔════════════════════
         copiedFiles.push('.vscode/settings.json');
       }
     }
-    
-    // .vscode/mcp.json (beads + shadcn + playwright + deepwiki)
-    if (!skipMcp) {
-      const mcpJsonSrc = join(TEMPLATES_DIR, '.vscode', 'mcp.json');
-      const mcpJsonDest = join(vscodeDest, 'mcp.json');
-      if (existsSync(mcpJsonSrc)) {
-        if (existsSync(mcpJsonDest) && !force) {
-          logWarning('Skipped (exists): .vscode/mcp.json');
-        } else {
-          copyFileSync(mcpJsonSrc, mcpJsonDest);
-          copiedFiles.push('.vscode/mcp.json');
-        }
-      }
-    }
   }
 
-  // === COPILOT CLI FILES ===
-  if (clients.copilotCli && !clients.vscode) {
-    // Only install copilot-instructions.md if VS Code didn't already do it
-    log('\nInstalling Copilot CLI configuration...');
-    
-    const copilotInstructionsSrc = join(TEMPLATES_DIR, '.github', 'copilot-instructions.md');
-    const copilotInstructionsDest = join(cwd, '.github', 'copilot-instructions.md');
-    if (existsSync(copilotInstructionsSrc)) {
-      if (existsSync(copilotInstructionsDest) && !force) {
-        logWarning('Skipped (exists): .github/copilot-instructions.md');
-      } else {
-        mkdirSync(join(cwd, '.github'), { recursive: true });
-        copyFileSync(copilotInstructionsSrc, copilotInstructionsDest);
-        copiedFiles.push('.github/copilot-instructions.md');
-      }
-    }
-  }
-
-  // === CLAUDE CODE FILES ===
-  if (clients.claudeCode) {
-    log('\nInstalling Claude Code configuration...');
-    
-    // CLAUDE.md
-    const claudeMdSrc = join(TEMPLATES_DIR, 'CLAUDE.md');
-    const claudeMdDest = join(cwd, 'CLAUDE.md');
-    if (existsSync(claudeMdSrc)) {
-      if (existsSync(claudeMdDest) && !force) {
-        logWarning('Skipped (exists): CLAUDE.md');
-      } else {
-        copyFileSync(claudeMdSrc, claudeMdDest);
-        copiedFiles.push('CLAUDE.md');
-      }
-    }
-  }
-
-  // Persist client selection for quickstart and other commands
-  persistClientConfig(cwd, clients);
-  copiedFiles.push('.github/.beth-client.json');
-
   // Summary
   console.log('');
   if (copiedFiles.length > 0) {
@@ -1226,190 +796,20 @@ ${COLORS.yellow}╔════════════════════
     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');
-    }
-    
-    // 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.');
-          }
-        } 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('');
-        }
-      }
-    } else {
-      logSuccess('beads is initialized in this project');
-    }
-  } 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();
-  }
-
-  // === CLIENT-SPECIFIC BEADS INTEGRATION ===
-  if (!skipBeads && getBeadsPath() && isBeadsInitialized(cwd)) {
-    // VS Code: install beads-mcp (MCP server)
-    if (clients.vscode) {
-      const shouldInstallMcp = await promptYesNo('Install beads-mcp for VS Code MCP integration?');
-      if (shouldInstallMcp) {
-        await installBeadsMcp();
-      } else {
-        logInfo('Skipped beads-mcp. Install later with: uv tool install beads-mcp');
-      }
-    }
-    
-    // Claude Code: run bd setup claude
-    if (clients.claudeCode) {
-      const shouldSetupClaude = await promptYesNo('Configure beads for Claude Code? (bd setup claude)');
-      if (shouldSetupClaude) {
-        await runBdSetupClaude();
-      } else {
-        logInfo('Skipped Claude Code setup. Run later: bd setup claude');
-      }
-    }
-  }
-
   // 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 (client-specific)
-  console.log('');
-  log('Next steps:', COLORS.bright);
-  
-  if (clients.vscode) {
-    console.log(`
-  ${COLORS.bright}VS Code + Copilot:${COLORS.reset}
+  // Next steps
+  console.log(`
+${COLORS.bright}Next steps:${COLORS.reset}
   1. Open this project in VS Code
   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`);
-  }
-  
-  if (clients.copilotCli) {
-    console.log(`
-  ${COLORS.bright}Copilot CLI:${COLORS.reset}
-  1. Run ${COLORS.cyan}copilot${COLORS.reset} in your project directory
-  2. Beth's instructions are in ${COLORS.cyan}.github/copilot-instructions.md${COLORS.reset}
-  3. Use ${COLORS.cyan}bd ready${COLORS.reset} to find work, ${COLORS.cyan}bd create${COLORS.reset} to track tasks`);
-  }
-  
-  if (clients.claudeCode) {
-    console.log(`
-  ${COLORS.bright}Claude Code:${COLORS.reset}
-  1. Run ${COLORS.cyan}claude${COLORS.reset} in your project directory
-  2. Beth's instructions are in ${COLORS.cyan}CLAUDE.md${COLORS.reset}
-  3. Use ${COLORS.cyan}bd ready${COLORS.reset} to find work, ${COLORS.cyan}bd prime${COLORS.reset} for session context`);
-  }
+  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.
 
-  console.log(`
 ${COLORS.bright}Documentation:${COLORS.reset}
   https://github.com/stephschofield/beth
 
@@ -1418,13 +818,16 @@ ${COLORS.cyan}"They broke my wings and forgot I had claws."${COLORS.reset}
 }
 
 // Input validation constants
-const ALLOWED_COMMANDS = ['init', 'help', '--help', '-h', 'doctor', 'quickstart'];
-const ALLOWED_FLAGS = ['--force', '--skip-backlog', '--skip-mcp', '--skip-beads', '--verbose', '--client'];
-const ALLOWED_CLIENTS = ['vscode', 'copilot-cli', 'claude-code', 'all'];
+const ALLOWED_COMMANDS = ['init', 'help', '--help', '-h', 'doctor', 'quickstart', 'pre-push-guard', 'update', 'land'];
+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 'land' and 'update' commands handle their own arg validation
+  const command = args[0]?.toLowerCase();
+  if (command === 'land' || command === 'update') return;
+
   for (const arg of args) {
     // Prevent excessively long arguments (log injection, DoS)
     if (arg.length > MAX_ARG_LENGTH) {
@@ -1445,40 +848,25 @@ validateArgs(args);
 
 const command = args[0]?.toLowerCase();
 
-// Parse --client flag value (e.g. --client vscode)
-let clientArg = null;
-const clientFlagIndex = args.indexOf('--client');
-if (clientFlagIndex !== -1 && clientFlagIndex + 1 < args.length) {
-  clientArg = args[clientFlagIndex + 1].toLowerCase();
-  if (!ALLOWED_CLIENTS.includes(clientArg)) {
-    logError(`Invalid client: ${clientArg.slice(0, MAX_ARG_LENGTH)}`);
-    console.log(`Valid clients: ${ALLOWED_CLIENTS.join(', ')}`);
-    process.exit(1);
-  }
-}
-
 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'),
-  client: clientArg,
 };
 
 // Set global verbose flag for logDebug
 globalThis.VERBOSE = options.verbose;
 
 // Validate unknown flags (exclude --help which is handled as a command)
-// Also exclude the value after --client since it's not a flag
-const clientValueIndex = clientFlagIndex !== -1 ? clientFlagIndex + 1 : -1;
-const unknownFlags = args.filter((arg, i) => 
-  arg.startsWith('--') && !ALLOWED_FLAGS.includes(arg) && arg !== '--help' && i !== clientValueIndex
-);
-if (unknownFlags.length > 0) {
-  logError(`Unknown flag: ${unknownFlags[0].slice(0, MAX_ARG_LENGTH)}`);
-  console.log('Run "npx beth-copilot help" for usage information.');
-  process.exit(1);
+// Skip for 'land' and 'update' commands which handle their own arg parsing
+if (command !== 'land' && command !== 'update') {
+  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)}`);
+    console.log('Run "npx beth-copilot help" for usage information.');
+    process.exit(1);
+  }
 }
 
 switch (command) {
@@ -1505,6 +893,27 @@ switch (command) {
       await quickstart(options);
     }
     break;
+  case 'land':
+    {
+      const { land } = await loadTsCommand('land');
+      // Pass raw args after 'land' — the command handles its own parsing
+      const landArgs = process.argv.slice(3);
+      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 'help':
   case '--help':
   case '-h':