@codebakers/cli 3.3.18 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebakers/cli",
-  "version": "3.3.18",
+  "version": "3.4.0",
   "description": "CodeBakers CLI - Production patterns for AI-assisted development",
   "main": "dist/index.js",
   "bin": {

package/src/commands/install-precommit.ts

@@ -0,0 +1,234 @@
+import chalk from 'chalk';
+import { existsSync, mkdirSync, writeFileSync, chmodSync, readFileSync } from 'fs';
+import { join } from 'path';
+
+const PRE_COMMIT_SCRIPT = `#!/bin/sh
+# CodeBakers Pre-Commit Hook - Session Enforcement
+# Blocks commits unless AI called discover_patterns and validate_complete
+
+# Run the validation script
+node "$(dirname "$0")/validate-session.js"
+exit $?
+`;
+
+const VALIDATE_SESSION_SCRIPT = `#!/usr/bin/env node
+/**
+ * CodeBakers Pre-Commit Validation
+ * Blocks commits unless a valid session exists
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const RED = '\\x1b[31m';
+const GREEN = '\\x1b[32m';
+const YELLOW = '\\x1b[33m';
+const CYAN = '\\x1b[36m';
+const RESET = '\\x1b[0m';
+
+function log(color, message) {
+  console.log(color + message + RESET);
+}
+
+async function validateSession() {
+  const cwd = process.cwd();
+  const stateFile = path.join(cwd, '.codebakers.json');
+
+  // Check if this is a CodeBakers project
+  if (!fs.existsSync(stateFile)) {
+    return { valid: true, reason: 'not-codebakers-project' };
+  }
+
+  let state;
+  try {
+    state = JSON.parse(fs.readFileSync(stateFile, 'utf-8'));
+  } catch (error) {
+    return { valid: false, reason: 'invalid-state-file' };
+  }
+
+  // Check if v6.0 server-enforced mode
+  if (!state.serverEnforced) {
+    return { valid: true, reason: 'legacy-project' };
+  }
+
+  // Check for session token (means discover_patterns was called)
+  const sessionToken = state.currentSessionToken;
+  if (!sessionToken) {
+    // Check if there's a recent passed validation
+    const lastValidation = state.lastValidation;
+    if (!lastValidation || !lastValidation.passed) {
+      return {
+        valid: false,
+        reason: 'no-session',
+        message: 'No active CodeBakers session.\\nAI must call discover_patterns before writing code.'
+      };
+    }
+  }
+
+  // Check session expiry
+  const sessionExpiry = state.sessionExpiresAt;
+  if (sessionExpiry && new Date(sessionExpiry) < new Date()) {
+    return {
+      valid: false,
+      reason: 'session-expired',
+      message: 'CodeBakers session has expired.\\nAI must call discover_patterns again.'
+    };
+  }
+
+  // Check if validation was completed
+  const lastValidation = state.lastValidation;
+  if (!lastValidation) {
+    return {
+      valid: false,
+      reason: 'no-validation',
+      message: 'No validation completed.\\nAI must call validate_complete before committing.'
+    };
+  }
+
+  // Check if validation passed
+  if (!lastValidation.passed) {
+    const issues = lastValidation.issues?.map(i => i.message || i).join(', ') || 'Unknown issues';
+    return {
+      valid: false,
+      reason: 'validation-failed',
+      message: 'Validation failed: ' + issues + '\\nAI must fix issues and call validate_complete again.'
+    };
+  }
+
+  // Check if validation is recent (within last 30 minutes)
+  const validationTime = new Date(lastValidation.timestamp);
+  const thirtyMinutesAgo = new Date(Date.now() - 30 * 60 * 1000);
+  if (validationTime < thirtyMinutesAgo) {
+    return {
+      valid: false,
+      reason: 'validation-stale',
+      message: 'Validation is stale (older than 30 minutes).\\nAI must call validate_complete again.'
+    };
+  }
+
+  return { valid: true, reason: 'session-valid' };
+}
+
+async function main() {
+  console.log('');
+  log(CYAN, '  🍪 CodeBakers Pre-Commit Validation');
+  console.log('');
+
+  const result = await validateSession();
+
+  if (result.valid) {
+    if (result.reason === 'not-codebakers-project') {
+      log(GREEN, '  ✓ Not a CodeBakers project - commit allowed');
+    } else if (result.reason === 'legacy-project') {
+      log(GREEN, '  ✓ Legacy project (pre-6.0) - commit allowed');
+    } else {
+      log(GREEN, '  ✓ Valid CodeBakers session - commit allowed');
+    }
+    console.log('');
+    process.exit(0);
+  } else {
+    log(RED, '  ✗ Commit blocked: ' + result.reason);
+    console.log('');
+    if (result.message) {
+      log(YELLOW, '  ' + result.message.split('\\n').join('\\n  '));
+    }
+    console.log('');
+    log(CYAN, '  How to fix:');
+    log(RESET, '  1. AI must call discover_patterns before writing code');
+    log(RESET, '  2. AI must call validate_complete before saying "done"');
+    log(RESET, '  3. Both tools must pass for commits to be allowed');
+    console.log('');
+    log(YELLOW, '  To bypass (not recommended): git commit --no-verify');
+    console.log('');
+    process.exit(1);
+  }
+}
+
+main().catch(error => {
+  log(RED, '  Error: ' + error.message);
+  process.exit(1);
+});
+`;
+
+export async function installPrecommit(): Promise<void> {
+  console.log(chalk.blue('\n  CodeBakers Pre-Commit Hook Installation\n'));
+
+  const cwd = process.cwd();
+
+  // Check if this is a git repository
+  const gitDir = join(cwd, '.git');
+  if (!existsSync(gitDir)) {
+    console.log(chalk.red('  ✗ Not a git repository'));
+    console.log(chalk.gray('  Initialize git first: git init\n'));
+    process.exit(1);
+  }
+
+  // Check if this is a CodeBakers project
+  const stateFile = join(cwd, '.codebakers.json');
+  if (!existsSync(stateFile)) {
+    console.log(chalk.yellow('  ⚠️  No .codebakers.json found'));
+    console.log(chalk.gray('  Run codebakers upgrade first to enable server enforcement\n'));
+  }
+
+  // Create hooks directory if it doesn't exist
+  const hooksDir = join(gitDir, 'hooks');
+  if (!existsSync(hooksDir)) {
+    mkdirSync(hooksDir, { recursive: true });
+  }
+
+  // Write the pre-commit hook
+  const preCommitPath = join(hooksDir, 'pre-commit');
+  writeFileSync(preCommitPath, PRE_COMMIT_SCRIPT);
+
+  // Make it executable (Unix only, Windows ignores this)
+  try {
+    chmodSync(preCommitPath, '755');
+  } catch {
+    // Windows doesn't support chmod
+  }
+
+  console.log(chalk.green('  ✓ Created pre-commit hook'));
+
+  // Write the validation script
+  const validatePath = join(hooksDir, 'validate-session.js');
+  writeFileSync(validatePath, VALIDATE_SESSION_SCRIPT);
+
+  console.log(chalk.green('  ✓ Created validation script'));
+
+  // Check if husky is being used
+  const huskyDir = join(cwd, '.husky');
+  if (existsSync(huskyDir)) {
+    // Also install in husky
+    const huskyPreCommit = join(huskyDir, 'pre-commit');
+    let huskyContent = '';
+
+    if (existsSync(huskyPreCommit)) {
+      huskyContent = readFileSync(huskyPreCommit, 'utf-8');
+      if (!huskyContent.includes('validate-session')) {
+        huskyContent += '\n# CodeBakers session enforcement\nnode .git/hooks/validate-session.js\n';
+        writeFileSync(huskyPreCommit, huskyContent);
+        console.log(chalk.green('  ✓ Added to existing husky pre-commit'));
+      } else {
+        console.log(chalk.gray('  ✓ Husky hook already configured'));
+      }
+    } else {
+      huskyContent = '#!/usr/bin/env sh\n. "$(dirname -- "$0")/_/husky.sh"\n\n# CodeBakers session enforcement\nnode .git/hooks/validate-session.js\n';
+      writeFileSync(huskyPreCommit, huskyContent);
+      try {
+        chmodSync(huskyPreCommit, '755');
+      } catch {
+        // Windows
+      }
+      console.log(chalk.green('  ✓ Created husky pre-commit hook'));
+    }
+  }
+
+  console.log(chalk.green('\n  ✅ Pre-commit hook installed!\n'));
+  console.log(chalk.cyan('  What this does:'));
+  console.log(chalk.gray('  - Blocks commits unless AI called discover_patterns'));
+  console.log(chalk.gray('  - Blocks commits unless AI called validate_complete'));
+  console.log(chalk.gray('  - Requires validation to pass before committing'));
+  console.log(chalk.gray('  - Validation expires after 30 minutes\n'));
+  console.log(chalk.yellow('  To bypass (not recommended):'));
+  console.log(chalk.gray('  git commit --no-verify\n'));
+}

package/src/commands/upgrade.ts

@@ -1,16 +1,135 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { existsSync, writeFileSync, mkdirSync } from 'fs';
+import { existsSync, writeFileSync, mkdirSync, readFileSync, rmSync, readdirSync, copyFileSync, chmodSync } from 'fs';
 import { join } from 'path';
 import { getApiKey, getApiUrl } from '../config.js';
 import { checkForUpdates, getCliVersion } from '../lib/api.js';
 
+// Pre-commit hook script for session enforcement
+const PRE_COMMIT_SCRIPT = `#!/bin/sh
+# CodeBakers Pre-Commit Hook - Session Enforcement
+# Blocks commits unless AI called discover_patterns and validate_complete
+node "$(dirname "$0")/validate-session.js"
+exit $?
+`;
+
+const VALIDATE_SESSION_SCRIPT = `#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const RED = '\\x1b[31m', GREEN = '\\x1b[32m', YELLOW = '\\x1b[33m', CYAN = '\\x1b[36m', RESET = '\\x1b[0m';
+function log(c, m) { console.log(c + m + RESET); }
+
+async function validate() {
+  const stateFile = path.join(process.cwd(), '.codebakers.json');
+  if (!fs.existsSync(stateFile)) return { valid: true, reason: 'not-codebakers' };
+
+  let state;
+  try { state = JSON.parse(fs.readFileSync(stateFile, 'utf-8')); }
+  catch { return { valid: false, reason: 'invalid-state' }; }
+
+  if (!state.serverEnforced) return { valid: true, reason: 'legacy' };
+
+  const v = state.lastValidation;
+  if (!v) return { valid: false, reason: 'no-validation', msg: 'AI must call validate_complete before commit' };
+  if (!v.passed) return { valid: false, reason: 'failed', msg: 'Validation failed - fix issues first' };
+
+  const age = Date.now() - new Date(v.timestamp).getTime();
+  if (age > 30 * 60 * 1000) return { valid: false, reason: 'stale', msg: 'Validation expired - call validate_complete again' };
+
+  return { valid: true, reason: 'ok' };
+}
+
+async function main() {
+  console.log(''); log(CYAN, '  🍪 CodeBakers Pre-Commit');
+  const r = await validate();
+  if (r.valid) { log(GREEN, '  ✓ Commit allowed'); console.log(''); process.exit(0); }
+  else { log(RED, '  ✗ Blocked: ' + r.reason); if (r.msg) log(YELLOW, '  ' + r.msg);
+    console.log(''); log(YELLOW, '  Bypass: git commit --no-verify'); console.log(''); process.exit(1); }
+}
+main().catch(e => { log(RED, '  Error: ' + e.message); process.exit(1); });
+`;
+
+/**
+ * Install pre-commit hook for session enforcement
+ */
+function installPrecommitHook(cwd: string): void {
+  const gitDir = join(cwd, '.git');
+  if (!existsSync(gitDir)) {
+    console.log(chalk.gray('  ⏭️  Skipping pre-commit hook (not a git repo)'));
+    return;
+  }
+
+  const hooksDir = join(gitDir, 'hooks');
+  if (!existsSync(hooksDir)) {
+    mkdirSync(hooksDir, { recursive: true });
+  }
+
+  // Write pre-commit hook
+  const preCommitPath = join(hooksDir, 'pre-commit');
+  writeFileSync(preCommitPath, PRE_COMMIT_SCRIPT);
+  try { chmodSync(preCommitPath, '755'); } catch { /* Windows */ }
+
+  // Write validation script
+  const validatePath = join(hooksDir, 'validate-session.js');
+  writeFileSync(validatePath, VALIDATE_SESSION_SCRIPT);
+
+  console.log(chalk.green('  ✓ Installed pre-commit hook (blocks commits without validation)'));
+}
+
 interface ContentResponse {
   version: string;
   router: string;
   modules: Record<string, string>;
 }
 
+// Ultra-minimal CLAUDE.md for v6.0 - ALL instructions come from server
+const MINIMAL_CLAUDE_MD = `# CodeBakers v6.0
+
+**MANDATORY: Before writing ANY code, call the \`discover_patterns\` MCP tool.**
+
+\`\`\`
+Tool: discover_patterns
+Args: { task: "description of what you're building" }
+\`\`\`
+
+The server will return:
+- All coding patterns and rules you must follow
+- Test requirements
+- Validation instructions
+
+**You cannot write code without calling this tool first. The server tracks compliance.**
+
+---
+*CodeBakers v6.0 - Server-Enforced*
+`;
+
+// Ultra-minimal .cursorrules for v6.0 - ALL instructions come from server
+const MINIMAL_CURSORRULES = `# CodeBakers v6.0
+
+MANDATORY: Before writing ANY code, call the discover_patterns MCP tool.
+
+Tool: discover_patterns
+Args: { task: "description of what you're building" }
+
+The server returns all patterns, rules, and test requirements.
+You cannot write code without calling this tool first.
+`;
+
+/**
+ * Compare semantic versions (returns true if v1 < v2)
+ */
+function isVersionLessThan(v1: string, v2: string): boolean {
+  const parts1 = v1.split('.').map(Number);
+  const parts2 = v2.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    const p1 = parts1[i] || 0;
+    const p2 = parts2[i] || 0;
+    if (p1 < p2) return true;
+    if (p1 > p2) return false;
+  }
+  return false;
+}
+
 interface ConfirmData {
   version: string;
   moduleCount: number;
@@ -37,6 +156,131 @@ async function confirmDownload(apiUrl: string, apiKey: string, data: ConfirmData
   }
 }
 
