beth-copilot 1.0.18 → 1.1.0

package/bin/cli.js

@@ -775,6 +775,77 @@ async function runBeadsDoctor() {
   });
 }
 
+const BETH_GUARD_BEGIN = '# --- BEGIN BETH GUARD ---';
+const BETH_GUARD_END = '# --- END BETH GUARD ---';
+
+/**
+ * Generate the shell script to append to the pre-push hook.
+ * Pure shell — no Node dependency at hook time for speed.
+ */
+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}
+`;
+}
+
+/**
+ * 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 });
   console.log(`${COLORS.bright}Beth${COLORS.reset} - AI Orchestrator for GitHub Copilot
@@ -782,65 +853,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 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}
   --force                             Overwrite existing files
   --skip-backlog                      Don't create Backlog.md
-  --skip-mcp                          Don't install MCP server configs
+  --skip-mcp                          Don't create mcp.json.example
   --skip-beads                        Skip beads check (not recommended)
   --verbose                           Show detailed diagnostics on errors
-  --client <type>                     Skip interactive prompt. Values:
-                                        vscode, copilot-cli, claude-code, all
 
 ${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 +938,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, skipBeads = false } = options;
   const cwd = process.cwd();
   
   // Check for updates
@@ -1054,27 +962,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 +970,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 +1007,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 +1042,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) {
@@ -1342,27 +1169,9 @@ ${COLORS.yellow}╔════════════════════
     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');
-      }
-    }
+  // Install pre-push guard hook
+  if (!skipBeads && isBeadsInitialized(cwd)) {
+    installPrePushGuard(cwd);
   }
 
   // Final verification
@@ -1381,35 +1190,15 @@ ${COLORS.yellow}╔════════════════════
     process.exit(1);
   }
 
-  // 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 +1207,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', '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 MAX_ARG_LENGTH = 50;
 
 // Validate and sanitize input
 function validateArgs(args) {
+  // The 'close' and 'land' commands handle their own arg validation
+  const command = args[0]?.toLowerCase();
+  if (command === 'close' || command === 'land') return;
+
   for (const arg of args) {
     // Prevent excessively long arguments (log injection, DoS)
     if (arg.length > MAX_ARG_LENGTH) {
@@ -1445,40 +1237,26 @@ 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 'close' and 'land' commands which handle their own arg parsing
+if (command !== 'close' && command !== 'land') {
+  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 +1283,28 @@ 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');
+      // Pass raw args after 'land' — the command handles its own parsing
+      const landArgs = process.argv.slice(3);
+      await land(landArgs);
+    }
+    break;
+  case 'pre-push-guard':
+    {
+      const { prePushGuard } = await loadTsCommand('pre-push-guard');
+      await prePushGuard();
+    }
+    break;
   case 'help':
   case '--help':
   case '-h':

package/dist/__tests__/smoke.test.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Smoke Test — Vitest Infrastructure Verification
+ *
+ * Proves the new Vitest test infrastructure works correctly
+ * alongside the existing node:test-based tests.
+ */
+export {};
+//# sourceMappingURL=smoke.test.d.ts.map

package/dist/__tests__/smoke.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"smoke.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/smoke.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}