@codebakers/cli 3.8.8 → 3.9.0

package/dist/commands/go.d.ts

@@ -8,6 +8,10 @@ interface GoOptions {
 /**
  * Zero-friction entry point - start using CodeBakers instantly
  * Single command for both trial and paid users
+ *
+ * SMART BEHAVIOR:
+ * - If CodeBakers already set up → Show context and resume from where you left off
+ * - If not set up → Run first-time setup (trial or login)
  */
 export declare function go(options?: GoOptions): Promise<void>;
 export {};

package/dist/commands/go.js

@@ -709,6 +709,190 @@ function updateGitignore(cwd) {
         }
     }
 }
+function analyzeProjectState(cwd) {
+    const state = {
+        isSetUp: false,
+        hasPrd: false,
+        inProgressTasks: [],
+        completedTasks: [],
+        blockers: [],
+        suggestion: '',
+    };
+    // Check if CodeBakers is set up
+    const codebakersJsonPath = (0, path_1.join)(cwd, '.codebakers.json');
+    if (!(0, fs_1.existsSync)(codebakersJsonPath)) {
+        state.suggestion = 'Project not set up. Running first-time setup...';
+        return state;
+    }
+    state.isSetUp = true;
+    // Read .codebakers.json
+    try {
+        const cbState = JSON.parse((0, fs_1.readFileSync)(codebakersJsonPath, 'utf-8'));
+        state.projectName = cbState.projectName;
+        state.projectType = cbState.projectType;
+    }
+    catch {
+        // Ignore parse errors
+    }
+    // Check for PRD.md
+    const prdPath = (0, path_1.join)(cwd, 'PRD.md');
+    if ((0, fs_1.existsSync)(prdPath)) {
+        state.hasPrd = true;
+        try {
+            const prdContent = (0, fs_1.readFileSync)(prdPath, 'utf-8');
+            // Extract one-liner if present
+            const oneLineMatch = prdContent.match(/\*\*One-liner:\*\*\s*(.+)/);
+            if (oneLineMatch) {
+                state.prdSummary = oneLineMatch[1].trim();
+            }
+            else {
+                // Get first non-comment, non-header line
+                const lines = prdContent.split('\n').filter(l => l.trim() && !l.startsWith('#') && !l.startsWith('<!--'));
+                if (lines[0]) {
+                    state.prdSummary = lines[0].substring(0, 100);
+                }
+            }
+        }
+        catch {
+            // Ignore read errors
+        }
+    }
+    // Read PROJECT-STATE.md for tasks
+    const projectStatePath = (0, path_1.join)(cwd, 'PROJECT-STATE.md');
+    if ((0, fs_1.existsSync)(projectStatePath)) {
+        try {
+            const content = (0, fs_1.readFileSync)(projectStatePath, 'utf-8');
+            // Extract In Progress section
+            const inProgressMatch = content.match(/## In Progress\n([\s\S]*?)(?=\n##|$)/);
+            if (inProgressMatch) {
+                const lines = inProgressMatch[1].split('\n')
+                    .filter(l => l.trim().startsWith('-'))
+                    .map(l => l.replace(/^-\s*/, '').trim())
+                    .filter(l => l && !l.startsWith('<!--'));
+                state.inProgressTasks = lines;
+            }
+            // Extract Completed section (last 5)
+            const completedMatch = content.match(/## Completed\n([\s\S]*?)(?=\n##|$)/);
+            if (completedMatch) {
+                const lines = completedMatch[1].split('\n')
+                    .filter(l => l.trim().startsWith('-'))
+                    .map(l => l.replace(/^-\s*/, '').trim())
+                    .filter(l => l && !l.startsWith('<!--'));
+                state.completedTasks = lines.slice(-5);
+            }
+            // Extract Blockers section
+            const blockersMatch = content.match(/## Blockers\n([\s\S]*?)(?=\n##|$)/);
+            if (blockersMatch) {
+                const lines = blockersMatch[1].split('\n')
+                    .filter(l => l.trim().startsWith('-'))
+                    .map(l => l.replace(/^-\s*/, '').trim())
+                    .filter(l => l && !l.startsWith('<!--'));
+                state.blockers = lines;
+            }
+        }
+        catch {
+            // Ignore read errors
+        }
+    }
+    // Read DEVLOG for last session
+    const devlogPath = (0, path_1.join)(cwd, '.codebakers', 'DEVLOG.md');
+    if ((0, fs_1.existsSync)(devlogPath)) {
+        try {
+            const content = (0, fs_1.readFileSync)(devlogPath, 'utf-8');
+            // Get first session entry
+            const sessionMatch = content.match(/## .+?\n\*\*Session:\*\*\s*(.+)/);
+            if (sessionMatch) {
+                state.lastSession = sessionMatch[1].trim();
+            }
+            // Get "What was done" from most recent entry
+            const whatDoneMatch = content.match(/### What was done:\n([\s\S]*?)(?=\n###|---|\n\n)/);
+            if (whatDoneMatch && !state.lastSession) {
+                const lines = whatDoneMatch[1].split('\n')
+                    .filter(l => l.trim().startsWith('-'))
+                    .map(l => l.replace(/^-\s*/, '').trim());
+                if (lines[0]) {
+                    state.lastSession = lines[0];
+                }
+            }
+        }
+        catch {
+            // Ignore read errors
+        }
+    }
+    // Determine suggestion based on state
+    if (state.blockers.length > 0) {
+        state.suggestion = `BLOCKED: ${state.blockers[0]}. Address this blocker first.`;
+    }
+    else if (state.inProgressTasks.length > 0) {
+        state.suggestion = `CONTINUE: ${state.inProgressTasks[0]}`;
+    }
+    else if (state.hasPrd && state.completedTasks.length === 0) {
+        state.suggestion = `START BUILDING: PRD exists. Begin implementing features from PRD.md`;
+    }
+    else if (!state.hasPrd) {
+        state.suggestion = `DEFINE PROJECT: No PRD found. Describe what you want to build.`;
+    }
+    else {
+        state.suggestion = `READY: Project set up. Ask for the next feature to build.`;
+    }
+    return state;
+}
+function showResumeContext(state) {
+    console.log(chalk_1.default.blue(`
+  ╔═══════════════════════════════════════════════════════════╗
+  ║                                                           ║
+  ║   ${chalk_1.default.bold.white('CodeBakers - Resuming Session')}                          ║
+  ║                                                           ║
+  ╚═══════════════════════════════════════════════════════════╝
+  `));
+    console.log(chalk_1.default.white(`  📁 Project: ${chalk_1.default.cyan(state.projectName || 'Unknown')}`));
+    if (state.prdSummary) {
+        console.log(chalk_1.default.gray(`  📝 ${state.prdSummary}`));
+    }
+    console.log('');
+    // Show blockers first (critical)
+    if (state.blockers.length > 0) {
+        console.log(chalk_1.default.red('  ⚠️  BLOCKERS:'));
+        for (const blocker of state.blockers) {
+            console.log(chalk_1.default.red(`      • ${blocker}`));
+        }
+        console.log('');
+    }
+    // Show in-progress tasks
+    if (state.inProgressTasks.length > 0) {
+        console.log(chalk_1.default.yellow('  🔄 IN PROGRESS:'));
+        for (const task of state.inProgressTasks) {
+            console.log(chalk_1.default.yellow(`      • ${task}`));
+        }
+        console.log('');
+    }
+    // Show recent completed (context)
+    if (state.completedTasks.length > 0) {
+        console.log(chalk_1.default.green('  ✓ RECENTLY COMPLETED:'));
+        for (const task of state.completedTasks.slice(-3)) {
+            console.log(chalk_1.default.gray(`      • ${task}`));
+        }
+        console.log('');
+    }
+    // Show last session timestamp if available
+    if (state.lastSession) {
+        console.log(chalk_1.default.gray(`  📅 Last session: ${state.lastSession}`));
+        console.log('');
+    }
+    // Show the suggestion prominently
+    console.log(chalk_1.default.cyan('  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+    console.log(chalk_1.default.white.bold(`\n  → ${state.suggestion}\n`));
+    console.log(chalk_1.default.cyan('  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
+    // Output machine-readable context for AI
+    console.log(chalk_1.default.gray('  [AI Context]'));
+    console.log(chalk_1.default.gray(`  Project: ${state.projectName || 'Unknown'}`));
+    console.log(chalk_1.default.gray(`  Status: ${state.inProgressTasks.length > 0 ? 'IN_PROGRESS' : state.blockers.length > 0 ? 'BLOCKED' : 'READY'}`));
+    console.log(chalk_1.default.gray(`  Next Action: ${state.suggestion}`));
+    if (state.hasPrd) {
+        console.log(chalk_1.default.gray(`  PRD: Available at PRD.md`));
+    }
+    console.log('');
+}
 /**
  * Get CLI version from package.json
  */
@@ -754,11 +938,42 @@ function log(message, options) {
 /**
  * Zero-friction entry point - start using CodeBakers instantly
  * Single command for both trial and paid users
+ *
+ * SMART BEHAVIOR:
+ * - If CodeBakers already set up → Show context and resume from where you left off
+ * - If not set up → Run first-time setup (trial or login)
  */
 async function go(options = {}) {
     log('Starting go command...', options);
     log(`API URL: ${(0, config_js_1.getApiUrl)()}`, options);
     log(`Working directory: ${process.cwd()}`, options);
+    const cwd = process.cwd();
+    // =========================================================================
+    // SMART CONTEXT CHECK - If already set up, show resume context
+    // =========================================================================
+    const projectState = analyzeProjectState(cwd);
+    if (projectState.isSetUp) {
+        // Project already has CodeBakers - show context and resume
+        showResumeContext(projectState);
+        // Verify auth is still valid
+        const existingApiKey = (0, config_js_1.getApiKey)();
+        const existingTrial = (0, config_js_1.getTrialState)();
+        if (existingApiKey) {
+            console.log(chalk_1.default.green('  ✓ Authenticated (API key)\n'));
+        }
+        else if (existingTrial && !(0, config_js_1.isTrialExpired)()) {
+            const daysRemaining = (0, config_js_1.getTrialDaysRemaining)();
+            console.log(chalk_1.default.green(`  ✓ Trial active (${daysRemaining} days remaining)\n`));
+        }
+        else if (existingTrial && (0, config_js_1.isTrialExpired)()) {
+            console.log(chalk_1.default.yellow('  ⚠️  Trial expired. Run `codebakers extend` or login.\n'));
+        }
+        // Don't run setup again - just show context
+        return;
+    }
+    // =========================================================================
+    // FIRST-TIME SETUP - Project not yet configured
+    // =========================================================================
     console.log(chalk_1.default.blue(`
   ╔═══════════════════════════════════════════════════════════╗
   ║                                                           ║

package/dist/mcp/server.js

@@ -1440,6 +1440,19 @@ class CodeBakersServer {
                         properties: {},
                     },
                 },
+                {
+                    name: 'resume_session',
+                    description: 'IMPORTANT: Call this AUTOMATICALLY at the start of any session, especially after conversation compaction/summarization. Returns full project context including: project name, PRD summary, in-progress tasks, completed tasks, blockers, and a suggested next action. This prevents losing context after Claude Code or Cursor compacts the conversation. Use when: (1) starting a new session, (2) conversation was just summarized, (3) you are unsure what you were working on, (4) user says "where was I?" or "what should I do next?".',
+                    inputSchema: {
+                        type: 'object',
+                        properties: {
+                            reason: {
+                                type: 'string',
+                                description: 'Why you are calling this (e.g., "session start", "after compaction", "context lost")',
+                            },
+                        },
+                    },
+                },
                 // Engineering workflow tools
                 ...engineering_tools_js_1.ENGINEERING_TOOLS,
             ],
@@ -1570,6 +1583,8 @@ class CodeBakersServer {
                     return this.handleProjectSync(args);
                 case 'project_dashboard_url':
                     return this.handleProjectDashboardUrl();
+                case 'resume_session':
+                    return this.handleResumeSession(args);
                 // Engineering workflow tools
                 case 'engineering_start':
                 case 'engineering_scope':
@@ -3354,6 +3369,200 @@ Just describe what you want to build! I'll automatically:
                 }],
         };
     }
+    handleResumeSession(args) {
+        const { reason = 'session start' } = args;
+        const cwd = process.cwd();
+        // Initialize state object
+        const state = {
+            isSetUp: false,
+            projectName: '',
+            projectType: '',
+            hasPrd: false,
+            prdSummary: '',
+            inProgressTasks: [],
+            completedTasks: [],
+            blockers: [],
+            lastSession: '',
+            suggestion: '',
+            status: 'UNKNOWN',
+        };
+        // Check if CodeBakers is set up
+        const codebakersJsonPath = path.join(cwd, '.codebakers.json');
+        if (!fs.existsSync(codebakersJsonPath)) {
+            state.suggestion = 'Project not set up. Run `codebakers go` in the terminal to start.';
+            state.status = 'NOT_INITIALIZED';
+        }
+        else {
+            state.isSetUp = true;
+            // Read .codebakers.json
+            try {
+                const cbState = JSON.parse(fs.readFileSync(codebakersJsonPath, 'utf-8'));
+                state.projectName = cbState.projectName || '';
+                state.projectType = cbState.projectType || '';
+            }
+            catch {
+                // Ignore parse errors
+            }
+        }
+        // Check for PRD.md
+        const prdPath = path.join(cwd, 'PRD.md');
+        if (fs.existsSync(prdPath)) {
+            state.hasPrd = true;
+            try {
+                const prdContent = fs.readFileSync(prdPath, 'utf-8');
+                // Extract one-liner if present
+                const oneLineMatch = prdContent.match(/\*\*One-liner:\*\*\s*(.+)/);
+                if (oneLineMatch) {
+                    state.prdSummary = oneLineMatch[1].trim();
+                }
+                else {
+                    // Get first non-comment, non-header line
+                    const lines = prdContent.split('\n').filter(l => l.trim() && !l.startsWith('#') && !l.startsWith('<!--'));
+                    if (lines[0]) {
+                        state.prdSummary = lines[0].substring(0, 150);
+                    }
+                }
+            }
+            catch {
+                // Ignore read errors
+            }
+        }
+        // Read PROJECT-STATE.md for tasks
+        const projectStatePath = path.join(cwd, 'PROJECT-STATE.md');
+        if (fs.existsSync(projectStatePath)) {
+            try {
+                const content = fs.readFileSync(projectStatePath, 'utf-8');
+                // Extract In Progress section
+                const inProgressMatch = content.match(/## In Progress\n([\s\S]*?)(?=\n##|$)/);
+                if (inProgressMatch) {
+                    const lines = inProgressMatch[1].split('\n')
+                        .filter(l => l.trim().startsWith('-'))
+                        .map(l => l.replace(/^-\s*/, '').trim())
+                        .filter(l => l && !l.startsWith('<!--'));
+                    state.inProgressTasks = lines;
+                }
+                // Extract Completed section (last 5)
+                const completedMatch = content.match(/## Completed\n([\s\S]*?)(?=\n##|$)/);
+                if (completedMatch) {
+                    const lines = completedMatch[1].split('\n')
+                        .filter(l => l.trim().startsWith('-'))
+                        .map(l => l.replace(/^-\s*/, '').trim())
+                        .filter(l => l && !l.startsWith('<!--'));
+                    state.completedTasks = lines.slice(-5);
+                }
+                // Extract Blockers section
+                const blockersMatch = content.match(/## Blockers\n([\s\S]*?)(?=\n##|$)/);
+                if (blockersMatch) {
+                    const lines = blockersMatch[1].split('\n')
+                        .filter(l => l.trim().startsWith('-'))
+                        .map(l => l.replace(/^-\s*/, '').trim())
+                        .filter(l => l && !l.startsWith('<!--'));
+                    state.blockers = lines;
+                }
+            }
+            catch {
+                // Ignore read errors
+            }
+        }
+        // Read DEVLOG for last session
+        const devlogPath = path.join(cwd, '.codebakers', 'DEVLOG.md');
+        if (fs.existsSync(devlogPath)) {
+            try {
+                const content = fs.readFileSync(devlogPath, 'utf-8');
+                // Get first session entry
+                const sessionMatch = content.match(/## .+?\n\*\*Session:\*\*\s*(.+)/);
+                if (sessionMatch) {
+                    state.lastSession = sessionMatch[1].trim();
+                }
+                // Get "What was done" from most recent entry
+                const whatDoneMatch = content.match(/### What was done:\n([\s\S]*?)(?=\n###|---|\n\n)/);
+                if (whatDoneMatch && !state.lastSession) {
+                    const lines = whatDoneMatch[1].split('\n')
+                        .filter(l => l.trim().startsWith('-'))
+                        .map(l => l.replace(/^-\s*/, '').trim());
+                    if (lines[0]) {
+                        state.lastSession = lines[0];
+                    }
+                }
+            }
+            catch {
+                // Ignore read errors
+            }
+        }
+        // Determine suggestion and status based on state
+        if (!state.isSetUp) {
+            state.status = 'NOT_INITIALIZED';
+            state.suggestion = 'Run `codebakers go` in the terminal to set up the project.';
+        }
+        else if (state.blockers.length > 0) {
+            state.status = 'BLOCKED';
+            state.suggestion = `BLOCKED: ${state.blockers[0]}. Address this blocker first.`;
+        }
+        else if (state.inProgressTasks.length > 0) {
+            state.status = 'IN_PROGRESS';
+            state.suggestion = `CONTINUE: ${state.inProgressTasks[0]}`;
+        }
+        else if (state.hasPrd && state.completedTasks.length === 0) {
+            state.status = 'READY_TO_BUILD';
+            state.suggestion = 'START BUILDING: PRD exists. Begin implementing features from PRD.md';
+        }
+        else if (!state.hasPrd) {
+            state.status = 'NEEDS_PRD';
+            state.suggestion = 'DEFINE PROJECT: No PRD found. Ask the user what they want to build.';
+        }
+        else {
+            state.status = 'READY';
+            state.suggestion = 'READY: Project set up. Ask the user for the next feature to build.';
+        }
+        // Build response
+        let response = `# 🔄 Session Context Recovered\n\n`;
+        response += `**Reason:** ${reason}\n\n`;
+        response += `## Project\n`;
+        response += `- **Name:** ${state.projectName || 'Unknown'}\n`;
+        response += `- **Type:** ${state.projectType || 'Not set'}\n`;
+        response += `- **Status:** ${state.status}\n`;
+        if (state.prdSummary) {
+            response += `- **Description:** ${state.prdSummary}\n`;
+        }
+        response += `\n`;
+        if (state.blockers.length > 0) {
+            response += `## ⚠️ BLOCKERS (Address First!)\n`;
+            for (const blocker of state.blockers) {
+                response += `- ${blocker}\n`;
+            }
+            response += `\n`;
+        }
+        if (state.inProgressTasks.length > 0) {
+            response += `## 🔄 In Progress\n`;
+            for (const task of state.inProgressTasks) {
+                response += `- ${task}\n`;
+            }
+            response += `\n`;
+        }
+        if (state.completedTasks.length > 0) {
+            response += `## ✅ Recently Completed\n`;
+            for (const task of state.completedTasks) {
+                response += `- ${task}\n`;
+            }
+            response += `\n`;
+        }
+        if (state.lastSession) {
+            response += `## 📅 Last Session\n`;
+            response += `${state.lastSession}\n\n`;
+        }
+        response += `---\n\n`;
+        response += `## 🎯 NEXT ACTION\n\n`;
+        response += `**${state.suggestion}**\n\n`;
+        response += `---\n\n`;
+        response += `*Context recovered via CodeBakers resume_session. `;
+        response += `This tool should be called automatically after conversation compaction.*`;
+        return {
+            content: [{
+                    type: 'text',
+                    text: response,
+                }],
+        };
+    }
     handleRunTests(args) {
         const { filter, watch = false } = args;
         const cwd = process.cwd();

package/package.json

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

package/src/commands/go.ts

@@ -778,6 +778,222 @@ interface GoOptions {
   skipReview?: boolean;
 }
 
+// ============================================================================
+// SMART CONTEXT DETECTION - "Where am I? What's next?"
+// ============================================================================
+
+interface ProjectState {
+  isSetUp: boolean;
+  projectName?: string;
+  projectType?: string;
+  hasPrd: boolean;
+  prdSummary?: string;
+  inProgressTasks: string[];
+  completedTasks: string[];
+  blockers: string[];
+  lastSession?: string;
+  suggestion: string;
+}
+
+function analyzeProjectState(cwd: string): ProjectState {
+  const state: ProjectState = {
+    isSetUp: false,
+    hasPrd: false,
+    inProgressTasks: [],
+    completedTasks: [],
+    blockers: [],
+    suggestion: '',
+  };
+
+  // Check if CodeBakers is set up
+  const codebakersJsonPath = join(cwd, '.codebakers.json');
+  if (!existsSync(codebakersJsonPath)) {
+    state.suggestion = 'Project not set up. Running first-time setup...';
+    return state;
+  }
+
+  state.isSetUp = true;
+
+  // Read .codebakers.json
+  try {
+    const cbState = JSON.parse(readFileSync(codebakersJsonPath, 'utf-8'));
+    state.projectName = cbState.projectName;
+    state.projectType = cbState.projectType;
+  } catch {
+    // Ignore parse errors
+  }
+
+  // Check for PRD.md
+  const prdPath = join(cwd, 'PRD.md');
+  if (existsSync(prdPath)) {
+    state.hasPrd = true;
+    try {
+      const prdContent = readFileSync(prdPath, 'utf-8');
+      // Extract one-liner if present
+      const oneLineMatch = prdContent.match(/\*\*One-liner:\*\*\s*(.+)/);
+      if (oneLineMatch) {
+        state.prdSummary = oneLineMatch[1].trim();
+      } else {
+        // Get first non-comment, non-header line
+        const lines = prdContent.split('\n').filter(l =>
+          l.trim() && !l.startsWith('#') && !l.startsWith('<!--')
+        );
+        if (lines[0]) {
+          state.prdSummary = lines[0].substring(0, 100);
+        }
+      }
+    } catch {
+      // Ignore read errors
+    }
+  }
+
+  // Read PROJECT-STATE.md for tasks
+  const projectStatePath = join(cwd, 'PROJECT-STATE.md');
+  if (existsSync(projectStatePath)) {
+    try {
+      const content = readFileSync(projectStatePath, 'utf-8');
+
+      // Extract In Progress section
+      const inProgressMatch = content.match(/## In Progress\n([\s\S]*?)(?=\n##|$)/);
+      if (inProgressMatch) {
+        const lines = inProgressMatch[1].split('\n')
+          .filter(l => l.trim().startsWith('-'))
+          .map(l => l.replace(/^-\s*/, '').trim())
+          .filter(l => l && !l.startsWith('<!--'));
+        state.inProgressTasks = lines;
+      }
+
+      // Extract Completed section (last 5)
+      const completedMatch = content.match(/## Completed\n([\s\S]*?)(?=\n##|$)/);
+      if (completedMatch) {
+        const lines = completedMatch[1].split('\n')
+          .filter(l => l.trim().startsWith('-'))
+          .map(l => l.replace(/^-\s*/, '').trim())
+          .filter(l => l && !l.startsWith('<!--'));
+        state.completedTasks = lines.slice(-5);
+      }
+
+      // Extract Blockers section
+      const blockersMatch = content.match(/## Blockers\n([\s\S]*?)(?=\n##|$)/);
+      if (blockersMatch) {
+        const lines = blockersMatch[1].split('\n')
+          .filter(l => l.trim().startsWith('-'))
+          .map(l => l.replace(/^-\s*/, '').trim())
+          .filter(l => l && !l.startsWith('<!--'));
+        state.blockers = lines;
+      }
+    } catch {
+      // Ignore read errors
+    }
+  }
+
+  // Read DEVLOG for last session
+  const devlogPath = join(cwd, '.codebakers', 'DEVLOG.md');
+  if (existsSync(devlogPath)) {
+    try {
+      const content = readFileSync(devlogPath, 'utf-8');
+      // Get first session entry
+      const sessionMatch = content.match(/## .+?\n\*\*Session:\*\*\s*(.+)/);
+      if (sessionMatch) {
+        state.lastSession = sessionMatch[1].trim();
+      }
+      // Get "What was done" from most recent entry
+      const whatDoneMatch = content.match(/### What was done:\n([\s\S]*?)(?=\n###|---|\n\n)/);
+      if (whatDoneMatch && !state.lastSession) {
+        const lines = whatDoneMatch[1].split('\n')
+          .filter(l => l.trim().startsWith('-'))
+          .map(l => l.replace(/^-\s*/, '').trim());
+        if (lines[0]) {
+          state.lastSession = lines[0];
+        }
+      }
+    } catch {
+      // Ignore read errors
+    }
+  }
+
+  // Determine suggestion based on state
+  if (state.blockers.length > 0) {
+    state.suggestion = `BLOCKED: ${state.blockers[0]}. Address this blocker first.`;
+  } else if (state.inProgressTasks.length > 0) {
+    state.suggestion = `CONTINUE: ${state.inProgressTasks[0]}`;
+  } else if (state.hasPrd && state.completedTasks.length === 0) {
+    state.suggestion = `START BUILDING: PRD exists. Begin implementing features from PRD.md`;
+  } else if (!state.hasPrd) {
+    state.suggestion = `DEFINE PROJECT: No PRD found. Describe what you want to build.`;
+  } else {
+    state.suggestion = `READY: Project set up. Ask for the next feature to build.`;
+  }
+
+  return state;
+}
+
+function showResumeContext(state: ProjectState): void {
+  console.log(chalk.blue(`
+  ╔═══════════════════════════════════════════════════════════╗
+  ║                                                           ║
+  ║   ${chalk.bold.white('CodeBakers - Resuming Session')}                          ║
+  ║                                                           ║
+  ╚═══════════════════════════════════════════════════════════╝
+  `));
+
+  console.log(chalk.white(`  📁 Project: ${chalk.cyan(state.projectName || 'Unknown')}`));
+
+  if (state.prdSummary) {
+    console.log(chalk.gray(`  📝 ${state.prdSummary}`));
+  }
+
+  console.log('');
+
+  // Show blockers first (critical)
+  if (state.blockers.length > 0) {
+    console.log(chalk.red('  ⚠️  BLOCKERS:'));
+    for (const blocker of state.blockers) {
+      console.log(chalk.red(`      • ${blocker}`));
+    }
+    console.log('');
+  }
+
+  // Show in-progress tasks
+  if (state.inProgressTasks.length > 0) {
+    console.log(chalk.yellow('  🔄 IN PROGRESS:'));
+    for (const task of state.inProgressTasks) {
+      console.log(chalk.yellow(`      • ${task}`));
+    }
+    console.log('');
+  }
+
+  // Show recent completed (context)
+  if (state.completedTasks.length > 0) {
+    console.log(chalk.green('  ✓ RECENTLY COMPLETED:'));
+    for (const task of state.completedTasks.slice(-3)) {
+      console.log(chalk.gray(`      • ${task}`));
+    }
+    console.log('');
+  }
+
+  // Show last session timestamp if available
+  if (state.lastSession) {
+    console.log(chalk.gray(`  📅 Last session: ${state.lastSession}`));
+    console.log('');
+  }
+
+  // Show the suggestion prominently
+  console.log(chalk.cyan('  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+  console.log(chalk.white.bold(`\n  → ${state.suggestion}\n`));
+  console.log(chalk.cyan('  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
+
+  // Output machine-readable context for AI
+  console.log(chalk.gray('  [AI Context]'));
+  console.log(chalk.gray(`  Project: ${state.projectName || 'Unknown'}`));
+  console.log(chalk.gray(`  Status: ${state.inProgressTasks.length > 0 ? 'IN_PROGRESS' : state.blockers.length > 0 ? 'BLOCKED' : 'READY'}`));
+  console.log(chalk.gray(`  Next Action: ${state.suggestion}`));
+  if (state.hasPrd) {
+    console.log(chalk.gray(`  PRD: Available at PRD.md`));
+  }
+  console.log('');
+}
+
 interface ConfirmData {
   version: string;
   moduleCount: number;
@@ -838,12 +1054,48 @@ function log(message: string, options?: GoOptions): void {
 /**
  * Zero-friction entry point - start using CodeBakers instantly
  * Single command for both trial and paid users
+ *
+ * SMART BEHAVIOR:
+ * - If CodeBakers already set up → Show context and resume from where you left off
+ * - If not set up → Run first-time setup (trial or login)
  */
 export async function go(options: GoOptions = {}): Promise<void> {
   log('Starting go command...', options);
   log(`API URL: ${getApiUrl()}`, options);
   log(`Working directory: ${process.cwd()}`, options);
 
+  const cwd = process.cwd();
+
+  // =========================================================================
+  // SMART CONTEXT CHECK - If already set up, show resume context
+  // =========================================================================
+  const projectState = analyzeProjectState(cwd);
+
+  if (projectState.isSetUp) {
+    // Project already has CodeBakers - show context and resume
+    showResumeContext(projectState);
+
+    // Verify auth is still valid
+    const existingApiKey = getApiKey();
+    const existingTrial = getTrialState();
+
+    if (existingApiKey) {
+      console.log(chalk.green('  ✓ Authenticated (API key)\n'));
+    } else if (existingTrial && !isTrialExpired()) {
+      const daysRemaining = getTrialDaysRemaining();
+      console.log(chalk.green(`  ✓ Trial active (${daysRemaining} days remaining)\n`));
+    } else if (existingTrial && isTrialExpired()) {
+      console.log(chalk.yellow('  ⚠️  Trial expired. Run `codebakers extend` or login.\n'));
+    }
+
+    // Don't run setup again - just show context
+    return;
+  }
+
+  // =========================================================================
+  // FIRST-TIME SETUP - Project not yet configured
+  // =========================================================================
+
   console.log(chalk.blue(`
   ╔═══════════════════════════════════════════════════════════╗
   ║                                                           ║

package/src/mcp/server.ts

@@ -1552,6 +1552,20 @@ class CodeBakersServer {
             properties: {},
           },
         },
+        {
+          name: 'resume_session',
+          description:
+            'IMPORTANT: Call this AUTOMATICALLY at the start of any session, especially after conversation compaction/summarization. Returns full project context including: project name, PRD summary, in-progress tasks, completed tasks, blockers, and a suggested next action. This prevents losing context after Claude Code or Cursor compacts the conversation. Use when: (1) starting a new session, (2) conversation was just summarized, (3) you are unsure what you were working on, (4) user says "where was I?" or "what should I do next?".',
+          inputSchema: {
+            type: 'object' as const,
+            properties: {
+              reason: {
+                type: 'string',
+                description: 'Why you are calling this (e.g., "session start", "after compaction", "context lost")',
+              },
+            },
+          },
+        },
         // Engineering workflow tools
         ...ENGINEERING_TOOLS,
       ],
@@ -1797,6 +1811,9 @@ class CodeBakersServer {
         case 'project_dashboard_url':
           return this.handleProjectDashboardUrl();
 
+        case 'resume_session':
+          return this.handleResumeSession(args as { reason?: string });
+
         // Engineering workflow tools
         case 'engineering_start':
         case 'engineering_scope':
@@ -3784,6 +3801,211 @@ Just describe what you want to build! I'll automatically:
     };
   }
 
+  private handleResumeSession(args: { reason?: string }) {
+    const { reason = 'session start' } = args;
+    const cwd = process.cwd();
+
+    // Initialize state object
+    const state = {
+      isSetUp: false,
+      projectName: '',
+      projectType: '',
+      hasPrd: false,
+      prdSummary: '',
+      inProgressTasks: [] as string[],
+      completedTasks: [] as string[],
+      blockers: [] as string[],
+      lastSession: '',
+      suggestion: '',
+      status: 'UNKNOWN',
+    };
+
+    // Check if CodeBakers is set up
+    const codebakersJsonPath = path.join(cwd, '.codebakers.json');
+    if (!fs.existsSync(codebakersJsonPath)) {
+      state.suggestion = 'Project not set up. Run `codebakers go` in the terminal to start.';
+      state.status = 'NOT_INITIALIZED';
+    } else {
+      state.isSetUp = true;
+
+      // Read .codebakers.json
+      try {
+        const cbState = JSON.parse(fs.readFileSync(codebakersJsonPath, 'utf-8'));
+        state.projectName = cbState.projectName || '';
+        state.projectType = cbState.projectType || '';
+      } catch {
+        // Ignore parse errors
+      }
+    }
+
+    // Check for PRD.md
+    const prdPath = path.join(cwd, 'PRD.md');
+    if (fs.existsSync(prdPath)) {
+      state.hasPrd = true;
+      try {
+        const prdContent = fs.readFileSync(prdPath, 'utf-8');
+        // Extract one-liner if present
+        const oneLineMatch = prdContent.match(/\*\*One-liner:\*\*\s*(.+)/);
+        if (oneLineMatch) {
+          state.prdSummary = oneLineMatch[1].trim();
+        } else {
+          // Get first non-comment, non-header line
+          const lines = prdContent.split('\n').filter(l =>
+            l.trim() && !l.startsWith('#') && !l.startsWith('<!--')
+          );
+          if (lines[0]) {
+            state.prdSummary = lines[0].substring(0, 150);
+          }
+        }
+      } catch {
+        // Ignore read errors
+      }
+    }
+
+    // Read PROJECT-STATE.md for tasks
+    const projectStatePath = path.join(cwd, 'PROJECT-STATE.md');
+    if (fs.existsSync(projectStatePath)) {
+      try {
+        const content = fs.readFileSync(projectStatePath, 'utf-8');
+
+        // Extract In Progress section
+        const inProgressMatch = content.match(/## In Progress\n([\s\S]*?)(?=\n##|$)/);
+        if (inProgressMatch) {
+          const lines = inProgressMatch[1].split('\n')
+            .filter(l => l.trim().startsWith('-'))
+            .map(l => l.replace(/^-\s*/, '').trim())
+            .filter(l => l && !l.startsWith('<!--'));
+          state.inProgressTasks = lines;
+        }
+
+        // Extract Completed section (last 5)
+        const completedMatch = content.match(/## Completed\n([\s\S]*?)(?=\n##|$)/);
+        if (completedMatch) {
+          const lines = completedMatch[1].split('\n')
+            .filter(l => l.trim().startsWith('-'))
+            .map(l => l.replace(/^-\s*/, '').trim())
+            .filter(l => l && !l.startsWith('<!--'));
+          state.completedTasks = lines.slice(-5);
+        }
+
+        // Extract Blockers section
+        const blockersMatch = content.match(/## Blockers\n([\s\S]*?)(?=\n##|$)/);
+        if (blockersMatch) {
+          const lines = blockersMatch[1].split('\n')
+            .filter(l => l.trim().startsWith('-'))
+            .map(l => l.replace(/^-\s*/, '').trim())
+            .filter(l => l && !l.startsWith('<!--'));
+          state.blockers = lines;
+        }
+      } catch {
+        // Ignore read errors
+      }
+    }
+
+    // Read DEVLOG for last session
+    const devlogPath = path.join(cwd, '.codebakers', 'DEVLOG.md');
+    if (fs.existsSync(devlogPath)) {
+      try {
+        const content = fs.readFileSync(devlogPath, 'utf-8');
+        // Get first session entry
+        const sessionMatch = content.match(/## .+?\n\*\*Session:\*\*\s*(.+)/);
+        if (sessionMatch) {
+          state.lastSession = sessionMatch[1].trim();
+        }
+        // Get "What was done" from most recent entry
+        const whatDoneMatch = content.match(/### What was done:\n([\s\S]*?)(?=\n###|---|\n\n)/);
+        if (whatDoneMatch && !state.lastSession) {
+          const lines = whatDoneMatch[1].split('\n')
+            .filter(l => l.trim().startsWith('-'))
+            .map(l => l.replace(/^-\s*/, '').trim());
+          if (lines[0]) {
+            state.lastSession = lines[0];
+          }
+        }
+      } catch {
+        // Ignore read errors
+      }
+    }
+
+    // Determine suggestion and status based on state
+    if (!state.isSetUp) {
+      state.status = 'NOT_INITIALIZED';
+      state.suggestion = 'Run `codebakers go` in the terminal to set up the project.';
+    } else if (state.blockers.length > 0) {
+      state.status = 'BLOCKED';
+      state.suggestion = `BLOCKED: ${state.blockers[0]}. Address this blocker first.`;
+    } else if (state.inProgressTasks.length > 0) {
+      state.status = 'IN_PROGRESS';
+      state.suggestion = `CONTINUE: ${state.inProgressTasks[0]}`;
+    } else if (state.hasPrd && state.completedTasks.length === 0) {
+      state.status = 'READY_TO_BUILD';
+      state.suggestion = 'START BUILDING: PRD exists. Begin implementing features from PRD.md';
+    } else if (!state.hasPrd) {
+      state.status = 'NEEDS_PRD';
+      state.suggestion = 'DEFINE PROJECT: No PRD found. Ask the user what they want to build.';
+    } else {
+      state.status = 'READY';
+      state.suggestion = 'READY: Project set up. Ask the user for the next feature to build.';
+    }
+
+    // Build response
+    let response = `# 🔄 Session Context Recovered\n\n`;
+    response += `**Reason:** ${reason}\n\n`;
+
+    response += `## Project\n`;
+    response += `- **Name:** ${state.projectName || 'Unknown'}\n`;
+    response += `- **Type:** ${state.projectType || 'Not set'}\n`;
+    response += `- **Status:** ${state.status}\n`;
+    if (state.prdSummary) {
+      response += `- **Description:** ${state.prdSummary}\n`;
+    }
+    response += `\n`;
+
+    if (state.blockers.length > 0) {
+      response += `## ⚠️ BLOCKERS (Address First!)\n`;
+      for (const blocker of state.blockers) {
+        response += `- ${blocker}\n`;
+      }
+      response += `\n`;
+    }
+
+    if (state.inProgressTasks.length > 0) {
+      response += `## 🔄 In Progress\n`;
+      for (const task of state.inProgressTasks) {
+        response += `- ${task}\n`;
+      }
+      response += `\n`;
+    }
+
+    if (state.completedTasks.length > 0) {
+      response += `## ✅ Recently Completed\n`;
+      for (const task of state.completedTasks) {
+        response += `- ${task}\n`;
+      }
+      response += `\n`;
+    }
+
+    if (state.lastSession) {
+      response += `## 📅 Last Session\n`;
+      response += `${state.lastSession}\n\n`;
+    }
+
+    response += `---\n\n`;
+    response += `## 🎯 NEXT ACTION\n\n`;
+    response += `**${state.suggestion}**\n\n`;
+
+    response += `---\n\n`;
+    response += `*Context recovered via CodeBakers resume_session. `;
+    response += `This tool should be called automatically after conversation compaction.*`;
+
+    return {
+      content: [{
+        type: 'text' as const,
+        text: response,
+      }],
+    };
+  }
+
   private handleRunTests(args: { filter?: string; watch?: boolean }) {
     const { filter, watch = false } = args;
     const cwd = process.cwd();