+/**
+ * Get current installed version from .claude/.version.json
+ */
+function getCurrentVersion(cwd: string): string | null {
+  const versionFile = join(cwd, '.claude', '.version.json');
+  const codebakersFile = join(cwd, '.codebakers.json');
+
+  try {
+    if (existsSync(versionFile)) {
+      const data = JSON.parse(readFileSync(versionFile, 'utf-8'));
+      return data.version || null;
+    }
+    if (existsSync(codebakersFile)) {
+      const data = JSON.parse(readFileSync(codebakersFile, 'utf-8'));
+      return data.version || null;
+    }
+  } catch {
+    // Ignore errors
+  }
+  return null;
+}
+
+/**
+ * Backup old files before migration
+ */
+function backupOldFiles(cwd: string): void {
+  const backupDir = join(cwd, '.codebakers', 'backup', new Date().toISOString().replace(/[:.]/g, '-'));
+  mkdirSync(backupDir, { recursive: true });
+
+  // Backup CLAUDE.md
+  const claudeMd = join(cwd, 'CLAUDE.md');
+  if (existsSync(claudeMd)) {
+    copyFileSync(claudeMd, join(backupDir, 'CLAUDE.md'));
+  }
+
+  // Backup .cursorrules
+  const cursorrules = join(cwd, '.cursorrules');
+  if (existsSync(cursorrules)) {
+    copyFileSync(cursorrules, join(backupDir, '.cursorrules'));
+  }
+
+  // Backup .claude folder
+  const claudeDir = join(cwd, '.claude');
+  if (existsSync(claudeDir)) {
+    const claudeBackup = join(backupDir, '.claude');
+    mkdirSync(claudeBackup, { recursive: true });
+    const files = readdirSync(claudeDir);
+    for (const file of files) {
+      const src = join(claudeDir, file);
+      const dest = join(claudeBackup, file);
+      try {
+        copyFileSync(src, dest);
+      } catch {
+        // Ignore copy errors
+      }
+    }
+  }
+
+  console.log(chalk.gray(`  Backup saved to: ${backupDir}`));
+}
+
+/**
+ * Migrate to v6.0 server-enforced patterns
+ */
+function migrateToV6(cwd: string): void {
+  console.log(chalk.yellow('\n  📦 Migrating to v6.0 Server-Enforced Patterns...\n'));
+
+  // Backup old files
+  console.log(chalk.gray('  Backing up old files...'));
+  backupOldFiles(cwd);
+
+  // Replace CLAUDE.md with minimal version
+  const claudeMd = join(cwd, 'CLAUDE.md');
+  writeFileSync(claudeMd, MINIMAL_CLAUDE_MD);
+  console.log(chalk.green('  ✓ Updated CLAUDE.md (minimal server-enforced version)'));
+
+  // Replace .cursorrules with minimal version
+  const cursorrules = join(cwd, '.cursorrules');
+  writeFileSync(cursorrules, MINIMAL_CURSORRULES);
+  console.log(chalk.green('  ✓ Updated .cursorrules (minimal server-enforced version)'));
+
+  // Delete .claude folder (patterns now come from server)
+  const claudeDir = join(cwd, '.claude');
+  if (existsSync(claudeDir)) {
+    try {
+      rmSync(claudeDir, { recursive: true, force: true });
+      console.log(chalk.green('  ✓ Removed .claude/ folder (patterns now server-side)'));
+    } catch (error) {
+      console.log(chalk.yellow('  ⚠️  Could not remove .claude/ folder - please delete manually'));
+    }
+  }
+
+  // Create .codebakers directory if it doesn't exist
+  const codebakersDir = join(cwd, '.codebakers');
+  if (!existsSync(codebakersDir)) {
+    mkdirSync(codebakersDir, { recursive: true });
+  }
+
+  // Update version in .codebakers.json
+  const stateFile = join(cwd, '.codebakers.json');
+  let state: Record<string, unknown> = {};
+  if (existsSync(stateFile)) {
+    try {
+      state = JSON.parse(readFileSync(stateFile, 'utf-8'));
+    } catch {
+      // Ignore errors
+    }
+  }
+  state.version = '6.0';
+  state.migratedAt = new Date().toISOString();
+  state.serverEnforced = true;
+  writeFileSync(stateFile, JSON.stringify(state, null, 2));
+
+  // Auto-install pre-commit hook for enforcement
+  installPrecommitHook(cwd);
+
+  console.log(chalk.green('\n  ✅ Migration to v6.0 complete!\n'));
+  console.log(chalk.cyan('  What changed:'));
+  console.log(chalk.gray('  - Patterns are now fetched from server in real-time'));
+  console.log(chalk.gray('  - discover_patterns creates a server-tracked session'));
+  console.log(chalk.gray('  - validate_complete verifies with server before completion'));
+  console.log(chalk.gray('  - Pre-commit hook blocks commits without validation'));
+  console.log(chalk.gray('  - No local pattern files needed\n'));
+}
+
 /**
  * Upgrade CodeBakers patterns to the latest version
  */
