beth-copilot 1.0.17 → 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,6 +853,9 @@ 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
 
@@ -1095,6 +1169,11 @@ ${COLORS.yellow}╔════════════════════
     await runBeadsDoctor();
   }
 
+  // Install pre-push guard hook
+  if (!skipBeads && isBeadsInitialized(cwd)) {
+    installPrePushGuard(cwd);
+  }
+
   // Final verification
   console.log('');
   log('Verifying installation...', COLORS.cyan);
@@ -1128,12 +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'];
+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) {
@@ -1166,11 +1249,14 @@ const options = {
 globalThis.VERBOSE = options.verbose;
 
 // Validate unknown flags (exclude --help which is handled as a command)
-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);
+// 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) {
@@ -1197,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"}

package/dist/__tests__/smoke.test.js

@@ -0,0 +1,49 @@
+/**
+ * Smoke Test — Vitest Infrastructure Verification
+ *
+ * Proves the new Vitest test infrastructure works correctly
+ * alongside the existing node:test-based tests.
+ */
+import { describe, it, expect } from 'vitest';
+import { join } from 'node:path';
+import { loadAgents } from '../core/agents/loader.js';
+import { loadSkills } from '../core/skills/loader.js';
+const TEMPLATES_AGENTS_DIR = join(process.cwd(), 'templates', '.github', 'agents');
+const TEMPLATES_SKILLS_DIR = join(process.cwd(), 'templates', '.github', 'skills');
+describe('Smoke Test: Agent Loader', () => {
+    it('should load agents from templates directory', () => {
+        const result = loadAgents(TEMPLATES_AGENTS_DIR);
+        expect(result.errors).toHaveLength(0);
+        expect(result.agents.length).toBeGreaterThanOrEqual(6);
+        const agentIds = result.agents.map((a) => a.id);
+        expect(agentIds).toContain('beth');
+        expect(agentIds).toContain('developer');
+    });
+});
+describe('Smoke Test: Skill Loader', () => {
+    it('should load skills from templates directory', () => {
+        const result = loadSkills(TEMPLATES_SKILLS_DIR);
+        expect(result.errors).toHaveLength(0);
+        expect(result.skills.length).toBeGreaterThanOrEqual(5);
+        const skillIds = result.skills.map((s) => s.id);
+        expect(skillIds).toContain('prd');
+        expect(skillIds).toContain('shadcn-ui');
+    });
+});
+describe('Smoke Test: Barrel Exports', () => {
+    it('should export agent loader functions', async () => {
+        const mod = await import('../index.js');
+        expect(mod.loadAgents).toBeDefined();
+        expect(typeof mod.loadAgents).toBe('function');
+        expect(mod.loadAgent).toBeDefined();
+        expect(typeof mod.loadAgent).toBe('function');
+    });
+    it('should export skill loader functions', async () => {
+        const mod = await import('../index.js');
+        expect(mod.loadSkills).toBeDefined();
+        expect(typeof mod.loadSkills).toBe('function');
+        expect(mod.loadSkill).toBeDefined();
+        expect(typeof mod.loadSkill).toBe('function');
+    });
+});
+//# sourceMappingURL=smoke.test.js.map

package/dist/__tests__/smoke.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"smoke.test.js","sourceRoot":"","sources":["../../src/__tests__/smoke.test.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/beads.e2e.test.d.ts

@@ -0,0 +1,13 @@
+/**
+ * E2E tests for beads (bd) CLI commands that Beth depends on.
+ *
+ * Tests the full lifecycle of bd commands: create, show, list, update,
+ * close, ready, dep, children, and epic workflows.
+ *
+ * These tests run against the REAL beads database. All test issues are
+ * cleaned up in afterAll. Uses --json for deterministic assertions.
+ *
+ * Run with: npx vitest run src/cli/commands/beads.e2e.test.ts
+ */
+export {};
+//# sourceMappingURL=beads.e2e.test.d.ts.map

package/dist/cli/commands/beads.e2e.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"beads.e2e.test.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/beads.e2e.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG"}