@codebakers/cli 3.8.2 → 3.8.3

package/src/commands/init.ts

@@ -1,11 +1,33 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import { createInterface } from 'readline';
-import { writeFileSync, mkdirSync, existsSync, readFileSync, readdirSync, statSync } from 'fs';
-import { join, extname } from 'path';
+import { writeFileSync, mkdirSync, existsSync, readFileSync, readdirSync, statSync, rmSync } from 'fs';
+import { join } from 'path';
 import { setApiKey, getApiKey, getApiUrl } from '../config.js';
+import { audit } from './audit.js';
+import { heal } from './heal.js';
+
+// ============================================================================
+// TEMPLATES
+// ============================================================================
+
+const CLAUDE_MD_BOOTSTRAP = `# CodeBakers
+
+**MANDATORY: Before writing ANY code, call the \`discover_patterns\` MCP tool.**
+
+\`\`\`
+Tool: discover_patterns
+Args: { task: "description of what you're building" }
+\`\`\`
+
+The server will return:
+- All coding patterns and rules you must follow
+- Test requirements
+- Validation instructions
+
+**You cannot write code without calling this tool first. The server tracks compliance.**
+`;
 
-// Enhanced .cursorrules with pre-flight and self-review automation
 const CURSORRULES_TEMPLATE = `# CODEBAKERS CURSOR RULES
 # Zero-friction AI assistance - everything is automatic
 
@@ -13,10 +35,9 @@ const CURSORRULES_TEMPLATE = `# CODEBAKERS CURSOR RULES
 
 ### PHASE 1: CONTEXT LOAD (automatic)
 1. Read CLAUDE.md → Load router
-2. Read PRD.md → Understand what we're building
-3. Read PROJECT-CONTEXT.md → Understand codebase
-4. Read PROJECT-STATE.md → Check what's in progress
-5. Read DECISIONS.md → Know past decisions
+2. Read PROJECT-CONTEXT.md → Understand codebase
+3. Read PROJECT-STATE.md → Check what's in progress
+4. Read DECISIONS.md → Know past decisions
 
 ### PHASE 2: PRE-FLIGHT CHECK (before writing code)
 Ask yourself silently:
@@ -24,16 +45,9 @@ Ask yourself silently:
 - [ ] Is similar code already in the codebase? (copy that pattern)
 - [ ] What's the data model involved?
 - [ ] What are the error cases?
-- [ ] Is someone else working on this? (check PROJECT-STATE.md)
-
-If PROJECT-CONTEXT.md is empty or stale (>7 days), SCAN THE PROJECT FIRST:
-- Read package.json for dependencies
-- Check src/ structure
-- Note existing patterns
-- Update PROJECT-CONTEXT.md
 
 ### PHASE 3: EXECUTE
-- State: \`📋 CodeBakers | [Type] | v6.0 Server-Enforced\`
+- State: \`📋 CodeBakers | [Type] | Server-Enforced\`
 - Call discover_patterns MCP tool first
 - Follow patterns from server EXACTLY
 
@@ -50,11 +64,7 @@ If ANY check fails, fix it before responding.
 ### PHASE 5: UPDATE STATE
 - Update PROJECT-STATE.md with completed work
 - Add to DECISIONS.md if architectural choice was made
-
-## MULTI-AGENT AWARENESS
-- ALWAYS check PROJECT-STATE.md "In Progress" section
-- Do NOT duplicate work another agent is doing
-- If conflict detected, STOP and ask user
+- Update .codebakers/DEVLOG.md with session summary
 
 ## REMEMBER
 - You are a full product team, not just a code assistant
@@ -67,40 +77,31 @@ const CURSORIGNORE_TEMPLATE = `# CodeBakers - Files to ignore in Cursor context
 # Dependencies
 node_modules/
 .pnpm-store/
-bower_components/
 
 # Build outputs
 dist/
 build/
 .next/
 .nuxt/
-.output/
 out/
 
 # Cache
 .cache/
 .turbo/
-.eslintcache
-.prettiercache
 *.tsbuildinfo
 
 # Logs
 logs/
 *.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 
 # Environment files (don't leak secrets)
 .env
 .env.local
 .env.*.local
-.env.production
 
 # IDE
 .idea/
 *.swp
-*.swo
 
 # OS
 .DS_Store
@@ -108,9 +109,8 @@ Thumbs.db
 
 # Test coverage
 coverage/
-.nyc_output/
 
-# Package locks (large files, not needed for context)
+# Package locks
 package-lock.json
 yarn.lock
 pnpm-lock.yaml