@@ -46,9 +290,10 @@ export async function upgrade(): Promise<void> {
   const cwd = process.cwd();
   const claudeMdPath = join(cwd, 'CLAUDE.md');
   const claudeDir = join(cwd, '.claude');
+  const codebakersJson = join(cwd, '.codebakers.json');
 
   // Check if this is a CodeBakers project
-  if (!existsSync(claudeMdPath) && !existsSync(claudeDir)) {
+  if (!existsSync(claudeMdPath) && !existsSync(claudeDir) && !existsSync(codebakersJson)) {
     console.log(chalk.yellow('  No CodeBakers installation found in this directory.\n'));
     console.log(chalk.gray('  Run `codebakers install` to set up patterns first.\n'));
     return;
@@ -72,11 +317,71 @@ export async function upgrade(): Promise<void> {
     return;
   }
 
-  // Fetch latest patterns
-  const spinner = ora('Fetching latest patterns...').start();
+  // Check current version and determine if migration is needed
+  const currentVersion = getCurrentVersion(cwd);
+  const spinner = ora('Checking server for latest version...').start();
 
   try {
     const apiUrl = getApiUrl();
+
+    // Check latest version from server
+    const versionResponse = await fetch(`${apiUrl}/api/content/version`, {
+      method: 'GET',
+      headers: {
+        'Authorization': `Bearer ${apiKey}`,
+      },
+    });
+
+    if (!versionResponse.ok) {
+      throw new Error('Failed to check version');
+    }
+
+    const versionData = await versionResponse.json();
+    const latestVersion = versionData.version;
+
+    spinner.succeed(`Latest version: v${latestVersion}`);
+
+    // Check if we need to migrate to v6.0
+    const needsV6Migration = currentVersion && isVersionLessThan(currentVersion, '6.0') &&
+                             !isVersionLessThan(latestVersion, '6.0');
+
+    if (needsV6Migration || (!currentVersion && !isVersionLessThan(latestVersion, '6.0'))) {
+      // Need to migrate to v6.0 server-enforced patterns
+      migrateToV6(cwd);
+
+      // Confirm migration to server
+      confirmDownload(apiUrl, apiKey, {
+        version: '6.0',
+        moduleCount: 0, // No local modules in v6
+        cliVersion: getCliVersion(),
+        command: 'upgrade-v6-migration',
+      }).catch(() => {});
+
+      return;
+    }
+
+    // For v6.0+, just confirm the installation is up to date
+    const stateFile = join(cwd, '.codebakers.json');
+    let state: Record<string, unknown> = {};
+    if (existsSync(stateFile)) {
+      try {
+        state = JSON.parse(readFileSync(stateFile, 'utf-8'));
+      } catch {
+        // Ignore
+      }
+    }
+
+    if (state.serverEnforced) {
+      // Already on v6.0+ server-enforced mode
+      console.log(chalk.green('\n  ✅ Already using v6.0 server-enforced patterns!\n'));
+      console.log(chalk.gray('  Patterns are fetched from server in real-time.'));
+      console.log(chalk.gray('  No local updates needed.\n'));
+      return;
+    }
+
+    // Legacy upgrade for pre-6.0 versions (fetch full content)
+    const contentSpinner = ora('Fetching latest patterns...').start();
+
     const response = await fetch(`${apiUrl}/api/content`, {
       method: 'GET',
       headers: {
@@ -91,7 +396,7 @@ export async function upgrade(): Promise<void> {
 
     const content: ContentResponse = await response.json();
 
-    spinner.succeed(`Patterns v${content.version} downloaded`);
+    contentSpinner.succeed(`Patterns v${content.version} downloaded`);
 
     // Count what we're updating
     const moduleCount = Object.keys(content.modules).length;
@@ -124,6 +429,10 @@ export async function upgrade(): Promise<void> {
       updatedAt: new Date().toISOString(),
       cliVersion: getCliVersion(),
     };
+
+    if (!existsSync(claudeDir)) {
+      mkdirSync(claudeDir, { recursive: true });
+    }
     writeFileSync(join(claudeDir, '.version.json'), JSON.stringify(versionInfo, null, 2));
     console.log(chalk.green('  ✓ Version info saved'));
 

package/src/index.ts

@@ -7,6 +7,7 @@ import { install } from './commands/install.js';
 import { status } from './commands/status.js';
 import { uninstall } from './commands/uninstall.js';
 import { installHook, uninstallHook } from './commands/install-hook.js';
+import { installPrecommit } from './commands/install-precommit.js';
 import { doctor } from './commands/doctor.js';
 import { init } from './commands/init.js';
 import { serve } from './commands/serve.js';
@@ -471,6 +472,11 @@ program
   .description('Remove the CodeBakers hook from Claude Code')
   .action(uninstallHook);
 
+program
+  .command('install-precommit')
+  .description('Install git pre-commit hook for session enforcement (v6.0)')
+  .action(installPrecommit);
+
 program
   .command('doctor')
   .description('Check if CodeBakers is set up correctly')