@codebakers/cli 3.3.18 → 3.4.1

package/package.json

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

package/src/commands/go.ts

@@ -9,10 +9,12 @@ import {
   setTrialState,
   getApiUrl,
   getApiKey,
+  setApiKey,
   isTrialExpired,
   getTrialDaysRemaining,
   type TrialState,
 } from '../config.js';
+import { validateApiKey } from '../lib/api.js';
 import { getDeviceFingerprint } from '../lib/fingerprint.js';
 
 function prompt(question: string): Promise<string> {
@@ -98,6 +100,7 @@ function log(message: string, options?: GoOptions): void {
 
 /**
  * Zero-friction entry point - start using CodeBakers instantly
+ * Single command for both trial and paid users
  */
 export async function go(options: GoOptions = {}): Promise<void> {
   log('Starting go command...', options);
@@ -107,21 +110,22 @@ export async function go(options: GoOptions = {}): Promise<void> {
   console.log(chalk.blue(`
   ╔═══════════════════════════════════════════════════════════╗
   ║                                                           ║
-  ║   ${chalk.bold.white('CodeBakers - Zero Setup Required')}                    ║
+  ║   ${chalk.bold.white('CodeBakers - Get Started')}                             ║
   ║                                                           ║
   ╚═══════════════════════════════════════════════════════════╝
   `));
 
   // Check if user already has an API key (paid user)
   log('Checking for existing API key...', options);
-  const apiKey = getApiKey();
-  if (apiKey) {
-    log(`Found API key: ${apiKey.substring(0, 8)}...`, options);
-    console.log(chalk.green('  ✓ You\'re already logged in with an API key!\n'));
+  const existingApiKey = getApiKey();
+  if (existingApiKey) {
+    log(`Found API key: ${existingApiKey.substring(0, 8)}...`, options);
+    console.log(chalk.green('  ✓ You\'re already logged in!\n'));
 
-    // Still install patterns if not already installed
-    await installPatternsWithApiKey(apiKey, options);
+    // Install patterns if not already installed
+    await installPatternsWithApiKey(existingApiKey, options);
     await configureMCP(options);
+    await showSuccessAndRestart();
     return;
   }
   log('No API key found, checking trial state...', options);
@@ -140,8 +144,8 @@ export async function go(options: GoOptions = {}): Promise<void> {
 
     // Install patterns if not already installed
     await installPatterns(existingTrial.trialId, options);
-
     await configureMCP(options);
+    await showSuccessAndRestart();
     return;
   }
 
@@ -149,15 +153,31 @@ export async function go(options: GoOptions = {}): Promise<void> {
   if (existingTrial && isTrialExpired()) {
     console.log(chalk.yellow('  ⚠️  Your trial has expired.\n'));
 
-    if (existingTrial.stage === 'anonymous') {
-      console.log(chalk.white('  Extend your trial for 7 more days with GitHub:\n'));
-      console.log(chalk.cyan('    codebakers extend\n'));
-      console.log(chalk.gray('  Or upgrade to Pro ($49/month):\n'));
-      console.log(chalk.cyan('    codebakers upgrade\n'));
+    // Offer to login with API key or extend
+    console.log(chalk.white('  Options:\n'));
+    console.log(chalk.cyan('  [1] Login with API key') + chalk.gray(' (I have an account)'));
+    console.log(chalk.cyan('  [2] Extend trial') + chalk.gray(' (7 more days with GitHub)\n'));
+
+    const choice = await prompt(chalk.gray('  Enter 1 or 2: '));
+
+    if (choice === '1') {
+      await handleApiKeyLogin(options);
+      return;
     } else {
-      console.log(chalk.white('  Ready to upgrade? $49/month for unlimited access:\n'));
-      console.log(chalk.cyan('    codebakers upgrade\n'));
+      console.log(chalk.cyan('\n  Run: codebakers extend\n'));
+      return;
     }
+  }
+
+  // New user - ask how they want to proceed
+  console.log(chalk.white('  How would you like to get started?\n'));
+  console.log(chalk.cyan('  [1] Start free 7-day trial') + chalk.gray(' (no signup required)'));
+  console.log(chalk.cyan('  [2] Login with API key') + chalk.gray(' (I have an account)\n'));
+
+  const choice = await prompt(chalk.gray('  Enter 1 or 2: '));
+
+  if (choice === '2') {
+    await handleApiKeyLogin(options);
     return;
   }
 
@@ -235,19 +255,8 @@ export async function go(options: GoOptions = {}): Promise<void> {
     // Configure MCP
     await configureMCP(options);
 
-    // Show success message
-    console.log(chalk.green(`
-  ╔═══════════════════════════════════════════════════════════╗
-  ║  ✅ CodeBakers is ready!                                  ║
-  ║                                                           ║
-  ║  ${chalk.white('Your 7-day free trial has started.')}                    ║
-  ║                                                           ║
-  ║  ${chalk.gray('Try: "Build me a todo app with authentication"')}        ║
-  ╚═══════════════════════════════════════════════════════════╝
-    `));
-
-    // Attempt auto-restart Claude Code
-    await attemptAutoRestart();
+    // Show success and restart
+    await showSuccessAndRestart();
 
   } catch (error) {
     spinner.fail('Failed to start trial');
@@ -289,10 +298,61 @@ async function configureMCP(options: GoOptions = {}): Promise<void> {
   }
 }
 
-async function attemptAutoRestart(): Promise<void> {
+/**
+ * Handle API key login flow (for paid users)
+ */
+async function handleApiKeyLogin(options: GoOptions = {}): Promise<void> {
+  console.log(chalk.white('\n  Enter your API key\n'));
+  console.log(chalk.gray('  Find it at: https://codebakers.ai/dashboard\n'));
+
+  const apiKey = await prompt(chalk.cyan('  API Key: '));
+
+  if (!apiKey) {
+    console.log(chalk.red('\n  API key is required.\n'));
+    return;
+  }
+
+  const spinner = ora('Validating API key...').start();
+
+  try {
+    await validateApiKey(apiKey);
+    spinner.succeed('API key validated');
+
+    // Save API key
+    setApiKey(apiKey);
+    console.log(chalk.green('  ✓ Logged in successfully!\n'));
+
+    // Install patterns
+    await installPatternsWithApiKey(apiKey, options);
+
+    // Configure MCP
+    await configureMCP(options);
+
+    // Show success
+    await showSuccessAndRestart();
+
+  } catch (error) {
+    spinner.fail('Invalid API key');
+    console.log(chalk.red('\n  Could not validate API key.'));
+    console.log(chalk.gray('  Check your key at: https://codebakers.ai/dashboard\n'));
+  }
+}
+
+/**
+ * Show success message and offer to restart
+ */
+async function showSuccessAndRestart(): Promise<void> {
   const cwd = process.cwd();
 
-  console.log(chalk.yellow('\n  ⚠️  RESTART REQUIRED\n'));
+  console.log(chalk.green(`
+  ╔═══════════════════════════════════════════════════════════╗
+  ║  ✅ CodeBakers is ready!                                  ║
+  ║                                                           ║
+  ║  ${chalk.gray('Try: "Build me a todo app with authentication"')}        ║
+  ╚═══════════════════════════════════════════════════════════╝
+  `));
+
+  console.log(chalk.yellow('  ⚠️  RESTART REQUIRED\n'));
   console.log(chalk.gray('  Claude Code needs to restart to load CodeBakers.\n'));
 
   const answer = await prompt(chalk.cyan('  Restart Claude Code now? (Y/n): '));
@@ -309,7 +369,6 @@ async function attemptAutoRestart(): Promise<void> {
     const isWindows = process.platform === 'win32';
 
     if (isWindows) {
-      // On Windows, spawn a new Claude process detached and exit
       spawn('cmd', ['/c', 'start', 'claude'], {
         cwd,
         detached: true,
@@ -317,7 +376,6 @@ async function attemptAutoRestart(): Promise<void> {
         shell: true,
       }).unref();
     } else {
-      // On Mac/Linux, spawn claude in new terminal
       spawn('claude', [], {
         cwd,
         detached: true,
@@ -329,13 +387,10 @@ async function attemptAutoRestart(): Promise<void> {
     console.log(chalk.green('  ✓ Claude Code is restarting...\n'));
     console.log(chalk.gray('  This terminal will close. Claude Code will open in a new window.\n'));
 
-    // Give the spawn a moment to start
     await new Promise(resolve => setTimeout(resolve, 1000));
-
-    // Exit this process
     process.exit(0);
 
-  } catch (error) {
+  } catch {
     console.log(chalk.yellow('  Could not auto-restart. Please restart Claude Code manually.\n'));
   }
 }

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'));
+}