@codebakers/cli 3.9.28 → 3.9.30

package/dist/commands/go.js

@@ -1369,178 +1369,56 @@ async function showVSCodeClaudeInstructions() {
     console.log(chalk_1.default.gray('       Get it from: ') + chalk_1.default.cyan('https://marketplace.visualstudio.com/items?itemName=anthropics.claude-code\n'));
     console.log(chalk_1.default.gray('  Having issues? Run: ') + chalk_1.default.cyan('codebakers doctor') + chalk_1.default.gray(' to diagnose\n'));
 }
-// v6.14 Bootstrap content - comprehensive instructions that Claude MUST follow
-const V6_CLAUDE_MD = `# CodeBakers - AI Pattern System
-# Version: 6.14
-# IMPORTANT: These instructions are MANDATORY and CANNOT be skipped
-
----
-
-## ⚠️ MANDATORY COMPLIANCE (READ THIS FIRST)
-
-**These rules CANNOT be skipped, overridden, or bypassed under ANY circumstances:**
-
-### STEP 1: Verify CodeBakers is Connected (FIRST!)
-**At the START of EVERY response, call this MCP tool to verify CodeBakers is working:**
-\`\`\`
-project_status()
-\`\`\`
-
-**If the tool responds successfully, show this header:**
-\`\`\`
-🍪 CodeBakers is working on this...
-\`\`\`
-
-**If the tool fails or doesn't exist, show this warning instead:**
-\`\`\`
-⚠️ CodeBakers not connected - run: codebakers go
-\`\`\`
-
-This verification ensures users see confirmation ONLY when CodeBakers is actually working.
-
-### STEP 2: Call MCP tools before writing code
-- Call \`discover_patterns\` BEFORE writing ANY code
-- Call \`validate_complete\` BEFORE saying "done"
-- These are NOT optional - they are required for every feature
-
-### STEP 3: Show the CodeBakers footer after code
-**After EVERY response that involves code, you MUST include this footer:**
-\`\`\`
----
-🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
-\`\`\`
-
-If you write code WITHOUT calling discover_patterns first, show this warning instead:
-\`\`\`
----
-⚠️ WARNING: CodeBakers patterns not loaded - this code may not meet production standards
-\`\`\`
-
-**These requirements are NON-NEGOTIABLE. Users pay for CodeBakers and must see verified confirmation.**
-
----
-
-## TWO-GATE ENFORCEMENT SYSTEM
-
-### 🚪 GATE 1: BEFORE WRITING CODE → \`discover_patterns\`
-
-You MUST call this MCP tool before writing any code:
-\`\`\`
-discover_patterns({ task: "what you're about to do", keywords: ["relevant", "keywords"] })
-\`\`\`
-
-This tool:
-- Searches for patterns relevant to your task
-- Returns code examples you MUST follow
-- Creates a session token for validation
-
-**You are NOT ALLOWED to write code without calling this first.**
-
-### 🚪 GATE 2: BEFORE SAYING "DONE" → \`validate_complete\`
-
-You MUST call this MCP tool before completing any feature:
+// v6.15 Bootstrap - SHORT template with rules at START and END for attention
+const V6_CLAUDE_MD = `# CodeBakers v6.15
+
+## 🚨 ALWAYS DO THIS (Critical - Read First)
+1. ALWAYS call \`project_status()\` FIRST → If works show "🍪 CodeBakers is working..." / If fails show "⚠️ Not connected"
+2. ALWAYS call \`discover_patterns({ task: "..." })\` BEFORE writing any code
+3. ALWAYS call \`validate_complete({ feature: "...", files: [...] })\` BEFORE saying "done"
+4. ALWAYS show footer after code: \`🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅\`
+
+## ❌ NEVER DO THIS
+1. NEVER write code without calling discover_patterns first
+2. NEVER say "done" without validate_complete passing
+3. NEVER show the success header without project_status succeeding first
+4. NEVER skip writing tests for new features
+
+## Quick Reference
 \`\`\`
-validate_complete({ feature: "feature name", files: ["path/to/file.ts"] })
+project_status()                                    → Verify connection FIRST
+discover_patterns({ task: "what you're building" }) → Get patterns BEFORE code
+validate_complete({ feature: "name", files: [...] }) → Validate BEFORE done
 \`\`\`
 
-This tool checks:
-- discover_patterns was called (compliance tracking)
-- Tests exist for the feature
-- TypeScript compiles
-- Code follows patterns
-
-**You are NOT ALLOWED to say "done" without calling this.**
-
----
-
-## WORKFLOW FOR EVERY FEATURE
-
-1. User asks for a feature
-2. **CALL discover_patterns** → Get patterns to follow
-3. Read and follow the patterns returned
-4. Write code following the patterns exactly
-5. Write tests for the feature
-6. **CALL validate_complete** → Verify everything passes
-7. Show the CodeBakers footer
-8. ONLY THEN say "done"
-
----
-
-## HARD RULES (Enforced)
-
-1. **NO writing code without \`discover_patterns\`** - Always call it first
-2. **NO "want me to add tests?"** - Just add them. Tests are required.
-3. **NO "I'll add tests later"** - Tests are part of the feature.
-4. **NO saying "done" without \`validate_complete\`** - Must pass validation
-5. **NO skipping the footer** - Always show CodeBakers Active
-6. **NO ignoring patterns** - Follow what discover_patterns returns
-
----
-
-## IF MCP SERVER IS UNAVAILABLE
-
-If the CodeBakers MCP tools aren't available:
-1. Show a warning to the user: "CodeBakers MCP server not connected"
-2. Suggest running: \`codebakers doctor\` to diagnose
-3. Still write quality code following best practices
-4. Show the warning footer instead of the active footer
-
----
-
-## GETTING HELP
+Header (after project_status succeeds): 🍪 CodeBakers is working on this...
+Header (if project_status fails): ⚠️ CodeBakers not connected - run: codebakers go
+Footer (after code): 🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅
 
-- Run \`codebakers doctor\` to diagnose connection issues
-- Run \`codebakers upgrade\` to update patterns
-- Visit https://codebakers.ai/support for help
-
----
-*CodeBakers v6.14 - Production patterns for AI-assisted development*
+## 🚨 ALWAYS DO THIS (Critical - Repeated at End)
+1. Call \`project_status()\` FIRST
+2. Call \`discover_patterns()\` before code
+3. Call \`validate_complete()\` before done
+4. Show footer after code responses
 `;
