@codebakers/cli 3.4.0 → 3.5.0

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
@@ -179,22 +194,12 @@ async function go(options = {}) {
         (0, config_js_1.setTrialState)(trialState);
         spinner.succeed(`Trial started (${data.daysRemaining} days free)`);
         console.log('');
-        // Install patterns (CLAUDE.md and .claude/)
+        // Install v6.0 bootstrap files (CLAUDE.md and .cursorrules only)
         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,135 +312,173 @@ 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'));
     }
 }
+// v6.0 Bootstrap content - minimal files that point to MCP tools
+const V6_CLAUDE_MD = `# CodeBakers v6.0 - Server-Enforced Patterns
+
+**All patterns are server-side. No local pattern files needed.**
+
+## Required MCP Tools
+
+Before writing ANY code, you MUST use these CodeBakers MCP tools:
+
+### 1. discover_patterns (MANDATORY - START GATE)
+Call this BEFORE writing any code:
+\`\`\`
+Tool: discover_patterns
+Args: { task: "what you're about to do", files: ["files to modify"], keywords: ["relevant terms"] }
+\`\`\`
+This returns:
+- Relevant patterns from the server
+- A session token (required for validation)
+- Code examples to follow
+
+### 2. validate_complete (MANDATORY - END GATE)
+Call this BEFORE saying "done" or "complete":
+\`\`\`
+Tool: validate_complete
+Args: { feature: "what you built", files: ["files modified"] }
+\`\`\`
+This checks:
+- You called discover_patterns first (server verifies)
+- Tests exist and pass
+- TypeScript compiles
+- Returns pass/fail from server
+
+## Rules
+
+1. **You CANNOT skip discover_patterns** - Server tracks compliance
+2. **You CANNOT say "done" without validate_complete** - Server must approve
+3. **Follow patterns returned by server** - They are mandatory
+4. **Write tests** - Validation will fail without them
+5. **Fix TypeScript errors** - Validation will fail with errors
+
+## If Server is Unreachable
+
+The tools will show "OFFLINE MODE" if the server can't be reached. In this case:
+- Enforcement is limited to local checks only
+- You should still follow best practices
+- Try again when connection is restored
+
+## Getting Help
+
+- Run \`codebakers doctor\` to diagnose issues
+- Run \`codebakers upgrade\` to update patterns
+- Visit https://codebakers.ai/support for help
+
+---
+*CodeBakers v6.0 - Server-Enforced Patterns*
+`;
+const V6_CURSORRULES = `# CodeBakers v6.0 - Server-Enforced Patterns
+
+All patterns are server-side. No local pattern files needed.
+
+## Required MCP Tools
+
+Before writing ANY code, you MUST use these CodeBakers MCP tools:
+
+### 1. discover_patterns (MANDATORY - START GATE)
+Call this BEFORE writing any code:
+- Tool: discover_patterns
+- Args: { task: "what you're about to do", files: ["files to modify"], keywords: ["relevant terms"] }
+
+Returns:
+- Relevant patterns from the server
+- A session token (required for validation)
+- Code examples to follow
+
+### 2. validate_complete (MANDATORY - END GATE)
+Call this BEFORE saying "done" or "complete":
+- Tool: validate_complete
+- Args: { feature: "what you built", files: ["files modified"] }
+
+Checks:
+- You called discover_patterns first (server verifies)
+- Tests exist and pass
+- TypeScript compiles
+- Returns pass/fail from server
+
+## Rules
+
+1. You CANNOT skip discover_patterns - Server tracks compliance
+2. You CANNOT say "done" without validate_complete - Server must approve
+3. Follow patterns returned by server - They are mandatory
+4. Write tests - Validation will fail without them
+5. Fix TypeScript errors - Validation will fail with errors
+
+## If Server is Unreachable
+
+The tools will show "OFFLINE MODE" if the server can't be reached. In this case:
+- Enforcement is limited to local checks only
+- You should still follow best practices
+- Try again when connection is restored
+
+---
+CodeBakers v6.0 - Server-Enforced Patterns
+`;
 /**
- * Install pattern files for API key users (paid users)
+ * Install v6.0 bootstrap files for API key users (paid users)
+ * Only installs minimal CLAUDE.md and .cursorrules - no .claude/ folder
  */
 async function installPatternsWithApiKey(apiKey, options = {}) {
-    log('Installing patterns with API key...', options);
-    const spinner = (0, ora_1.default)('Installing CodeBakers patterns...').start();
-    const cwd = process.cwd();
-    const apiUrl = (0, config_js_1.getApiUrl)();
-    log(`Fetching from: ${apiUrl}/api/content`, options);
-    try {
-        const response = await fetch(`${apiUrl}/api/content`, {
-            method: 'GET',
-            headers: {
-                'Authorization': `Bearer ${apiKey}`,
-            },
-        });
-        if (!response.ok) {
-            log(`Response not OK: ${response.status} ${response.statusText}`, options);
-            spinner.warn('Could not download patterns');
-            return;
-        }
-        log('Response OK, parsing JSON...', options);
-        const content = await response.json();
-        log(`Received version: ${content.version}, modules: ${Object.keys(content.modules || {}).length}`, options);
-        await writePatternFiles(cwd, content, spinner, options, { apiKey });
-    }
-    catch (error) {
-        log(`Error: ${error instanceof Error ? error.message : String(error)}`, options);
-        spinner.warn('Could not install patterns');
-        console.log(chalk_1.default.gray('  Check your internet connection.\n'));
-    }
+    log('Installing v6.0 bootstrap files (API key user)...', options);
+    await installBootstrapFiles(options, { apiKey });
 }
 /**
- * Install pattern files (CLAUDE.md and .claude/) for trial users
+ * Install v6.0 bootstrap files for trial users
+ * Only installs minimal CLAUDE.md and .cursorrules - no .claude/ folder
  */
 async function installPatterns(trialId, options = {}) {
-    log(`Installing patterns with trial ID: ${trialId.substring(0, 8)}...`, options);
-    const spinner = (0, ora_1.default)('Installing CodeBakers patterns...').start();
+    log(`Installing v6.0 bootstrap files (trial: ${trialId.substring(0, 8)}...)`, options);
+    await installBootstrapFiles(options, { trialId });
+}
+/**
+ * Install v6.0 minimal bootstrap files
+ * - CLAUDE.md: Instructions for Claude Code
+ * - .cursorrules: Instructions for Cursor
+ * - NO .claude/ folder - all patterns are server-side
+ */
+async function installBootstrapFiles(options = {}, auth) {
+    const spinner = (0, ora_1.default)('Installing CodeBakers v6.0...').start();
     const cwd = process.cwd();
-    const apiUrl = (0, config_js_1.getApiUrl)();
     try {
-        // Fetch patterns using trial ID
-        log(`Fetching from: ${apiUrl}/api/content`, options);
-        const response = await fetch(`${apiUrl}/api/content`, {
-            method: 'GET',
-            headers: {
-                'X-Trial-ID': trialId,
-            },
-        });
-        if (!response.ok) {
-            log(`Primary endpoint failed: ${response.status}, trying trial endpoint...`, options);
-            // Try without auth - some patterns may be available for trial
-            const publicResponse = await fetch(`${apiUrl}/api/content/trial`, {
-                method: 'GET',
-                headers: {
-                    'X-Trial-ID': trialId,
-                },
-            });
-            if (!publicResponse.ok) {
-                log(`Trial endpoint also failed: ${publicResponse.status}`, options);
-                spinner.warn('Could not download patterns (will use MCP tools)');
+        const claudeMdPath = (0, path_1.join)(cwd, 'CLAUDE.md');
+        const cursorRulesPath = (0, path_1.join)(cwd, '.cursorrules');
+        // Check if already installed with v6
+        if ((0, fs_1.existsSync)(claudeMdPath)) {
+            const content = (0, fs_1.readFileSync)(claudeMdPath, 'utf-8');
+            if (content.includes('v6.0') && content.includes('discover_patterns')) {
+                spinner.succeed('CodeBakers v6.0 already installed');
                 return;
             }
-            const content = await publicResponse.json();
-            log(`Received version: ${content.version}, modules: ${Object.keys(content.modules || {}).length}`, options);
-            await writePatternFiles(cwd, content, spinner, options, { trialId });
-            return;
+            // Upgrade from v5
+            log('Upgrading from v5 to v6...', options);
+        }
+        // Write v6.0 bootstrap files
+        (0, fs_1.writeFileSync)(claudeMdPath, V6_CLAUDE_MD);
+        (0, fs_1.writeFileSync)(cursorRulesPath, V6_CURSORRULES);
+        spinner.succeed('CodeBakers v6.0 installed');
+        console.log(chalk_1.default.gray('  Patterns are server-enforced via MCP tools\n'));
+        // Confirm install to server (non-blocking)
+        if (auth) {
+            const apiUrl = (0, config_js_1.getApiUrl)();
+            confirmDownload(apiUrl, auth, {
+                version: '6.0',
+                moduleCount: 0, // No local modules in v6
+                cliVersion: getCliVersion(),
+                command: 'go',
+            }).catch(() => { }); // Silently ignore
         }
-        const content = await response.json();
-        log(`Received version: ${content.version}, modules: ${Object.keys(content.modules || {}).length}`, options);
-        await writePatternFiles(cwd, content, spinner, options, { trialId });
     }
     catch (error) {
         log(`Error: ${error instanceof Error ? error.message : String(error)}`, options);
-        spinner.warn('Could not install patterns (will use MCP tools)');
-        console.log(chalk_1.default.gray('  Patterns will be available via MCP tools.\n'));
-    }
-}
-async function writePatternFiles(cwd, content, spinner, options = {}, auth) {
-    log(`Writing pattern files to ${cwd}...`, options);
-    // Check if patterns already exist
-    const claudeMdPath = (0, path_1.join)(cwd, 'CLAUDE.md');
-    if ((0, fs_1.existsSync)(claudeMdPath)) {
-        spinner.succeed('CodeBakers patterns already installed');
-        return;
-    }
-    // Write CLAUDE.md (router file)
-    if (content.router) {
-        (0, fs_1.writeFileSync)(claudeMdPath, content.router);
-    }
-    // Write pattern modules to .claude/
-    const moduleCount = Object.keys(content.modules || {}).length;
-    if (content.modules && moduleCount > 0) {
-        const modulesDir = (0, path_1.join)(cwd, '.claude');
-        if (!(0, fs_1.existsSync)(modulesDir)) {
-            (0, fs_1.mkdirSync)(modulesDir, { recursive: true });
-        }
-        for (const [name, data] of Object.entries(content.modules)) {
-            (0, fs_1.writeFileSync)((0, path_1.join)(modulesDir, name), data);
-        }
-    }
-    // Update .gitignore to exclude encoded patterns
-    const gitignorePath = (0, path_1.join)(cwd, '.gitignore');
-    if ((0, fs_1.existsSync)(gitignorePath)) {
-        const { readFileSync } = await import('fs');
-        const gitignore = readFileSync(gitignorePath, 'utf-8');
-        if (!gitignore.includes('.claude/')) {
-            (0, fs_1.writeFileSync)(gitignorePath, gitignore + '\n# CodeBakers patterns\n.claude/\n');
-        }
-    }
-    spinner.succeed(`CodeBakers patterns installed (v${content.version})`);
-    console.log(chalk_1.default.gray(`  ${moduleCount} pattern modules ready\n`));
-    // Confirm download to server (non-blocking)
-    if (auth) {
-        const apiUrl = (0, config_js_1.getApiUrl)();
-        confirmDownload(apiUrl, auth, {
-            version: content.version,
-            moduleCount,
-            cliVersion: getCliVersion(),
-            command: 'go',
-        }).catch(() => { }); // Silently ignore
+        spinner.warn('Could not install bootstrap files');
+        console.log(chalk_1.default.gray('  MCP tools will still work without local files.\n'));
     }
 }

package/package.json

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

package/src/commands/go.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import { execSync, spawn } from 'child_process';
-import { writeFileSync, mkdirSync, existsSync } from 'fs';
+import { writeFileSync, existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { createInterface } from 'readline';
 import {
@@ -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> {
@@ -29,12 +31,6 @@ function prompt(question: string): Promise<string> {
   });
 }
 
-interface ContentResponse {
-  version: string;
-  router: string;
-  modules: Record<string, string>;
-}
-
 interface GoOptions {
   verbose?: boolean;
 }
@@ -98,6 +94,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 +104,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 +138,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 +147,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;
   }
 
@@ -229,25 +243,14 @@ export async function go(options: GoOptions = {}): Promise<void> {
     spinner.succeed(`Trial started (${data.daysRemaining} days free)`);
     console.log('');
 
-    // Install patterns (CLAUDE.md and .claude/)
+    // Install v6.0 bootstrap files (CLAUDE.md and .cursorrules only)
     await installPatterns(data.trialId, options);
 
     // 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 +292,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 +363,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 +370,6 @@ async function attemptAutoRestart(): Promise<void> {
         shell: true,
       }).unref();
     } else {
-      // On Mac/Linux, spawn claude in new terminal
       spawn('claude', [], {
         cwd,
         detached: true,
@@ -329,160 +381,183 @@ 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'));
   }
 }
 
-/**
- * Install pattern files for API key users (paid users)
- */
-async function installPatternsWithApiKey(apiKey: string, options: GoOptions = {}): Promise<void> {
-  log('Installing patterns with API key...', options);
-  const spinner = ora('Installing CodeBakers patterns...').start();
-  const cwd = process.cwd();
-  const apiUrl = getApiUrl();
+// v6.0 Bootstrap content - minimal files that point to MCP tools
+const V6_CLAUDE_MD = `# CodeBakers v6.0 - Server-Enforced Patterns
 
-  log(`Fetching from: ${apiUrl}/api/content`, options);
+**All patterns are server-side. No local pattern files needed.**
 
-  try {
-    const response = await fetch(`${apiUrl}/api/content`, {
-      method: 'GET',
-      headers: {
-        'Authorization': `Bearer ${apiKey}`,
-      },
-    });
+## Required MCP Tools
 
-    if (!response.ok) {
-      log(`Response not OK: ${response.status} ${response.statusText}`, options);
-      spinner.warn('Could not download patterns');
-      return;
-    }
+Before writing ANY code, you MUST use these CodeBakers MCP tools:
 
-    log('Response OK, parsing JSON...', options);
-    const content: ContentResponse = await response.json();
-    log(`Received version: ${content.version}, modules: ${Object.keys(content.modules || {}).length}`, options);
-    await writePatternFiles(cwd, content, spinner, options, { apiKey });
+### 1. discover_patterns (MANDATORY - START GATE)
+Call this BEFORE writing any code:
+\`\`\`
+Tool: discover_patterns
+Args: { task: "what you're about to do", files: ["files to modify"], keywords: ["relevant terms"] }
+\`\`\`
+This returns:
+- Relevant patterns from the server
+- A session token (required for validation)
+- Code examples to follow
 
-  } catch (error) {
-    log(`Error: ${error instanceof Error ? error.message : String(error)}`, options);
-    spinner.warn('Could not install patterns');
-    console.log(chalk.gray('  Check your internet connection.\n'));
-  }
+### 2. validate_complete (MANDATORY - END GATE)
+Call this BEFORE saying "done" or "complete":
+\`\`\`
+Tool: validate_complete
+Args: { feature: "what you built", files: ["files modified"] }
+\`\`\`
+This checks:
+- You called discover_patterns first (server verifies)
+- Tests exist and pass
+- TypeScript compiles
+- Returns pass/fail from server
+
+## Rules
+
+1. **You CANNOT skip discover_patterns** - Server tracks compliance
+2. **You CANNOT say "done" without validate_complete** - Server must approve
+3. **Follow patterns returned by server** - They are mandatory
+4. **Write tests** - Validation will fail without them
+5. **Fix TypeScript errors** - Validation will fail with errors
+
+## If Server is Unreachable
+
+The tools will show "OFFLINE MODE" if the server can't be reached. In this case:
+- Enforcement is limited to local checks only
+- You should still follow best practices
+- Try again when connection is restored
+
+## Getting Help
+
+- Run \`codebakers doctor\` to diagnose issues
+- Run \`codebakers upgrade\` to update patterns
+- Visit https://codebakers.ai/support for help
+
+---
+*CodeBakers v6.0 - Server-Enforced Patterns*
+`;
+
+const V6_CURSORRULES = `# CodeBakers v6.0 - Server-Enforced Patterns
+
+All patterns are server-side. No local pattern files needed.
+
+## Required MCP Tools
+
+Before writing ANY code, you MUST use these CodeBakers MCP tools:
+
+### 1. discover_patterns (MANDATORY - START GATE)
+Call this BEFORE writing any code:
+- Tool: discover_patterns
+- Args: { task: "what you're about to do", files: ["files to modify"], keywords: ["relevant terms"] }
+
+Returns:
+- Relevant patterns from the server
+- A session token (required for validation)
+- Code examples to follow
+
+### 2. validate_complete (MANDATORY - END GATE)
+Call this BEFORE saying "done" or "complete":
+- Tool: validate_complete
+- Args: { feature: "what you built", files: ["files modified"] }
+
+Checks:
+- You called discover_patterns first (server verifies)
+- Tests exist and pass
+- TypeScript compiles
+- Returns pass/fail from server
+
+## Rules
+
+1. You CANNOT skip discover_patterns - Server tracks compliance
+2. You CANNOT say "done" without validate_complete - Server must approve
+3. Follow patterns returned by server - They are mandatory
+4. Write tests - Validation will fail without them
+5. Fix TypeScript errors - Validation will fail with errors
+
+## If Server is Unreachable
+
+The tools will show "OFFLINE MODE" if the server can't be reached. In this case:
+- Enforcement is limited to local checks only
+- You should still follow best practices
+- Try again when connection is restored
+
+---
+CodeBakers v6.0 - Server-Enforced Patterns
+`;
+
+/**
+ * Install v6.0 bootstrap files for API key users (paid users)
+ * Only installs minimal CLAUDE.md and .cursorrules - no .claude/ folder
+ */
+async function installPatternsWithApiKey(apiKey: string, options: GoOptions = {}): Promise<void> {
+  log('Installing v6.0 bootstrap files (API key user)...', options);
+  await installBootstrapFiles(options, { apiKey });
 }
 
 /**
- * Install pattern files (CLAUDE.md and .claude/) for trial users
+ * Install v6.0 bootstrap files for trial users
+ * Only installs minimal CLAUDE.md and .cursorrules - no .claude/ folder
  */
 async function installPatterns(trialId: string, options: GoOptions = {}): Promise<void> {
-  log(`Installing patterns with trial ID: ${trialId.substring(0, 8)}...`, options);
-  const spinner = ora('Installing CodeBakers patterns...').start();
+  log(`Installing v6.0 bootstrap files (trial: ${trialId.substring(0, 8)}...)`, options);
+  await installBootstrapFiles(options, { trialId });
+}
+
+/**
+ * Install v6.0 minimal bootstrap files
+ * - CLAUDE.md: Instructions for Claude Code
+ * - .cursorrules: Instructions for Cursor
+ * - NO .claude/ folder - all patterns are server-side
+ */
+async function installBootstrapFiles(options: GoOptions = {}, auth?: AuthInfo): Promise<void> {
+  const spinner = ora('Installing CodeBakers v6.0...').start();
   const cwd = process.cwd();
-  const apiUrl = getApiUrl();
 
   try {
-    // Fetch patterns using trial ID
-    log(`Fetching from: ${apiUrl}/api/content`, options);
-    const response = await fetch(`${apiUrl}/api/content`, {
-      method: 'GET',
-      headers: {
-        'X-Trial-ID': trialId,
-      },
-    });
-
-    if (!response.ok) {
-      log(`Primary endpoint failed: ${response.status}, trying trial endpoint...`, options);
-      // Try without auth - some patterns may be available for trial
-      const publicResponse = await fetch(`${apiUrl}/api/content/trial`, {
-        method: 'GET',
-        headers: {
-          'X-Trial-ID': trialId,
-        },
-      });
-
-      if (!publicResponse.ok) {
-        log(`Trial endpoint also failed: ${publicResponse.status}`, options);
-        spinner.warn('Could not download patterns (will use MCP tools)');
+    const claudeMdPath = join(cwd, 'CLAUDE.md');
+    const cursorRulesPath = join(cwd, '.cursorrules');
+
+    // Check if already installed with v6
+    if (existsSync(claudeMdPath)) {
+      const content = readFileSync(claudeMdPath, 'utf-8');
+      if (content.includes('v6.0') && content.includes('discover_patterns')) {
+        spinner.succeed('CodeBakers v6.0 already installed');
         return;
       }
-
-      const content: ContentResponse = await publicResponse.json();
-      log(`Received version: ${content.version}, modules: ${Object.keys(content.modules || {}).length}`, options);
-      await writePatternFiles(cwd, content, spinner, options, { trialId });
-      return;
+      // Upgrade from v5
+      log('Upgrading from v5 to v6...', options);
     }
 
-    const content: ContentResponse = await response.json();
-    log(`Received version: ${content.version}, modules: ${Object.keys(content.modules || {}).length}`, options);
-    await writePatternFiles(cwd, content, spinner, options, { trialId });
+    // Write v6.0 bootstrap files
+    writeFileSync(claudeMdPath, V6_CLAUDE_MD);
+    writeFileSync(cursorRulesPath, V6_CURSORRULES);
+
+    spinner.succeed('CodeBakers v6.0 installed');
+    console.log(chalk.gray('  Patterns are server-enforced via MCP tools\n'));
+
+    // Confirm install to server (non-blocking)
+    if (auth) {
+      const apiUrl = getApiUrl();
+      confirmDownload(apiUrl, auth, {
+        version: '6.0',
+        moduleCount: 0, // No local modules in v6
+        cliVersion: getCliVersion(),
+        command: 'go',
+      }).catch(() => {}); // Silently ignore
+    }
 
   } catch (error) {
     log(`Error: ${error instanceof Error ? error.message : String(error)}`, options);
-    spinner.warn('Could not install patterns (will use MCP tools)');
-    console.log(chalk.gray('  Patterns will be available via MCP tools.\n'));
-  }
-}
-
-async function writePatternFiles(
-  cwd: string,
-  content: ContentResponse,
-  spinner: ReturnType<typeof ora>,
-  options: GoOptions = {},
-  auth?: AuthInfo
-): Promise<void> {
-  log(`Writing pattern files to ${cwd}...`, options);
-  // Check if patterns already exist
-  const claudeMdPath = join(cwd, 'CLAUDE.md');
-  if (existsSync(claudeMdPath)) {
-    spinner.succeed('CodeBakers patterns already installed');
-    return;
-  }
-
-  // Write CLAUDE.md (router file)
-  if (content.router) {
-    writeFileSync(claudeMdPath, content.router);
-  }
-
-  // Write pattern modules to .claude/
-  const moduleCount = Object.keys(content.modules || {}).length;
-  if (content.modules && moduleCount > 0) {
-    const modulesDir = join(cwd, '.claude');
-    if (!existsSync(modulesDir)) {
-      mkdirSync(modulesDir, { recursive: true });
-    }
-
-    for (const [name, data] of Object.entries(content.modules)) {
-      writeFileSync(join(modulesDir, name), data);
-    }
-  }
-
-  // Update .gitignore to exclude encoded patterns
-  const gitignorePath = join(cwd, '.gitignore');
-  if (existsSync(gitignorePath)) {
-    const { readFileSync } = await import('fs');
-    const gitignore = readFileSync(gitignorePath, 'utf-8');
-    if (!gitignore.includes('.claude/')) {
-      writeFileSync(gitignorePath, gitignore + '\n# CodeBakers patterns\n.claude/\n');
-    }
-  }
-
-  spinner.succeed(`CodeBakers patterns installed (v${content.version})`);
-  console.log(chalk.gray(`  ${moduleCount} pattern modules ready\n`));
-
-  // Confirm download to server (non-blocking)
-  if (auth) {
-    const apiUrl = getApiUrl();
-    confirmDownload(apiUrl, auth, {
-      version: content.version,
-      moduleCount,
-      cliVersion: getCliVersion(),
-      command: 'go',
-    }).catch(() => {}); // Silently ignore
+    spinner.warn('Could not install bootstrap files');
+    console.log(chalk.gray('  MCP tools will still work without local files.\n'));
   }
 }