@codebakers/cli 3.9.10 → 3.9.12

package/dist/commands/go.js

@@ -1035,14 +1035,24 @@ async function go(options = {}) {
         const existingApiKey = (0, config_js_1.getApiKey)();
         const existingTrial = (0, config_js_1.getTrialState)();
         if (existingApiKey) {
-            console.log(chalk_1.default.green('  ✓ Authenticated (API key)\n'));
+            console.log(chalk_1.default.green('  ✓ Authenticated with API key\n'));
+            console.log(chalk_1.default.gray('  You\'re all set! Ask Claude to help you build something.\n'));
         }
         else if (existingTrial && !(0, config_js_1.isTrialExpired)()) {
             const daysRemaining = (0, config_js_1.getTrialDaysRemaining)();
-            console.log(chalk_1.default.green(`  ✓ Trial active (${daysRemaining} days remaining)\n`));
+            console.log(chalk_1.default.green(`  ✓ Trial active - ${daysRemaining} day${daysRemaining === 1 ? '' : 's'} remaining\n`));
+            console.log(chalk_1.default.gray('  You\'re all set! Ask Claude to help you build something.\n'));
         }
         else if (existingTrial && (0, config_js_1.isTrialExpired)()) {
-            console.log(chalk_1.default.yellow('  ⚠️  Trial expired. Run `codebakers extend` or login.\n'));
+            console.log(chalk_1.default.yellow('  ⚠️  Trial expired\n'));
+            console.log(chalk_1.default.white('  To continue using CodeBakers:'));
+            console.log(chalk_1.default.cyan('    codebakers extend') + chalk_1.default.gray(' - Get 7 more days (free)'));
+            console.log(chalk_1.default.cyan('    codebakers go') + chalk_1.default.gray('     - Login with API key\n'));
+        }
+        else {
+            console.log(chalk_1.default.yellow('  ⚠️  No active session\n'));
+            console.log(chalk_1.default.white('  To activate CodeBakers:'));
+            console.log(chalk_1.default.cyan('    codebakers go\n'));
         }
         // Don't run setup again - just show context
         return;
@@ -1053,13 +1063,28 @@ async function go(options = {}) {
     // Auto-detect non-interactive mode (e.g., running from Claude Code)
     const isNonInteractive = !process.stdin.isTTY;
     if (isNonInteractive) {
-        console.log(chalk_1.default.yellow('\n  ⚡ Non-interactive mode - setting up project files only\n'));
+        console.log(chalk_1.default.blue('\n  ───────────────────────────────────────────────────────'));
+        console.log(chalk_1.default.blue('  CodeBakers - Non-Interactive Setup'));
+        console.log(chalk_1.default.blue('  ───────────────────────────────────────────────────────\n'));
+        console.log(chalk_1.default.gray('  Running from Claude Code - installing project files...\n'));
         // Just set up the project files without auth
         // Auth can be done later via `codebakers go` in terminal or via MCP tools
         await setupProject(options);
-        console.log(chalk_1.default.green('\n  ✓ Project files installed!\n'));
-        console.log(chalk_1.default.gray('  To activate trial/login, run in terminal:'));
-        console.log(chalk_1.default.cyan('    codebakers go\n'));
+        console.log(chalk_1.default.green('\n  ✅ Project files installed successfully!\n'));
+        console.log(chalk_1.default.white('  What was set up:'));
+        console.log(chalk_1.default.gray('    • CLAUDE.md - AI instructions for this project'));
+        console.log(chalk_1.default.gray('    • .codebakers.json - Project configuration'));
+        console.log(chalk_1.default.gray('    • MCP server - Registered in Claude Code config\n'));
+        console.log(chalk_1.default.yellow('  ⚠️  RESTART REQUIRED to load MCP tools\n'));
+        console.log(chalk_1.default.white('  The CodeBakers MCP server was registered, but Claude Code'));
+        console.log(chalk_1.default.white('  needs to restart to load it.\n'));
+        console.log(chalk_1.default.cyan('  To restart Claude Code:\n'));
+        console.log(chalk_1.default.gray('    Option 1: ') + chalk_1.default.white('Press ') + chalk_1.default.cyan('Ctrl+C') + chalk_1.default.white(' and run ') + chalk_1.default.cyan('claude') + chalk_1.default.white(' again'));
+        console.log(chalk_1.default.gray('    Option 2: ') + chalk_1.default.white('In VS Code: ') + chalk_1.default.cyan('Cmd/Ctrl+Shift+P') + chalk_1.default.white(' → "Reload Window"\n'));
+        console.log(chalk_1.default.white('  After restart, MCP tools (discover_patterns, validate_complete)'));
+        console.log(chalk_1.default.white('  will be available.\n'));
+        console.log(chalk_1.default.gray('  ─────────────────────────────────────────────────────────\n'));
+        console.log(chalk_1.default.gray('  Optional: To activate trial, run ') + chalk_1.default.cyan('codebakers go') + chalk_1.default.gray(' in a terminal.\n'));
         return;
     }
     console.log(chalk_1.default.blue(`
@@ -1097,25 +1122,34 @@ async function go(options = {}) {
     }
     // Check if trial expired
     if (existingTrial && (0, config_js_1.isTrialExpired)()) {
-        console.log(chalk_1.default.yellow('  ⚠️  Your trial has expired.\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'));
+        console.log(chalk_1.default.yellow(`
+  ╭───────────────────────────────────────────────────────────╮
+  │  ⚠️  Your 7-day trial has expired                         │
+  ╰───────────────────────────────────────────────────────────╯
+    `));
+        console.log(chalk_1.default.white('  You can still use CodeBakers! Choose an option:\n'));
+        console.log(chalk_1.default.cyan('  [1] Login with API key'));
+        console.log(chalk_1.default.gray('      If you purchased a subscription at codebakers.ai\n'));
+        console.log(chalk_1.default.cyan('  [2] Extend trial (+7 days)'));
+        console.log(chalk_1.default.gray('      Connect your GitHub account for more time\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.cyan('\n  Run: codebakers extend\n'));
+            console.log(chalk_1.default.white('\n  To extend your trial, run:\n'));
+            console.log(chalk_1.default.cyan('    codebakers extend\n'));
+            console.log(chalk_1.default.gray('  This will open GitHub for authentication.\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(' (GitHub login required)'));
-    console.log(chalk_1.default.cyan('  [2] Login with API key') + chalk_1.default.gray(' (I have an account)\n'));
+    console.log(chalk_1.default.cyan('  [1] Start free 7-day trial'));
+    console.log(chalk_1.default.gray('      No credit card needed - just GitHub login\n'));
+    console.log(chalk_1.default.cyan('  [2] Login with API key'));
+    console.log(chalk_1.default.gray('      I already have a CodeBakers account\n'));
     const choice = await prompt(chalk_1.default.gray('  Enter 1 or 2: '));
     if (choice === '2') {
         await handleApiKeyLogin(options);
@@ -1243,52 +1277,28 @@ async function handleApiKeyLogin(options = {}) {
     }
 }
 /**
- * Show success message and offer to restart
+ * Show success message with clear next steps
  */
 async function showSuccessAndRestart() {
-    const cwd = process.cwd();
     console.log(chalk_1.default.green(`
   ╔═══════════════════════════════════════════════════════════╗
-  ║  ✅ CodeBakers is ready!                                  ║
   ║                                                           ║
-  ║  ${chalk_1.default.gray('Try: "Build me a todo app with authentication"')}        ║
+  ║   ✅  CodeBakers Setup Complete!                          ║
+  ║                                                           ║
   ╚═══════════════════════════════════════════════════════════╝
   `));
-    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') {
-        console.log(chalk_1.default.gray('\n  No problem! Just restart Claude Code manually when ready.\n'));
-        return;
-    }
-    // Attempt to restart Claude Code
-    console.log(chalk_1.default.gray('\n  Restarting Claude Code...\n'));
-    try {
-        const isWindows = process.platform === 'win32';
-        if (isWindows) {
-            (0, child_process_1.spawn)('cmd', ['/c', 'start', 'claude'], {
-                cwd,
-                detached: true,
-                stdio: 'ignore',
-                shell: true,
-            }).unref();
-        }
-        else {
-            (0, child_process_1.spawn)('claude', [], {
-                cwd,
-                detached: true,
-                stdio: 'ignore',
-                shell: true,
-            }).unref();
-        }
-        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'));
-        await new Promise(resolve => setTimeout(resolve, 1000));
-        process.exit(0);
-    }
-    catch {
-        console.log(chalk_1.default.yellow('  Could not auto-restart. Please restart Claude Code manually.\n'));
-    }
+    console.log(chalk_1.default.yellow('  ⚠️  ONE MORE STEP - Restart Required\n'));
+    console.log(chalk_1.default.white('  Claude Code needs to restart to load the CodeBakers MCP server.\n'));
+    console.log(chalk_1.default.cyan('  How to restart Claude Code:\n'));
+    console.log(chalk_1.default.gray('    Option 1: ') + chalk_1.default.white('Close this window and run ') + chalk_1.default.cyan('claude') + chalk_1.default.white(' again'));
+    console.log(chalk_1.default.gray('    Option 2: ') + chalk_1.default.white('Press ') + chalk_1.default.cyan('Ctrl+C') + chalk_1.default.white(' and run ') + chalk_1.default.cyan('claude') + chalk_1.default.white(' again'));
+    console.log(chalk_1.default.gray('    Option 3: ') + chalk_1.default.white('In VS Code: ') + chalk_1.default.cyan('Cmd/Ctrl+Shift+P') + chalk_1.default.white(' → "Claude Code: Restart"\n'));
+    console.log(chalk_1.default.green('  After restart, try saying:\n'));
+    console.log(chalk_1.default.white('    "Build me a todo app with authentication"'));
+    console.log(chalk_1.default.white('    "Add a login page to my project"'));
+    console.log(chalk_1.default.white('    "Review my code and make it production-ready"\n'));
+    console.log(chalk_1.default.gray('  ─────────────────────────────────────────────────────────\n'));
+    console.log(chalk_1.default.gray('  Having issues? Run: ') + chalk_1.default.cyan('codebakers doctor') + chalk_1.default.gray(' to diagnose\n'));
 }
 // v6.12 Bootstrap content - minimal files that point to MCP tools
 const V6_CLAUDE_MD = `# CodeBakers v6.12 - Server-Enforced Patterns

package/dist/index.js

@@ -34,7 +34,7 @@ const api_js_1 = require("./lib/api.js");
 // ============================================
 // Automatic Update Notification
 // ============================================
-const CURRENT_VERSION = '3.9.10';
+const CURRENT_VERSION = '3.9.12';
 // Simple semver comparison: returns true if v1 > v2
 function isNewerVersion(v1, v2) {
     const parts1 = v1.split('.').map(Number);
@@ -210,7 +210,7 @@ const program = new commander_1.Command();
 program
     .name('codebakers')
     .description('CodeBakers CLI - Production patterns for AI-assisted development')
-    .version('3.9.10');
+    .version('3.9.12');
 // Zero-friction trial entry (no signup required)
 program
     .command('go')

package/package.json

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

package/src/commands/go.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { execSync, spawn } from 'child_process';
+import { execSync } from 'child_process';
 import { writeFileSync, existsSync, readFileSync, mkdirSync, readdirSync, statSync, rmSync } from 'fs';
 import { join } from 'path';
 import { createInterface } from 'readline';
@@ -1168,12 +1168,21 @@ export async function go(options: GoOptions = {}): Promise<void> {
     const existingTrial = getTrialState();
 
     if (existingApiKey) {
-      console.log(chalk.green('  ✓ Authenticated (API key)\n'));
+      console.log(chalk.green('  ✓ Authenticated with API key\n'));
+      console.log(chalk.gray('  You\'re all set! Ask Claude to help you build something.\n'));
     } else if (existingTrial && !isTrialExpired()) {
       const daysRemaining = getTrialDaysRemaining();
-      console.log(chalk.green(`  ✓ Trial active (${daysRemaining} days remaining)\n`));
+      console.log(chalk.green(`  ✓ Trial active - ${daysRemaining} day${daysRemaining === 1 ? '' : 's'} remaining\n`));
+      console.log(chalk.gray('  You\'re all set! Ask Claude to help you build something.\n'));
     } else if (existingTrial && isTrialExpired()) {
-      console.log(chalk.yellow('  ⚠️  Trial expired. Run `codebakers extend` or login.\n'));
+      console.log(chalk.yellow('  ⚠️  Trial expired\n'));
+      console.log(chalk.white('  To continue using CodeBakers:'));
+      console.log(chalk.cyan('    codebakers extend') + chalk.gray(' - Get 7 more days (free)'));
+      console.log(chalk.cyan('    codebakers go') + chalk.gray('     - Login with API key\n'));
+    } else {
+      console.log(chalk.yellow('  ⚠️  No active session\n'));
+      console.log(chalk.white('  To activate CodeBakers:'));
+      console.log(chalk.cyan('    codebakers go\n'));
     }
 
     // Don't run setup again - just show context
@@ -1187,15 +1196,32 @@ export async function go(options: GoOptions = {}): Promise<void> {
   // Auto-detect non-interactive mode (e.g., running from Claude Code)
   const isNonInteractive = !process.stdin.isTTY;
   if (isNonInteractive) {
-    console.log(chalk.yellow('\n  ⚡ Non-interactive mode - setting up project files only\n'));
+    console.log(chalk.blue('\n  ───────────────────────────────────────────────────────'));
+    console.log(chalk.blue('  CodeBakers - Non-Interactive Setup'));
+    console.log(chalk.blue('  ───────────────────────────────────────────────────────\n'));
+
+    console.log(chalk.gray('  Running from Claude Code - installing project files...\n'));
 
     // Just set up the project files without auth
     // Auth can be done later via `codebakers go` in terminal or via MCP tools
     await setupProject(options);
 
-    console.log(chalk.green('\n  ✓ Project files installed!\n'));
-    console.log(chalk.gray('  To activate trial/login, run in terminal:'));
-    console.log(chalk.cyan('    codebakers go\n'));
+    console.log(chalk.green('\n  ✅ Project files installed successfully!\n'));
+    console.log(chalk.white('  What was set up:'));
+    console.log(chalk.gray('    • CLAUDE.md - AI instructions for this project'));
+    console.log(chalk.gray('    • .codebakers.json - Project configuration'));
+    console.log(chalk.gray('    • MCP server - Registered in Claude Code config\n'));
+
+    console.log(chalk.yellow('  ⚠️  RESTART REQUIRED to load MCP tools\n'));
+    console.log(chalk.white('  The CodeBakers MCP server was registered, but Claude Code'));
+    console.log(chalk.white('  needs to restart to load it.\n'));
+    console.log(chalk.cyan('  To restart Claude Code:\n'));
+    console.log(chalk.gray('    Option 1: ') + chalk.white('Press ') + chalk.cyan('Ctrl+C') + chalk.white(' and run ') + chalk.cyan('claude') + chalk.white(' again'));
+    console.log(chalk.gray('    Option 2: ') + chalk.white('In VS Code: ') + chalk.cyan('Cmd/Ctrl+Shift+P') + chalk.white(' → "Reload Window"\n'));
+    console.log(chalk.white('  After restart, MCP tools (discover_patterns, validate_complete)'));
+    console.log(chalk.white('  will be available.\n'));
+    console.log(chalk.gray('  ─────────────────────────────────────────────────────────\n'));
+    console.log(chalk.gray('  Optional: To activate trial, run ') + chalk.cyan('codebakers go') + chalk.gray(' in a terminal.\n'));
     return;
   }
 
@@ -1241,12 +1267,17 @@ export async function go(options: GoOptions = {}): Promise<void> {
 
   // Check if trial expired
   if (existingTrial && isTrialExpired()) {
-    console.log(chalk.yellow('  ⚠️  Your trial has expired.\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'));
+    console.log(chalk.yellow(`
+  ╭───────────────────────────────────────────────────────────╮
+  │  ⚠️  Your 7-day trial has expired                         │
+  ╰───────────────────────────────────────────────────────────╯
+    `));
+
+    console.log(chalk.white('  You can still use CodeBakers! Choose an option:\n'));
+    console.log(chalk.cyan('  [1] Login with API key'));
+    console.log(chalk.gray('      If you purchased a subscription at codebakers.ai\n'));
+    console.log(chalk.cyan('  [2] Extend trial (+7 days)'));
+    console.log(chalk.gray('      Connect your GitHub account for more time\n'));
 
     const choice = await prompt(chalk.gray('  Enter 1 or 2: '));
 
@@ -1254,15 +1285,19 @@ export async function go(options: GoOptions = {}): Promise<void> {
       await handleApiKeyLogin(options);
       return;
     } else {
-      console.log(chalk.cyan('\n  Run: codebakers extend\n'));
+      console.log(chalk.white('\n  To extend your trial, run:\n'));
+      console.log(chalk.cyan('    codebakers extend\n'));
+      console.log(chalk.gray('  This will open GitHub for authentication.\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(' (GitHub login required)'));
-  console.log(chalk.cyan('  [2] Login with API key') + chalk.gray(' (I have an account)\n'));
+  console.log(chalk.cyan('  [1] Start free 7-day trial'));
+  console.log(chalk.gray('      No credit card needed - just GitHub login\n'));
+  console.log(chalk.cyan('  [2] Login with API key'));
+  console.log(chalk.gray('      I already have a CodeBakers account\n'));
 
   const choice = await prompt(chalk.gray('  Enter 1 or 2: '));
 
@@ -1413,60 +1448,33 @@ async function handleApiKeyLogin(options: GoOptions = {}): Promise<void> {
 }
 
 /**
- * Show success message and offer to restart
+ * Show success message with clear next steps
  */
 async function showSuccessAndRestart(): Promise<void> {
-  const cwd = process.cwd();
-
   console.log(chalk.green(`
   ╔═══════════════════════════════════════════════════════════╗
-  ║  ✅ CodeBakers is ready!                                  ║
   ║                                                           ║
-  ║  ${chalk.gray('Try: "Build me a todo app with authentication"')}        ║
+  ║   ✅  CodeBakers Setup Complete!                          ║
+  ║                                                           ║
   ╚═══════════════════════════════════════════════════════════╝
   `));
 
-  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): '));
-
-  if (answer === 'n' || answer === 'no') {
-    console.log(chalk.gray('\n  No problem! Just restart Claude Code manually when ready.\n'));
-    return;
-  }
-
-  // Attempt to restart Claude Code
-  console.log(chalk.gray('\n  Restarting Claude Code...\n'));
+  console.log(chalk.yellow('  ⚠️  ONE MORE STEP - Restart Required\n'));
 
-  try {
-    const isWindows = process.platform === 'win32';
+  console.log(chalk.white('  Claude Code needs to restart to load the CodeBakers MCP server.\n'));
 
-    if (isWindows) {
-      spawn('cmd', ['/c', 'start', 'claude'], {
-        cwd,
-        detached: true,
-        stdio: 'ignore',
-        shell: true,
-      }).unref();
-    } else {
-      spawn('claude', [], {
-        cwd,
-        detached: true,
-        stdio: 'ignore',
-        shell: true,
-      }).unref();
-    }
-
-    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'));
+  console.log(chalk.cyan('  How to restart Claude Code:\n'));
+  console.log(chalk.gray('    Option 1: ') + chalk.white('Close this window and run ') + chalk.cyan('claude') + chalk.white(' again'));
+  console.log(chalk.gray('    Option 2: ') + chalk.white('Press ') + chalk.cyan('Ctrl+C') + chalk.white(' and run ') + chalk.cyan('claude') + chalk.white(' again'));
+  console.log(chalk.gray('    Option 3: ') + chalk.white('In VS Code: ') + chalk.cyan('Cmd/Ctrl+Shift+P') + chalk.white(' → "Claude Code: Restart"\n'));
 
-    await new Promise(resolve => setTimeout(resolve, 1000));
-    process.exit(0);
+  console.log(chalk.green('  After restart, try saying:\n'));
+  console.log(chalk.white('    "Build me a todo app with authentication"'));
+  console.log(chalk.white('    "Add a login page to my project"'));
+  console.log(chalk.white('    "Review my code and make it production-ready"\n'));
 
-  } catch {
-    console.log(chalk.yellow('  Could not auto-restart. Please restart Claude Code manually.\n'));
-  }
+  console.log(chalk.gray('  ─────────────────────────────────────────────────────────\n'));
+  console.log(chalk.gray('  Having issues? Run: ') + chalk.cyan('codebakers doctor') + chalk.gray(' to diagnose\n'));
 }
 
 // v6.12 Bootstrap content - minimal files that point to MCP tools

package/src/index.ts

@@ -34,7 +34,7 @@ import { join } from 'path';
 // Automatic Update Notification
 // ============================================
 
-const CURRENT_VERSION = '3.9.10';
+const CURRENT_VERSION = '3.9.12';
 
 // Simple semver comparison: returns true if v1 > v2
 function isNewerVersion(v1: string, v2: string): boolean {
@@ -230,7 +230,7 @@ const program = new Command();
 program
   .name('codebakers')
   .description('CodeBakers CLI - Production patterns for AI-assisted development')
-  .version('3.9.10');
+  .version('3.9.12');
 
 // Zero-friction trial entry (no signup required)
 program