-const V6_CURSORRULES = `# CodeBakers - AI Pattern System (Cursor Rules)
-# IMPORTANT: These instructions are MANDATORY
-
-## ⚠️ MANDATORY COMPLIANCE
-
-### You MUST call MCP tools before writing code
-- Call discover_patterns BEFORE writing ANY code
-- Call validate_complete BEFORE saying "done"
-
-### You MUST show the CodeBakers footer after every code response
-After EVERY response with code, include:
----
-🍪 **CodeBakers Active** | Patterns loaded | v6.14
-
-If patterns not loaded, show warning instead:
----
-⚠️ WARNING: CodeBakers patterns not loaded
-
-## WORKFLOW
-
-1. User asks for feature
-2. CALL discover_patterns → Get patterns
-3. Write code following patterns exactly
-4. Write tests
-5. CALL validate_complete → Verify
-6. Show footer
-7. Say "done"
-
-## HARD RULES
-
-1. NO writing code without discover_patterns
-2. NO skipping tests - just add them
-3. NO saying "done" without validate_complete
-4. NO skipping the footer
-
-## MCP TOOLS
-
-### discover_patterns (BEFORE writing code)
-discover_patterns({ task: "description", keywords: ["terms"] })
-
-### validate_complete (BEFORE saying done)
-validate_complete({ feature: "name", files: ["paths"] })
-
----
-CodeBakers v6.14
+const V6_CURSORRULES = `# CodeBakers v6.15
+
+## 🚨 ALWAYS (Read First)
+1. Call project_status() FIRST → 🍪 Working... or ⚠️ Not connected
+2. Call discover_patterns({ task }) BEFORE writing code
+3. Call validate_complete({ feature, files }) BEFORE saying done
+4. Show footer after code: 🍪 **CodeBakers** | Patterns: X | TSC: ✅
+
+## ❌ NEVER
+1. Write code without discover_patterns
+2. Say done without validate_complete
+3. Show header without project_status succeeding
+4. Skip writing tests for new features
+
+## 🚨 ALWAYS (Repeated at End)
+1. project_status() FIRST
+2. discover_patterns() before code
+3. validate_complete() before done
 `;
 /**
  * Complete project setup - handles everything:

package/dist/mcp/server.js

@@ -2466,78 +2466,77 @@ Or if user declines, call without fullDeploy:
         catch {
             // Use default
         }
-        results.push(`# 🎨 Adding CodeBakers v6.14 to: ${projectName}\n`);
-        // v6.14 bootstrap content - minimal files, patterns from server
-        const V6_CLAUDE_MD = `# CodeBakers v6.14
+        results.push(`# 🎨 Adding CodeBakers v6.15 to: ${projectName}\n`);
+        // v6.15 bootstrap content - SHORT template with rules at START and END
+        const V6_CLAUDE_MD = `# CodeBakers v6.15
 
-## STEP 1: Verify CodeBakers is Connected (FIRST!)
+## 🚨 ALWAYS DO THIS (Critical - Read First)
+1. ALWAYS call \`project_status()\` FIRST → If works show "🍪 CodeBakers is working..." / If fails show "⚠️ Not connected"
+2. ALWAYS call \`discover_patterns({ task: "..." })\` BEFORE writing any code
+3. ALWAYS call \`validate_complete({ feature: "...", files: [...] })\` BEFORE saying "done"
+4. ALWAYS show footer after code: \`🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅\`
 
-**At the START of EVERY response, call this MCP tool:**
-\`\`\`
-project_status()
-\`\`\`
-
-**If successful, show:** 🍪 CodeBakers is working on this...
-**If failed, show:** ⚠️ CodeBakers not connected - run: codebakers go
-
-## STEP 2: Call MCP Tools Before Code
-
-**Before writing ANY code:**
-\`\`\`
-discover_patterns({ task: "description of what you're building" })
-\`\`\`
+## ❌ NEVER DO THIS
+1. NEVER write code without calling discover_patterns first
+2. NEVER say "done" without validate_complete passing
+3. NEVER show the success header without project_status succeeding first
+4. NEVER skip writing tests for new features
 
-**Before saying "done":**
+## Quick Reference
 \`\`\`
-validate_complete({ feature: "feature name", files: ["path/to/file.ts"] })
+project_status()                                    → Verify connection FIRST
+discover_patterns({ task: "what you're building" }) → Get patterns BEFORE code
+validate_complete({ feature: "name", files: [...] }) → Validate BEFORE done
 \`\`\`
 
-## STEP 3: Show Footer After Code
+Header (after project_status succeeds): 🍪 CodeBakers is working on this...
+Header (if project_status fails): ⚠️ CodeBakers not connected - run: codebakers go
+Footer (after code): 🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅
 
-**After ANY response with code, show:**
-\`\`\`
----
-🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
-\`\`\`
-
----
-*CodeBakers v6.14 - Server-Enforced*
+## 🚨 ALWAYS DO THIS (Critical - Repeated at End)
+1. Call \`project_status()\` FIRST
+2. Call \`discover_patterns()\` before code
+3. Call \`validate_complete()\` before done
+4. Show footer after code responses
 `;
