@codebakers/cli 3.3.4 → 3.3.6

package/dist/commands/init.js

@@ -656,6 +656,34 @@ async function init() {
         (0, fs_1.writeFileSync)((0, path_1.join)(cwd, '.cursorrules'), CURSORRULES_TEMPLATE);
         // Write .cursorignore
         (0, fs_1.writeFileSync)((0, path_1.join)(cwd, '.cursorignore'), CURSORIGNORE_TEMPLATE);
+        // Create .cursor/mcp.json for MCP server configuration
+        const cursorDir = (0, path_1.join)(cwd, '.cursor');
+        if (!(0, fs_1.existsSync)(cursorDir)) {
+            (0, fs_1.mkdirSync)(cursorDir, { recursive: true });
+        }
+        const mcpConfigPath = (0, path_1.join)(cursorDir, 'mcp.json');
+        const isWindows = process.platform === 'win32';
+        const mcpConfig = {
+            mcpServers: {
+                codebakers: isWindows
+                    ? { command: 'cmd', args: ['/c', 'npx', '-y', '@codebakers/cli', 'serve'] }
+                    : { command: 'npx', args: ['-y', '@codebakers/cli', 'serve'] }
+            }
+        };
+        // Merge with existing MCP config if present
+        if ((0, fs_1.existsSync)(mcpConfigPath)) {
+            try {
+                const existing = JSON.parse((0, fs_1.readFileSync)(mcpConfigPath, 'utf-8'));
+                existing.mcpServers = { ...existing.mcpServers, ...mcpConfig.mcpServers };
+                (0, fs_1.writeFileSync)(mcpConfigPath, JSON.stringify(existing, null, 2));
+            }
+            catch {
+                (0, fs_1.writeFileSync)(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+            }
+        }
+        else {
+            (0, fs_1.writeFileSync)(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+        }
         // Create/merge .vscode/settings.json
         const vscodeDir = (0, path_1.join)(cwd, '.vscode');
         if (!(0, fs_1.existsSync)(vscodeDir)) {
@@ -671,6 +699,7 @@ async function init() {
             (0, fs_1.writeFileSync)(existingSettingsPath, JSON.stringify(VSCODE_SETTINGS_TEMPLATE, null, 2));
         }
         cursorSpinner.succeed('Cursor configuration installed!');
+        console.log(chalk_1.default.green('    ✓ MCP server configured (.cursor/mcp.json)'));
     }
     catch (error) {
         cursorSpinner.warn('Could not install Cursor files (continuing anyway)');

package/dist/commands/setup.js

@@ -8,6 +8,8 @@ const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const readline_1 = require("readline");
 const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
 const config_js_1 = require("../config.js");
 const api_js_1 = require("../lib/api.js");
 const progress_js_1 = require("../lib/progress.js");
@@ -127,47 +129,78 @@ async function setup() {
 }
 function showFinalInstructions() {
     const isWindows = process.platform === 'win32';
+    const cwd = process.cwd();
     console.log(chalk_1.default.blue('  ══════════════════════════════════════════════════════════'));
-    console.log(chalk_1.default.white.bold('\n  STEP 3: Connecting CodeBakers to Claude...\n'));
+    console.log(chalk_1.default.white.bold('\n  STEP 3: Connecting CodeBakers to your IDE...\n'));
     console.log(chalk_1.default.blue('  ══════════════════════════════════════════════════════════\n'));
-    // Auto-install MCP server
+    // Install MCP for Claude Code CLI
     const mcpCmd = isWindows
         ? 'claude mcp add --transport stdio codebakers -- cmd /c npx -y @codebakers/cli serve'
         : 'claude mcp add --transport stdio codebakers -- npx -y @codebakers/cli serve';
+    let claudeCodeInstalled = false;
     try {
         (0, child_process_1.execSync)(mcpCmd, { stdio: 'pipe' });
-        console.log(chalk_1.default.green('  ✅ CodeBakers MCP server installed!\n'));
+        console.log(chalk_1.default.green('  ✅ Claude Code MCP server installed!\n'));
+        claudeCodeInstalled = true;
     }
     catch (error) {
-        // Check if it's already installed (command might fail if already exists)
         const errorMessage = error instanceof Error ? error.message : String(error);
         if (errorMessage.includes('already exists') || errorMessage.includes('already registered')) {
-            console.log(chalk_1.default.green('  ✅ CodeBakers MCP server already installed!\n'));
+            console.log(chalk_1.default.green('  ✅ Claude Code MCP server already installed!\n'));
+            claudeCodeInstalled = true;
         }
         else {
-            console.log(chalk_1.default.yellow('  ⚠️  Could not auto-install MCP server.\n'));
-            console.log(chalk_1.default.white('  Run this command manually in your terminal:\n'));
-            console.log(chalk_1.default.bgBlue.white('\n  ' + mcpCmd + '  \n'));
-            console.log(chalk_1.default.yellow('\n  ⚠️  Then close this terminal and open a new one in your project.\n'));
-            return;
+            console.log(chalk_1.default.yellow('  ⚠️  Claude Code not detected (that\'s OK if using Cursor)\n'));
         }
     }
+    // Install MCP for Cursor IDE (create .cursor/mcp.json)
+    const cursorDir = (0, path_1.join)(cwd, '.cursor');
+    const mcpConfigPath = (0, path_1.join)(cursorDir, 'mcp.json');
+    const mcpConfig = {
+        mcpServers: {
+            codebakers: isWindows
+                ? { command: 'cmd', args: ['/c', 'npx', '-y', '@codebakers/cli', 'serve'] }
+                : { command: 'npx', args: ['-y', '@codebakers/cli', 'serve'] }
+        }
+    };
+    try {
+        if (!(0, fs_1.existsSync)(cursorDir)) {
+            (0, fs_1.mkdirSync)(cursorDir, { recursive: true });
+        }
+        // Merge with existing MCP config if present
+        if ((0, fs_1.existsSync)(mcpConfigPath)) {
+            const existing = JSON.parse((0, fs_1.readFileSync)(mcpConfigPath, 'utf-8'));
+            existing.mcpServers = { ...existing.mcpServers, ...mcpConfig.mcpServers };
+            (0, fs_1.writeFileSync)(mcpConfigPath, JSON.stringify(existing, null, 2));
+        }
+        else {
+            (0, fs_1.writeFileSync)(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+        }
+        console.log(chalk_1.default.green('  ✅ Cursor MCP server configured! (.cursor/mcp.json)\n'));
+    }
+    catch (error) {
+        console.log(chalk_1.default.yellow('  ⚠️  Could not create Cursor MCP config\n'));
+    }
     console.log(chalk_1.default.blue('  ══════════════════════════════════════════════════════════'));
     console.log(chalk_1.default.white.bold('\n  🎉 Setup Complete!\n'));
     console.log(chalk_1.default.blue('  ══════════════════════════════════════════════════════════\n'));
-    console.log(chalk_1.default.yellow.bold('  ⚠️  RESTART REQUIRED - Follow these steps:\n'));
-    console.log(chalk_1.default.white('  For Claude Code:\n'));
-    console.log(chalk_1.default.gray('    1. Close this terminal completely (type ') + chalk_1.default.cyan('exit') + chalk_1.default.gray(')'));
-    console.log(chalk_1.default.gray('    2. Open a NEW terminal window'));
-    console.log(chalk_1.default.gray('    3. Navigate to your project folder'));
-    console.log(chalk_1.default.gray('    4. Run ') + chalk_1.default.cyan('claude') + chalk_1.default.gray(' to start Claude Code\n'));
+    console.log(chalk_1.default.yellow.bold('  ⚠️  RESTART REQUIRED:\n'));
     console.log(chalk_1.default.white('  For Cursor:\n'));
     console.log(chalk_1.default.gray('    1. Close Cursor completely (Cmd+Q / Alt+F4)'));
     console.log(chalk_1.default.gray('    2. Reopen Cursor'));
     console.log(chalk_1.default.gray('    3. Open Composer (Cmd+I / Ctrl+I)\n'));
+    if (claudeCodeInstalled) {
+        console.log(chalk_1.default.white('  For Claude Code:\n'));
+        console.log(chalk_1.default.gray('    1. Close this terminal completely (type ') + chalk_1.default.cyan('exit') + chalk_1.default.gray(')'));
+        console.log(chalk_1.default.gray('    2. Open a NEW terminal window'));
+        console.log(chalk_1.default.gray('    3. Navigate to your project folder'));
+        console.log(chalk_1.default.gray('    4. Run ') + chalk_1.default.cyan('claude') + chalk_1.default.gray(' to start Claude Code\n'));
+    }
     console.log(chalk_1.default.blue('  ──────────────────────────────────────────────────────────\n'));
-    console.log(chalk_1.default.white('  ✅ To verify CodeBakers is working, ask the AI:\n'));
-    console.log(chalk_1.default.green('    "Are you using CodeBakers?"\n'));
-    console.log(chalk_1.default.gray('  The AI should respond with its CodeBakers status.'));
+    console.log(chalk_1.default.white('  Next step: Initialize patterns in your project:\n'));
+    console.log(chalk_1.default.cyan('    codebakers init\n'));
+    console.log(chalk_1.default.white('  To verify CodeBakers is working, ask the AI:\n'));
+    console.log(chalk_1.default.green('    "update codebakers patterns"\n'));
+    console.log(chalk_1.default.gray('  The AI should call the update_patterns MCP tool.'));
     console.log(chalk_1.default.gray('  Need help? https://codebakers.ai/docs\n'));
 }

package/dist/config.d.ts

@@ -139,4 +139,21 @@ export declare function setCachedPatternInfo(latestVersion: string): void;
  * Clear pattern cache to force a fresh check
  */
 export declare function clearPatternCache(): void;
+/**
+ * Check if we should attempt CLI auto-update
+ * Returns false if we recently attempted and failed
+ */
+export declare function shouldAttemptCliUpdate(): boolean;
+/**
+ * Record a CLI update attempt
+ */
+export declare function setCliUpdateAttempt(targetVersion: string, success: boolean): void;
+/**
+ * Check if CLI auto-update is disabled
+ */
+export declare function isCliAutoUpdateDisabled(): boolean;
+/**
+ * Disable/enable CLI auto-update
+ */
+export declare function setCliAutoUpdateDisabled(disabled: boolean): void;
 export {};

package/dist/config.js

@@ -38,6 +38,10 @@ exports.getCliVersion = getCliVersion;
 exports.getCachedPatternInfo = getCachedPatternInfo;
 exports.setCachedPatternInfo = setCachedPatternInfo;
 exports.clearPatternCache = clearPatternCache;
+exports.shouldAttemptCliUpdate = shouldAttemptCliUpdate;
+exports.setCliUpdateAttempt = setCliUpdateAttempt;
+exports.isCliAutoUpdateDisabled = isCliAutoUpdateDisabled;
+exports.setCliAutoUpdateDisabled = setCliAutoUpdateDisabled;
 const conf_1 = __importDefault(require("conf"));
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -458,7 +462,7 @@ function setCachedUpdateInfo(latestVersion) {
  * Get the current CLI version from package.json
  */
 function getCliVersion() {
-    return '3.3.0'; // Keep in sync with package.json
+    return '3.3.5'; // Keep in sync with package.json
 }
 // ============================================
 // Pattern Auto-Update Cache
@@ -491,3 +495,46 @@ function clearPatternCache() {
     config.set('lastPatternCheck', null);
     config.set('latestPatternVersion', null);
 }
+// ============================================
+// CLI Auto-Update Tracking
+// ============================================
+const CLI_UPDATE_COOLDOWN_HOURS = 24; // Don't retry auto-update for 24 hours after failure
+/**
+ * Check if we should attempt CLI auto-update
+ * Returns false if we recently attempted and failed
+ */
+function shouldAttemptCliUpdate() {
+    const lastAttempt = config.get('lastCliUpdateAttempt');
+    const lastAttemptVersion = config.get('lastCliUpdateAttemptVersion');
+    if (!lastAttempt || typeof lastAttempt !== 'string')
+        return true;
+    const hoursSinceAttempt = (Date.now() - new Date(lastAttempt).getTime()) / (1000 * 60 * 60);
+    // If we already successfully updated to this version, don't retry
+    const currentVersion = getCliVersion();
+    if (lastAttemptVersion === currentVersion)
+        return false;
+    // If cooldown hasn't passed, don't retry
+    if (hoursSinceAttempt < CLI_UPDATE_COOLDOWN_HOURS)
+        return false;
+    return true;
+}
+/**
+ * Record a CLI update attempt
+ */
+function setCliUpdateAttempt(targetVersion, success) {
+    config.set('lastCliUpdateAttempt', new Date().toISOString());
+    config.set('lastCliUpdateAttemptVersion', targetVersion);
+    config.set('lastCliUpdateSuccess', success);
+}
+/**
+ * Check if CLI auto-update is disabled
+ */
+function isCliAutoUpdateDisabled() {
+    return config.get('disableCliAutoUpdate') === true;
+}
+/**
+ * Disable/enable CLI auto-update
+ */
+function setCliAutoUpdateDisabled(disabled) {
+    config.set('disableCliAutoUpdate', disabled);
+}

package/dist/index.js

@@ -27,13 +27,14 @@ const go_js_1 = require("./commands/go.js");
 const extend_js_1 = require("./commands/extend.js");
 const billing_js_1 = require("./commands/billing.js");
 const config_js_2 = require("./config.js");
+const child_process_1 = require("child_process");
 const api_js_1 = require("./lib/api.js");
 const fs_1 = require("fs");
 const path_1 = require("path");
 // ============================================
 // Automatic Update Notification
 // ============================================
-const CURRENT_VERSION = '3.3.1';
+const CURRENT_VERSION = '3.3.6';
 async function checkForUpdatesInBackground() {
     // Check if we have a valid cached result first (fast path)
     const cached = (0, config_js_2.getCachedUpdateInfo)();
@@ -93,6 +94,65 @@ function showUpdateBanner(currentVersion, latestVersion, isRecommended) {
   ╰─────────────────────────────────────────────────────────╯
   `));
 }
+// ============================================
+// CLI Auto-Update
+// ============================================
+async function autoUpdateCli() {
+    // Check if auto-update is disabled
+    if ((0, config_js_2.isCliAutoUpdateDisabled)())
+        return;
+    // Check if we should attempt update (cooldown, etc.)
+    if (!(0, config_js_2.shouldAttemptCliUpdate)())
+        return;
+    // Check for available updates
+    try {
+        const updateInfo = await (0, api_js_1.checkForUpdates)();
+        if (!updateInfo || !updateInfo.updateAvailable)
+            return;
+        // Don't auto-update blocked versions - show warning instead
+        if (updateInfo.isBlocked)
+            return;
+        const targetVersion = updateInfo.latestVersion;
+        const currentVersion = CURRENT_VERSION;
+        // Only auto-update if the version has auto-update enabled from server
+        if (!updateInfo.autoUpdateEnabled)
+            return;
+        console.log(chalk_1.default.blue(`\n  🔄 Auto-updating CLI: ${chalk_1.default.gray(currentVersion)} → ${chalk_1.default.green(targetVersion)}...\n`));
+        try {
+            // Run npm install globally
+            (0, child_process_1.execSync)('npm install -g @codebakers/cli@latest', {
+                stdio: 'inherit',
+                timeout: 60000, // 60 second timeout
+            });
+            (0, config_js_2.setCliUpdateAttempt)(targetVersion, true);
+            console.log(chalk_1.default.green(`\n  ✓ CLI updated to v${targetVersion}!\n`));
+            console.log(chalk_1.default.gray('  The update will take effect on your next command.\n'));
+        }
+        catch (installError) {
+            (0, config_js_2.setCliUpdateAttempt)(targetVersion, false);
+            // Check if it's a permission error
+            const errorMessage = installError instanceof Error ? installError.message : String(installError);
+            if (errorMessage.includes('EACCES') || errorMessage.includes('permission')) {
+                console.log(chalk_1.default.yellow(`
+  ⚠️  Auto-update failed (permission denied)
+
+  Run manually with: ${chalk_1.default.cyan('sudo npm i -g @codebakers/cli@latest')}
+  Or disable auto-update: ${chalk_1.default.cyan('codebakers config set disableCliAutoUpdate true')}
+        `));
+            }
+            else {
+                console.log(chalk_1.default.yellow(`
+  ⚠️  Auto-update failed
+
+  Run manually: ${chalk_1.default.cyan('npm i -g @codebakers/cli@latest')}
+        `));
+            }
+        }
+    }
+    catch {
+        // Silently fail - don't block CLI for update check
+    }
+}
 function getLocalPatternVersion() {
     const cwd = process.cwd();
     const versionFile = (0, path_1.join)(cwd, '.claude', '.version.json');
@@ -406,7 +466,10 @@ program
     .action(mcp_config_js_1.mcpUninstall);
 // Add update check hook (runs before every command)
 program.hook('preAction', async () => {
-    // Run CLI update check and pattern auto-update in parallel
+    // Run CLI auto-update first (if enabled and conditions met)
+    // Then run pattern auto-update in parallel with update banner check
+    await autoUpdateCli();
+    // Run pattern auto-update and update banner check in parallel
     await Promise.all([
         checkForUpdatesInBackground(),
         autoUpdatePatterns(),

package/package.json

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

package/src/commands/init.ts

@@ -700,6 +700,35 @@ export async function init(): Promise<void> {
     // Write .cursorignore
     writeFileSync(join(cwd, '.cursorignore'), CURSORIGNORE_TEMPLATE);
 
+    // Create .cursor/mcp.json for MCP server configuration
+    const cursorDir = join(cwd, '.cursor');
+    if (!existsSync(cursorDir)) {
+      mkdirSync(cursorDir, { recursive: true });
+    }
+
+    const mcpConfigPath = join(cursorDir, 'mcp.json');
+    const isWindows = process.platform === 'win32';
+    const mcpConfig = {
+      mcpServers: {
+        codebakers: isWindows
+          ? { command: 'cmd', args: ['/c', 'npx', '-y', '@codebakers/cli', 'serve'] }
+          : { command: 'npx', args: ['-y', '@codebakers/cli', 'serve'] }
+      }
+    };
+
+    // Merge with existing MCP config if present
+    if (existsSync(mcpConfigPath)) {
+      try {
+        const existing = JSON.parse(readFileSync(mcpConfigPath, 'utf-8'));
+        existing.mcpServers = { ...existing.mcpServers, ...mcpConfig.mcpServers };
+        writeFileSync(mcpConfigPath, JSON.stringify(existing, null, 2));
+      } catch {
+        writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+      }
+    } else {
+      writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+    }
+
     // Create/merge .vscode/settings.json
     const vscodeDir = join(cwd, '.vscode');
     if (!existsSync(vscodeDir)) {
@@ -717,6 +746,7 @@ export async function init(): Promise<void> {
     }
 
     cursorSpinner.succeed('Cursor configuration installed!');
+    console.log(chalk.green('    ✓ MCP server configured (.cursor/mcp.json)'));
   } catch (error) {
     cursorSpinner.warn('Could not install Cursor files (continuing anyway)');
   }

package/src/commands/setup.ts

@@ -2,6 +2,8 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { createInterface } from 'readline';
 import { execSync } from 'child_process';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { join } from 'path';
 import { setApiKey, getApiKey, getApiUrl, syncServiceKeys, SERVICE_KEY_LABELS, type ServiceName } from '../config.js';
 import { validateApiKey, formatApiError, checkForUpdates, getCliVersion, type ApiError } from '../lib/api.js';
 import { showQuickStartGuide, formatFriendlyError, getNetworkError, getAuthError } from '../lib/progress.js';
@@ -136,55 +138,88 @@ export async function setup(): Promise<void> {
 
 function showFinalInstructions(): void {
   const isWindows = process.platform === 'win32';
+  const cwd = process.cwd();
 
   console.log(chalk.blue('  ══════════════════════════════════════════════════════════'));
-  console.log(chalk.white.bold('\n  STEP 3: Connecting CodeBakers to Claude...\n'));
+  console.log(chalk.white.bold('\n  STEP 3: Connecting CodeBakers to your IDE...\n'));
   console.log(chalk.blue('  ══════════════════════════════════════════════════════════\n'));
 
-  // Auto-install MCP server
+  // Install MCP for Claude Code CLI
   const mcpCmd = isWindows
     ? 'claude mcp add --transport stdio codebakers -- cmd /c npx -y @codebakers/cli serve'
     : 'claude mcp add --transport stdio codebakers -- npx -y @codebakers/cli serve';
 
+  let claudeCodeInstalled = false;
   try {
     execSync(mcpCmd, { stdio: 'pipe' });
-    console.log(chalk.green('  ✅ CodeBakers MCP server installed!\n'));
+    console.log(chalk.green('  ✅ Claude Code MCP server installed!\n'));
+    claudeCodeInstalled = true;
   } catch (error) {
-    // Check if it's already installed (command might fail if already exists)
     const errorMessage = error instanceof Error ? error.message : String(error);
     if (errorMessage.includes('already exists') || errorMessage.includes('already registered')) {
-      console.log(chalk.green('  ✅ CodeBakers MCP server already installed!\n'));
+      console.log(chalk.green('  ✅ Claude Code MCP server already installed!\n'));
+      claudeCodeInstalled = true;
     } else {
-      console.log(chalk.yellow('  ⚠️  Could not auto-install MCP server.\n'));
-      console.log(chalk.white('  Run this command manually in your terminal:\n'));
-      console.log(chalk.bgBlue.white('\n  ' + mcpCmd + '  \n'));
-      console.log(chalk.yellow('\n  ⚠️  Then close this terminal and open a new one in your project.\n'));
-      return;
+      console.log(chalk.yellow('  ⚠️  Claude Code not detected (that\'s OK if using Cursor)\n'));
     }
   }
 
+  // Install MCP for Cursor IDE (create .cursor/mcp.json)
+  const cursorDir = join(cwd, '.cursor');
+  const mcpConfigPath = join(cursorDir, 'mcp.json');
+  const mcpConfig = {
+    mcpServers: {
+      codebakers: isWindows
+        ? { command: 'cmd', args: ['/c', 'npx', '-y', '@codebakers/cli', 'serve'] }
+        : { command: 'npx', args: ['-y', '@codebakers/cli', 'serve'] }
+    }
+  };
+
+  try {
+    if (!existsSync(cursorDir)) {
+      mkdirSync(cursorDir, { recursive: true });
+    }
+
+    // Merge with existing MCP config if present
+    if (existsSync(mcpConfigPath)) {
+      const existing = JSON.parse(readFileSync(mcpConfigPath, 'utf-8'));
+      existing.mcpServers = { ...existing.mcpServers, ...mcpConfig.mcpServers };
+      writeFileSync(mcpConfigPath, JSON.stringify(existing, null, 2));
+    } else {
+      writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+    }
+    console.log(chalk.green('  ✅ Cursor MCP server configured! (.cursor/mcp.json)\n'));
+  } catch (error) {
+    console.log(chalk.yellow('  ⚠️  Could not create Cursor MCP config\n'));
+  }
+
   console.log(chalk.blue('  ══════════════════════════════════════════════════════════'));
   console.log(chalk.white.bold('\n  🎉 Setup Complete!\n'));
   console.log(chalk.blue('  ══════════════════════════════════════════════════════════\n'));
 
-  console.log(chalk.yellow.bold('  ⚠️  RESTART REQUIRED - Follow these steps:\n'));
-
-  console.log(chalk.white('  For Claude Code:\n'));
-  console.log(chalk.gray('    1. Close this terminal completely (type ') + chalk.cyan('exit') + chalk.gray(')'));
-  console.log(chalk.gray('    2. Open a NEW terminal window'));
-  console.log(chalk.gray('    3. Navigate to your project folder'));
-  console.log(chalk.gray('    4. Run ') + chalk.cyan('claude') + chalk.gray(' to start Claude Code\n'));
+  console.log(chalk.yellow.bold('  ⚠️  RESTART REQUIRED:\n'));
 
   console.log(chalk.white('  For Cursor:\n'));
   console.log(chalk.gray('    1. Close Cursor completely (Cmd+Q / Alt+F4)'));
   console.log(chalk.gray('    2. Reopen Cursor'));
   console.log(chalk.gray('    3. Open Composer (Cmd+I / Ctrl+I)\n'));
 
+  if (claudeCodeInstalled) {
+    console.log(chalk.white('  For Claude Code:\n'));
+    console.log(chalk.gray('    1. Close this terminal completely (type ') + chalk.cyan('exit') + chalk.gray(')'));
+    console.log(chalk.gray('    2. Open a NEW terminal window'));
+    console.log(chalk.gray('    3. Navigate to your project folder'));
+    console.log(chalk.gray('    4. Run ') + chalk.cyan('claude') + chalk.gray(' to start Claude Code\n'));
+  }
+
   console.log(chalk.blue('  ──────────────────────────────────────────────────────────\n'));
 
-  console.log(chalk.white('  ✅ To verify CodeBakers is working, ask the AI:\n'));
-  console.log(chalk.green('    "Are you using CodeBakers?"\n'));
+  console.log(chalk.white('  Next step: Initialize patterns in your project:\n'));
+  console.log(chalk.cyan('    codebakers init\n'));
+
+  console.log(chalk.white('  To verify CodeBakers is working, ask the AI:\n'));
+  console.log(chalk.green('    "update codebakers patterns"\n'));
 
-  console.log(chalk.gray('  The AI should respond with its CodeBakers status.'));
+  console.log(chalk.gray('  The AI should call the update_patterns MCP tool.'));
   console.log(chalk.gray('  Need help? https://codebakers.ai/docs\n'));
 }

package/src/config.ts

@@ -542,7 +542,7 @@ export function setCachedUpdateInfo(latestVersion: string): void {
  * Get the current CLI version from package.json
  */
 export function getCliVersion(): string {
-  return '3.3.0'; // Keep in sync with package.json
+  return '3.3.5'; // Keep in sync with package.json
 }
 
 // ============================================
@@ -581,3 +581,54 @@ export function clearPatternCache(): void {
   config.set('lastPatternCheck', null);
   config.set('latestPatternVersion', null);
 }
+
+// ============================================
+// CLI Auto-Update Tracking
+// ============================================
+
+const CLI_UPDATE_COOLDOWN_HOURS = 24; // Don't retry auto-update for 24 hours after failure
+
+/**
+ * Check if we should attempt CLI auto-update
+ * Returns false if we recently attempted and failed
+ */
+export function shouldAttemptCliUpdate(): boolean {
+  const lastAttempt = config.get('lastCliUpdateAttempt') as string | undefined;
+  const lastAttemptVersion = config.get('lastCliUpdateAttemptVersion') as string | undefined;
+
+  if (!lastAttempt || typeof lastAttempt !== 'string') return true;
+
+  const hoursSinceAttempt = (Date.now() - new Date(lastAttempt).getTime()) / (1000 * 60 * 60);
+
+  // If we already successfully updated to this version, don't retry
+  const currentVersion = getCliVersion();
+  if (lastAttemptVersion === currentVersion) return false;
+
+  // If cooldown hasn't passed, don't retry
+  if (hoursSinceAttempt < CLI_UPDATE_COOLDOWN_HOURS) return false;
+
+  return true;
+}
+
+/**
+ * Record a CLI update attempt
+ */
+export function setCliUpdateAttempt(targetVersion: string, success: boolean): void {
+  config.set('lastCliUpdateAttempt', new Date().toISOString());
+  config.set('lastCliUpdateAttemptVersion', targetVersion);
+  config.set('lastCliUpdateSuccess', success);
+}
+
+/**
+ * Check if CLI auto-update is disabled
+ */
+export function isCliAutoUpdateDisabled(): boolean {
+  return config.get('disableCliAutoUpdate') === true;
+}
+
+/**
+ * Disable/enable CLI auto-update
+ */
+export function setCliAutoUpdateDisabled(disabled: boolean): void {
+  config.set('disableCliAutoUpdate', disabled);
+}

package/src/index.ts

@@ -22,7 +22,8 @@ import { pushPatterns, pushPatternsInteractive } from './commands/push-patterns.
 import { go } from './commands/go.js';
 import { extend } from './commands/extend.js';
 import { billing } from './commands/billing.js';
-import { getCachedUpdateInfo, setCachedUpdateInfo, getCliVersion, getCachedPatternInfo, setCachedPatternInfo, getApiKey, getApiUrl, getTrialState, hasValidAccess } from './config.js';
+import { getCachedUpdateInfo, setCachedUpdateInfo, getCliVersion, getCachedPatternInfo, setCachedPatternInfo, getApiKey, getApiUrl, getTrialState, hasValidAccess, shouldAttemptCliUpdate, setCliUpdateAttempt, isCliAutoUpdateDisabled } from './config.js';
+import { execSync } from 'child_process';
 import { checkForUpdates } from './lib/api.js';
 import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
@@ -31,7 +32,7 @@ import { join } from 'path';
 // Automatic Update Notification
 // ============================================
 
-const CURRENT_VERSION = '3.3.1';
+const CURRENT_VERSION = '3.3.6';
 
 async function checkForUpdatesInBackground(): Promise<void> {
   // Check if we have a valid cached result first (fast path)
@@ -97,6 +98,71 @@ function showUpdateBanner(currentVersion: string, latestVersion: string, isRecom
   `));
 }
 
+// ============================================
+// CLI Auto-Update
+// ============================================
+
+async function autoUpdateCli(): Promise<void> {
+  // Check if auto-update is disabled
+  if (isCliAutoUpdateDisabled()) return;
+
+  // Check if we should attempt update (cooldown, etc.)
+  if (!shouldAttemptCliUpdate()) return;
+
+  // Check for available updates
+  try {
+    const updateInfo = await checkForUpdates();
+
+    if (!updateInfo || !updateInfo.updateAvailable) return;
+
+    // Don't auto-update blocked versions - show warning instead
+    if (updateInfo.isBlocked) return;
+
+    const targetVersion = updateInfo.latestVersion;
+    const currentVersion = CURRENT_VERSION;
+
+    // Only auto-update if the version has auto-update enabled from server
+    if (!updateInfo.autoUpdateEnabled) return;
+
+    console.log(chalk.blue(`\n  🔄 Auto-updating CLI: ${chalk.gray(currentVersion)} → ${chalk.green(targetVersion)}...\n`));
+
+    try {
+      // Run npm install globally
+      execSync('npm install -g @codebakers/cli@latest', {
+        stdio: 'inherit',
+        timeout: 60000, // 60 second timeout
+      });
+
+      setCliUpdateAttempt(targetVersion, true);
+
+      console.log(chalk.green(`\n  ✓ CLI updated to v${targetVersion}!\n`));
+      console.log(chalk.gray('  The update will take effect on your next command.\n'));
+
+    } catch (installError) {
+      setCliUpdateAttempt(targetVersion, false);
+
+      // Check if it's a permission error
+      const errorMessage = installError instanceof Error ? installError.message : String(installError);
+      if (errorMessage.includes('EACCES') || errorMessage.includes('permission')) {
+        console.log(chalk.yellow(`
+  ⚠️  Auto-update failed (permission denied)
+
+  Run manually with: ${chalk.cyan('sudo npm i -g @codebakers/cli@latest')}
+  Or disable auto-update: ${chalk.cyan('codebakers config set disableCliAutoUpdate true')}
+        `));
+      } else {
+        console.log(chalk.yellow(`
+  ⚠️  Auto-update failed
+
+  Run manually: ${chalk.cyan('npm i -g @codebakers/cli@latest')}
+        `));
+      }
+    }
+  } catch {
+    // Silently fail - don't block CLI for update check
+  }
+}
+
 // ============================================
 // Automatic Pattern Updates
 // ============================================
@@ -476,7 +542,11 @@ program
 
 // Add update check hook (runs before every command)
 program.hook('preAction', async () => {
-  // Run CLI update check and pattern auto-update in parallel
+  // Run CLI auto-update first (if enabled and conditions met)
+  // Then run pattern auto-update in parallel with update banner check
+  await autoUpdateCli();
+
+  // Run pattern auto-update and update banner check in parallel
   await Promise.all([
     checkForUpdatesInBackground(),
     autoUpdatePatterns(),