@codebakers/cli 3.3.18 → 3.4.1

package/dist/commands/go.d.ts

@@ -3,6 +3,7 @@ interface GoOptions {
 }
 /**
  * Zero-friction entry point - start using CodeBakers instantly
+ * Single command for both trial and paid users
  */
 export declare function go(options?: GoOptions): Promise<void>;
 export {};

package/dist/commands/go.js

@@ -11,6 +11,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const readline_1 = require("readline");
 const config_js_1 = require("../config.js");
+const api_js_1 = require("../lib/api.js");
 const fingerprint_js_1 = require("../lib/fingerprint.js");
 function prompt(question) {
     const rl = (0, readline_1.createInterface)({
@@ -68,6 +69,7 @@ function log(message, options) {
 }
 /**
  * Zero-friction entry point - start using CodeBakers instantly
+ * Single command for both trial and paid users
  */
 async function go(options = {}) {
     log('Starting go command...', options);
@@ -76,19 +78,20 @@ async function go(options = {}) {
     console.log(chalk_1.default.blue(`
   ╔═══════════════════════════════════════════════════════════╗
   ║                                                           ║
-  ║   ${chalk_1.default.bold.white('CodeBakers - Zero Setup Required')}                    ║
+  ║   ${chalk_1.default.bold.white('CodeBakers - Get Started')}                             ║
   ║                                                           ║
   ╚═══════════════════════════════════════════════════════════╝
   `));
     // Check if user already has an API key (paid user)
     log('Checking for existing API key...', options);
-    const apiKey = (0, config_js_1.getApiKey)();
-    if (apiKey) {
-        log(`Found API key: ${apiKey.substring(0, 8)}...`, options);
-        console.log(chalk_1.default.green('  ✓ You\'re already logged in with an API key!\n'));
-        // Still install patterns if not already installed
-        await installPatternsWithApiKey(apiKey, options);
+    const existingApiKey = (0, config_js_1.getApiKey)();
+    if (existingApiKey) {
+        log(`Found API key: ${existingApiKey.substring(0, 8)}...`, options);
+        console.log(chalk_1.default.green('  ✓ You\'re already logged in!\n'));
+        // 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);
@@ -104,21 +107,33 @@ async function go(options = {}) {
         // Install patterns if not already installed
         await installPatterns(existingTrial.trialId, options);
         await configureMCP(options);
+        await showSuccessAndRestart();
         return;
     }
     // Check if trial expired
     if (existingTrial && (0, config_js_1.isTrialExpired)()) {
         console.log(chalk_1.default.yellow('  ⚠️  Your trial has expired.\n'));
-        if (existingTrial.stage === 'anonymous') {
-            console.log(chalk_1.default.white('  Extend your trial for 7 more days with GitHub:\n'));
-            console.log(chalk_1.default.cyan('    codebakers extend\n'));
-            console.log(chalk_1.default.gray('  Or upgrade to Pro ($49/month):\n'));
-            console.log(chalk_1.default.cyan('    codebakers upgrade\n'));
+        // Offer to login with API key or extend
+        console.log(chalk_1.default.white('  Options:\n'));
+        console.log(chalk_1.default.cyan('  [1] Login with API key') + chalk_1.default.gray(' (I have an account)'));
+        console.log(chalk_1.default.cyan('  [2] Extend trial') + chalk_1.default.gray(' (7 more days with GitHub)\n'));
+        const choice = await prompt(chalk_1.default.gray('  Enter 1 or 2: '));
+        if (choice === '1') {
+            await handleApiKeyLogin(options);
+            return;
         }
         else {
-            console.log(chalk_1.default.white('  Ready to upgrade? $49/month for unlimited access:\n'));
-            console.log(chalk_1.default.cyan('    codebakers upgrade\n'));
+            console.log(chalk_1.default.cyan('\n  Run: codebakers extend\n'));
+            return;
         }
+    }
+    // New user - ask how they want to proceed
+    console.log(chalk_1.default.white('  How would you like to get started?\n'));
+    console.log(chalk_1.default.cyan('  [1] Start free 7-day trial') + chalk_1.default.gray(' (no signup required)'));
+    console.log(chalk_1.default.cyan('  [2] Login with API key') + chalk_1.default.gray(' (I have an account)\n'));
+    const choice = await prompt(chalk_1.default.gray('  Enter 1 or 2: '));
+    if (choice === '2') {
+        await handleApiKeyLogin(options);
         return;
     }
     // Start new trial
@@ -183,18 +198,8 @@ async function go(options = {}) {
         await installPatterns(data.trialId, options);
         // Configure MCP
         await configureMCP(options);
-        // Show success message
-        console.log(chalk_1.default.green(`
-  ╔═══════════════════════════════════════════════════════════╗
-  ║  ✅ CodeBakers is ready!                                  ║
-  ║                                                           ║
-  ║  ${chalk_1.default.white('Your 7-day free trial has started.')}                    ║
-  ║                                                           ║
-  ║  ${chalk_1.default.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');
@@ -235,9 +240,50 @@ async function configureMCP(options = {}) {
         }
     }
 }
-async function attemptAutoRestart() {
+/**
+ * Handle API key login flow (for paid users)
+ */
+async function handleApiKeyLogin(options = {}) {
+    console.log(chalk_1.default.white('\n  Enter your API key\n'));
+    console.log(chalk_1.default.gray('  Find it at: https://codebakers.ai/dashboard\n'));
+    const apiKey = await prompt(chalk_1.default.cyan('  API Key: '));
+    if (!apiKey) {
+        console.log(chalk_1.default.red('\n  API key is required.\n'));
+        return;
+    }
+    const spinner = (0, ora_1.default)('Validating API key...').start();
+    try {
+        await (0, api_js_1.validateApiKey)(apiKey);
+        spinner.succeed('API key validated');
+        // Save API key
+        (0, config_js_1.setApiKey)(apiKey);
+        console.log(chalk_1.default.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_1.default.red('\n  Could not validate API key.'));
+        console.log(chalk_1.default.gray('  Check your key at: https://codebakers.ai/dashboard\n'));
+    }
+}
+/**
+ * Show success message and offer to restart
+ */
+async function showSuccessAndRestart() {
     const cwd = process.cwd();
-    console.log(chalk_1.default.yellow('\n  ⚠️  RESTART REQUIRED\n'));
+    console.log(chalk_1.default.green(`
+  ╔═══════════════════════════════════════════════════════════╗
+  ║  ✅ CodeBakers is ready!                                  ║
+  ║                                                           ║
+  ║  ${chalk_1.default.gray('Try: "Build me a todo app with authentication"')}        ║
+  ╚═══════════════════════════════════════════════════════════╝
+  `));
+    console.log(chalk_1.default.yellow('  ⚠️  RESTART REQUIRED\n'));
     console.log(chalk_1.default.gray('  Claude Code needs to restart to load CodeBakers.\n'));
     const answer = await prompt(chalk_1.default.cyan('  Restart Claude Code now? (Y/n): '));
     if (answer === 'n' || answer === 'no') {
@@ -249,7 +295,6 @@ async function attemptAutoRestart() {
     try {
         const isWindows = process.platform === 'win32';
         if (isWindows) {
-            // On Windows, spawn a new Claude process detached and exit
             (0, child_process_1.spawn)('cmd', ['/c', 'start', 'claude'], {
                 cwd,
                 detached: true,
@@ -258,7 +303,6 @@ async function attemptAutoRestart() {
             }).unref();
         }
         else {
-            // On Mac/Linux, spawn claude in new terminal
             (0, child_process_1.spawn)('claude', [], {
                 cwd,
                 detached: true,
@@ -268,12 +312,10 @@ async function attemptAutoRestart() {
         }
         console.log(chalk_1.default.green('  ✓ Claude Code is restarting...\n'));
         console.log(chalk_1.default.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_1.default.yellow('  Could not auto-restart. Please restart Claude Code manually.\n'));
     }
 }

package/dist/commands/install-precommit.d.ts

@@ -0,0 +1 @@
+export declare function installPrecommit(): Promise<void>;

package/dist/commands/install-precommit.js

@@ -0,0 +1,229 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installPrecommit = installPrecommit;
+const chalk_1 = __importDefault(require("chalk"));
+const fs_1 = require("fs");
+const path_1 = require("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);
+});
+`;
+async function installPrecommit() {
+    console.log(chalk_1.default.blue('\n  CodeBakers Pre-Commit Hook Installation\n'));
+    const cwd = process.cwd();
+    // Check if this is a git repository
+    const gitDir = (0, path_1.join)(cwd, '.git');
+    if (!(0, fs_1.existsSync)(gitDir)) {
+        console.log(chalk_1.default.red('  ✗ Not a git repository'));
+        console.log(chalk_1.default.gray('  Initialize git first: git init\n'));
+        process.exit(1);
+    }
+    // Check if this is a CodeBakers project
+    const stateFile = (0, path_1.join)(cwd, '.codebakers.json');
+    if (!(0, fs_1.existsSync)(stateFile)) {
+        console.log(chalk_1.default.yellow('  ⚠️  No .codebakers.json found'));
+        console.log(chalk_1.default.gray('  Run codebakers upgrade first to enable server enforcement\n'));
+    }
+    // Create hooks directory if it doesn't exist
+    const hooksDir = (0, path_1.join)(gitDir, 'hooks');
+    if (!(0, fs_1.existsSync)(hooksDir)) {
+        (0, fs_1.mkdirSync)(hooksDir, { recursive: true });
+    }
+    // Write the pre-commit hook
+    const preCommitPath = (0, path_1.join)(hooksDir, 'pre-commit');
+    (0, fs_1.writeFileSync)(preCommitPath, PRE_COMMIT_SCRIPT);
+    // Make it executable (Unix only, Windows ignores this)
+    try {
+        (0, fs_1.chmodSync)(preCommitPath, '755');
+    }
+    catch {
+        // Windows doesn't support chmod
+    }
+    console.log(chalk_1.default.green('  ✓ Created pre-commit hook'));
+    // Write the validation script
+    const validatePath = (0, path_1.join)(hooksDir, 'validate-session.js');
+    (0, fs_1.writeFileSync)(validatePath, VALIDATE_SESSION_SCRIPT);
+    console.log(chalk_1.default.green('  ✓ Created validation script'));
+    // Check if husky is being used
+    const huskyDir = (0, path_1.join)(cwd, '.husky');
+    if ((0, fs_1.existsSync)(huskyDir)) {
+        // Also install in husky
+        const huskyPreCommit = (0, path_1.join)(huskyDir, 'pre-commit');
+        let huskyContent = '';
+        if ((0, fs_1.existsSync)(huskyPreCommit)) {
+            huskyContent = (0, fs_1.readFileSync)(huskyPreCommit, 'utf-8');
+            if (!huskyContent.includes('validate-session')) {
+                huskyContent += '\n# CodeBakers session enforcement\nnode .git/hooks/validate-session.js\n';
+                (0, fs_1.writeFileSync)(huskyPreCommit, huskyContent);
+                console.log(chalk_1.default.green('  ✓ Added to existing husky pre-commit'));
+            }
+            else {
+                console.log(chalk_1.default.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';
+            (0, fs_1.writeFileSync)(huskyPreCommit, huskyContent);
+            try {
+                (0, fs_1.chmodSync)(huskyPreCommit, '755');
+            }
+            catch {
+                // Windows
+            }
+            console.log(chalk_1.default.green('  ✓ Created husky pre-commit hook'));
+        }
+    }
+    console.log(chalk_1.default.green('\n  ✅ Pre-commit hook installed!\n'));
+    console.log(chalk_1.default.cyan('  What this does:'));
+    console.log(chalk_1.default.gray('  - Blocks commits unless AI called discover_patterns'));
+    console.log(chalk_1.default.gray('  - Blocks commits unless AI called validate_complete'));
+    console.log(chalk_1.default.gray('  - Requires validation to pass before committing'));
+    console.log(chalk_1.default.gray('  - Validation expires after 30 minutes\n'));
+    console.log(chalk_1.default.yellow('  To bypass (not recommended):'));
+    console.log(chalk_1.default.gray('  git commit --no-verify\n'));
+}