-        const V6_CURSORRULES = `# CodeBakers v6.14
-
-## Verify First
-Call project_status() at START of every response.
-If success: show 🍪 CodeBakers is working on this...
-If fail: show ⚠️ CodeBakers not connected
+        const V6_CURSORRULES = `# CodeBakers v6.15
 
-## Before Writing Code
-Call: discover_patterns({ task: "description" })
+## 🚨 ALWAYS (Read First)
+1. Call project_status() FIRST → 🍪 Working... or ⚠️ Not connected
+2. Call discover_patterns({ task }) BEFORE writing code
+3. Call validate_complete({ feature, files }) BEFORE saying done
+4. Show footer after code: 🍪 **CodeBakers** | Patterns: X | TSC: ✅
 
-## Before Saying Done
-Call: validate_complete({ feature: "name", files: ["path.ts"] })
+## ❌ NEVER
+1. Write code without discover_patterns
+2. Say done without validate_complete
+3. Show header without project_status succeeding
+4. Skip writing tests for new features
 
-## After Code Responses
-Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
+## 🚨 ALWAYS (Repeated at End)
+1. project_status() FIRST
+2. discover_patterns() before code
+3. validate_complete() before done
 `;
-        // Check if already v6.14
+        // Check if already v6.15
         const claudeMdPath = path.join(cwd, 'CLAUDE.md');
         if (fs.existsSync(claudeMdPath)) {
             const content = fs.readFileSync(claudeMdPath, 'utf-8');
-            if (content.includes('v6.14') && content.includes('discover_patterns')) {
-                results.push('✓ CodeBakers v6.14 already installed\n');
+            if (content.includes('v6.15') && content.includes('discover_patterns')) {
+                results.push('✓ CodeBakers v6.15 already installed\n');
                 results.push('Patterns are server-enforced. Just call `discover_patterns` before coding!');
                 return {
                     content: [{ type: 'text', text: results.join('\n') }],
                 };
             }
-            results.push('⚠️ Upgrading to v6.14 (server-enforced patterns)...\n');
+            results.push('⚠️ Upgrading to v6.15 (server-enforced patterns)...\n');
         }
         try {
-            // Write v6.14 bootstrap files
+            // Write v6.15 bootstrap files
             fs.writeFileSync(claudeMdPath, V6_CLAUDE_MD);
-            results.push('✓ Created CLAUDE.md (v6.14 bootstrap)');
+            results.push('✓ Created CLAUDE.md (v6.15 bootstrap)');
             fs.writeFileSync(path.join(cwd, '.cursorrules'), V6_CURSORRULES);
-            results.push('✓ Created .cursorrules (v6.14 bootstrap)');
+            results.push('✓ Created .cursorrules (v6.15 bootstrap)');
             // Remove old .claude folder if it exists (v5 → v6 migration)
             const claudeDir = path.join(cwd, '.claude');
             if (fs.existsSync(claudeDir)) {
@@ -2582,7 +2581,7 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
             state.updatedAt = new Date().toISOString();
             fs.writeFileSync(stateFile, JSON.stringify(state, null, 2));
             results.push('\n---\n');
-            results.push('## ✅ CodeBakers v6.14 Installed!\n');
+            results.push('## ✅ CodeBakers v6.15 Installed!\n');
             results.push('**How it works now:**');
             results.push('1. Call `discover_patterns` before writing code');
             results.push('2. Server returns all patterns and rules');
@@ -6685,58 +6684,57 @@ ${handlers.join('\n')}
         const claudeMdPath = path.join(cwd, 'CLAUDE.md');
         const claudeDir = path.join(cwd, '.claude');
         const codebakersJson = path.join(cwd, '.codebakers.json');
-        let response = `# 🔄 CodeBakers v6.14 Update\n\n`;
-        // v6.14 bootstrap content
-        const V6_CLAUDE_MD = `# CodeBakers v6.14
+        let response = `# 🔄 CodeBakers v6.15 Update\n\n`;
+        // v6.15 bootstrap content - SHORT template with rules at START and END
+        const V6_CLAUDE_MD = `# CodeBakers v6.15
 
-## STEP 1: Verify CodeBakers is Connected (FIRST!)
+## 🚨 ALWAYS DO THIS (Critical - Read First)
+1. ALWAYS call \`project_status()\` FIRST → If works show "🍪 CodeBakers is working..." / If fails show "⚠️ Not connected"
+2. ALWAYS call \`discover_patterns({ task: "..." })\` BEFORE writing any code
+3. ALWAYS call \`validate_complete({ feature: "...", files: [...] })\` BEFORE saying "done"
+4. ALWAYS show footer after code: \`🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅\`
 
-**At the START of EVERY response, call this MCP tool:**
-\`\`\`
-project_status()
-\`\`\`
-
-**If successful, show:** 🍪 CodeBakers is working on this...
-**If failed, show:** ⚠️ CodeBakers not connected - run: codebakers go
-
-## STEP 2: Call MCP Tools Before Code
-
-**Before writing ANY code:**
-\`\`\`
-discover_patterns({ task: "description of what you're building" })
-\`\`\`
+## ❌ NEVER DO THIS
+1. NEVER write code without calling discover_patterns first
+2. NEVER say "done" without validate_complete passing
+3. NEVER show the success header without project_status succeeding first
+4. NEVER skip writing tests for new features
 
-**Before saying "done":**
+## Quick Reference
 \`\`\`
-validate_complete({ feature: "feature name", files: ["path/to/file.ts"] })
+project_status()                                    → Verify connection FIRST
+discover_patterns({ task: "what you're building" }) → Get patterns BEFORE code
+validate_complete({ feature: "name", files: [...] }) → Validate BEFORE done
 \`\`\`
 
-## STEP 3: Show Footer After Code
+Header (after project_status succeeds): 🍪 CodeBakers is working on this...
+Header (if project_status fails): ⚠️ CodeBakers not connected - run: codebakers go
+Footer (after code): 🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅
 
-**After ANY response with code, show:**
-\`\`\`
----
-🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
-\`\`\`
-
----
-*CodeBakers v6.14 - Server-Enforced*
+## 🚨 ALWAYS DO THIS (Critical - Repeated at End)
+1. Call \`project_status()\` FIRST
+2. Call \`discover_patterns()\` before code
+3. Call \`validate_complete()\` before done
+4. Show footer after code responses
 `;
