fivocell 4.3.1 → 4.4.0

package/dist/{cli.js → walls/07-runtime/cli/cli.js}

@@ -43,8 +43,8 @@ const os = __importStar(require("os"));
 const chalk_1 = __importDefault(require("chalk"));
 const figlet_1 = __importDefault(require("figlet"));
 const gradient_string_1 = __importDefault(require("gradient-string"));
-const database_1 = require("./core/database");
-const layers_1 = require("./layers");
+const database_1 = require("../../06-memory/database/database");
+const layers_1 = require("../../05-community/stats/layers");
 const cli_repl_1 = require("./cli-repl");
 (0, database_1.initializeDatabase)();
 const C = {
@@ -88,6 +88,18 @@ function parseArgs(argv) {
 }
 const args = parseArgs(process.argv.slice(2));
 const cmd = args[0] || '';
+// Module-level state for watch-editor (must be declared before switch)
+let activeMonitor = null;
+let monitorStateFile = null;
+function isPidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 switch (cmd) {
     case '--version':
     case '-v':
@@ -134,12 +146,49 @@ switch (cmd) {
     case 'blindspots':
         doBlindspots();
         break;
+    case 'doctor':
+        doDoctor().catch((e) => {
+            const msg = e instanceof Error ? e.message : String(e);
+            console.log(C.warn('  Doctor failed: ' + msg));
+            process.exit(1);
+        });
+        break;
     case 'context':
         doContext();
         break;
     case 'mcp-config':
         doMcpConfig();
         break;
+    case 'replay':
+        doReplay();
+        break;
+    case 'continue':
+        doContinue();
+        break;
+    case 'bridge':
+        doBridge();
+        break;
+    case 'watch-editor':
+        doWatchEditor();
+        break;
+    case 'switch-back':
+        doSwitchBack();
+        break;
+    case 'branches':
+        doBranches();
+        break;
+    case 'lessons':
+        doLessons();
+        break;
+    case 'evolution':
+        doEvolution();
+        break;
+    case 'focus':
+        doFocus();
+        break;
+    case 'why':
+        doWhy();
+        break;
     case 'repl':
     case '-i':
     case '--interactive':
@@ -162,12 +211,27 @@ switch (cmd) {
 }
 // ─── cell start ─────────────────────────────────────────────────────────────
 function doStart() {
-    const banner = figlet_1.default.textSync('CELL', { font: 'ANSI Shadow', horizontalLayout: 'fitted' });
-    console.log((0, gradient_string_1.default)(['#FF6B35', '#FFAB91'])(banner));
-    console.log(C.dim('  Starting everything...\n'));
+    const fromAutostart = args.includes('--from-autostart');
+    if (fromAutostart) {
+        console.log('[cell] Autostart: starting daemon...');
+    }
+    else {
+        const banner = figlet_1.default.textSync('CELL', { font: 'ANSI Shadow', horizontalLayout: 'fitted' });
+        console.log((0, gradient_string_1.default)(['#FF6B35', '#FFAB91'])(banner));
+        console.log(C.dim('  Starting everything...\n'));
+        try {
+            const { registerAutostart } = require('../setup/autostart');
+            const auto = registerAutostart();
+            if (auto.ok && !auto.skipped)
+                console.log(C.success('  ' + auto.message));
+            else if (!auto.ok)
+                console.log(C.warn('  ' + auto.message));
+        }
+        catch { }
+    }
     // 0. First-run greeting
     try {
-        const { firstRunGreeting } = require('./first-run');
+        const { firstRunGreeting } = require('../setup/first-run');
         firstRunGreeting();
     }
     catch { }
@@ -204,7 +268,7 @@ function doStart() {
 function startDaemon() {
     // 1. Kill any stale daemon (clean restart)
     try {
-        const { stopDaemon } = require('./daemon/lifecycle');
+        const { stopDaemon } = require('../daemon/lifecycle');
         stopDaemon();
         // Wait for port to be released
         const { execSync } = require('child_process');
@@ -228,7 +292,7 @@ function startDaemon() {
         const pathMod = require('path');
         const fsMod = require('fs');
         const osMod = require('os');
-        const serverPath = pathMod.join(__dirname, 'daemon', 'server.js');
+        const serverPath = pathMod.join(__dirname, '..', 'daemon', 'server.js');
         const logFile = pathMod.join(osMod.homedir(), '.fivo', 'cell', 'daemon.log');
         fsMod.mkdirSync(pathMod.dirname(logFile), { recursive: true });
         const out = fsMod.openSync(logFile, 'a');
@@ -256,7 +320,7 @@ function startDaemon() {
 }
 function printProjectStatusAndExit() {
     try {
-        const { detectProject, checkScanState, checkWatchState, checkMcpState, isDaemonRunning } = require('./core/setup');
+        const { detectProject, checkScanState, checkWatchState, checkMcpState, isDaemonRunning } = require('../setup/setup');
         const httpMod = require('http');
         const project = detectProject(process.cwd());
         const scan = checkScanState(process.cwd());
@@ -290,13 +354,22 @@ function printProjectStatusAndExit() {
 function doStop() {
     console.log(C.dim('  Stopping Cell daemon...'));
     try {
-        const { stopDaemon } = require('./daemon/lifecycle');
+        const { stopDaemon } = require('../daemon/lifecycle');
         const result = stopDaemon();
         console.log(result.success ? C.success(`  ${result.message}`) : C.warn(`  ${result.message}`));
     }
     catch (e) {
         console.log(C.warn('  Stop failed: ' + String(e)));
     }
+    try {
+        const { unregisterAutostart } = require('../setup/autostart');
+        const auto = unregisterAutostart();
+        if (auto.ok && !auto.skipped)
+            console.log(C.success('  ' + auto.message));
+        else if (!auto.ok)
+            console.log(C.warn('  ' + auto.message));
+    }
+    catch { }
     console.log();
 }
 // ─── cell analyze ───────────────────────────────────────────────────────────
@@ -318,7 +391,7 @@ function doAnalyze() {
         process.stdin.on('end', () => {
             const content = Buffer.concat(chunks).toString().trim();
             if (content) {
-                const { saveAIInsight } = require('./ai-bridge');
+                const { saveAIInsight } = require('../../03-knowledge/decisions/ai-bridge');
                 saveAIInsight(project, category, content);
                 console.log(C.success(`  Insights saved: ${category}`));
                 console.log(C.dim(`  .cell/personal/insights/${category}.md`));
@@ -336,7 +409,7 @@ function doAnalyze() {
     }
     // ─── Show insights ─────────────────────────────────────────────────
     if (sub === '--show') {
-        const { getAIInsights } = require('./ai-bridge');
+        const { getAIInsights } = require('../../03-knowledge/decisions/ai-bridge');
         const insights = getAIInsights(project);
         if (insights.length === 0) {
             console.log(C.dim('  No AI insights yet. Run: cell analyze'));
@@ -353,7 +426,7 @@ function doAnalyze() {
         return;
     }
     // ─── Default: Generate prompts ─────────────────────────────────────
-    const { getAnalysisCommand } = require('./ai-bridge');
+    const { getAnalysisCommand } = require('../../03-knowledge/decisions/ai-bridge');
     const { intro, prompts } = getAnalysisCommand(process.cwd());
     console.log(C.dim(intro));
     console.log();
@@ -390,9 +463,14 @@ function doScan() {
     // path.basename(cwd) which is a *name*, not a directory path.
     const scanPathArg = args.find((a, i) => i >= 1 && !a.startsWith('--'));
     const scanCwd = scanPathArg ? path.resolve(scanPathArg) : process.cwd();
-    const scanProject = path.basename(scanCwd);
+    let scanProject = path.basename(scanCwd);
     try {
-        const { scanCodebase } = require('./code-scanner');
+        const { detectProject } = require('../setup/setup');
+        scanProject = detectProject(scanCwd).name;
+    }
+    catch { }
+    try {
+        const { scanCodebase } = require('../../02-scanner/blindspots/code-scanner');
         const result = scanCodebase(scanCwd, scanProject);
         console.log(C.success(`  [1/2] Scanned ${result.filesScanned} files, ${result.totalLines.toLocaleString()} lines`));
         (0, layers_1.populateAllLayers)({
@@ -406,7 +484,7 @@ function doScan() {
         console.log(C.dim('    .cell/community/ — community patterns, trends'));
         // ─── AI rules files (AGENTS.md, .cursorrules) ─────────────────────────
         if (!noRules) {
-            const { writeCellRules } = require('./core/agents-md');
+            const { writeCellRules } = require('../../01-context/context/agents-md');
             const rulesResult = writeCellRules(scanCwd, { overwrite: forceRules });
             const lines = [];
             if (rulesResult.agentsMd === 'written')
@@ -423,9 +501,43 @@ function doScan() {
         else {
             console.log(C.dim('  [3/3] AI rules: skipped (--no-rules)'));
         }
+        // ─── Top 5 fixes ────────────────────────────────────────────────────
+        try {
+            const { scanDirectoryForBlindSpots, getTopFixes, getCategorySummary } = require('../../../core/enhanced-blind-spots');
+            const spots = scanDirectoryForBlindSpots(scanCwd, 200);
+            const topFixes = getTopFixes(spots, 5);
+            if (topFixes.length > 0) {
+                console.log();
+                console.log(C.bold('  Top 5 fixes first:'));
+                for (let i = 0; i < topFixes.length; i++) {
+                    const s = topFixes[i];
+                    console.log(`  ${C.num(String(i + 1))}. ${s.message}`);
+                    console.log(`     ${C.dim(s.filePath + ':' + s.lineNumber)}`);
+                }
+            }
+            const catSummary = getCategorySummary(spots);
+            if (catSummary.length > 0) {
+                console.log();
+                console.log(C.dim('  Category breakdown:'));
+                for (const c of catSummary.slice(0, 6)) {
+                    console.log(C.dim(`    ${c.category}: ${c.count} (${c.topSeverity})`));
+                }
+            }
+        }
+        catch { }
         console.log();
         console.log(C.dim('  Run: cell status'));
         console.log();
+        try {
+            const { markFirstScan } = require('../setup/cell-state');
+            markFirstScan();
+        }
+        catch { }
+        try {
+            const { captureCurrentBranchSnapshot } = require('../../03-knowledge/decisions/branch-snapshot');
+            captureCurrentBranchSnapshot(scanProject, scanCwd);
+        }
+        catch { }
     }
     catch (e) {
         console.log(C.warn('  Scan failed: ' + String(e)));
@@ -464,7 +576,7 @@ async function doSetup() {
     const dirIdx = args.indexOf('--dir');
     const dir = dirIdx > 0 ? args[dirIdx + 1] : undefined;
     try {
-        const { runSetup, detectProject, checkScanState, checkWatchState, checkMcpState, isDaemonRunning, } = require('./core/setup');
+        const { runSetup, detectProject, checkScanState, checkWatchState, checkMcpState, isDaemonRunning, } = require('../setup/setup');
         const cwd = process.cwd();
         const project = detectProject(cwd, projectName);
         console.log(C.bold(`  Project: ${C.num(project.name)}`));
@@ -474,13 +586,28 @@ async function doSetup() {
             console.log(C.warn('  Mode:    DRY RUN (no changes will be made)'));
         console.log();
         // ─── Daemon check ────────────────────────────────────────────────────
-        const daemonUp = await isDaemonRunning();
+        let daemonUp = await isDaemonRunning();
         if (daemonUp) {
             console.log(C.success('  [daemon] running on http://localhost:9876'));
         }
         else {
-            console.log(C.warn('  [daemon] not running — watcher will be skipped'));
-            console.log(C.dim('           run `cell start` to bring it up, then re-run `cell setup`'));
+            console.log(C.warn('  [daemon] not running'));
+            if (!skipWatch && !dryRun) {
+                try {
+                    console.log(C.primary('  [daemon] starting now so watcher can be registered...'));
+                    const { startDaemon } = require('../daemon/lifecycle');
+                    await startDaemon();
+                    daemonUp = await isDaemonRunning();
+                    if (daemonUp)
+                        console.log(C.success('  [daemon] running on http://localhost:9876'));
+                }
+                catch (e) {
+                    console.log(C.warn('  [daemon] start failed: ' + String(e)));
+                }
+            }
+            else {
+                console.log(C.dim('           run `cell start` to bring it up when ready'));
+            }
         }
         console.log();
         // ─── Pre-flight state report ────────────────────────────────────────
@@ -496,6 +623,17 @@ async function doSetup() {
             const allDone = scan.done && watch.done && mcp.done === mcp.total;
             if (allDone) {
                 console.log(C.success('  Already fully set up — nothing to do.'));
+                try {
+                    const { registerAutostart } = require('../setup/autostart');
+                    const auto = registerAutostart({ dryRun });
+                    if (auto.ok && !auto.skipped)
+                        console.log(C.success('  [autostart] ' + auto.message));
+                    else if (auto.ok && auto.skipped)
+                        console.log(C.dim('  [autostart] ' + auto.message));
+                    else
+                        console.log(C.warn('  [autostart] ' + auto.message));
+                }
+                catch { }
                 console.log(C.dim('  Tip: re-run anytime; it is safe and idempotent.'));
                 console.log();
                 return;
@@ -539,13 +677,35 @@ async function doSetup() {
         const allGood = result.scan.done && result.watch.done && mcpOk && result.errors.length === 0;
         if (allGood) {
             console.log(C.success(`  Setup complete in ${ms}ms. Cell is ready.`));
+            try {
+                const { markSetupCompleted } = require('../setup/cell-state');
+                markSetupCompleted();
+            }
+            catch { }
         }
         else {
             console.log(C.warn(`  Setup finished in ${ms}ms with warnings (see above).`));
         }
         console.log();
-        console.log(C.dim('  Run: cell status     Check what Cell knows about you'));
-        console.log(C.dim('  Run: cell context   Inject @cell block into your AI prompt'));
+        try {
+            const { registerAutostart } = require('../setup/autostart');
+            const auto = registerAutostart({ dryRun });
+            if (auto.ok && !auto.skipped)
+                console.log(C.success('  [autostart] ' + auto.message));
+            else if (auto.ok && auto.skipped)
+                console.log(C.dim('  [autostart] ' + auto.message));
+            else
+                console.log(C.warn('  [autostart] ' + auto.message));
+            console.log();
+        }
+        catch { }
+        console.log(C.bold('  Next commands:'));
+        console.log(`  ${C.num('1.')} ${C.primary('cell context')}       See what Cell knows about your project`);
+        console.log(`  ${C.num('2.')} ${C.primary('cell blindspots --top')}  See your top fixes`);
+        console.log(`  ${C.primary('3.')} ${C.primary('cell bridge start')}  Connect your IDE`);
+        console.log(`  ${C.num('4.')} ${C.primary('cell continue')}       Resume your last session`);
+        console.log();
+        console.log(C.dim('  Run cell doctor anytime to check health.'));
         console.log();
     }
     catch (e) {
@@ -567,7 +727,7 @@ function semiLabel(s) {
 }
 // ─── cell --version / -v / version ───────────────────────────────────────────
 function doVersion() {
-    const pkg = require('../package.json');
+    const pkg = require('../../../../package.json');
     console.log(`${C.primary('cell')} v${C.num(pkg.version)}`);
     console.log(C.dim(`  ${pkg.description}`));
     console.log();
@@ -629,7 +789,7 @@ function doStatus() {
     }
 }
 function showProjectStatus() {
-    const { getDeveloperProfile } = require('./code-scanner');
+    const { getDeveloperProfile } = require('../../02-scanner/blindspots/code-scanner');
     const profile = getDeveloperProfile(project);
     if (!profile) {
         console.log(C.warn(`\n  No profile for "${project}". Run: cell start`));
@@ -644,7 +804,7 @@ function showProjectStatus() {
     console.log(C.dim('  ─────────────────'));
     // Stack fingerprint (from stack-detector)
     try {
-        const { detectProjectDNA } = require('./stack-detector');
+        const { detectProjectDNA } = require('../../02-scanner/stack/stack-detector');
         const dna = detectProjectDNA(process.cwd());
         if (dna && dna.stack.trustScore > 0) {
             const s = dna.stack;
@@ -677,7 +837,7 @@ function showProjectStatus() {
     }
     // Behavioral data
     try {
-        const { getBehaviorSummary } = require('./behavioral-tracker');
+        const { getBehaviorSummary } = require('../../03-knowledge/decisions/behavioral-tracker');
         const b = getBehaviorSummary(project);
         if (b.totalErrors > 0 || b.totalDecisions > 0 || b.currentContext || b.stuckIssues.length > 0) {
             console.log(C.bold('  Behavior:'));
@@ -694,7 +854,7 @@ function showProjectStatus() {
     catch { }
     // ─── Git Intelligence ────────────────────────────────────────────────────
     try {
-        const { buildDeveloperIntelligence } = require('./developer-intelligence');
+        const { buildDeveloperIntelligence } = require('../../02-scanner/profile/developer-intelligence');
         const gitIntel = buildDeveloperIntelligence(process.cwd());
         if (gitIntel) {
             console.log();
@@ -727,7 +887,7 @@ function showProjectStatus() {
     catch { }
     // ─── Predictions ─────────────────────────────────────────────────────────
     try {
-        const { getQuickWarnings } = require('./predictive-engine');
+        const { getQuickWarnings } = require('../../03-knowledge/decisions/predictive-engine');
         const warnings = getQuickWarnings(project);
         if (warnings.length > 0) {
             console.log();
@@ -788,7 +948,7 @@ function doSession() {
     console.log(C.dim('  ───────────────────────────────'));
     console.log();
     try {
-        const { getLastTouchedFile, getPatternCounts, getBehaviorSummary } = require('./behavioral-tracker');
+        const { getLastTouchedFile, getPatternCounts, getBehaviorSummary } = require('../../03-knowledge/decisions/behavioral-tracker');
         const last = getLastTouchedFile(project);
         const patterns = getPatternCounts(project);
         const behavior = getBehaviorSummary(project);
@@ -825,7 +985,7 @@ function doDecisions() {
     console.log(C.dim('  ─────────────────────────────────'));
     console.log();
     try {
-        const { getRecentDecisionsWithAgo, getBehaviorSummary } = require('./behavioral-tracker');
+        const { getRecentDecisionsWithAgo, getBehaviorSummary } = require('../../03-knowledge/decisions/behavioral-tracker');
         const decisions = getRecentDecisionsWithAgo(project, 5);
         const behavior = getBehaviorSummary(project);
         if (decisions.length === 0) {
@@ -903,7 +1063,7 @@ function doTeam() {
     // ─── team push ──────────────────────────────────────────────────────
     if (sub === 'push') {
         console.log(C.primary('  Pushing your patterns to team...'));
-        const { teamPush } = require('./team-git');
+        const { teamPush } = require('../../04-team/collab/team-git');
         const name = args[2];
         if (!name) {
             console.log(C.warn('  Usage: cell team push <your-name> [role]'));
@@ -919,7 +1079,7 @@ function doTeam() {
     // ─── team pull ──────────────────────────────────────────────────────
     if (sub === 'pull') {
         console.log(C.primary('  Pulling team data...'));
-        const { teamPull } = require('./team-git');
+        const { teamPull } = require('../../04-team/collab/team-git');
         const result = teamPull();
         if (result.success) {
             console.log(C.success(`  ${result.message}`));
@@ -936,7 +1096,7 @@ function doTeam() {
         const newMember = args[2];
         const teamPath = path.join(process.cwd(), '.cell', 'team');
         console.log(C.primary(`  Generating onboarding guide for ${newMember}...`));
-        const { generateOnboardingGuide, formatOnboardingText } = require('./team-intel');
+        const { generateOnboardingGuide, formatOnboardingText } = require('../../04-team/collab/team-intel');
         const guide = generateOnboardingGuide(teamPath, newMember);
         if (guide) {
             console.log(formatOnboardingText(guide));
@@ -949,7 +1109,7 @@ function doTeam() {
     }
     // ─── team status ────────────────────────────────────────────────────
     if (sub === 'status') {
-        const { teamStatus } = require('./team-git');
+        const { teamStatus } = require('../../04-team/collab/team-git');
         const intel = teamStatus();
         if (!intel) {
             console.log(C.dim('  No team data. Run: cell team push <your-name>'));
@@ -990,7 +1150,7 @@ function doTeam() {
         // Team pattern library
         const teamPath = path.join(process.cwd(), '.cell', 'team');
         try {
-            const { buildTeamPatternLibrary } = require('./team-intel');
+            const { buildTeamPatternLibrary } = require('../../04-team/collab/team-intel');
             const rules = buildTeamPatternLibrary(teamPath);
             if (rules.length > 0) {
                 console.log(C.bold('  📋 Pattern Library:'));
@@ -1012,7 +1172,7 @@ function doTeam() {
     }
     // ─── team silos ─────────────────────────────────────────────────────
     if (sub === 'silos') {
-        const { detectKnowledgeSilos } = require('./team-collaboration');
+        const { detectKnowledgeSilos } = require('../../04-team/collab/team-collaboration');
         const silos = detectKnowledgeSilos();
         console.log(C.bold(`  Knowledge Silos: ${silos.length}`));
         console.log();
@@ -1031,7 +1191,7 @@ function doTeam() {
     }
     // ─── team bus-factor ───────────────────────────────────────────────
     if (sub === 'bus-factor') {
-        const { calculateBusFactor } = require('./team-collaboration');
+        const { calculateBusFactor } = require('../../04-team/collab/team-collaboration');
         const report = calculateBusFactor();
         console.log(C.bold(`  Bus Factor: ${report.overallScore}/100`));
         console.log();
@@ -1053,7 +1213,7 @@ function doTeam() {
     }
     // ─── team health ───────────────────────────────────────────────────
     if (sub === 'health') {
-        const { getTeamHealth } = require('./team-collaboration');
+        const { getTeamHealth } = require('../../04-team/collab/team-collaboration');
         const health = getTeamHealth(args[2]);
         console.log(C.bold(`  Team Health: ${health.score}/100`));
         console.log();
@@ -1080,7 +1240,7 @@ function doTeam() {
     if (sub === 'community' || sub === 'comm') {
         const csub = args[2];
         if (csub === 'stats') {
-            const { getCommunityStats } = require('./core/community-store');
+            const { getCommunityStats } = require('../../06-memory/stores/community-store');
             const stats = getCommunityStats();
             console.log(C.bold('  Community Stats'));
             console.log(C.dim(`  Patterns: ${stats.totalPatterns}, Insights: ${stats.totalInsights}, Benchmarks: ${stats.totalBenchmarks}`));
@@ -1095,7 +1255,7 @@ function doTeam() {
             return;
         }
         if (csub === 'share' && args[3]) {
-            const { shareCommunityPattern, validatePrivacy } = require('./core/community-store');
+            const { shareCommunityPattern, validatePrivacy } = require('../../06-memory/stores/community-store');
             const rule = args[3];
             const category = args[4] || 'general';
             const language = args[5];
@@ -1118,7 +1278,7 @@ function doTeam() {
             return;
         }
         if (csub === 'trends') {
-            const { getTechEvolution } = require('./core/community-store');
+            const { getTechEvolution } = require('../../06-memory/stores/community-store');
             const trends = getTechEvolution();
             console.log(C.bold('  Technology Trends'));
             for (const t of trends.slice(0, 10)) {
@@ -1134,7 +1294,7 @@ function doTeam() {
     }
     // ─── team usage (Phase 6) ──────────────────────────────────────────
     if (sub === 'usage') {
-        const { getUsageDashboard, getDecisionPatterns, detectRepeatMistakes, getBurnoutSignals } = require('./core/usage-intelligence-store');
+        const { getUsageDashboard, getDecisionPatterns, detectRepeatMistakes, getBurnoutSignals } = require('../../06-memory/stores/usage-intelligence-store');
         const project = args[2] || 'Fivo-Cell';
         const dash = getUsageDashboard(project);
         console.log(C.bold(`  Usage Dashboard — ${project}`));
@@ -1229,9 +1389,9 @@ function doWatch() {
     //   cell watch events fivo-cell --type file_save
     //   cell watch events --limit 5 --type file_create
     const watchArgs = args.slice(2);
-    const { positional } = require('./core/watch-cli').parseWatchFlags(watchArgs);
-    const watchLimit = require('./core/watch-cli').parseWatchLimit(watchArgs);
-    const watchEventType = require('./core/watch-cli').parseWatchEventType(watchArgs);
+    const { positional } = require('../watcher/watch-cli').parseWatchFlags(watchArgs);
+    const watchLimit = require('../watcher/watch-cli').parseWatchLimit(watchArgs);
+    const watchEventType = require('../watcher/watch-cli').parseWatchEventType(watchArgs);
     const project = positional[0] || path.basename(process.cwd());
     const dir = positional[1] || process.cwd();
     // If invoked with no subcommand: run as a long-lived watcher daemon (for .bat auto-restart loop)
@@ -1240,7 +1400,7 @@ function doWatch() {
         return;
     }
     try {
-        const liveWatcher = require('./core/live-watcher');
+        const liveWatcher = require('../watcher/live-watcher');
         const http = require('http');
         function callDaemon(toolName, toolArgs) {
             return new Promise((resolve, reject) => {
@@ -1281,7 +1441,7 @@ function doWatch() {
             return;
         }
         if (sub === 'events') {
-            const { isValidEventType } = require('./core/watch-cli');
+            const { isValidEventType } = require('../watcher/watch-cli');
             const typeFilter = isValidEventType(watchEventType) ? watchEventType : undefined;
             const events = liveWatcher.getLiveEvents(project, watchLimit, typeFilter);
             if (events.length === 0) {
@@ -1343,20 +1503,41 @@ function doBlindspots() {
     console.log(C.bold('  Cell Blind Spots'));
     console.log(C.dim('  ────────────────'));
     console.log();
-    const dir = args[1] || process.cwd();
-    const maxFiles = parseInt(args[2] || '200', 10);
+    const showTop = args.includes('--top');
+    const topN = (() => {
+        const idx = args.indexOf('--top');
+        if (idx >= 0 && args[idx + 1] && /^\d+$/.test(args[idx + 1]))
+            return parseInt(args[idx + 1], 10);
+        return 5;
+    })();
+    const dirArg = args.find((a, i) => i >= 1 && !a.startsWith('--') && a !== String(topN));
+    const dir = dirArg || process.cwd();
+    const maxFiles = parseInt(args.find((a, i) => i >= 1 && !a.startsWith('--') && /^\d+$/.test(a) && a !== String(topN)) || '200', 10);
     try {
-        const { scanDirectoryForBlindSpots, formatBlindSpotReport, summarizeBlindSpots } = require('./core/enhanced-blind-spots');
+        const { scanDirectoryForBlindSpots, formatBlindSpotReport, summarizeBlindSpots, getTopFixes, getCategorySummary } = require('../../../core/enhanced-blind-spots');
         console.log(C.dim(`  Scanning ${dir} (max ${maxFiles} files)...`));
         const spots = scanDirectoryForBlindSpots(dir, maxFiles);
         console.log();
-        console.log(formatBlindSpotReport(spots));
-        const summary = summarizeBlindSpots(spots);
-        if (Object.keys(summary.byCategory).length > 0) {
+        if (showTop) {
+            const topFixes = getTopFixes(spots, topN);
+            console.log(C.bold(`  Top ${topFixes.length} fixes first:`));
+            for (let i = 0; i < topFixes.length; i++) {
+                const s = topFixes[i];
+                const score = s.priorityScore ? ` (score ${s.priorityScore.toFixed(1)})` : '';
+                console.log(`  ${C.num(String(i + 1))}. ${s.message}${score}`);
+                console.log(`     ${C.dim(s.filePath + ':' + s.lineNumber)} → ${s.recommendation}`);
+            }
+            console.log();
+        }
+        else {
+            console.log(formatBlindSpotReport(spots));
+        }
+        const catSummary = getCategorySummary(spots);
+        if (catSummary.length > 0) {
             console.log();
-            console.log(C.dim('  By category:'));
-            for (const [cat, count] of Object.entries(summary.byCategory)) {
-                console.log(`    ${C.num(String(count))} ${cat}`);
+            console.log(C.bold('  By category:'));
+            for (const c of catSummary) {
+                console.log(`    ${C.num(String(c.count))} ${c.category} (top: ${c.topSeverity})`);
             }
         }
     }
@@ -1366,10 +1547,207 @@ function doBlindspots() {
     }
     console.log();
 }
+// ─── cell doctor ─────────────────────────────────────────────────────────────
+async function doDoctor() {
+    console.log();
+    console.log(C.bold('  Cell Doctor — Health Check'));
+    console.log(C.dim('  ─────────────────────────'));
+    console.log();
+    const { detectProject, checkScanState, checkWatchState, checkMcpState, isDaemonRunning, } = require('../setup/setup');
+    const cwd = process.cwd();
+    const project = detectProject(cwd);
+    const issues = [];
+    const passes = [];
+    // 1. Git repo
+    const gitDir = path.join(cwd, '.git');
+    if (fs.existsSync(gitDir)) {
+        console.log(`  ${C.success('OK')}  Git repo detected`);
+        passes.push('git');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  Git repo not found (optional, but recommended)`);
+        issues.push('git');
+    }
+    // 2. Node/TypeScript project
+    const pkgJson = path.join(cwd, 'package.json');
+    const tsconfig = path.join(cwd, 'tsconfig.json');
+    if (fs.existsSync(pkgJson)) {
+        console.log(`  ${C.success('OK')}  Node.js project detected (package.json)`);
+        passes.push('node');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  No package.json found (non-Node project?)`);
+        issues.push('node');
+    }
+    if (fs.existsSync(tsconfig)) {
+        console.log(`  ${C.success('OK')}  TypeScript project detected (tsconfig.json)`);
+        passes.push('typescript');
+    }
+    // 3. .cell folder
+    const cellDir = path.join(cwd, '.cell');
+    if (fs.existsSync(cellDir)) {
+        const personalDir = path.join(cellDir, 'personal');
+        const fileCount = fs.existsSync(personalDir) ? fs.readdirSync(personalDir).length : 0;
+        console.log(`  ${C.success('OK')}  .cell/ folder exists (${fileCount} personal files)`);
+        passes.push('cell-dir');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  No .cell/ folder found`);
+        issues.push('cell-dir');
+    }
+    // 4. SQLite DB
+    const dbPath = path.join(os.homedir(), '.fivo', 'cell', 'cell.db');
+    if (fs.existsSync(dbPath)) {
+        try {
+            const stat = fs.statSync(dbPath);
+            const sizeMB = (stat.size / 1024 / 1024).toFixed(1);
+            console.log(`  ${C.success('OK')}  SQLite DB exists (${sizeMB} MB)`);
+            passes.push('db');
+        }
+        catch {
+            console.log(`  ${C.warn('--')}  SQLite DB exists but not readable`);
+            issues.push('db');
+        }
+    }
+    else {
+        console.log(`  ${C.warn('--')}  No SQLite DB found`);
+        issues.push('db');
+    }
+    // 5. Last scan
+    const scan = checkScanState(cwd);
+    if (scan.done) {
+        console.log(`  ${C.success('OK')}  Scan completed (${scan.reason})`);
+        passes.push('scan');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  No scan found (${scan.reason})`);
+        issues.push('scan');
+    }
+    // 6. Daemon / bridge status
+    const daemonUp = await isDaemonRunning();
+    if (daemonUp) {
+        console.log(`  ${C.success('OK')}  Daemon running on http://localhost:9876`);
+        passes.push('daemon');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  Daemon not running`);
+        issues.push('daemon');
+    }
+    // 7. Watcher status
+    const watch = checkWatchState(project.name);
+    if (watch.done) {
+        console.log(`  ${C.success('OK')}  Watcher active (${watch.reason})`);
+        passes.push('watcher');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  Watcher not active (${watch.reason})`);
+        if (daemonUp)
+            issues.push('watcher');
+    }
+    // 8. Bridge status
+    try {
+        const { discoverBridgePort } = require('../watcher/socket-bridge');
+        const port = discoverBridgePort();
+        if (port) {
+            console.log(`  ${C.success('OK')}  Bridge reachable (port ${port})`);
+            passes.push('bridge');
+        }
+        else {
+            console.log(`  ${C.warn('--')}  Bridge not running`);
+            issues.push('bridge');
+        }
+    }
+    catch {
+        console.log(`  ${C.warn('--')}  Bridge not running`);
+        issues.push('bridge');
+    }
+    // 9. AGENTS.md / .cursorrules
+    const agentsMd = path.join(cwd, 'AGENTS.md');
+    const cursorRules = path.join(cwd, '.cursorrules');
+    const rulesFound = [];
+    if (fs.existsSync(agentsMd))
+        rulesFound.push('AGENTS.md');
+    if (fs.existsSync(cursorRules))
+        rulesFound.push('.cursorrules');
+    if (rulesFound.length > 0) {
+        console.log(`  ${C.success('OK')}  AI rules: ${rulesFound.join(', ')}`);
+        passes.push('rules');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  No AGENTS.md or .cursorrules found`);
+        issues.push('rules');
+    }
+    // 10. MCP config
+    const mcp = checkMcpState(os.homedir());
+    if (mcp.done > 0) {
+        console.log(`  ${C.success('OK')}  MCP config: ${mcp.done}/${mcp.total} IDEs wired`);
+        passes.push('mcp');
+    }
+    else {
+        console.log(`  ${C.warn('--')}  No MCP configs found (run: cell mcp-config)`);
+        issues.push('mcp');
+    }
+    // 11. First-run state
+    const firstRunFile = path.join(os.homedir(), '.fivo', 'cell', '.first-run-shown');
+    const stateFile = path.join(os.homedir(), '.fivo', 'cell', 'cell-state.json');
+    if (fs.existsSync(stateFile)) {
+        try {
+            const state = JSON.parse(fs.readFileSync(stateFile, 'utf8'));
+            console.log(`  ${C.success('OK')}  First-run state: setup at ${state.setup_completed || 'unknown'}`);
+            passes.push('first-run');
+        }
+        catch {
+            console.log(`  ${C.dim('--')}  First-run state file exists but unreadable`);
+        }
+    }
+    else if (fs.existsSync(firstRunFile)) {
+        console.log(`  ${C.success('OK')}  First-run greeting shown`);
+        passes.push('first-run');
+    }
+    else {
+        console.log(`  ${C.dim('--')}  First-run not completed yet`);
+        issues.push('first-run');
+    }
+    // ─── Summary ──────────────────────────────────────────────────────────
+    console.log();
+    const total = passes.length + issues.length;
+    if (issues.length === 0) {
+        console.log(C.success(`  All ${total} checks passed. Cell is fully healthy.`));
+    }
+    else {
+        console.log(C.warn(`  ${passes.length}/${total} checks passed, ${issues.length} need attention:`));
+        console.log();
+        const recovery = {
+            'cell-dir': 'cell scan',
+            'db': 'cell start',
+            'scan': 'cell scan',
+            'daemon': 'cell start',
+            'watcher': 'cell start  (then: cell watch start)',
+            'bridge': 'cell bridge start',
+            'rules': 'cell scan  (writes AGENTS.md + .cursorrules)',
+            'mcp': 'cell mcp-config',
+            'first-run': 'cell setup',
+            'git': 'git init',
+            'node': 'npm init -y',
+        };
+        for (const issue of issues) {
+            const fix = recovery[issue];
+            if (fix) {
+                console.log(`    ${C.warn('!')} ${issue}: Run ${C.primary(fix)}`);
+            }
+        }
+    }
+    console.log();
+    try {
+        const { markDoctorRun } = require('../setup/cell-state');
+        markDoctorRun();
+    }
+    catch { }
+}
 // Long-lived watcher daemon — auto-attaches to current project, runs forever.
 // Used by fivo-cell-daemon.bat to keep a watcher alive in the background.
 function runWatchDaemon(project, dir) {
-    const liveWatcher = require('./core/live-watcher');
+    const liveWatcher = require('../watcher/live-watcher');
     const result = liveWatcher.startWatcher(project, dir);
     if (!result.started) {
         // "already running" means the daemon process already has a watcher; keep this process alive anyway
@@ -1404,7 +1782,7 @@ function doCommunity() {
     const sub = args[1] || '';
     if (sub === 'share') {
         try {
-            const { sharePatterns } = require('./community-intel');
+            const { sharePatterns } = require('../../05-community/stats/community-intel');
             const result = sharePatterns();
             console.log(result.success ? C.success(`  ${result.message}`) : C.warn(`  ${result.message}`));
             console.log(C.dim('  Anonymous — only pattern types shared, zero code.'));
@@ -1417,7 +1795,7 @@ function doCommunity() {
     }
     if (sub === 'browse' || sub === '') {
         try {
-            const { generateCommunityReport } = require('./community-intel');
+            const { generateCommunityReport } = require('../../05-community/stats/community-intel');
             const report = generateCommunityReport();
             if (report.patterns.length > 0) {
                 console.log(C.bold(`  📊 Top Patterns (${report.patterns.length} total):`));
@@ -1460,21 +1838,696 @@ function doCommunity() {
 }
 // ─── cell context ───────────────────────────────────────────────────────────
 function doContext() {
-    // args[0] is the project name (optional, defaults to cwd)
-    // args[1] is the tool name (optional, e.g. 'claude-code', 'cursor')
+    const positionalArgs = args.slice(1).filter(a => !a.startsWith('--'));
+    const projectArg = positionalArgs[0] || project;
+    const toolArg = positionalArgs[1] || 'claude-code';
+    let showLive = true;
+    let asJson = false;
+    let port = null;
+    let host = '127.0.0.1';
+    let shortMode = false;
+    let fullMode = false;
+    for (let i = 2; i < args.length; i++) {
+        const a = args[i];
+        if (a === '--no-live') {
+            showLive = false;
+            continue;
+        }
+        if (a === '--json') {
+            asJson = true;
+            continue;
+        }
+        if (a === '--short') {
+            shortMode = true;
+            continue;
+        }
+        if (a === '--full') {
+            fullMode = true;
+            continue;
+        }
+        if (typeof a === 'string' && a.startsWith('--port='))
+            port = parseInt(a.split('=')[1], 10) || null;
+        if (typeof a === 'string' && a.startsWith('--host='))
+            host = a.split('=')[1] || '127.0.0.1';
+    }
+    // Try to discover bridge port from pid file if not specified
+    if (port === null) {
+        try {
+            const { discoverBridgePort } = require('../watcher/socket-bridge');
+            const discovered = discoverBridgePort();
+            if (discovered)
+                port = discovered;
+        }
+        catch { /* ignore */ }
+    }
+    if (port === null)
+        port = 9877;
+    // Async wrapper to print live state then static context (in order).
+    const run = async () => {
+        let liveStates = [];
+        let liveError;
+        if (showLive) {
+            try {
+                const { queryBridgeEditorStates } = require('../watcher/socket-bridge');
+                const result = await queryBridgeEditorStates(projectArg, port, host);
+                liveStates = result.states;
+                liveError = result.error;
+            }
+            catch (e) {
+                liveError = e?.message || String(e);
+            }
+        }
+        if (asJson) {
+            let ctx;
+            try {
+                const { buildContext } = require('../../01-context/context/prompt-builder');
+                ctx = buildContext(projectArg, toolArg);
+            }
+            catch (e) {
+                console.log(JSON.stringify({ error: e?.message || String(e) }));
+                return;
+            }
+            console.log(JSON.stringify({
+                ...ctx,
+                liveEditorStates: liveStates,
+                liveError: liveError,
+            }, null, 2));
+            return;
+        }
+        // Print live state at top
+        if (showLive) {
+            if (liveStates.length > 0) {
+                console.log(C.bold('  ── Live Editor State (Feature #2) ──'));
+                for (const s of liveStates) {
+                    const dirtyMark = s.isDirty ? C.warn(' [unsaved]') : '';
+                    console.log(`  ${C.primary(s.editorName)}: ${s.filePath}:${s.line}:${s.column}${dirtyMark}`);
+                    if (s.language)
+                        console.log(C.dim(`    language: ${s.language}`));
+                    if (s.unsavedBuffer) {
+                        const allLines = s.unsavedBuffer.split('\n');
+                        const head = allLines.slice(0, 5);
+                        console.log(C.dim(`    unsaved (${s.unsavedLength || s.unsavedBuffer.length} chars):`));
+                        for (const line of head) {
+                            console.log(C.dim(`      ${line.length > 80 ? line.slice(0, 77) + '...' : line}`));
+                        }
+                        if (allLines.length > 5) {
+                            console.log(C.dim(`      ... ${allLines.length - 5} more lines`));
+                        }
+                    }
+                }
+                console.log('');
+            }
+            else if (liveError) {
+                console.log(C.dim('  ── Live Editor State ──'));
+                console.log(C.dim(`  Bridge not reachable (${liveError}). Start with: cell bridge start`));
+                console.log('');
+            }
+            else {
+                console.log(C.dim('  ── Live Editor State ──'));
+                console.log(C.dim(`  No editors connected for "${projectArg}"`));
+                console.log(C.dim('  Start an editor that pushes to the bridge (or run cell bridge status)'));
+                console.log('');
+            }
+        }
+        // Static project context
+        try {
+            const { buildContext, formatContextForTool } = require('../../01-context/context/prompt-builder');
+            const ctx = buildContext(projectArg, toolArg);
+            const text = formatContextForTool(ctx, toolArg, projectArg);
+            if (shortMode) {
+                const lines = text.split('\n');
+                const shortLines = [];
+                let inCore = false;
+                let coreCount = 0;
+                for (const line of lines) {
+                    if (line.startsWith('## ') || line.startsWith('# ')) {
+                        if (coreCount > 0)
+                            break;
+                        inCore = true;
+                    }
+                    if (inCore) {
+                        shortLines.push(line);
+                        if (line.trim() && !line.startsWith('#') && !line.startsWith('─'))
+                            coreCount++;
+                    }
+                }
+                if (shortLines.length === 0) {
+                    const first5 = lines.slice(0, 5);
+                    console.log(first5.join('\n'));
+                    console.log(C.dim(`  ... (${lines.length} total lines. Use --full to see all)`));
+                }
+                else {
+                    console.log(shortLines.join('\n'));
+                    console.log(C.dim(`  ... (${lines.length} total lines. Use --full or no flag for default)`));
+                }
+            }
+            else if (fullMode) {
+                console.log(text);
+            }
+            else {
+                console.log(text);
+            }
+            try {
+                const { markFirstContext } = require('../setup/cell-state');
+                markFirstContext();
+            }
+            catch { }
+            try {
+                const { captureCurrentBranchSnapshot } = require('../../03-knowledge/decisions/branch-snapshot');
+                captureCurrentBranchSnapshot(projectArg, process.cwd());
+            }
+            catch { }
+        }
+        catch (e) {
+            console.log(C.warn('  No context available yet.'));
+            console.log(C.dim('  Run these commands first:'));
+            console.log(C.primary('    cell scan'));
+            console.log(C.primary('    cell doctor'));
+        }
+    };
+    run();
+}
+// ─── cell replay — show full session timeline ──────────────────────────────
+function doReplay() {
+    // args[1] = project (optional, defaults to cwd)
+    // args[2] = sessionId (optional)
+    // --since <ISO>
+    // --until <ISO>
+    // --type file_save,cursor_move,...
+    // --file <path>
+    // --format text|json|markdown|compact
+    // --group minute|hour|file|type
+    // --limit <n>
+    // --recent <n>     (replay last N events, ignoring other filters)
+    // --summary        (just show session summary, no events)
+    // --last           (shorthand for --recent 50)
     const projectArg = args[1] || project;
-    const toolArg = args[2] || 'claude-code';
-    let ctx;
+    let sessionId;
+    let since;
+    let until;
+    let eventTypes;
+    let filePath;
+    let filePattern;
+    let format = 'text';
+    let groupBy = 'none';
+    let limit;
+    let recent;
+    let summaryOnly = false;
+    for (let i = 2; i < args.length; i++) {
+        const a = args[i];
+        if (a === '--since' && i + 1 < args.length) {
+            since = args[++i];
+            continue;
+        }
+        if (a.startsWith('--since=')) {
+            since = a.slice('--since='.length);
+            continue;
+        }
+        if (a === '--until' && i + 1 < args.length) {
+            until = args[++i];
+            continue;
+        }
+        if (a.startsWith('--until=')) {
+            until = a.slice('--until='.length);
+            continue;
+        }
+        if (a === '--type' && i + 1 < args.length) {
+            eventTypes = args[++i].split(',');
+            continue;
+        }
+        if (a.startsWith('--type=')) {
+            eventTypes = a.slice('--type='.length).split(',');
+            continue;
+        }
+        if (a === '--file' && i + 1 < args.length) {
+            filePath = args[++i];
+            continue;
+        }
+        if (a.startsWith('--file=')) {
+            filePath = a.slice('--file='.length);
+            continue;
+        }
+        if (a === '--pattern' && i + 1 < args.length) {
+            filePattern = args[++i];
+            continue;
+        }
+        if (a.startsWith('--pattern=')) {
+            filePattern = a.slice('--pattern='.length);
+            continue;
+        }
+        if (a === '--format' && i + 1 < args.length) {
+            format = args[++i];
+            continue;
+        }
+        if (a.startsWith('--format=')) {
+            format = a.slice('--format='.length);
+            continue;
+        }
+        if (a === '--group' && i + 1 < args.length) {
+            groupBy = args[++i];
+            continue;
+        }
+        if (a.startsWith('--group=')) {
+            groupBy = a.slice('--group='.length);
+            continue;
+        }
+        if (a === '--limit' && i + 1 < args.length) {
+            limit = parseInt(args[++i], 10);
+            continue;
+        }
+        if (a.startsWith('--limit=')) {
+            limit = parseInt(a.slice('--limit='.length), 10);
+            continue;
+        }
+        if (a === '--recent' && i + 1 < args.length) {
+            recent = parseInt(args[++i], 10);
+            continue;
+        }
+        if (a.startsWith('--recent=')) {
+            recent = parseInt(a.slice('--recent='.length), 10);
+            continue;
+        }
+        if (a === '--last') {
+            recent = 50;
+            continue;
+        }
+        if (a === '--summary') {
+            summaryOnly = true;
+            continue;
+        }
+        if (a === '--session' && i + 1 < args.length) {
+            sessionId = parseInt(args[++i], 10);
+            continue;
+        }
+        if (a.startsWith('--session=')) {
+            sessionId = parseInt(a.slice('--session='.length), 10);
+            continue;
+        }
+        if (/^\d+$/.test(a) && sessionId === undefined) {
+            sessionId = parseInt(a, 10);
+            continue;
+        }
+    }
+    let result;
     try {
-        const { buildContext, formatContextForTool } = require('./core/prompt-builder');
-        ctx = buildContext(projectArg, toolArg);
-        const text = formatContextForTool(ctx, toolArg, projectArg);
-        console.log(text);
+        const { replay, replayRecent, summarizeSession, renderSessionSummary } = require('../../01-context/sessions/replay');
+        if (recent !== undefined) {
+            result = replayRecent(projectArg, recent, format);
+        }
+        else {
+            result = replay({
+                project: projectArg,
+                sessionId,
+                eventTypes: eventTypes,
+                since,
+                until,
+                filePath,
+                filePattern,
+                limit,
+                format,
+                groupBy,
+            });
+        }
+        if (summaryOnly && sessionId !== undefined) {
+            const summary = summarizeSession(projectArg, sessionId);
+            if (!summary) {
+                console.log(C.warn(`  No session #${sessionId} found for project "${projectArg}".`));
+                return;
+            }
+            console.log(renderSessionSummary(summary));
+            return;
+        }
+        if (result.filteredCount === 0) {
+            console.log(C.warn(`  No${eventTypes ? ' ' + eventTypes.join(',') : ''} events to replay yet.`));
+            console.log(C.dim(`  Project: ${projectArg}`));
+            console.log(C.dim('  Start capturing by running:'));
+            console.log(C.primary('    cell scan'));
+            console.log(C.primary('    cell session start --tool claude-code'));
+            console.log(C.primary('    cell bridge start'));
+            return;
+        }
+        console.log(result.formatted);
     }
     catch (e) {
-        console.log(C.warn('  No context available yet.'));
-        console.log(C.dim('  Run: cell scan first to populate context.'));
-        return;
+        console.log(C.warn('  Replay failed: ' + (e?.message || String(e))));
+    }
+}
+// ─── cell continue — resume last session with full context ────────────────
+function doContinue() {
+    // args[1] = project (optional, defaults to cwd)
+    // args[2] = tool (optional, e.g. 'cursor', 'claude-code')
+    // --tool <name>    tool to format context for
+    // --no-snapshot    skip writing the session-end snapshot
+    const projectArg = args[1] || project;
+    let toolArg = args[2] || 'claude-code';
+    let writeSnapshot = true;
+    for (let i = 2; i < args.length; i++) {
+        const a = args[i];
+        if (a === '--tool' && i + 1 < args.length) {
+            toolArg = args[++i];
+            continue;
+        }
+        if (a.startsWith('--tool=')) {
+            toolArg = a.slice('--tool='.length);
+            continue;
+        }
+        if (a === '--no-snapshot') {
+            writeSnapshot = false;
+            continue;
+        }
+    }
+    try {
+        const { SessionMemory } = require('../../01-context/sessions/session-memory');
+        const { linkSessionToRecentEvents, recordSessionStart, recordSessionEnd, recordFileFocus } = require('../../01-context/sessions/event-capture');
+        const { summarizeSession, renderSessionSummary } = require('../../01-context/sessions/replay');
+        const { buildContext, formatContextForTool } = require('../../01-context/context/prompt-builder');
+        const mem = new SessionMemory();
+        // 1) Find the last session for this project
+        const lastSession = mem.getLastSessionForProject(projectArg);
+        if (!lastSession) {
+            console.log(C.warn('  No previous session found for this project.'));
+            console.log(C.dim('  Start one with:'));
+            console.log(C.primary('    cell session start --tool claude-code'));
+            console.log(C.dim('  Then: cell continue  (resume anytime)'));
+            return;
+        }
+        // 2) Show summary of the last session
+        const summary = summarizeSession(projectArg, lastSession.id);
+        if (summary) {
+            console.log(C.bold('  ── Last Session ──'));
+            console.log(renderSessionSummary(summary));
+            console.log('');
+        }
+        // 3) Open a new session
+        const newSessionId = mem.startSession(toolArg, projectArg);
+        recordSessionStart({ project: projectArg, sessionId: newSessionId, toolName: toolArg });
+        const linked = linkSessionToRecentEvents(projectArg, newSessionId, true);
+        console.log(C.success(`  ✓ New session #${newSessionId} started in ${toolArg}`));
+        if (linked > 0) {
+            console.log(C.dim(`  Linked ${linked} recent events to this session`));
+        }
+        console.log('');
+        // 4) Build and show the cross-tool context block
+        try {
+            const ctx = buildContext(projectArg, toolArg);
+            const text = formatContextForTool(ctx, toolArg, projectArg);
+            console.log(C.bold('  ── Context to inject ──'));
+            console.log(text);
+        }
+        catch (e) {
+            console.log(C.warn('  Could not build context (run cell scan first).'));
+        }
+        // 5) Print session ID for later use with `cell replay --session <id>`
+        console.log('');
+        console.log(C.dim(`  To replay this session later: cell replay ${projectArg} ${newSessionId}`));
+        console.log(C.dim(`  To end this session: cell session end ${newSessionId} ${projectArg}`));
+    }
+    catch (e) {
+        console.log(C.warn('  Continue failed: ' + (e?.message || String(e))));
+    }
+}
+// ─── cell bridge — bidirectional editor↔daemon socket ────────────────────
+function doBridge() {
+    // args[1] = subcommand: start | stop | status | kill (default: status)
+    // --port <n>     port to bind (default 9877)
+    // --host <ip>    host to bind (default 127.0.0.1)
+    // --foreground   don't detach (default for tests/debug)
+    const sub = args[1] || 'status';
+    let port = 9877;
+    let host = '127.0.0.1';
+    for (let i = 2; i < args.length; i++) {
+        const a = args[i];
+        if (a === '--port' && i + 1 < args.length) {
+            port = parseInt(args[++i], 10);
+            continue;
+        }
+        if (a.startsWith('--port=')) {
+            port = parseInt(a.slice('--port='.length), 10);
+            continue;
+        }
+        if (a === '--host' && i + 1 < args.length) {
+            host = args[++i];
+            continue;
+        }
+        if (a.startsWith('--host=')) {
+            host = a.slice('--host='.length);
+            continue;
+        }
+    }
+    try {
+        const { startBridge, stopBridge, getBridgeInfo, isBridgeRunning, killStaleBridge, discoverBridgePort, } = require('../watcher/socket-bridge');
+        if (sub === 'start') {
+            if (isBridgeRunning()) {
+                const info = getBridgeInfo();
+                console.log(C.warn(`  Bridge already running on port ${info.port} (${info.clientCount} clients, ${info.totalEventsReceived} events received)`));
+                return;
+            }
+            startBridge(port, host)
+                .then((info) => {
+                console.log(C.success(`  ✓ Bridge started on ${info.host}:${info.port}`));
+                console.log(C.dim(`  Editors can connect to ws://${info.host}:${info.port} (newline-delimited JSON)`));
+                console.log(C.dim(`  To stop: cell bridge stop`));
+                try {
+                    const { markBridgeStarted } = require('../setup/cell-state');
+                    markBridgeStarted();
+                }
+                catch { }
+            })
+                .catch((e) => {
+                console.log(C.warn('  Bridge start failed: ' + e.message));
+            });
+        }
+        else if (sub === 'stop') {
+            const ok = stopBridge();
+            if (ok) {
+                console.log(C.success('  ✓ Bridge stopped'));
+            }
+            else {
+                console.log(C.dim('  Bridge was not running'));
+            }
+        }
+        else if (sub === 'kill') {
+            const killed = killStaleBridge();
+            if (killed) {
+                console.log(C.success('  ✓ Killed stale bridge process'));
+            }
+            else {
+                console.log(C.dim('  No stale bridge found'));
+            }
+        }
+        else {
+            // status
+            const info = getBridgeInfo();
+            const discovered = discoverBridgePort();
+            const liveInfo = discovered && !info.running
+                ? { running: true, port: discovered, host: host, startedAt: C.dim('(another process)'), clientCount: -1, totalEventsReceived: -1, clients: [] }
+                : info;
+            const i = liveInfo;
+            console.log(C.bold('  Cell Bridge'));
+            console.log('  ───────────');
+            console.log(`  Running:    ${i.running ? C.success('yes') : C.dim('no')}`);
+            console.log(`  Port:       ${i.port}`);
+            console.log(`  Host:       ${i.host}`);
+            console.log(`  Started:    ${i.startedAt || C.dim('(never)')}`);
+            console.log(`  Clients:    ${i.clientCount >= 0 ? i.clientCount : '?'}`);
+            console.log(`  Events rx:  ${i.totalEventsReceived >= 0 ? i.totalEventsReceived : '?'}`);
+            if (i.clients && i.clients.length > 0) {
+                console.log('');
+                console.log(C.dim('  Connected clients:'));
+                for (const c of i.clients) {
+                    console.log(C.dim(`    #${c.id} ${c.remoteAddress}:${c.remotePort} project=${c.project} events=${c.eventsReceived}`));
+                }
+            }
+            if (!info.running) {
+                console.log('');
+                console.log(C.dim('  To start: cell bridge start [--port 9877] [--host 127.0.0.1]'));
+            }
+        }
+    }
+    catch (e) {
+        console.log(C.warn('  Bridge failed: ' + (e?.message || String(e))));
+    }
+}
+// ─── cell watch-editor (Feature #2: push active editor state to bridge) ────
+function monitorStatePath(project) {
+    const os = require('os');
+    const path = require('path');
+    const fs = require('fs');
+    const dir = path.join(os.tmpdir(), 'fivo-cell');
+    if (!fs.existsSync(dir))
+        fs.mkdirSync(dir, { recursive: true });
+    return path.join(dir, `watch-editor-${project}.json`);
+}
+function readMonitorState(project) {
+    const fs = require('fs');
+    const p = monitorStatePath(project);
+    try {
+        if (!fs.existsSync(p))
+            return null;
+        return JSON.parse(fs.readFileSync(p, 'utf8'));
+    }
+    catch {
+        return null;
+    }
+}
+function writeMonitorState(project, data) {
+    const fs = require('fs');
+    try {
+        fs.writeFileSync(monitorStatePath(project), JSON.stringify(data, null, 2));
+    }
+    catch { /* ignore */ }
+}
+function clearMonitorState(project) {
+    const fs = require('fs');
+    try {
+        fs.unlinkSync(monitorStatePath(project));
+    }
+    catch { /* ignore */ }
+}
+function doWatchEditor() {
+    const sub = (args[1] || 'status').toString();
+    // Find --project=... flag, or fall back to positional args[2] or cwd basename
+    const projectFlag = args.find((a) => typeof a === 'string' && a.startsWith('--project='));
+    const project = projectFlag ? projectFlag.split('=')[1] : ((args[2] && !String(args[2]).startsWith('--')) ? String(args[2]) : path.basename(process.cwd()));
+    const intervalArg = args.find((a) => typeof a === 'string' && a.startsWith('--interval='));
+    const portArg = args.find((a) => typeof a === 'string' && a.startsWith('--port='));
+    const hostArg = args.find((a) => typeof a === 'string' && a.startsWith('--host='));
+    const interval = parseInt(intervalArg ? intervalArg.split('=')[1] : '3000', 10);
+    let port = portArg ? parseInt(portArg.split('=')[1], 10) : null;
+    const host = (hostArg ? hostArg.split('=')[1] : '127.0.0.1') || '127.0.0.1';
+    // Try to discover bridge port from pid file if not specified
+    if (port === null) {
+        try {
+            const { discoverBridgePort } = require('../watcher/socket-bridge');
+            const discovered = discoverBridgePort();
+            if (discovered)
+                port = discovered;
+        }
+        catch { /* ignore */ }
+    }
+    if (port === null)
+        port = 9877;
+    try {
+        const { EditorMonitor, getActiveWindow, parseTitleToState } = require('../watcher/editor-monitor');
+        if (sub === 'start') {
+            if (activeMonitor) {
+                console.log(C.warn('  Monitor already running in this process'));
+                return;
+            }
+            const prev = readMonitorState(project);
+            if (prev && prev.running) {
+                console.log(C.warn(`  Monitor for "${project}" already started at ${prev.startTime}`));
+                console.log(C.dim('  Use `cell watch-editor stop --project ' + project + '` first'));
+                return;
+            }
+            const monitor = new EditorMonitor({
+                project,
+                intervalMs: interval,
+                bridgeHost: host,
+                bridgePort: port,
+                fileBaseDir: process.cwd(),
+                watchFiles: true,
+                onState: (s) => {
+                    if (process.env.CELL_VERBOSE) {
+                        console.log(C.dim(`  [${new Date().toISOString()}] ${s.editorName}: ${s.filePath} [${s.isDirty ? 'unsaved' : 'clean'}]`));
+                    }
+                },
+                onError: (e) => {
+                    if (process.env.CELL_VERBOSE)
+                        console.error(C.warn('  ' + e.message));
+                },
+                onSkip: (reason) => {
+                    if (process.env.CELL_VERBOSE)
+                        console.log(C.dim('  skip: ' + reason));
+                },
+            });
+            monitor.start();
+            activeMonitor = monitor;
+            monitorStateFile = project;
+            writeMonitorState(project, { running: true, startTime: new Date().toISOString(), pid: process.pid, project, port, host, interval });
+            console.log(C.success(`  Watch-editor started for project "${project}"`));
+            console.log(C.dim(`  Bridge: ${host}:${port}  |  Interval: ${interval}ms`));
+            console.log(C.dim('  State will appear in `cell context ' + project + '`'));
+            console.log(C.dim('  Press Ctrl+C to stop'));
+            // Keep the process alive
+            process.on('SIGINT', () => {
+                console.log(C.dim('\n  Stopping watch-editor...'));
+                if (activeMonitor)
+                    activeMonitor.stop();
+                clearMonitorState(project);
+                process.exit(0);
+            });
+            process.on('SIGTERM', () => {
+                if (activeMonitor)
+                    activeMonitor.stop();
+                clearMonitorState(project);
+                process.exit(0);
+            });
+        }
+        else if (sub === 'stop') {
+            if (activeMonitor) {
+                activeMonitor.stop();
+                activeMonitor = null;
+            }
+            clearMonitorState(project);
+            console.log(C.success(`  Watch-editor stopped for "${project}"`));
+        }
+        else if (sub === 'status') {
+            const local = activeMonitor ? activeMonitor.getInfo() : null;
+            const saved = readMonitorState(project);
+            if (local) {
+                console.log(C.bold(`  Watch-editor (in-process) — ${project}`));
+                console.log(`  Running:    ${C.success('yes')}`);
+                console.log(`  Started:    ${local.startTime}`);
+                console.log(`  Polls:      ${local.pollsCompleted}`);
+                console.log(`  Detected:   ${local.statesDetected}`);
+                console.log(`  Pushed:     ${local.statesPushed}`);
+                console.log(`  Bridge:     ${local.bridgeConnected ? C.success('connected') : C.warn('not connected')}`);
+                if (local.lastState) {
+                    console.log(`  Last:       ${local.lastState.editorName} → ${local.lastState.filePath}${local.lastState.isDirty ? ' [unsaved]' : ''}`);
+                }
+            }
+            else if (saved) {
+                console.log(C.bold(`  Watch-editor (saved state) — ${project}`));
+                console.log(`  Started:    ${saved.startTime}`);
+                console.log(`  PID:        ${saved.pid}${saved.pid && !isPidAlive(saved.pid) ? C.warn(' (not running)') : ''}`);
+                console.log(`  Bridge:     ${saved.host}:${saved.port}`);
+                console.log(`  Interval:   ${saved.interval}ms`);
+            }
+            else {
+                console.log(C.dim(`  No watch-editor session for "${project}"`));
+                console.log(C.dim('  Start with: cell watch-editor start --project ' + project));
+            }
+        }
+        else if (sub === 'check') {
+            // One-shot check — useful for testing
+            getActiveWindow().then((win) => {
+                if (!win) {
+                    console.log(C.dim('  No active window detected'));
+                    return;
+                }
+                console.log(`  Active: ${win.processName} (PID ${win.pid})`);
+                console.log(`  Title:  ${win.title}`);
+                const state = parseTitleToState(win.title, win.processName, project, process.cwd());
+                if (state) {
+                    console.log(C.success('  Parsed:'));
+                    console.log(`    editor:  ${state.editorName}`);
+                    console.log(`    file:    ${state.filePath}`);
+                    console.log(`    line:    ${state.line}`);
+                    console.log(`    dirty:   ${state.isDirty}`);
+                    console.log(`    lang:    ${state.language || 'unknown'}`);
+                }
+                else {
+                    console.log(C.warn('  Could not parse title into editor state'));
+                }
+            });
+        }
+        else {
+            console.log(C.dim('  Usage: cell watch-editor <start|stop|status|check> [--project NAME] [--interval 3000] [--port 9877] [--host 127.0.0.1]'));
+        }
+    }
+    catch (e) {
+        console.log(C.warn('  watch-editor failed: ' + (e?.message || String(e))));
     }
 }
 // ─── cell mcp-config (Pre-Launch: auto-register all IDEs) ────────────────────
@@ -1494,7 +2547,7 @@ function doMcpConfig() {
     console.log(C.bold('  Cell MCP Auto-Config'));
     console.log(C.dim('  ─────────────────────'));
     console.log();
-    const { writeMcpConfig, getMcpTargets } = require('./core/mcp-config');
+    const { writeMcpConfig, getMcpTargets } = require('../../../core/mcp-config');
     const homedir = os.homedir();
     const targets = getMcpTargets(homedir);
     const result = writeMcpConfig(homedir);
@@ -1555,7 +2608,7 @@ function doRepl() {
     console.log();
     // First-run greeting
     try {
-        const { firstRunGreeting } = require('./first-run');
+        const { firstRunGreeting } = require('../setup/first-run');
         firstRunGreeting();
     }
     catch { }
@@ -1614,7 +2667,7 @@ function doRepl() {
         // In-REPL version (avoid child spawn for trivial info)
         if (cmd === 'version' || cmd === '--version' || cmd === '-v') {
             try {
-                const pkg = require('../package.json');
+                const pkg = require('../../../../package.json');
                 console.log(`${C.primary('cell')} v${C.num(pkg.version)}`);
             }
             catch { }
@@ -1655,6 +2708,338 @@ function doRepl() {
         process.exit(0);
     });
 }
+// ─── cell switch-back ──────────────────────────────────────────────────────
+function doSwitchBack() {
+    const switchArgs = process.argv.slice(3);
+    const branch = switchArgs[0];
+    if (!branch) {
+        console.log();
+        console.log(C.bold('  Branch Context Recovery'));
+        console.log(C.dim('  ──────────────────────'));
+        console.log();
+        console.log('  Usage: cell switch-back <branch-name>');
+        console.log();
+        console.log('  Shows saved context for a branch (goal, files, errors, decisions).');
+        console.log();
+        console.log('  Examples:');
+        console.log('    cell switch-back feature-auth');
+        console.log('    cell switch-back fix/login-bug');
+        console.log();
+        return;
+    }
+    console.log();
+    console.log(C.bold(`  Branch: ${branch}`));
+    console.log(C.dim('  ──────────────────────'));
+    console.log();
+    let project = path.basename(process.cwd());
+    try {
+        const { detectProject } = require('../setup/setup');
+        const detected = detectProject(process.cwd());
+        project = detected.name;
+    }
+    catch { }
+    // Try real saved context first
+    try {
+        const { loadBranchSnapshot } = require('../../03-knowledge/decisions/branch-snapshot');
+        const snapshot = loadBranchSnapshot(project, branch);
+        if (snapshot) {
+            if (snapshot.goal)
+                console.log(`  Goal:     ${C.primary(snapshot.goal)}`);
+            if (snapshot.filesTouched && snapshot.filesTouched.length > 0) {
+                console.log(`  Files:    ${C.num(String(snapshot.filesTouched.length))} touched`);
+                for (const f of snapshot.filesTouched.slice(0, 8)) {
+                    console.log(C.dim(`    - ${f}`));
+                }
+                if (snapshot.filesTouched.length > 8) {
+                    console.log(C.dim(`    ... ${snapshot.filesTouched.length - 8} more`));
+                }
+            }
+            if (snapshot.pendingTasks && snapshot.pendingTasks.length > 0) {
+                console.log(`  Pending:  ${snapshot.pendingTasks.length} task(s)`);
+                for (const t of snapshot.pendingTasks.slice(0, 5)) {
+                    console.log(C.warn(`    ! ${t}`));
+                }
+            }
+            if (snapshot.recentErrors && snapshot.recentErrors.length > 0) {
+                console.log(`  Errors:   ${snapshot.recentErrors.length} recent`);
+                for (const e of snapshot.recentErrors.slice(0, 3)) {
+                    console.log(C.warn(`    x ${e}`));
+                }
+            }
+            if (snapshot.recentDecisions && snapshot.recentDecisions.length > 0) {
+                console.log(`  Recent commits:`);
+                for (const d of snapshot.recentDecisions.slice(0, 5)) {
+                    console.log(C.dim(`    - ${d}`));
+                }
+            }
+            if (snapshot.lastActiveAt) {
+                console.log(C.dim(`  Last active: ${snapshot.lastActiveAt}`));
+            }
+            console.log();
+            console.log(C.dim('  Restore context:'));
+            console.log('    1. git checkout ' + branch);
+            console.log('    2. cell context');
+            console.log();
+            return;
+        }
+    }
+    catch { }
+    // Fallback to name parser
+    const { GitBranchPreGenerator } = require('../../03-knowledge/decisions/git-branch-pregenerator');
+    const gen = new GitBranchPreGenerator();
+    const summary = gen.getIntentSummary(branch);
+    const parsed = gen.parseBranchName(branch);
+    console.log(C.dim('  (No saved context for this branch — showing inferred intent)'));
+    console.log();
+    console.log(`  Type: ${C.primary(parsed.type)}`);
+    console.log(`  Intent: ${parsed.intent}`);
+    console.log(`  Summary: ${summary}`);
+    console.log();
+    const patterns = gen.generateFiles(branch, [], 'typescript');
+    if (patterns.length > 0) {
+        console.log(C.dim('  Expected files:'));
+        for (const f of patterns) {
+            console.log(`    ${C.primary(f.path)} (${f.type})`);
+        }
+        console.log();
+    }
+    console.log(C.dim('  Save real context by running:'));
+    console.log(C.primary('    cell scan'));
+    console.log(C.primary('    cell context'));
+    console.log();
+    console.log(C.dim('  Restore context:'));
+    console.log('    1. git checkout ' + branch);
+    console.log('    2. cell context');
+    console.log();
+}
+// ─── cell branches ──────────────────────────────────────────────────────────
+function doBranches() {
+    console.log();
+    console.log(C.bold('  Known Branches'));
+    console.log(C.dim('  ──────────────'));
+    console.log();
+    let project = path.basename(process.cwd());
+    try {
+        const { detectProject } = require('../setup/setup');
+        const detected = detectProject(process.cwd());
+        project = detected.name;
+    }
+    catch { }
+    try {
+        const { listBranchSnapshots } = require('../../03-knowledge/decisions/branch-snapshot');
+        const snapshots = listBranchSnapshots(project);
+        if (snapshots.length === 0) {
+            console.log(C.dim('  No branch context saved yet.'));
+            console.log();
+            console.log(C.dim('  Save context by running cell scan or cell context on a branch.'));
+            console.log();
+            return;
+        }
+        for (const s of snapshots) {
+            const active = s.lastActiveAt ? s.lastActiveAt.slice(0, 10) : 'unknown';
+            const goalStr = s.goal ? ` — ${s.goal}` : '';
+            const fileCount = s.filesTouched?.length || 0;
+            console.log(`  ${C.primary(s.branch)}${goalStr}`);
+            console.log(C.dim(`    Last active: ${active} | Files: ${fileCount} | Commits: ${s.recentDecisions?.length || 0}`));
+        }
+        console.log();
+        console.log(C.dim(`  ${snapshots.length} branch(es) tracked. Run cell switch-back <branch> for details.`));
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.log(C.warn(`  Branch list failed: ${msg}`));
+    }
+    // Also show git branches
+    try {
+        const { execSync } = require('child_process');
+        const gitBranches = execSync('git branch --list', { encoding: 'utf8' }).trim();
+        if (gitBranches) {
+            console.log();
+            console.log(C.dim('  Git branches:'));
+            for (const line of gitBranches.split('\n').filter(Boolean)) {
+                console.log(C.dim(`    ${line}`));
+            }
+        }
+    }
+    catch { }
+    console.log();
+}
+// ─── cell lessons ──────────────────────────────────────────────────────────
+function doLessons() {
+    const { getAvoidSuggestions, getFailureStats, getAllFailureRecords } = require('../../03-knowledge/decisions/failure-memory');
+    const lessonArgs = process.argv.slice(3);
+    const topic = lessonArgs[0];
+    let lessonProject = project;
+    try {
+        const { detectProject } = require('../setup/setup');
+        lessonProject = detectProject().name;
+    }
+    catch { }
+    console.log();
+    console.log(C.bold('  Engineering Lessons'));
+    console.log(C.dim('  ──────────────────'));
+    console.log();
+    const stats = getFailureStats(lessonProject);
+    if (stats.totalTracked === 0) {
+        console.log(C.warn('  No lessons recorded yet.'));
+        console.log();
+        console.log(C.dim('  Lessons are learned from pattern rejections during:'));
+        console.log(C.dim('    - AI code suggestions'));
+        console.log(C.dim('    - Code review feedback'));
+        console.log(C.dim('    - Scanner repeat issues'));
+        console.log();
+        console.log(C.dim('  Start collecting:'));
+        console.log(C.primary('    cell scan'));
+        console.log(C.primary('    cell blindspots --top'));
+        return;
+    }
+    console.log(`  Tracked: ${stats.totalTracked} patterns`);
+    console.log(`  Critical: ${stats.criticalCount} | High: ${stats.highCount} | Medium: ${stats.mediumCount} | Low: ${stats.lowCount}`);
+    console.log(`  Avg failure rate: ${Math.round(stats.avgFailureRate * 100)}%`);
+    console.log();
+    const suggestions = getAvoidSuggestions(0.5, lessonProject);
+    if (topic) {
+        const filtered = suggestions.filter((s) => s.description.toLowerCase().includes(topic.toLowerCase()) ||
+            s.patternId.toLowerCase().includes(topic.toLowerCase()));
+        if (filtered.length === 0) {
+            console.log(`  No lessons found for "${topic}".`);
+        }
+        else {
+            console.log(C.bold(`  Lessons for "${topic}":`));
+            console.log();
+            for (const s of filtered.slice(0, 10)) {
+                const icon = s.severity === 'critical' ? '!!!' : s.severity === 'high' ? '!!' : s.severity === 'medium' ? '!' : '-';
+                console.log(`  ${C.warn(icon)} ${s.description}`);
+                console.log(`     Failure rate: ${Math.round(s.failureRate * 100)}% (${s.severity})`);
+                console.log(`     ${s.alternativeDescription}`);
+                console.log();
+            }
+        }
+    }
+    else {
+        if (suggestions.length === 0) {
+            console.log('  No lessons to show yet. Keep building!');
+        }
+        else {
+            console.log(C.bold('  Top lessons (patterns to avoid):'));
+            console.log();
+            for (const s of suggestions.slice(0, 10)) {
+                const icon = s.severity === 'critical' ? '!!!' : s.severity === 'high' ? '!!' : s.severity === 'medium' ? '!' : '-';
+                console.log(`  ${C.warn(icon)} ${s.description}`);
+                console.log(`     Failure rate: ${Math.round(s.failureRate * 100)}% (${s.severity})`);
+                console.log(`     ${s.alternativeDescription}`);
+                console.log();
+            }
+        }
+    }
+    console.log(C.dim('  Use: cell lessons <topic>  to filter by topic'));
+    console.log();
+}
+// ─── cell evolution ────────────────────────────────────────────────────────
+function doEvolution() {
+    const { buildJourneyReport, saveJourneyReport } = require('../../03-knowledge/decisions/journey-memory');
+    const evoArgs = process.argv.slice(3);
+    const dir = evoArgs[0] || process.cwd();
+    const showStack = evoArgs.includes('--stack');
+    let evoProject = project;
+    try {
+        const { detectProject } = require('../setup/setup');
+        evoProject = detectProject(dir).name;
+    }
+    catch {
+        try {
+            const pkgPath = require('path').join(dir, 'package.json');
+            const pkg = JSON.parse(require('fs').readFileSync(pkgPath, 'utf-8'));
+            if (pkg.name)
+                evoProject = pkg.name;
+        }
+        catch { }
+    }
+    console.log();
+    console.log(C.bold('  Project Evolution Map'));
+    console.log(C.dim('  ────────────────────'));
+    console.log();
+    if (showStack) {
+        try {
+            const rows = (0, database_1.getDb)().prepare(`SELECT stack_json, file_count, line_count, scanned_at FROM stack_history WHERE LOWER(project) = LOWER(?) ORDER BY scanned_at ASC`).all(evoProject);
+            if (rows.length === 0) {
+                console.log(C.dim('  No stack history yet. Run: cell scan'));
+            }
+            else {
+                console.log(C.bold('  Stack Timeline:'));
+                console.log();
+                let prevStack = '';
+                for (const row of rows) {
+                    const date = String(row.scanned_at).slice(0, 10);
+                    let langs = {};
+                    try {
+                        langs = JSON.parse(String(row.stack_json));
+                    }
+                    catch { }
+                    const langList = Object.entries(langs).sort((a, b) => b[1] - a[1]).slice(0, 5).map(([l, c]) => `${l}(${c})`).join(', ');
+                    const currentStack = Object.keys(langs).sort().join(',');
+                    const changed = prevStack && prevStack !== currentStack;
+                    const marker = changed ? C.warn('CHANGED') : C.dim('same');
+                    console.log(`  ${date}  ${langList || 'unknown'}  ${row.file_count} files  ${row.line_count} lines  ${marker}`);
+                    prevStack = currentStack;
+                }
+            }
+        }
+        catch (e) {
+            console.log(C.warn(`  Stack history failed: ${e?.message || String(e)}`));
+        }
+        console.log();
+        return;
+    }
+    console.log('  Building journey report...');
+    try {
+        const report = buildJourneyReport(dir);
+        const savedPath = saveJourneyReport(report);
+        console.log();
+        console.log(C.bold('  Summary'));
+        console.log(`  Projects: ${report.summary.totalProjects}`);
+        console.log(`  Active since: ${report.summary.activeSince}`);
+        console.log(`  Languages: ${report.summary.languagesLearned}`);
+        console.log(`  Total commits: ${report.summary.totalCommits}`);
+        console.log(`  Top language: ${report.summary.mostUsedLanguage}`);
+        console.log(`  Top skill: ${report.summary.topSkill}`);
+        console.log(`  Growth: ${report.summary.growthRate}`);
+        console.log();
+        if (report.skills.length > 0) {
+            console.log(C.bold('  Skill Progression'));
+            console.log();
+            for (const s of report.skills.slice(0, 8)) {
+                const bar = '█'.repeat(Math.min(s.metrics.cleanFileRatio / 10, 10));
+                console.log(`  ${s.area.padEnd(15)} ${s.currentLevel.padEnd(14)} ${bar} ${s.metrics.cleanFileRatio}% clean`);
+            }
+            console.log();
+        }
+        if (report.chains.length > 0) {
+            console.log(C.bold('  Reused Patterns'));
+            console.log();
+            for (const c of report.chains.slice(0, 5)) {
+                console.log(`  ${c.pattern} (${Math.round(c.successRate * 100)}% success)`);
+                console.log(`    Used in: ${c.firstUsed.project}${c.reusedIn.length > 0 ? ', ' + c.reusedIn.map((r) => r.project).join(', ') : ''}`);
+            }
+            console.log();
+        }
+        if (report.goals.recommendations.length > 0) {
+            console.log(C.bold('  Recommendations'));
+            console.log();
+            for (const rec of report.goals.recommendations.slice(0, 5)) {
+                console.log(`  -> ${rec}`);
+            }
+            console.log();
+        }
+        console.log(C.dim(`  Full report: ${savedPath}`));
+        console.log(C.dim('  Also saved as: ~/.fivo/cell/journey.md'));
+        console.log();
+    }
+    catch (e) {
+        console.log(C.warn(`  Failed to build evolution map: ${e instanceof Error ? e.message : String(e)}`));
+        console.log();
+    }
+}
 // ─── cell help ──────────────────────────────────────────────────────────────
 function doHelp() {
     console.log();
@@ -1664,6 +3049,7 @@ function doHelp() {
     console.log(`  ${C.primary('cell start')}       Start daemon + MCP (port 9876) — re-run safe`);
     console.log(`  ${C.primary('cell stop')}        Stop daemon`);
     console.log(`  ${C.primary('cell setup')}       One-time project setup: scan + watcher + MCP (idempotent)`);
+    console.log(`  ${C.primary('cell doctor')}      Health check — diagnose what's missing and how to fix`);
     console.log(`  ${C.primary('cell --version')}   Print version + daemon status`);
     console.log(`  ${C.primary('cell mcp-config')}  Auto-register cell MCP in Cursor/Antigravity/Codex/OpenCode`);
     console.log(`  ${C.primary('cell scan')}        Scan codebase + build layers`);
@@ -1678,7 +3064,14 @@ function doHelp() {
     console.log(`  ${C.primary('cell watch [start|stop|events|check|status] [proj] [dir]')}  Live file watcher`);
     console.log(`  ${C.primary('cell watch daemon [proj] [dir]')}  Run as long-lived watcher (for .bat)`);
     console.log(`  ${C.primary('cell blindspots [dir] [maxFiles]')}  Scan for blind spots (15+ types)`);
-    console.log(`  ${C.primary('cell context [project] [tool]')}  Inject @cell context block`);
+    console.log(`  ${C.primary('cell blindspots --top [N]')}          Show top N prioritized fixes (default 5)`);
+    console.log(`  ${C.primary('cell context [project] [tool] [--short|--full]')}  Inject @cell context block`);
+    console.log(`  ${C.primary('cell switch-back <branch>')}  Restore branch context`);
+    console.log(`  ${C.primary('cell branches')}         List known branches with last context`);
+    console.log(`  ${C.primary('cell lessons [topic]')}  Engineering lessons from failures`);
+    console.log(`  ${C.primary('cell evolution [dir] [--stack]')}  Project evolution map + stack timeline`);
+    console.log(`  ${C.primary('cell focus [dir]')}     Focus report — active/stalled/abandoned projects`);
+    console.log(`  ${C.primary('cell why <topic>')}     Search decisions by topic`);
     console.log(`  ${C.primary('cell repl')}        Interactive REPL with / completion (or just run \`cell\` in a TTY)`);
     console.log(`  ${C.primary('cell help')}        Show this help`);
     console.log();
@@ -1686,5 +3079,167 @@ function doHelp() {
     console.log(C.dim('  Then: cell start'));
     console.log();
 }
+// ─── cell focus ────────────────────────────────────────────────────────────
+function doFocus() {
+    const { buildFocusReport, renderFocusMd } = require('../../03-knowledge/decisions/focus-report');
+    const focusArgs = process.argv.slice(3);
+    const rootDir = focusArgs[0] || path.dirname(process.cwd());
+    const asJson = focusArgs.includes('--json');
+    console.log();
+    console.log(C.bold('  Focus Report — Project Activity'));
+    console.log(C.dim('  ───────────────────────────────'));
+    console.log();
+    try {
+        const report = buildFocusReport(rootDir);
+        if (asJson) {
+            console.log(JSON.stringify(report, null, 2));
+            return;
+        }
+        console.log(`  Total: ${report.totalProjects} projects`);
+        console.log(`  Active: ${C.success(String(report.active))} | Stalled: ${C.warn(String(report.stalled))} | Abandoned: ${C.primary(String(report.abandoned))} | Fresh: ${report.fresh}`);
+        console.log();
+        if (report.topPicks.length > 0) {
+            console.log(C.bold('  Keep doing this:'));
+            for (const p of report.topPicks) {
+                console.log(`  ${C.success('>>')} ${p.name} — ${p.reason}`);
+            }
+            console.log();
+        }
+        if (report.shouldPause.length > 0) {
+            console.log(C.bold('  Pause / Decide:'));
+            for (const p of report.shouldPause) {
+                console.log(`  ${C.warn('??')} ${p.name} (${p.lastModifiedDays}d silent) — ${p.reason}`);
+            }
+            console.log();
+        }
+        if (report.shouldArchive.length > 0) {
+            console.log(C.bold('  Archive:'));
+            for (const p of report.shouldArchive) {
+                console.log(`  ${C.dim('..')} ${p.name} (${p.lastModifiedDays}d silent) — ${p.reason}`);
+            }
+            console.log();
+        }
+        if (report.shouldResurrect.length > 0) {
+            console.log(C.bold('  Resurrect:'));
+            for (const p of report.shouldResurrect) {
+                console.log(`  ${C.primary('!!')} ${p.name} (${p.lastModifiedDays}d silent) — ${p.reason}`);
+            }
+            console.log();
+        }
+        if (report.overallAdvice.length > 0) {
+            console.log(C.bold('  Advice:'));
+            for (const a of report.overallAdvice) {
+                console.log(`  ${C.dim('>')} ${a}`);
+            }
+        }
+    }
+    catch (e) {
+        console.log(C.warn(`  Focus report failed: ${e?.message || String(e)}`));
+        console.log(C.dim('  Tip: run from a parent directory containing multiple projects'));
+    }
+    console.log();
+}
+// ─── cell why <topic> ──────────────────────────────────────────────────────
+function doWhy() {
+    const whyArgs = process.argv.slice(3);
+    const topic = whyArgs[0];
+    if (!topic) {
+        console.log();
+        console.log(C.bold('  Cell Why — Decision Search'));
+        console.log(C.dim('  ───────────────────────────'));
+        console.log();
+        console.log(C.dim('  Usage: cell why <topic>'));
+        console.log(C.dim('  Example: cell why typescript'));
+        console.log(C.dim('  Example: cell why testing'));
+        console.log();
+        return;
+    }
+    const db = (0, database_1.getDb)();
+    console.log();
+    console.log(C.bold(`  Why — Decisions about "${topic}"`));
+    console.log(C.dim('  ─────────────────────────────'));
+    console.log();
+    const likeTopic = `%${topic}%`;
+    try {
+        const decisionRows = db.prepare(`
+      SELECT technology, reason, outcome, was_right, project, created_at
+      FROM decisions
+      WHERE technology LIKE ? OR reason LIKE ? OR outcome LIKE ?
+      ORDER BY created_at DESC LIMIT 10
+    `).all(likeTopic, likeTopic, likeTopic);
+        const decisionOutcomeRows = db.prepare(`
+      SELECT technology, reason, outcome, was_right, confidence, context, project, created_at
+      FROM decision_outcomes
+      WHERE technology LIKE ? OR reason LIKE ? OR outcome LIKE ? OR context LIKE ?
+      ORDER BY created_at DESC LIMIT 10
+    `).all(likeTopic, likeTopic, likeTopic, likeTopic);
+        const logRows = db.prepare(`
+      SELECT decision, approach, result, worked, file_path as file, decided_at
+      FROM decision_log
+      WHERE decision LIKE ? OR approach LIKE ? OR result LIKE ?
+      ORDER BY decided_at DESC LIMIT 10
+    `).all(likeTopic, likeTopic, likeTopic);
+        let found = 0;
+        if (decisionRows.length > 0) {
+            console.log(C.bold('  Technology Decisions:'));
+            for (const r of decisionRows) {
+                const verdict = Number(r.was_right) ? C.success('Right') : C.warn('Wrong');
+                console.log(`  ${verdict}  ${r.technology || r.reason}`);
+                if (r.reason)
+                    console.log(C.dim(`     Reason: ${r.reason}`));
+                if (r.outcome)
+                    console.log(C.dim(`     Outcome: ${r.outcome}`));
+                if (r.project)
+                    console.log(C.dim(`     Project: ${r.project}`));
+                console.log();
+            }
+            found += decisionRows.length;
+        }
+        if (decisionOutcomeRows.length > 0) {
+            console.log(C.bold('  Decision Outcomes:'));
+            for (const r of decisionOutcomeRows) {
+                const verdict = Number(r.was_right) ? C.success('Right') : C.warn('Wrong');
+                console.log(`  ${verdict}  ${r.technology || r.reason}`);
+                if (r.reason)
+                    console.log(C.dim(`     Reason: ${r.reason}`));
+                if (r.outcome)
+                    console.log(C.dim(`     Outcome: ${r.outcome}`));
+                if (r.context)
+                    console.log(C.dim(`     Context: ${r.context}`));
+                if (r.confidence)
+                    console.log(C.dim(`     Confidence: ${r.confidence}%`));
+                console.log();
+            }
+            found += decisionOutcomeRows.length;
+        }
+        if (logRows.length > 0) {
+            console.log(C.bold('  Session Decisions:'));
+            for (const r of logRows) {
+                const verdict = Number(r.worked) ? C.success('Worked') : C.warn("Didn't");
+                console.log(`  ${verdict}  ${r.decision}`);
+                if (r.approach)
+                    console.log(C.dim(`     Approach: ${r.approach}`));
+                if (r.result)
+                    console.log(C.dim(`     Result: ${r.result}`));
+                if (r.file)
+                    console.log(C.dim(`     File: ${r.file}`));
+                console.log();
+            }
+            found += logRows.length;
+        }
+        if (found === 0) {
+            console.log(C.dim(`  No decisions found about "${topic}".`));
+            console.log();
+            console.log(C.dim('  Decisions are logged when you:'));
+            console.log(C.dim('    - Accept/reject AI suggestions in your IDE'));
+            console.log(C.dim('    - Run cell scan + cell setup'));
+            console.log(C.dim('    - Use the decision MCP tool'));
+        }
+    }
+    catch (e) {
+        console.log(C.warn(`  Search failed: ${e?.message || String(e)}`));
+    }
+    console.log();
+}
 // test touch 14:40:59
 //# sourceMappingURL=cli.js.map