@@ -124,7 +124,6 @@ pnpm-lock.yaml
 const VSCODE_SETTINGS_TEMPLATE = {
   "cursor.chat.defaultContext": [
     "CLAUDE.md",
-    "PRD.md",
     "PROJECT-CONTEXT.md",
     "PROJECT-STATE.md",
     "DECISIONS.md"
@@ -134,119 +133,9 @@ const VSCODE_SETTINGS_TEMPLATE = {
   "cursor.general.enableAutoImport": true
 };
 
-function createPrdTemplate(projectName: string, projectType: string): string {
-  const date = new Date().toISOString().split('T')[0];
-
-  const typeSpecificSections = projectType === 'client'
-    ? `
-## Client Info
-- Client Name: [Who is this for?]
-- Contact: [Primary contact]
-- Deadline: [When is this due?]
-- Budget: [If relevant]
-`
-    : projectType === 'business'
-    ? `
-## Business Context
-- Target Market: [Who are you selling to?]
-- Revenue Model: [How does this make money?]
-- Competition: [Who are you competing with?]
-- MVP Deadline: [When do you need to launch?]
-`
-    : `
-## Personal Goals
-- Why am I building this? [Your motivation]
-- Learning goals: [What do you want to learn?]
-- Time commitment: [Hours per week?]
-`;
-
-  return `# Product Requirements Document
-# Project: ${projectName}
-# Created: ${date}
-# Type: ${projectType}
-
-## Overview
-**One-liner:** [Describe this project in one sentence]
-
-**Problem:** [What problem does this solve?]
-
-**Solution:** [How does this solve it?]
-${typeSpecificSections}
-## Target Users
-- **Primary:** [Who is the main user?]
-- **Secondary:** [Other users?]
-
-## Core Features (MVP)
-<!-- List the MINIMUM features needed to launch -->
-<!-- AI will build these first -->
-
-1. [ ] **Feature 1:** [Description]
-   - Acceptance criteria: [How do we know it's done?]
-
-2. [ ] **Feature 2:** [Description]
-   - Acceptance criteria: [How do we know it's done?]
-
-3. [ ] **Feature 3:** [Description]
-   - Acceptance criteria: [How do we know it's done?]
-
-## Nice-to-Have Features (Post-MVP)
-<!-- Features to add after MVP is working -->
-
-1. [ ] [Feature description]
-2. [ ] [Feature description]
-
-## Technical Requirements
-<!-- AI will use these to make architecture decisions -->
-
-- **Must use:** [Required technologies, APIs, etc.]
-- **Must avoid:** [Things you don't want]
-- **Performance:** [Any speed/scale requirements?]
-- **Security:** [Auth requirements, data sensitivity?]
-
-## User Flows
-<!-- Describe the main user journeys -->
-
-### Flow 1: [Name]
-1. User does X
-2. System responds with Y
-3. User sees Z
-
-### Flow 2: [Name]
-1. User does X
-2. System responds with Y
-3. User sees Z
-
-## Data Model (if known)
-<!-- Rough idea of main entities -->
-
-- **User:** [fields]
-- **[Entity 2]:** [fields]
-- **[Entity 3]:** [fields]
-
-## Success Metrics
-- [ ] [How will you measure success?]
-- [ ] [What does "done" look like?]
-
-## Open Questions
-<!-- Things you're unsure about - AI can help clarify -->
-
-1. [Question?]
-2. [Question?]
-
----
-<!-- AI INSTRUCTIONS -->
-<!-- When building features, reference this PRD -->
-<!-- Check off features as they're completed -->
-<!-- Add new questions to Open Questions -->
-<!-- Update this doc as requirements change -->
-`;
-}
-
-interface ContentResponse {
-  version: string;
-  router: string;
-  modules: Record<string, string>;
-}
+// ============================================================================
+// HELPER FUNCTIONS
+// ============================================================================
 
 type ProjectType = 'personal' | 'client' | 'business';
 
@@ -269,96 +158,171 @@ async function confirm(question: string): Promise<boolean> {
   return answer.toLowerCase() !== 'n';
 }
 
-async function selectProjectType(): Promise<{ type: ProjectType; name: string }> {
-  console.log(chalk.white('\n  What kind of project is this?\n'));
-  console.log(chalk.gray('    1. ') + chalk.cyan('PERSONAL') + chalk.gray(' - Just building for myself'));
-  console.log(chalk.gray('    2. ') + chalk.cyan('CLIENT') + chalk.gray('   - Building for someone else'));
-  console.log(chalk.gray('    3. ') + chalk.cyan('BUSINESS') + chalk.gray(' - My own product/startup\n'));
-
-  let typeChoice = '';
-  while (!['1', '2', '3'].includes(typeChoice)) {
-    typeChoice = await prompt('  Enter 1, 2, or 3: ');
+function countSourceFiles(dir: string): number {
+  let count = 0;
+  try {
+    const items = readdirSync(dir, { withFileTypes: true });
+    for (const item of items) {
+      if (item.name.startsWith('.') || item.name === 'node_modules') continue;
+
+      const fullPath = join(dir, item.name);
+      if (item.isDirectory()) {
+        count += countSourceFiles(fullPath);
+      } else if (
+        item.name.endsWith('.ts') ||
+        item.name.endsWith('.tsx') ||
+        item.name.endsWith('.js') ||
+        item.name.endsWith('.jsx')
+      ) {
+        count++;
+      }
+    }
+  } catch {
+    // Ignore access errors
   }
+  return count;
+}
 
-  const typeMap: Record<string, ProjectType> = {
-    '1': 'personal',
-    '2': 'client',
-    '3': 'business'
-  };
+function detectExistingProject(cwd: string): { exists: boolean; files: number; details: string[]; stack: Record<string, string> } {
+  const details: string[] = [];
+  const stack: Record<string, string> = {};
+  let sourceFileCount = 0;
 
-  const cwd = process.cwd();
-  const defaultName = cwd.split(/[\\/]/).pop() || 'my-project';
-  const name = await prompt(`  Project name (${defaultName}): `) || defaultName;
+  // Check for package.json with dependencies
+  const packageJsonPath = join(cwd, 'package.json');
+  if (existsSync(packageJsonPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+      const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+      const depCount = Object.keys(pkg.dependencies || {}).length;
 
-  return {
-    type: typeMap[typeChoice],
-    name
-  };
-}
+      if (depCount > 0) {
+        details.push(`package.json with ${depCount} dependencies`);
+      }
 
-function createProjectState(projectName: string, projectType: string): string {
-  const date = new Date().toISOString().split('T')[0];
-  return `# PROJECT STATE
-# Last Updated: ${date}
-# Auto-maintained by AI - update when starting/completing tasks
+      // Detect stack
+      if (deps['next']) stack.framework = `Next.js ${deps['next']}`;
+      else if (deps['react']) stack.framework = `React ${deps['react']}`;
+      else if (deps['vue']) stack.framework = `Vue ${deps['vue']}`;
+      else if (deps['express']) stack.framework = `Express ${deps['express']}`;
 
-## Project Info
-name: ${projectName}
-type: ${projectType}
-phase: planning
+      if (deps['drizzle-orm']) stack.database = 'Drizzle ORM';
+      else if (deps['prisma']) stack.database = 'Prisma';
+      else if (deps['mongoose']) stack.database = 'MongoDB/Mongoose';
 
-## Current Sprint
-Goal: [AI will fill this based on conversation]
+      if (deps['@supabase/supabase-js']) stack.auth = 'Supabase Auth';
+      else if (deps['next-auth']) stack.auth = 'NextAuth.js';
+      else if (deps['@clerk/nextjs']) stack.auth = 'Clerk';
 
-## In Progress
-<!-- AI: Add tasks here when you START working on them -->
-<!-- Format: - [task] (started: date, agent: cursor/claude) -->
+      if (deps['tailwindcss']) stack.styling = 'Tailwind CSS';
+      if (deps['typescript'] || existsSync(join(cwd, 'tsconfig.json'))) {
+        stack.language = 'TypeScript';
+      } else {
+        stack.language = 'JavaScript';
+      }
 
-## Completed
-<!-- AI: Move tasks here when DONE -->
-<!-- Format: - [task] (completed: date) -->
+      if (deps['vitest']) stack.testing = 'Vitest';
+      else if (deps['jest']) stack.testing = 'Jest';
+      else if (deps['@playwright/test']) stack.testing = 'Playwright';
+    } catch {
+      // Ignore parse errors
+    }
+  }
 
-## Blockers
-<!-- AI: List anything blocking progress -->
+  // Check for source directories
+  const sourceDirs = ['src', 'app', 'pages', 'components', 'lib'];
+  for (const dir of sourceDirs) {
+    const dirPath = join(cwd, dir);
+    if (existsSync(dirPath)) {
+      try {
+        if (statSync(dirPath).isDirectory()) {
+          const files = countSourceFiles(dirPath);
+          if (files > 0) {
+            sourceFileCount += files;
+            details.push(`${dir}/ with ${files} source files`);
+          }
+        }
+      } catch {
+        // Ignore access errors
+      }
+    }
+  }
 
-## Next Up
-<!-- AI: Queue of upcoming tasks -->
-`;
+  // Check for common config files
+  const configFiles = ['tsconfig.json', 'next.config.js', 'next.config.mjs', 'vite.config.ts', 'tailwind.config.js'];
+  for (const file of configFiles) {
+    if (existsSync(join(cwd, file))) {
+      details.push(file);
+    }
+  }
+
+  return {
+    exists: sourceFileCount > 5 || details.length >= 3,
+    files: sourceFileCount,
+    details,
+    stack
+  };
+}
+
+function buildStructureString(cwd: string): string {
+  try {
+    const items = readdirSync(cwd);
+    const dirs: string[] = [];
+    const files: string[] = [];
+
+    for (const item of items) {
+      if (item.startsWith('.') || item === 'node_modules') continue;
+      const fullPath = join(cwd, item);
+      try {
+        if (statSync(fullPath).isDirectory()) {
+          dirs.push(item + '/');
+        } else {
+          files.push(item);
+        }
+      } catch {
+        // Skip inaccessible items
+      }
+    }
+
+    return [...dirs.sort(), ...files.sort()].join('\n');
+  } catch {
+    return '[Could not scan structure]';
+  }
 }
 
-function createProjectContext(projectName: string, projectType: string): string {
+// ============================================================================
+// FILE CREATION FUNCTIONS
+// ============================================================================
+
+function createProjectContext(projectName: string, stack: Record<string, string>, structure: string, isExisting: boolean): string {
   const date = new Date().toISOString().split('T')[0];
   return `# PROJECT CONTEXT
 # Last Scanned: ${date}
-# AI: Update this when you first analyze the project or when structure changes significantly
+# Mode: ${isExisting ? 'Existing Project' : 'New Project'}
 
 ## Overview
 name: ${projectName}
-type: ${projectType}
-description: [AI will fill after scanning]
+description: ${isExisting ? '[Existing project - AI will analyze on first interaction]' : '[AI will fill after first feature]'}
 
 ## Tech Stack
-<!-- AI: Fill this by reading package.json and checking file extensions -->
-framework:
-language:
-database:
-auth:
-styling:
-testing:
+framework: ${stack.framework || '[Not detected]'}
+language: ${stack.language || '[Not detected]'}
+database: ${stack.database || '[Not detected]'}
+auth: ${stack.auth || '[Not detected]'}
+styling: ${stack.styling || '[Not detected]'}
+testing: ${stack.testing || '[Not detected]'}
 
 ## Project Structure
-<!-- AI: Fill this by scanning the directory structure -->
 \`\`\`
-[AI will map the project structure here]
+${structure || '[Empty project]'}
 \`\`\`
 
 ## Key Files
 <!-- AI: List the most important files for understanding the project -->
-- Entry point:
-- Config:
-- Database schema:
-- API routes:
-- Components:
+- Entry point: ${stack.framework?.includes('Next') ? 'src/app/page.tsx or pages/index.tsx' : '[AI will identify]'}
+- Config: ${existsSync(join(process.cwd(), 'tsconfig.json')) ? 'tsconfig.json' : '[AI will identify]'}
+- Database schema: [AI will identify]
+- API routes: ${stack.framework?.includes('Next') ? 'src/app/api/ or pages/api/' : '[AI will identify]'}
 
 ## Existing Patterns
 <!-- AI: Document patterns you find so you can reuse them -->
@@ -373,21 +337,46 @@ testing:
 [AI: Copy an example component pattern from this project]
 \`\`\`
 
-### Database Query Pattern
-\`\`\`typescript
-[AI: Copy an example database query pattern from this project]
-\`\`\`
-
 ## Environment Variables
 <!-- AI: List required env vars (don't include values!) -->
-- [ ] DATABASE_URL
-- [ ] [others...]
+${existsSync(join(process.cwd(), '.env.example')) ? '[Check .env.example]' : '- [ ] [AI will identify required vars]'}
 
 ## Notes
 <!-- AI: Any important context about this specific project -->
 `;
 }
 
+function createProjectState(projectName: string, isExisting: boolean): string {
+  const date = new Date().toISOString().split('T')[0];
+  return `# PROJECT STATE
+# Last Updated: ${date}
+# Auto-maintained by AI - update when starting/completing tasks
+
+## Project Info
+name: ${projectName}
+phase: ${isExisting ? 'active' : 'planning'}
+mode: ${isExisting ? 'existing-project' : 'new-project'}
+
+## Current Sprint
+Goal: ${isExisting ? '[AI will identify based on conversation]' : '[Define in first conversation]'}
+
+## In Progress
+<!-- AI: Add tasks here when you START working on them -->
+<!-- Format: - [task] (started: date, agent: cursor/claude) -->
+
+## Completed
+<!-- AI: Move tasks here when DONE -->
+<!-- Format: - [task] (completed: date) -->
+${isExisting ? `\n- CodeBakers integration (completed: ${date})` : ''}
+
+## Blockers
+<!-- AI: List anything blocking progress -->
+
+## Next Up
+<!-- AI: Queue of upcoming tasks -->
+`;
+}
+
 function createDecisionsLog(projectName: string): string {
   const date = new Date().toISOString().split('T')[0];
   return `# ARCHITECTURAL DECISIONS
@@ -400,12 +389,11 @@ When you make a decision that affects architecture, add an entry:
 - Decision
 - Reason
 - Alternatives considered
-- Pattern location (if applicable)
 
 ---
 
-## ${date}: Project Initialized
-**Decision:** Using CodeBakers v6.0 pattern system
+## ${date}: CodeBakers Initialized
+**Decision:** Using CodeBakers server-enforced pattern system
 **Reason:** Ensure consistent, production-quality code
 **Pattern:** Server-enforced via discover_patterns MCP tool
 
@@ -415,234 +403,159 @@ When you make a decision that affects architecture, add an entry:
 `;
 }
 
-/**
- * Auto-scan project to detect tech stack
- */
-function scanProject(cwd: string): { stack: Record<string, string>; structure: string } {
-  const stack: Record<string, string> = {};
-  let structure = '';
-
-  // Check package.json
-  const packageJsonPath = join(cwd, 'package.json');
-  if (existsSync(packageJsonPath)) {
-    try {
-      const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
-      const deps = { ...pkg.dependencies, ...pkg.devDependencies };
-
-      // Detect framework
-      if (deps['next']) stack.framework = `Next.js ${deps['next']}`;
-      else if (deps['react']) stack.framework = `React ${deps['react']}`;
-      else if (deps['vue']) stack.framework = `Vue ${deps['vue']}`;
-      else if (deps['express']) stack.framework = `Express ${deps['express']}`;
+function createDevlog(projectName: string, isExisting: boolean, auditScore?: number): string {
+  const date = new Date().toISOString().split('T')[0];
+  const timestamp = new Date().toISOString();
 
-      // Detect database
-      if (deps['drizzle-orm']) stack.database = 'Drizzle ORM';
-      else if (deps['prisma']) stack.database = 'Prisma';
-      else if (deps['mongoose']) stack.database = 'MongoDB/Mongoose';
-      else if (deps['pg']) stack.database = 'PostgreSQL';
+  return `# Development Log
+# Project: ${projectName}
 
-      // Detect auth
-      if (deps['@supabase/supabase-js']) stack.auth = 'Supabase Auth';
-      else if (deps['next-auth']) stack.auth = 'NextAuth.js';
-      else if (deps['@clerk/nextjs']) stack.auth = 'Clerk';
+## ${date} - CodeBakers Integration
+**Session:** ${timestamp}
+**Task Size:** MEDIUM
+**Status:** Completed
+
+### What was done:
+- Integrated CodeBakers into ${isExisting ? 'existing' : 'new'} project
+- Created project tracking files
+- Set up Cursor IDE configuration
+${isExisting && auditScore !== undefined ? `- Ran initial code audit (Score: ${auditScore}%)` : ''}
+
+### Files created:
+- \`CLAUDE.md\` - AI bootstrap file
+- \`.cursorrules\` - Cursor IDE rules
+- \`PROJECT-CONTEXT.md\` - Project knowledge base
+- \`PROJECT-STATE.md\` - Task tracking
+- \`DECISIONS.md\` - Architecture log
+- \`.codebakers/DEVLOG.md\` - This file
+
+### Next steps:
+${isExisting ? '- Start using AI assistance with existing codebase' : '- Define project requirements in first conversation'}
+${isExisting ? '- AI will analyze existing patterns on first interaction' : '- AI will help scaffold initial features'}
 
-      // Detect styling
-      if (deps['tailwindcss']) stack.styling = 'Tailwind CSS';
-      else if (deps['styled-components']) stack.styling = 'Styled Components';
+---
+`;
+}
 
-      // Detect testing
-      if (deps['vitest']) stack.testing = 'Vitest';
-      else if (deps['jest']) stack.testing = 'Jest';
-      else if (deps['@playwright/test']) stack.testing = 'Playwright';
+function createPrdTemplate(projectName: string, projectType: string): string {
+  const date = new Date().toISOString().split('T')[0];
 
-      // Detect language
-      if (deps['typescript'] || existsSync(join(cwd, 'tsconfig.json'))) {
-        stack.language = 'TypeScript';
-      } else {
-        stack.language = 'JavaScript';
-      }
-    } catch {
-      // Ignore parse errors
-    }
-  }
-
-  // Build simple structure
-  try {
-    const items = readdirSync(cwd);
-    const dirs: string[] = [];
-    const files: string[] = [];
-
-    for (const item of items) {
-      if (item.startsWith('.') || item === 'node_modules') continue;
-      const fullPath = join(cwd, item);
-      try {
-        if (statSync(fullPath).isDirectory()) {
-          dirs.push(item + '/');
-        } else {
-          files.push(item);
-        }
-      } catch {
-        // Skip inaccessible items
-      }
-    }
-
-    structure = [...dirs.sort(), ...files.sort()].join('\n');
-  } catch {
-    structure = '[Could not scan structure]';
-  }
+  const typeSpecificSections = projectType === 'client'
+    ? `
+## Client Info
+- Client Name: [Who is this for?]
+- Contact: [Primary contact]
+- Deadline: [When is this due?]
+`
+    : projectType === 'business'
+    ? `
+## Business Context
+- Target Market: [Who are you selling to?]
+- Revenue Model: [How does this make money?]
+- MVP Deadline: [When do you need to launch?]
+`
+    : `
+## Personal Goals
+- Why am I building this? [Your motivation]
+- Learning goals: [What do you want to learn?]
+`;
 
-  return { stack, structure };
-}
+  return `# Product Requirements Document
+# Project: ${projectName}
+# Created: ${date}
+# Type: ${projectType}
 
-function updateProjectContextWithScan(contextContent: string, stack: Record<string, string>, structure: string): string {
-  let updated = contextContent;
+## Overview
+**One-liner:** [Describe this project in one sentence]
 
-  // Update tech stack
-  if (stack.framework) updated = updated.replace('framework: ', `framework: ${stack.framework}`);
-  if (stack.language) updated = updated.replace('language: ', `language: ${stack.language}`);
-  if (stack.database) updated = updated.replace('database: ', `database: ${stack.database}`);
-  if (stack.auth) updated = updated.replace('auth: ', `auth: ${stack.auth}`);
-  if (stack.styling) updated = updated.replace('styling: ', `styling: ${stack.styling}`);
-  if (stack.testing) updated = updated.replace('testing: ', `testing: ${stack.testing}`);
+**Problem:** [What problem does this solve?]
 
-  // Update structure
-  updated = updated.replace(
-    '[AI will map the project structure here]',
-    structure || '[Empty project]'
-  );
+**Solution:** [How does this solve it?]
+${typeSpecificSections}
+## Target Users
+- **Primary:** [Who is the main user?]
+- **Secondary:** [Other users?]
 
-  return updated;
-}
+## Core Features (MVP)
+1. [ ] **Feature 1:** [Description]
+2. [ ] **Feature 2:** [Description]
+3. [ ] **Feature 3:** [Description]
 
-/**
- * Interactive init command - walks users through complete setup
- */
-export async function init(): Promise<void> {
-  console.log(chalk.blue(`
-  ╔═══════════════════════════════════════════════════════════╗
-  ║                                                           ║
-  ║   ${chalk.bold('Welcome to CodeBakers!')}                              ║
-  ║                                                           ║
-  ║   Production-grade patterns for AI-assisted development   ║
-  ║                                                           ║
-  ╚═══════════════════════════════════════════════════════════╝
-  `));
+## Nice-to-Have Features (Post-MVP)
+1. [ ] [Feature description]
+2. [ ] [Feature description]
 
-  console.log(chalk.gray('  This wizard will set up CodeBakers in your project.\n'));
+## Technical Requirements
+- **Must use:** [Required technologies, APIs, etc.]
+- **Must avoid:** [Things you don't want]
 
-  const cwd = process.cwd();
+## Success Metrics
+- [ ] [How will you measure success?]
+- [ ] [What does "done" look like?]
 
-  // Check if already initialized
-  const claudeMdPath = join(cwd, 'CLAUDE.md');
-  if (existsSync(claudeMdPath)) {
-    const reinitialize = await confirm('  CLAUDE.md already exists. Reinitialize?');
-    if (!reinitialize) {
-      console.log(chalk.yellow('\n  Skipping. Run with a fresh project or delete CLAUDE.md first.\n'));
-      return;
-    }
-  }
+---
+<!-- AI reads this file to understand what to build -->
+`;
+}
 
-  // Step 1: Get project type
-  const { type: projectType, name: projectName } = await selectProjectType();
-  console.log(chalk.green(`\n  ✓ Setting up ${projectName} as ${projectType.toUpperCase()} project\n`));
+// ============================================================================
+// SHARED SETUP FUNCTIONS
+// ============================================================================
 
-  // Step 2: Check if already logged in
+async function ensureLoggedIn(): Promise<string> {
   let apiKey = getApiKey();
 
   if (apiKey) {
     console.log(chalk.green('  ✓ Already logged in\n'));
     const useExisting = await confirm('  Use existing API key?');
-    if (!useExisting) {
-      apiKey = null;
-    }
+    if (useExisting) return apiKey;
+    apiKey = null;
   }
 
-  // Step 3: Login if needed
-  if (!apiKey) {
-    console.log(chalk.white('\n  Step 1: Get your API key\n'));
-    console.log(chalk.gray('  Go to: ') + chalk.cyan('https://codebakers.ai/dashboard'));
-    console.log(chalk.gray('  Copy your API key (starts with cb_)\n'));
+  console.log(chalk.white('\n  Login to CodeBakers\n'));
+  console.log(chalk.gray('  Go to: ') + chalk.cyan('https://codebakers.ai/dashboard'));
+  console.log(chalk.gray('  Copy your API key (starts with cb_)\n'));
 
-    apiKey = await prompt('  Paste your API key: ');
-
-    if (!apiKey || !apiKey.startsWith('cb_')) {
-      console.log(chalk.red('\n  ✗ Invalid API key. Keys start with "cb_"\n'));
-      console.log(chalk.gray('  Get your key at https://codebakers.ai/dashboard\n'));
-      process.exit(1);
-    }
+  apiKey = await prompt('  Paste your API key: ');
 
-    const spinner = ora('  Validating API key...').start();
-
-    try {
-      const apiUrl = getApiUrl();
-      const response = await fetch(`${apiUrl}/api/content`, {
-        method: 'GET',
-        headers: {
-          Authorization: `Bearer ${apiKey}`,
-        },
-      });
-
-      if (!response.ok) {
-        const error = await response.json().catch(() => ({}));
-        throw new Error(error.error || 'Invalid API key');
-      }
-
-      setApiKey(apiKey);
-      spinner.succeed('API key valid!');
-    } catch (error) {
-      spinner.fail('Invalid API key');
-      const message = error instanceof Error ? error.message : 'Unknown error';
-      console.log(chalk.red(`\n  Error: ${message}\n`));
-      process.exit(1);
-    }
+  if (!apiKey || !apiKey.startsWith('cb_')) {
+    console.log(chalk.red('\n  ✗ Invalid API key. Keys start with "cb_"\n'));
+    process.exit(1);
   }
 
-  // Step 4: Install v6.0 bootstrap files
-  console.log(chalk.white('\n  Step 2: Installing CodeBakers v6.0\n'));
-
-  const spinner = ora('  Installing v6.0 bootstrap...').start();
-
-  // v6.0 bootstrap content - minimal files, patterns from server
-  const V6_CLAUDE_MD = `# CodeBakers v6.0
-
-**MANDATORY: Before writing ANY code, call the \`discover_patterns\` MCP tool.**
-
-\`\`\`
-Tool: discover_patterns
-Args: { task: "description of what you're building" }
-\`\`\`
-
-The server will return:
-- All coding patterns and rules you must follow
-- Test requirements
-- Validation instructions
-
-**You cannot write code without calling this tool first. The server tracks compliance.**
-
----
-*CodeBakers v6.0 - Server-Enforced*
-`;
+  const spinner = ora('  Validating API key...').start();
 
-  const V6_CURSORRULES = `# CodeBakers v6.0
+  try {
+    const apiUrl = getApiUrl();
+    const response = await fetch(`${apiUrl}/api/content`, {
+      method: 'GET',
+      headers: { Authorization: `Bearer ${apiKey}` },
+    });
 
-MANDATORY: Before writing ANY code, call the discover_patterns MCP tool.
+    if (!response.ok) {
+      throw new Error('Invalid API key');
+    }
 
-Tool: discover_patterns
-Args: { task: "description of what you're building" }
+    setApiKey(apiKey);
+    spinner.succeed('API key valid!');
+    return apiKey;
+  } catch (error) {
+    spinner.fail('Invalid API key');
+    process.exit(1);
+  }
+}
 
-The server returns all patterns, rules, and test requirements.
-You cannot write code without calling this tool first.
-`;
+function installBootstrapFiles(cwd: string): void {
+  const spinner = ora('  Installing bootstrap files...').start();
 
   try {
-    // Write v6.0 bootstrap files
-    writeFileSync(join(cwd, 'CLAUDE.md'), V6_CLAUDE_MD);
-    writeFileSync(join(cwd, '.cursorrules'), V6_CURSORRULES);
+    writeFileSync(join(cwd, 'CLAUDE.md'), CLAUDE_MD_BOOTSTRAP);
+    writeFileSync(join(cwd, '.cursorrules'), CURSORRULES_TEMPLATE);
+    writeFileSync(join(cwd, '.cursorignore'), CURSORIGNORE_TEMPLATE);
 
-    // Remove old .claude folder if it exists (v5 → v6 migration)
+    // Remove old .claude folder if it exists
     const claudeDir = join(cwd, '.claude');
     if (existsSync(claudeDir)) {
-      const { rmSync } = await import('fs');
       try {
         rmSync(claudeDir, { recursive: true, force: true });
       } catch {
@@ -650,71 +563,18 @@ You cannot write code without calling this tool first.
       }
     }
 
-    spinner.succeed('CodeBakers v6.0 installed!');
-    console.log(chalk.gray('\n  Patterns are server-enforced via MCP tools'));
-
+    spinner.succeed('Bootstrap files installed!');
   } catch (error) {
-    spinner.fail('Installation failed');
-    const message = error instanceof Error ? error.message : 'Unknown error';
-    console.log(chalk.red(`\n  Error: ${message}\n`));
-    process.exit(1);
+    spinner.fail('Failed to install bootstrap files');
+    throw error;
   }
+}
 
-  // Step 5: Auto-scan project
-  console.log(chalk.white('\n  Step 3: Scanning project\n'));
-
-  const scanSpinner = ora('  Analyzing project structure...').start();
-  const { stack, structure } = scanProject(cwd);
-
-  const detectedItems = Object.entries(stack).filter(([_, v]) => v).map(([k, v]) => `${k}: ${v}`);
-  if (detectedItems.length > 0) {
-    scanSpinner.succeed('Project analyzed!');
-    console.log(chalk.gray('\n  Detected:'));
-    for (const item of detectedItems) {
-      console.log(chalk.gray(`    ${item}`));
-    }
-  } else {
-    scanSpinner.succeed('Project scanned (new project detected)');
-  }
-
-  // Step 6: Create PROJECT-CONTEXT.md with scan results
-  console.log(chalk.white('\n  Step 4: Setting up project files\n'));
-
-  const filesSpinner = ora('  Creating project files...').start();
-
-  try {
-    // PROJECT-CONTEXT.md
-    let contextContent = createProjectContext(projectName, projectType);
-    contextContent = updateProjectContextWithScan(contextContent, stack, structure);
-    writeFileSync(join(cwd, 'PROJECT-CONTEXT.md'), contextContent);
-
-    // PROJECT-STATE.md
-    const stateContent = createProjectState(projectName, projectType);
-    writeFileSync(join(cwd, 'PROJECT-STATE.md'), stateContent);
-
-    // DECISIONS.md
-    const decisionsContent = createDecisionsLog(projectName);
-    writeFileSync(join(cwd, 'DECISIONS.md'), decisionsContent);
-
-    filesSpinner.succeed('Project files created!');
-  } catch (error) {
-    filesSpinner.warn('Some project files could not be created');
-  }
-
-  // Step 7: Install Cursor files
-  console.log(chalk.white('\n  Step 5: Setting up Cursor IDE\n'));
-
-  const cursorSpinner = ora('  Installing Cursor configuration...').start();
+function setupCursorIDE(cwd: string): void {
+  const spinner = ora('  Setting up Cursor IDE...').start();
 
   try {
-    // Write .cursorrules
-    writeFileSync(join(cwd, '.cursorrules'), CURSORRULES_TEMPLATE);
-
-    // Write .cursorignore
-    writeFileSync(join(cwd, '.cursorignore'), CURSORIGNORE_TEMPLATE);
-
-    // Create GLOBAL ~/.cursor/mcp.json for MCP server configuration
-    // Cursor reads MCP config from global location, not project-local
+    // Global MCP config
     const homeDir = process.env.USERPROFILE || process.env.HOME || '';
     const globalCursorDir = join(homeDir, '.cursor');
     if (!existsSync(globalCursorDir)) {
@@ -731,7 +591,6 @@ You cannot write code without calling this tool first.
       }
     };
 
-    // Merge with existing MCP config if present
     if (existsSync(mcpConfigPath)) {
       try {
         const existing = JSON.parse(readFileSync(mcpConfigPath, 'utf-8'));
@@ -744,135 +603,323 @@ You cannot write code without calling this tool first.
       writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
     }
 
-    // Create/merge .vscode/settings.json
+    // VSCode settings
     const vscodeDir = join(cwd, '.vscode');
     if (!existsSync(vscodeDir)) {
       mkdirSync(vscodeDir, { recursive: true });
     }
 
-    const existingSettingsPath = join(vscodeDir, 'settings.json');
-
-    if (existsSync(existingSettingsPath)) {
-      const existing = JSON.parse(readFileSync(existingSettingsPath, 'utf-8'));
-      const merged = { ...existing, ...VSCODE_SETTINGS_TEMPLATE };
-      writeFileSync(existingSettingsPath, JSON.stringify(merged, null, 2));
+    const settingsPath = join(vscodeDir, 'settings.json');
+    if (existsSync(settingsPath)) {
+      const existing = JSON.parse(readFileSync(settingsPath, 'utf-8'));
+      writeFileSync(settingsPath, JSON.stringify({ ...existing, ...VSCODE_SETTINGS_TEMPLATE }, null, 2));
     } else {
-      writeFileSync(existingSettingsPath, JSON.stringify(VSCODE_SETTINGS_TEMPLATE, null, 2));
+      writeFileSync(settingsPath, JSON.stringify(VSCODE_SETTINGS_TEMPLATE, null, 2));
     }
 
-    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)');
+    spinner.succeed('Cursor IDE configured!');
+  } catch {
+    spinner.warn('Could not configure Cursor IDE (continuing anyway)');
   }
+}
 
-  // Step 8: Add to .gitignore if not present
+function updateGitignore(cwd: string): void {
   const gitignorePath = join(cwd, '.gitignore');
   if (existsSync(gitignorePath)) {
     const gitignore = readFileSync(gitignorePath, 'utf-8');
     if (!gitignore.includes('.cursorrules')) {
-      const additions = '\n# CodeBakers\n.cursorrules\n';
-      writeFileSync(gitignorePath, gitignore + additions);
+      writeFileSync(gitignorePath, gitignore + '\n# CodeBakers\n.cursorrules\n');
+    }
+  }
+}
+
+function createTrackingFiles(cwd: string, projectName: string, stack: Record<string, string>, structure: string, isExisting: boolean, auditScore?: number): void {
+  const spinner = ora('  Creating project tracking files...').start();
+
+  try {
+    // Create .codebakers directory
+    const codebakersDir = join(cwd, '.codebakers');
+    if (!existsSync(codebakersDir)) {
+      mkdirSync(codebakersDir, { recursive: true });
     }
+
+    // PROJECT-CONTEXT.md
+    writeFileSync(join(cwd, 'PROJECT-CONTEXT.md'), createProjectContext(projectName, stack, structure, isExisting));
+
+    // PROJECT-STATE.md
+    writeFileSync(join(cwd, 'PROJECT-STATE.md'), createProjectState(projectName, isExisting));
+
+    // DECISIONS.md
+    writeFileSync(join(cwd, 'DECISIONS.md'), createDecisionsLog(projectName));
+
+    // .codebakers/DEVLOG.md
+    writeFileSync(join(codebakersDir, 'DEVLOG.md'), createDevlog(projectName, isExisting, auditScore));
+
+    // .codebakers.json state file
+    const stateFile = join(cwd, '.codebakers.json');
+    const state = {
+      version: '1.0',
+      serverEnforced: true,
+      projectType: isExisting ? 'existing' : 'new',
+      projectName,
+      createdAt: new Date().toISOString(),
+      stack,
+      auditScore: auditScore
+    };
+    writeFileSync(stateFile, JSON.stringify(state, null, 2));
+
+    spinner.succeed('Project tracking files created!');
+  } catch (error) {
+    spinner.warn('Some tracking files could not be created');
+  }
+}
+
+// ============================================================================
+// MODE: NEW PROJECT
+// ============================================================================
+
+async function initNewProject(cwd: string): Promise<void> {
+  console.log(chalk.cyan('\n  ━━━ New Project Setup ━━━\n'));
+
+  // Get project info
+  console.log(chalk.white('  What kind of project is this?\n'));
+  console.log(chalk.gray('    1. ') + chalk.cyan('PERSONAL') + chalk.gray(' - Just building for myself'));
+  console.log(chalk.gray('    2. ') + chalk.cyan('CLIENT') + chalk.gray('   - Building for someone else'));
+  console.log(chalk.gray('    3. ') + chalk.cyan('BUSINESS') + chalk.gray(' - My own product/startup\n'));
+
+  let typeChoice = '';
+  while (!['1', '2', '3'].includes(typeChoice)) {
+    typeChoice = await prompt('  Enter 1, 2, or 3: ');
   }
 
-  // Step 9: PRD Setup
-  console.log(chalk.white('\n  Step 6: Product Requirements\n'));
+  const typeMap: Record<string, ProjectType> = { '1': 'personal', '2': 'client', '3': 'business' };
+  const projectType = typeMap[typeChoice];
+
+  const defaultName = cwd.split(/[\\/]/).pop() || 'my-project';
+  const projectName = await prompt(`  Project name (${defaultName}): `) || defaultName;
+
+  console.log(chalk.green(`\n  ✓ Setting up "${projectName}" as ${projectType.toUpperCase()} project\n`));
 
-  const prdPath = join(cwd, 'PRD.md');
-  let prdCreated = false;
+  // Login
+  await ensureLoggedIn();
 
-  if (existsSync(prdPath)) {
-    console.log(chalk.green('  ✓ PRD.md already exists\n'));
-    prdCreated = true;
+  // Install files
+  console.log(chalk.white('\n  Installing CodeBakers...\n'));
+  installBootstrapFiles(cwd);
+
+  // Create tracking files
+  const structure = buildStructureString(cwd);
+  createTrackingFiles(cwd, projectName, {}, structure, false);
+
+  // Setup Cursor
+  console.log('');
+  setupCursorIDE(cwd);
+
+  // Update .gitignore
+  updateGitignore(cwd);
+
+  // PRD Setup
+  console.log(chalk.white('\n  Product Requirements Document\n'));
+  console.log(chalk.gray('  A PRD helps the AI understand what you\'re building.\n'));
+  console.log(chalk.gray('    1. ') + chalk.cyan('CREATE TEMPLATE') + chalk.gray(' - I\'ll fill it out'));
+  console.log(chalk.gray('    2. ') + chalk.cyan('SKIP FOR NOW') + chalk.gray('    - I\'ll describe it in chat\n'));
+
+  let prdChoice = '';
+  while (!['1', '2'].includes(prdChoice)) {
+    prdChoice = await prompt('  Enter 1 or 2: ');
+  }
+
+  if (prdChoice === '1') {
+    const prdSpinner = ora('  Creating PRD template...').start();
+    writeFileSync(join(cwd, 'PRD.md'), createPrdTemplate(projectName, projectType));
+    prdSpinner.succeed('PRD template created!');
+    console.log(chalk.yellow('\n  → Open PRD.md and fill in your requirements\n'));
   } else {
-    console.log(chalk.gray('  A PRD helps the AI understand what you\'re building.\n'));
-    console.log(chalk.white('  How would you like to set up your PRD?\n'));
-    console.log(chalk.gray('    0. ') + chalk.magenta('You Decide') + chalk.gray(' - Let AI pick the best option'));
-    console.log(chalk.gray('    1. ') + chalk.cyan('CREATE TEMPLATE') + chalk.gray(' - I\'ll fill it out'));
-    console.log(chalk.gray('    2. ') + chalk.cyan('PASTE CONTENT') + chalk.gray('   - I have requirements ready'));
-    console.log(chalk.gray('    3. ') + chalk.cyan('SKIP FOR NOW') + chalk.gray('    - I\'ll add it later\n'));
-
-    let prdChoice = '';
-    while (!['0', '1', '2', '3'].includes(prdChoice)) {
-      prdChoice = await prompt('  Enter 0, 1, 2, or 3: ');
-    }
+    console.log(chalk.gray('\n  No problem! Just describe your project to the AI.\n'));
+  }
 
-    // "You Decide" defaults to creating a template (most helpful)
-    if (prdChoice === '0') {
-      console.log(chalk.magenta('  → AI chose: Create Template (recommended)\n'));
-      prdChoice = '1';
+  // Success
+  showSuccessMessage(projectName, false, prdChoice === '1');
+}
+
+// ============================================================================
+// MODE: EXISTING PROJECT
+// ============================================================================
+
+async function initExistingProject(cwd: string, projectInfo: ReturnType<typeof detectExistingProject>): Promise<void> {
+  console.log(chalk.cyan('\n  ━━━ Existing Project Setup ━━━\n'));
+
+  // Show what was detected
+  console.log(chalk.gray('  Detected:'));
+  for (const detail of projectInfo.details.slice(0, 5)) {
+    console.log(chalk.gray(`    • ${detail}`));
+  }
+
+  const stackItems = Object.entries(projectInfo.stack).filter(([_, v]) => v);
+  if (stackItems.length > 0) {
+    console.log(chalk.gray('\n  Tech Stack:'));
+    for (const [key, value] of stackItems) {
+      console.log(chalk.gray(`    • ${key}: ${value}`));
     }
+  }
 
-    if (prdChoice === '1') {
-      // Create template
-      const prdSpinner = ora('  Creating PRD template...').start();
-      const prdContent = createPrdTemplate(projectName, projectType);
-      writeFileSync(prdPath, prdContent);
-      prdSpinner.succeed('PRD template created!');
-      console.log(chalk.yellow('\n  → Open PRD.md and fill in your requirements'));
-      console.log(chalk.gray('    The AI will use this to understand what to build.\n'));
-      prdCreated = true;
-    } else if (prdChoice === '2') {
-      // Paste content
-      console.log(chalk.gray('\n  Paste your PRD content below.'));
-      console.log(chalk.gray('  When done, type ') + chalk.cyan('END') + chalk.gray(' on a new line and press Enter.\n'));
-
-      const lines: string[] = [];
-      let line = '';
-
-      while (true) {
-        line = await prompt('  ');
-        if (line.trim().toUpperCase() === 'END') break;
-        lines.push(line);
-      }
+  // Get project name
+  const defaultName = cwd.split(/[\\/]/).pop() || 'my-project';
+  const projectName = await prompt(`\n  Project name (${defaultName}): `) || defaultName;
 
-      if (lines.length > 0) {
-        const prdSpinner = ora('  Saving PRD...').start();
-        const header = `# Product Requirements Document\n# Project: ${projectName}\n# Created: ${new Date().toISOString().split('T')[0]}\n\n`;
-        writeFileSync(prdPath, header + lines.join('\n'));
-        prdSpinner.succeed('PRD saved!');
-        prdCreated = true;
-      } else {
-        console.log(chalk.yellow('  No content provided, skipping PRD.\n'));
+  // Code review offer
+  console.log(chalk.white('\n  Want me to review your code and bring it up to CodeBakers standards?\n'));
+  console.log(chalk.gray('    1. ') + chalk.cyan('YES, REVIEW & FIX') + chalk.gray(' - Run audit, then auto-fix issues'));
+  console.log(chalk.gray('    2. ') + chalk.cyan('REVIEW ONLY') + chalk.gray('      - Just show me the issues'));
+  console.log(chalk.gray('    3. ') + chalk.cyan('SKIP') + chalk.gray('             - Just install CodeBakers\n'));
+
+  let reviewChoice = '';
+  while (!['1', '2', '3'].includes(reviewChoice)) {
+    reviewChoice = await prompt('  Enter 1, 2, or 3: ');
+  }
+
+  let auditScore: number | undefined;
+
+  if (reviewChoice !== '3') {
+    console.log(chalk.blue('\n  Running code audit...\n'));
+    const auditResult = await audit();
+    auditScore = auditResult.score;
+
+    if (auditResult.score >= 90) {
+      console.log(chalk.green('\n  🎉 Your code is already in great shape!\n'));
+    } else if (reviewChoice === '1') {
+      const fixableCount = auditResult.checks.filter(c => !c.passed && c.severity !== 'info').length;
+      if (fixableCount > 0) {
+        console.log(chalk.blue('\n  🔧 Attempting to auto-fix issues...\n'));
+        const healResult = await heal({ auto: true });
+
+        if (healResult.fixed > 0) {
+          console.log(chalk.green(`\n  ✓ Fixed ${healResult.fixed} issue(s)!`));
+          if (healResult.remaining > 0) {
+            console.log(chalk.yellow(`  ⚠ ${healResult.remaining} issue(s) need manual attention.`));
+          }
+        }
       }
     } else {
-      console.log(chalk.gray('\n  You can add PRD.md anytime. The AI will use it automatically.\n'));
+      console.log(chalk.gray('\n  Run `codebakers heal --auto` later to fix issues.\n'));
     }
   }
 
-  // Success message
+  // Login
+  console.log('');
+  await ensureLoggedIn();
+
+  // Install files
+  console.log(chalk.white('\n  Installing CodeBakers...\n'));
+  installBootstrapFiles(cwd);
+
+  // Create tracking files with detected stack
+  const structure = buildStructureString(cwd);
+  createTrackingFiles(cwd, projectName, projectInfo.stack, structure, true, auditScore);
+
+  // Setup Cursor
+  console.log('');
+  setupCursorIDE(cwd);
+
+  // Update .gitignore
+  updateGitignore(cwd);
+
+  // Success
+  showSuccessMessage(projectName, true);
+}
+
+// ============================================================================
+// SUCCESS MESSAGE
+// ============================================================================
+
+function showSuccessMessage(projectName: string, isExisting: boolean, prdCreated?: boolean): void {
   console.log(chalk.green(`
   ╔═══════════════════════════════════════════════════════════╗
   ║                                                           ║
-  ║   ${chalk.bold('✓ Setup Complete!')}                                    ║
+  ║   ${chalk.bold('✓ CodeBakers Setup Complete!')}                         ║
   ║                                                           ║
   ╚═══════════════════════════════════════════════════════════╝
   `));
 
   console.log(chalk.white('  Files created:\n'));
-  console.log(chalk.cyan('    CLAUDE.md          ') + chalk.gray('→ v6.0 bootstrap (patterns via MCP)'));
-  console.log(chalk.cyan('    .cursorrules       ') + chalk.gray('→ v6.0 bootstrap (patterns via MCP)'));
-  if (prdCreated) {
-    console.log(chalk.cyan('    PRD.md             ') + chalk.gray('→ Product requirements (AI reads this!)'));
+  console.log(chalk.cyan('    CLAUDE.md            ') + chalk.gray('→ AI bootstrap (patterns via MCP)'));
+  console.log(chalk.cyan('    .cursorrules         ') + chalk.gray('→ Cursor IDE rules'));
+  if (!isExisting && prdCreated) {
+    console.log(chalk.cyan('    PRD.md               ') + chalk.gray('→ Product requirements'));
+  }
+  console.log(chalk.cyan('    PROJECT-CONTEXT.md   ') + chalk.gray('→ Codebase knowledge'));
+  console.log(chalk.cyan('    PROJECT-STATE.md     ') + chalk.gray('→ Task tracking'));
+  console.log(chalk.cyan('    DECISIONS.md         ') + chalk.gray('→ Architecture log'));
+  console.log(chalk.cyan('    .codebakers/DEVLOG.md') + chalk.gray('→ Development log\n'));
+
+  if (isExisting) {
+    console.log(chalk.white('  What happens next:\n'));
+    console.log(chalk.gray('    ✓ AI will analyze your existing code patterns'));
+    console.log(chalk.gray('    ✓ AI follows your existing conventions'));
+    console.log(chalk.gray('    ✓ AI updates tracking files as you work\n'));
+  } else {
+    console.log(chalk.white('  What happens next:\n'));
+    console.log(chalk.gray('    ✓ Describe what you want to build'));
+    console.log(chalk.gray('    ✓ AI fetches patterns and generates code'));
+    console.log(chalk.gray('    ✓ AI updates tracking files as you work\n'));
   }
-  console.log(chalk.cyan('    PROJECT-CONTEXT.md ') + chalk.gray('→ Codebase knowledge (auto-updated)'));
-  console.log(chalk.cyan('    PROJECT-STATE.md   ') + chalk.gray('→ Task tracking (auto-updated)'));
-  console.log(chalk.cyan('    DECISIONS.md       ') + chalk.gray('→ Architecture log (auto-updated)'));
-  console.log(chalk.cyan('    .cursorignore      ') + chalk.gray('→ Context optimization\n'));
 
-  console.log(chalk.white('  What happens automatically:\n'));
-  console.log(chalk.gray('    ✓ AI loads context before every response'));
-  console.log(chalk.gray('    ✓ AI checks for existing patterns to copy'));
-  console.log(chalk.gray('    ✓ AI validates code before outputting'));
-  console.log(chalk.gray('    ✓ AI updates project state after completing tasks'));
-  console.log(chalk.gray('    ✓ AI logs architectural decisions\n'));
+  console.log(chalk.white('  Getting started:\n'));
+  console.log(chalk.gray('    For Cursor: Just open the project and start chatting'));
+  console.log(chalk.gray('    For Claude Code: Run ') + chalk.cyan('codebakers install-hook') + chalk.gray(' first\n'));
 
-  console.log(chalk.white('  For Cursor users:\n'));
-  console.log(chalk.gray('    Just open the project and start chatting!\n'));
+  console.log(chalk.blue('  Ready to build! 🚀\n'));
+}
+
+// ============================================================================
+// MAIN INIT FUNCTION
+// ============================================================================
+
+export async function init(): Promise<void> {
+  console.log(chalk.blue(`
+  ╔═══════════════════════════════════════════════════════════╗
+  ║                                                           ║
+  ║   ${chalk.bold('Welcome to CodeBakers!')}                              ║
+  ║                                                           ║
+  ║   Production-grade patterns for AI-assisted development   ║
+  ║                                                           ║
+  ╚═══════════════════════════════════════════════════════════╝
+  `));
+
+  const cwd = process.cwd();
+
+  // Check if already initialized
+  const claudeMdPath = join(cwd, 'CLAUDE.md');
+  if (existsSync(claudeMdPath)) {
+    const reinitialize = await confirm('  CLAUDE.md already exists. Reinitialize?');
+    if (!reinitialize) {
+      console.log(chalk.yellow('\n  Skipping. Run with a fresh project or delete CLAUDE.md first.\n'));
+      return;
+    }
+  }
+
+  // Detect existing project
+  const projectInfo = detectExistingProject(cwd);
 
-  console.log(chalk.white('  For Claude Code users:\n'));
-  console.log(chalk.cyan('    codebakers install-hook') + chalk.gray('  (one-time setup)\n'));
+  if (projectInfo.exists) {
+    // Existing project detected - ask what they want to do
+    console.log(chalk.yellow('\n  📁 Existing project detected!\n'));
+    console.log(chalk.white('  How would you like to proceed?\n'));
+    console.log(chalk.gray('    1. ') + chalk.cyan('EXISTING PROJECT') + chalk.gray(' - Add CodeBakers to this codebase'));
+    console.log(chalk.gray('    2. ') + chalk.cyan('NEW PROJECT') + chalk.gray('      - Start fresh (ignore existing code)\n'));
+
+    let modeChoice = '';
+    while (!['1', '2'].includes(modeChoice)) {
+      modeChoice = await prompt('  Enter 1 or 2: ');
+    }
 
-  console.log(chalk.blue('  Zero friction. Just build.\n'));
+    if (modeChoice === '1') {
+      await initExistingProject(cwd, projectInfo);
+    } else {
+      await initNewProject(cwd);
+    }
+  } else {
+    // No existing project - go straight to new project flow
+    await initNewProject(cwd);
+  }
 }