-        const V6_CURSORRULES = `# CodeBakers v6.14
-
-## Verify First
-Call project_status() at START of every response.
-If success: show 🍪 CodeBakers is working on this...
-If fail: show ⚠️ CodeBakers not connected
+        const V6_CURSORRULES = `# CodeBakers v6.15
 
-## Before Writing Code
-Call: discover_patterns({ task: "description" })
+## 🚨 ALWAYS (Read First)
+1. Call project_status() FIRST → 🍪 Working... or ⚠️ Not connected
+2. Call discover_patterns({ task }) BEFORE writing code
+3. Call validate_complete({ feature, files }) BEFORE saying done
+4. Show footer after code: 🍪 **CodeBakers** | Patterns: X | TSC: ✅
 
-## Before Saying Done
-Call: validate_complete({ feature: "name", files: ["path.ts"] })
+## ❌ NEVER
+1. Write code without discover_patterns
+2. Say done without validate_complete
+3. Show header without project_status succeeding
+4. Skip writing tests for new features
 
-## After Code Responses
-Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
+## 🚨 ALWAYS (Repeated at End)
+1. project_status() FIRST
+2. discover_patterns() before code
+3. validate_complete() before done
 `;
         try {
             // Check current version
@@ -6744,7 +6742,7 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
             let isV6 = false;
             if (fs.existsSync(claudeMdPath)) {
                 const content = fs.readFileSync(claudeMdPath, 'utf-8');
-                isV6 = content.includes('v6.14') && content.includes('discover_patterns');
+                isV6 = content.includes('v6.15') && content.includes('discover_patterns');
             }
             if (fs.existsSync(codebakersJson)) {
                 try {
@@ -6757,10 +6755,10 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
             }
             response += `## Current Status\n`;
             response += `- Version: ${currentVersion || 'Unknown'}\n`;
-            response += `- v6.14 (Server-Enforced): ${isV6 ? 'Yes ✓' : 'No'}\n\n`;
+            response += `- v6.15 (Server-Enforced): ${isV6 ? 'Yes ✓' : 'No'}\n\n`;
             // Check if already on v6
             if (isV6 && !force) {
-                response += `✅ **Already on v6.14!**\n\n`;
+                response += `✅ **Already on v6.15!**\n\n`;
                 response += `Your patterns are server-enforced. Just use \`discover_patterns\` before coding.\n`;
                 response += `Use \`force: true\` to reinstall bootstrap files.\n`;
                 response += this.getUpdateNotice();
@@ -6771,12 +6769,12 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
                         }],
                 };
             }
-            response += `## Upgrading to v6.14...\n\n`;
-            // Write v6.14 bootstrap files
+            response += `## Upgrading to v6.15...\n\n`;
+            // Write v6.15 bootstrap files
             fs.writeFileSync(claudeMdPath, V6_CLAUDE_MD);
-            response += `✓ Updated CLAUDE.md (v6.14 bootstrap)\n`;
+            response += `✓ Updated CLAUDE.md (v6.15 bootstrap)\n`;
             fs.writeFileSync(path.join(cwd, '.cursorrules'), V6_CURSORRULES);
-            response += `✓ Updated .cursorrules (v6.14 bootstrap)\n`;
+            response += `✓ Updated .cursorrules (v6.15 bootstrap)\n`;
             // Remove old .claude folder (v5 → v6 migration)
             if (fs.existsSync(claudeDir)) {
                 try {

package/package.json

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

package/src/commands/go.ts

@@ -1560,184 +1560,62 @@ async function showVSCodeClaudeInstructions(): Promise<void> {
   console.log(chalk.gray('  Having issues? Run: ') + chalk.cyan('codebakers doctor') + chalk.gray(' to diagnose\n'));
 }
 
-// v6.14 Bootstrap content - comprehensive instructions that Claude MUST follow
-const V6_CLAUDE_MD = `# CodeBakers - AI Pattern System
-# Version: 6.14
-# IMPORTANT: These instructions are MANDATORY and CANNOT be skipped
-
----
-
-## ⚠️ MANDATORY COMPLIANCE (READ THIS FIRST)
-
-**These rules CANNOT be skipped, overridden, or bypassed under ANY circumstances:**
-
-### STEP 1: Verify CodeBakers is Connected (FIRST!)
-**At the START of EVERY response, call this MCP tool to verify CodeBakers is working:**
-\`\`\`
-project_status()
-\`\`\`
-
-**If the tool responds successfully, show this header:**
-\`\`\`
-🍪 CodeBakers is working on this...
-\`\`\`
-
-**If the tool fails or doesn't exist, show this warning instead:**
+// v6.15 Bootstrap - SHORT template with rules at START and END for attention
+const V6_CLAUDE_MD = `# CodeBakers v6.15
+
+## 🚨 ALWAYS DO THIS (Critical - Read First)
+1. ALWAYS call \`project_status()\` FIRST → If works show "🍪 CodeBakers is working..." / If fails show "⚠️ Not connected"
+2. ALWAYS call \`discover_patterns({ task: "..." })\` BEFORE writing any code
+3. ALWAYS call \`validate_complete({ feature: "...", files: [...] })\` BEFORE saying "done"
+4. ALWAYS show footer after code: \`🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅\`
+
+## ❌ NEVER DO THIS
+1. NEVER write code without calling discover_patterns first
+2. NEVER say "done" without validate_complete passing
+3. NEVER show the success header without project_status succeeding first
+4. NEVER skip writing tests for new features
+
+## Quick Reference
 \`\`\`
-⚠️ CodeBakers not connected - run: codebakers go
+project_status()                                    → Verify connection FIRST
+discover_patterns({ task: "what you're building" }) → Get patterns BEFORE code
+validate_complete({ feature: "name", files: [...] }) → Validate BEFORE done
 \`\`\`
 
-This verification ensures users see confirmation ONLY when CodeBakers is actually working.
-
-### STEP 2: Call MCP tools before writing code
-- Call \`discover_patterns\` BEFORE writing ANY code
-- Call \`validate_complete\` BEFORE saying "done"
-- These are NOT optional - they are required for every feature
-
-### STEP 3: Show the CodeBakers footer after code
-**After EVERY response that involves code, you MUST include this footer:**
-\`\`\`
----
-🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
-\`\`\`
-
-If you write code WITHOUT calling discover_patterns first, show this warning instead:
-\`\`\`
----
-⚠️ WARNING: CodeBakers patterns not loaded - this code may not meet production standards
-\`\`\`
-
-**These requirements are NON-NEGOTIABLE. Users pay for CodeBakers and must see verified confirmation.**
-
----
-
-## TWO-GATE ENFORCEMENT SYSTEM
-
-### 🚪 GATE 1: BEFORE WRITING CODE → \`discover_patterns\`
-
-You MUST call this MCP tool before writing any code:
-\`\`\`
-discover_patterns({ task: "what you're about to do", keywords: ["relevant", "keywords"] })
-\`\`\`
-
-This tool:
-- Searches for patterns relevant to your task
-- Returns code examples you MUST follow
-- Creates a session token for validation
-
-**You are NOT ALLOWED to write code without calling this first.**
-
-### 🚪 GATE 2: BEFORE SAYING "DONE" → \`validate_complete\`
-
-You MUST call this MCP tool before completing any feature:
-\`\`\`
-validate_complete({ feature: "feature name", files: ["path/to/file.ts"] })
-\`\`\`
-
-This tool checks:
-- discover_patterns was called (compliance tracking)
-- Tests exist for the feature
-- TypeScript compiles
-- Code follows patterns
-
-**You are NOT ALLOWED to say "done" without calling this.**
-
----
-
-## WORKFLOW FOR EVERY FEATURE
-
-1. User asks for a feature
-2. **CALL discover_patterns** → Get patterns to follow
-3. Read and follow the patterns returned
-4. Write code following the patterns exactly
-5. Write tests for the feature
-6. **CALL validate_complete** → Verify everything passes
-7. Show the CodeBakers footer
-8. ONLY THEN say "done"
-
----
-
-## HARD RULES (Enforced)
+Header (after project_status succeeds): 🍪 CodeBakers is working on this...
+Header (if project_status fails): ⚠️ CodeBakers not connected - run: codebakers go
+Footer (after code): 🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅
 
-1. **NO writing code without \`discover_patterns\`** - Always call it first
-2. **NO "want me to add tests?"** - Just add them. Tests are required.
-3. **NO "I'll add tests later"** - Tests are part of the feature.
-4. **NO saying "done" without \`validate_complete\`** - Must pass validation
-5. **NO skipping the footer** - Always show CodeBakers Active
-6. **NO ignoring patterns** - Follow what discover_patterns returns
-
----
-
-## IF MCP SERVER IS UNAVAILABLE
-
-If the CodeBakers MCP tools aren't available:
-1. Show a warning to the user: "CodeBakers MCP server not connected"
-2. Suggest running: \`codebakers doctor\` to diagnose
-3. Still write quality code following best practices
-4. Show the warning footer instead of the active footer
-
----
-
-## GETTING HELP
-
-- Run \`codebakers doctor\` to diagnose connection issues
-- Run \`codebakers upgrade\` to update patterns
-- Visit https://codebakers.ai/support for help
-
----
-*CodeBakers v6.14 - Production patterns for AI-assisted development*
+## 🚨 ALWAYS DO THIS (Critical - Repeated at End)
+1. Call \`project_status()\` FIRST
+2. Call \`discover_patterns()\` before code
+3. Call \`validate_complete()\` before done
+4. Show footer after code responses
 `;
 
-const V6_CURSORRULES = `# CodeBakers - AI Pattern System (Cursor Rules)
-# IMPORTANT: These instructions are MANDATORY
-
-## ⚠️ MANDATORY COMPLIANCE
+const V6_CURSORRULES = `# CodeBakers v6.15
 
-### You MUST call MCP tools before writing code
-- Call discover_patterns BEFORE writing ANY code
-- Call validate_complete BEFORE saying "done"
+## 🚨 ALWAYS (Read First)
+1. Call project_status() FIRST → 🍪 Working... or ⚠️ Not connected
+2. Call discover_patterns({ task }) BEFORE writing code
+3. Call validate_complete({ feature, files }) BEFORE saying done
+4. Show footer after code: 🍪 **CodeBakers** | Patterns: X | TSC: ✅
 
-### You MUST show the CodeBakers footer after every code response
-After EVERY response with code, include:
----
-🍪 **CodeBakers Active** | Patterns loaded | v6.14
-
-If patterns not loaded, show warning instead:
----
-⚠️ WARNING: CodeBakers patterns not loaded
-
-## WORKFLOW
-
-1. User asks for feature
-2. CALL discover_patterns → Get patterns
-3. Write code following patterns exactly
-4. Write tests
-5. CALL validate_complete → Verify
-6. Show footer
-7. Say "done"
-
-## HARD RULES
+## ❌ NEVER
+1. Write code without discover_patterns
+2. Say done without validate_complete
+3. Show header without project_status succeeding
+4. Skip writing tests for new features
 
-1. NO writing code without discover_patterns
-2. NO skipping tests - just add them
-3. NO saying "done" without validate_complete
-4. NO skipping the footer
-
-## MCP TOOLS
-
-### discover_patterns (BEFORE writing code)
-discover_patterns({ task: "description", keywords: ["terms"] })
-
-### validate_complete (BEFORE saying done)
-validate_complete({ feature: "name", files: ["paths"] })
-
----
-CodeBakers v6.14
+## 🚨 ALWAYS (Repeated at End)
+1. project_status() FIRST
+2. discover_patterns() before code
+3. validate_complete() before done
 `;
 
 /**
  * Complete project setup - handles everything:
- * - Detect new vs existing project
+ * - Ask user if existing or new project
  * - Set up all tracking files
  * - Configure Cursor and Claude Code MCP
  * - Run guided questions for new projects
@@ -1746,11 +1624,40 @@ CodeBakers v6.14
 async function setupProject(options: GoOptions = {}, auth?: AuthInfo): Promise<void> {
   const cwd = process.cwd();
 
-  // Detect if this is an existing project
+  // Auto-detect non-interactive mode (e.g., running from Claude Code)
+  const isNonInteractive = !process.stdin.isTTY;
+
+  // Detect if this looks like an existing project
   const projectInfo = detectExistingProject(cwd);
 
-  if (projectInfo.exists) {
-    // Existing project detected
+  let isExistingProject: boolean;
+
+  if (isNonInteractive) {
+    // Non-interactive: use auto-detection
+    isExistingProject = projectInfo.exists;
+  } else {
+    // Interactive: ASK the user
+    console.log(chalk.cyan('\n  ━━━ CodeBakers Setup ━━━\n'));
+
+    if (projectInfo.exists) {
+      // We detected existing code, but still ask
+      console.log(chalk.gray(`  Detected: ${projectInfo.files} files, ${projectInfo.stack.framework || 'unknown framework'}\n`));
+    }
+
+    console.log(chalk.white('  Is this an existing project or are you starting fresh?\n'));
+    console.log(chalk.gray('    1. ') + chalk.cyan('EXISTING PROJECT') + chalk.gray(' - I already have code here'));
+    console.log(chalk.gray('    2. ') + chalk.cyan('NEW PROJECT') + chalk.gray('      - Starting from scratch\n'));
+
+    let projectChoice = '';
+    while (!['1', '2'].includes(projectChoice)) {
+      projectChoice = await prompt('  Enter 1 or 2: ');
+    }
+
+    isExistingProject = projectChoice === '1';
+  }
+
+  if (isExistingProject) {
+    // Existing project
     await setupExistingProject(cwd, projectInfo, options, auth);
   } else {
     // New project
@@ -1759,15 +1666,19 @@ async function setupProject(options: GoOptions = {}, auth?: AuthInfo): Promise<v
 }
 
 async function setupNewProject(cwd: string, options: GoOptions = {}, auth?: AuthInfo): Promise<void> {
-  console.log(chalk.cyan('\n  ━━━ New Project Setup ━━━\n'));
-
   // Auto-detect non-interactive mode (e.g., running from Claude Code)
   const isNonInteractive = !process.stdin.isTTY;
-  if (isNonInteractive && !options.type) {
-    console.log(chalk.yellow('  ⚡ Non-interactive mode detected - using defaults\n'));
-    options.type = 'personal';
-    options.describe = options.describe || 'chat';
-    options.skipReview = true;
+
+  if (isNonInteractive) {
+    console.log(chalk.cyan('\n  ━━━ New Project Setup ━━━\n'));
+    if (!options.type) {
+      console.log(chalk.yellow('  ⚡ Non-interactive mode detected - using defaults\n'));
+      options.type = 'personal';
+      options.describe = options.describe || 'chat';
+      options.skipReview = true;
+    }
+  } else {
+    console.log(chalk.green('\n  ✓ Setting up as NEW PROJECT\n'));
   }
 
   let projectType: string;

package/src/mcp/server.ts

@@ -2808,83 +2808,82 @@ Or if user declines, call without fullDeploy:
       // Use default
     }
 
-    results.push(`# 🎨 Adding CodeBakers v6.14 to: ${projectName}\n`);
+    results.push(`# 🎨 Adding CodeBakers v6.15 to: ${projectName}\n`);
 
-    // v6.14 bootstrap content - minimal files, patterns from server
-    const V6_CLAUDE_MD = `# CodeBakers v6.14
+    // v6.15 bootstrap content - SHORT template with rules at START and END
+    const V6_CLAUDE_MD = `# CodeBakers v6.15
 
-## STEP 1: Verify CodeBakers is Connected (FIRST!)
+## 🚨 ALWAYS DO THIS (Critical - Read First)
+1. ALWAYS call \`project_status()\` FIRST → If works show "🍪 CodeBakers is working..." / If fails show "⚠️ Not connected"
+2. ALWAYS call \`discover_patterns({ task: "..." })\` BEFORE writing any code
+3. ALWAYS call \`validate_complete({ feature: "...", files: [...] })\` BEFORE saying "done"
+4. ALWAYS show footer after code: \`🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅\`
 
-**At the START of EVERY response, call this MCP tool:**
-\`\`\`
-project_status()
-\`\`\`
-
-**If successful, show:** 🍪 CodeBakers is working on this...
-**If failed, show:** ⚠️ CodeBakers not connected - run: codebakers go
-
-## STEP 2: Call MCP Tools Before Code
-
-**Before writing ANY code:**
-\`\`\`
-discover_patterns({ task: "description of what you're building" })
-\`\`\`
+## ❌ NEVER DO THIS
+1. NEVER write code without calling discover_patterns first
+2. NEVER say "done" without validate_complete passing
+3. NEVER show the success header without project_status succeeding first
+4. NEVER skip writing tests for new features
 
-**Before saying "done":**
+## Quick Reference
 \`\`\`
-validate_complete({ feature: "feature name", files: ["path/to/file.ts"] })
+project_status()                                    → Verify connection FIRST
+discover_patterns({ task: "what you're building" }) → Get patterns BEFORE code
+validate_complete({ feature: "name", files: [...] }) → Validate BEFORE done
 \`\`\`
 
-## STEP 3: Show Footer After Code
+Header (after project_status succeeds): 🍪 CodeBakers is working on this...
+Header (if project_status fails): ⚠️ CodeBakers not connected - run: codebakers go
+Footer (after code): 🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅
 
-**After ANY response with code, show:**
-\`\`\`
----
-🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
-\`\`\`
-
----
-*CodeBakers v6.14 - Server-Enforced*
+## 🚨 ALWAYS DO THIS (Critical - Repeated at End)
+1. Call \`project_status()\` FIRST
+2. Call \`discover_patterns()\` before code
+3. Call \`validate_complete()\` before done
+4. Show footer after code responses
 `;
 
-    const V6_CURSORRULES = `# CodeBakers v6.14
-
-## Verify First
-Call project_status() at START of every response.
-If success: show 🍪 CodeBakers is working on this...
-If fail: show ⚠️ CodeBakers not connected
+    const V6_CURSORRULES = `# CodeBakers v6.15
 
-## Before Writing Code
-Call: discover_patterns({ task: "description" })
+## 🚨 ALWAYS (Read First)
+1. Call project_status() FIRST → 🍪 Working... or ⚠️ Not connected
+2. Call discover_patterns({ task }) BEFORE writing code
+3. Call validate_complete({ feature, files }) BEFORE saying done
+4. Show footer after code: 🍪 **CodeBakers** | Patterns: X | TSC: ✅
 
-## Before Saying Done
-Call: validate_complete({ feature: "name", files: ["path.ts"] })
+## ❌ NEVER
+1. Write code without discover_patterns
+2. Say done without validate_complete
+3. Show header without project_status succeeding
+4. Skip writing tests for new features
 
-## After Code Responses
-Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
+## 🚨 ALWAYS (Repeated at End)
+1. project_status() FIRST
+2. discover_patterns() before code
+3. validate_complete() before done
 `;
 
-    // Check if already v6.14
+    // Check if already v6.15
     const claudeMdPath = path.join(cwd, 'CLAUDE.md');
     if (fs.existsSync(claudeMdPath)) {
       const content = fs.readFileSync(claudeMdPath, 'utf-8');
-      if (content.includes('v6.14') && content.includes('discover_patterns')) {
-        results.push('✓ CodeBakers v6.14 already installed\n');
+      if (content.includes('v6.15') && content.includes('discover_patterns')) {
+        results.push('✓ CodeBakers v6.15 already installed\n');
         results.push('Patterns are server-enforced. Just call `discover_patterns` before coding!');
         return {
           content: [{ type: 'text' as const, text: results.join('\n') }],
         };
       }
-      results.push('⚠️ Upgrading to v6.14 (server-enforced patterns)...\n');
+      results.push('⚠️ Upgrading to v6.15 (server-enforced patterns)...\n');
     }
 
     try {
-      // Write v6.14 bootstrap files
+      // Write v6.15 bootstrap files
       fs.writeFileSync(claudeMdPath, V6_CLAUDE_MD);
-      results.push('✓ Created CLAUDE.md (v6.14 bootstrap)');
+      results.push('✓ Created CLAUDE.md (v6.15 bootstrap)');
 
       fs.writeFileSync(path.join(cwd, '.cursorrules'), V6_CURSORRULES);
-      results.push('✓ Created .cursorrules (v6.14 bootstrap)');
+      results.push('✓ Created .cursorrules (v6.15 bootstrap)');
 
       // Remove old .claude folder if it exists (v5 → v6 migration)
       const claudeDir = path.join(cwd, '.claude');
@@ -2931,7 +2930,7 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
       fs.writeFileSync(stateFile, JSON.stringify(state, null, 2));
 
       results.push('\n---\n');
-      results.push('## ✅ CodeBakers v6.14 Installed!\n');
+      results.push('## ✅ CodeBakers v6.15 Installed!\n');
       results.push('**How it works now:**');
       results.push('1. Call `discover_patterns` before writing code');
       results.push('2. Server returns all patterns and rules');
@@ -7486,60 +7485,59 @@ ${handlers.join('\n')}
     const claudeDir = path.join(cwd, '.claude');
     const codebakersJson = path.join(cwd, '.codebakers.json');
 
-    let response = `# 🔄 CodeBakers v6.14 Update\n\n`;
+    let response = `# 🔄 CodeBakers v6.15 Update\n\n`;
 
-    // v6.14 bootstrap content
-    const V6_CLAUDE_MD = `# CodeBakers v6.14
+    // v6.15 bootstrap content - SHORT template with rules at START and END
+    const V6_CLAUDE_MD = `# CodeBakers v6.15
 
-## STEP 1: Verify CodeBakers is Connected (FIRST!)
+## 🚨 ALWAYS DO THIS (Critical - Read First)
+1. ALWAYS call \`project_status()\` FIRST → If works show "🍪 CodeBakers is working..." / If fails show "⚠️ Not connected"
+2. ALWAYS call \`discover_patterns({ task: "..." })\` BEFORE writing any code
+3. ALWAYS call \`validate_complete({ feature: "...", files: [...] })\` BEFORE saying "done"
+4. ALWAYS show footer after code: \`🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅\`
 
-**At the START of EVERY response, call this MCP tool:**
-\`\`\`
-project_status()
-\`\`\`
-
-**If successful, show:** 🍪 CodeBakers is working on this...
-**If failed, show:** ⚠️ CodeBakers not connected - run: codebakers go
-
-## STEP 2: Call MCP Tools Before Code
-
-**Before writing ANY code:**
-\`\`\`
-discover_patterns({ task: "description of what you're building" })
-\`\`\`
+## ❌ NEVER DO THIS
+1. NEVER write code without calling discover_patterns first
+2. NEVER say "done" without validate_complete passing
+3. NEVER show the success header without project_status succeeding first
+4. NEVER skip writing tests for new features
 
-**Before saying "done":**
+## Quick Reference
 \`\`\`
-validate_complete({ feature: "feature name", files: ["path/to/file.ts"] })
+project_status()                                    → Verify connection FIRST
+discover_patterns({ task: "what you're building" }) → Get patterns BEFORE code
+validate_complete({ feature: "name", files: [...] }) → Validate BEFORE done
 \`\`\`
 
-## STEP 3: Show Footer After Code
+Header (after project_status succeeds): 🍪 CodeBakers is working on this...
+Header (if project_status fails): ⚠️ CodeBakers not connected - run: codebakers go
+Footer (after code): 🍪 **CodeBakers** | Patterns: X | TSC: ✅ | Tests: ✅
 
-**After ANY response with code, show:**
-\`\`\`
----
-🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
-\`\`\`
-
----
-*CodeBakers v6.14 - Server-Enforced*
+## 🚨 ALWAYS DO THIS (Critical - Repeated at End)
+1. Call \`project_status()\` FIRST
+2. Call \`discover_patterns()\` before code
+3. Call \`validate_complete()\` before done
+4. Show footer after code responses
 `;
 
-    const V6_CURSORRULES = `# CodeBakers v6.14
-
-## Verify First
-Call project_status() at START of every response.
-If success: show 🍪 CodeBakers is working on this...
-If fail: show ⚠️ CodeBakers not connected
+    const V6_CURSORRULES = `# CodeBakers v6.15
 
-## Before Writing Code
-Call: discover_patterns({ task: "description" })
+## 🚨 ALWAYS (Read First)
+1. Call project_status() FIRST → 🍪 Working... or ⚠️ Not connected
+2. Call discover_patterns({ task }) BEFORE writing code
+3. Call validate_complete({ feature, files }) BEFORE saying done
+4. Show footer after code: 🍪 **CodeBakers** | Patterns: X | TSC: ✅
 
-## Before Saying Done
-Call: validate_complete({ feature: "name", files: ["path.ts"] })
+## ❌ NEVER
+1. Write code without discover_patterns
+2. Say done without validate_complete
+3. Show header without project_status succeeding
+4. Skip writing tests for new features
 
-## After Code Responses
-Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
+## 🚨 ALWAYS (Repeated at End)
+1. project_status() FIRST
+2. discover_patterns() before code
+3. validate_complete() before done
 `;
 
     try {
@@ -7549,7 +7547,7 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
 
       if (fs.existsSync(claudeMdPath)) {
         const content = fs.readFileSync(claudeMdPath, 'utf-8');
-        isV6 = content.includes('v6.14') && content.includes('discover_patterns');
+        isV6 = content.includes('v6.15') && content.includes('discover_patterns');
       }
 
       if (fs.existsSync(codebakersJson)) {
@@ -7563,11 +7561,11 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
 
       response += `## Current Status\n`;
       response += `- Version: ${currentVersion || 'Unknown'}\n`;
-      response += `- v6.14 (Server-Enforced): ${isV6 ? 'Yes ✓' : 'No'}\n\n`;
+      response += `- v6.15 (Server-Enforced): ${isV6 ? 'Yes ✓' : 'No'}\n\n`;
 
       // Check if already on v6
       if (isV6 && !force) {
-        response += `✅ **Already on v6.14!**\n\n`;
+        response += `✅ **Already on v6.15!**\n\n`;
         response += `Your patterns are server-enforced. Just use \`discover_patterns\` before coding.\n`;
         response += `Use \`force: true\` to reinstall bootstrap files.\n`;
         response += this.getUpdateNotice();
@@ -7580,14 +7578,14 @@ Show: 🍪 **CodeBakers** | Patterns: [count] | TSC: ✅ | Tests: ✅ | v6.14
         };
       }
 
-      response += `## Upgrading to v6.14...\n\n`;
+      response += `## Upgrading to v6.15...\n\n`;
 
-      // Write v6.14 bootstrap files
+      // Write v6.15 bootstrap files
       fs.writeFileSync(claudeMdPath, V6_CLAUDE_MD);
-      response += `✓ Updated CLAUDE.md (v6.14 bootstrap)\n`;
+      response += `✓ Updated CLAUDE.md (v6.15 bootstrap)\n`;
 
       fs.writeFileSync(path.join(cwd, '.cursorrules'), V6_CURSORRULES);
-      response += `✓ Updated .cursorrules (v6.14 bootstrap)\n`;
+      response += `✓ Updated .cursorrules (v6.15 bootstrap)\n`;
 
       // Remove old .claude folder (v5 → v6 migration)
       if (fs.existsSync(claudeDir)) {