fivocell 4.3.1 → 4.4.0

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

@@ -43,82 +43,81 @@ const morgan_1 = __importDefault(require("morgan"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const fs = __importStar(require("fs"));
-const signal_capture_1 = require("../core/signal-capture");
-const pattern_store_1 = require("../core/pattern-store");
-const learning_layer_1 = require("../core/learning-layer");
-const confidence_engine_1 = require("../core/confidence-engine");
-const extraction_cascade_1 = require("../core/extraction-cascade");
-const decay_engine_1 = require("../core/decay-engine");
-const config_attribution_1 = require("../core/config-attribution");
-const community_prior_1 = require("../core/community-prior");
-const community_live_1 = require("../core/community-live");
-const community_full_1 = require("../core/community-full");
-const team_composer_1 = require("../core/team-composer");
-const conflict_detector_1 = require("../core/conflict-detector");
-const prompt_conditioner_1 = require("../core/prompt-conditioner");
-const build_failure_predictor_1 = require("../core/build-failure-predictor");
-const next_action_predictor_1 = require("../core/next-action-predictor");
-const error_predictor_1 = require("../core/error-predictor");
-const security_predictor_1 = require("../core/security-predictor");
-const performance_predictor_1 = require("../core/performance-predictor");
-const merge_conflict_predictor_1 = require("../core/merge-conflict-predictor");
-const test_anticipator_1 = require("../core/test-anticipator");
-const context_restore_1 = require("../core/context-restore");
-const cross_project_sync_1 = require("../core/cross-project-sync");
-const solution_index_1 = require("../core/solution-index");
-const language_switch_assistant_1 = require("../core/language-switch-assistant");
-const interruption_recovery_1 = require("../core/interruption-recovery");
-const handoff_detector_1 = require("../core/handoff-detector");
-const knowledge_silo_detector_1 = require("../core/knowledge-silo-detector");
-const pr_review_assistant_1 = require("../core/pr-review-assistant");
-const standup_generator_1 = require("../core/standup-generator");
-const dead_code_detector_1 = require("../core/dead-code-detector");
-const circular_dependency_detector_1 = require("../core/circular-dependency-detector");
-const duplication_detector_1 = require("../core/duplication-detector");
-const complexity_analyzer_1 = require("../core/complexity-analyzer");
-const dependency_health_checker_1 = require("../core/dependency-health-checker");
-const ab_test_framework_1 = require("../core/ab-test-framework");
-const platt_calibration_1 = require("../core/platt-calibration");
-const offline_queue_1 = require("../core/offline-queue");
-const cross_domain_projections_1 = require("../core/cross-domain-projections");
-const pattern_utils_1 = require("../core/pattern-utils");
-const cross_language_mappings_1 = require("../core/cross-language-mappings");
-const model_intelligence_1 = require("../core/model-intelligence");
-const realtime_guardian_1 = require("../core/realtime-guardian");
-const session_recovery_1 = require("../core/session-recovery");
-const identity_resolver_1 = require("../core/identity-resolver");
-const cloud_client_1 = require("../core/cloud-client");
-const privacy_manager_1 = require("../core/privacy-manager");
-const ws_client_1 = require("../core/ws-client");
-const workflow_tracker_1 = require("../core/workflow-tracker");
-const outcome_recorder_1 = require("../core/outcome-recorder");
-const failure_memory_1 = require("../core/failure-memory");
-const time_saved_1 = require("../core/time-saved");
-const explainability_1 = require("../core/explainability");
-const ai_memory_1 = require("../core/ai-memory");
-const project_dna_1 = require("../core/project-dna");
-const knowledge_graph_1 = require("../core/knowledge-graph");
-const convention_detector_1 = require("../core/convention-detector");
-const cost_optimizer_1 = require("../core/cost-optimizer");
-const reputation_1 = require("../core/reputation");
-const playbook_generator_1 = require("../core/playbook-generator");
-const marketplace_1 = require("../core/marketplace");
-const organization_memory_1 = require("../core/organization-memory");
-const workflow_outcome_graph_1 = require("../core/workflow-outcome-graph");
-const outcome_engine_1 = require("../core/outcome-engine");
-const outcome_store_1 = require("../core/outcome-store");
-const developer_profile_1 = require("../core/developer-profile");
-const recommendation_engine_1 = require("../core/recommendation-engine");
-const recommendation_store_1 = require("../core/recommendation-store");
-const community_intelligence_1 = require("../core/community-intelligence");
-const org_intelligence_1 = require("../core/org-intelligence");
-const cross_layer_intelligence_1 = require("../core/cross-layer-intelligence");
-const database_1 = require("../core/database");
-const logger_1 = require("../core/logger");
+const signal_capture_1 = require("../../05-community/share/signal-capture");
+const pattern_store_1 = require("../../06-memory/stores/pattern-store");
+const learning_layer_1 = require("../../../core/learning-layer");
+const confidence_engine_1 = require("../../../core/confidence-engine");
+const extraction_cascade_1 = require("../../../core/extraction-cascade");
+const decay_engine_1 = require("../../06-memory/stores/decay-engine");
+const config_attribution_1 = require("../../03-knowledge/dna/config-attribution");
+const community_prior_1 = require("../../05-community/stats/community-prior");
+const community_live_1 = require("../../05-community/stats/community-live");
+const community_full_1 = require("../../05-community/stats/community-full");
+const team_composer_1 = require("../../../core/team-composer");
+const conflict_detector_1 = require("../../../core/conflict-detector");
+const prompt_conditioner_1 = require("../../../core/prompt-conditioner");
+const build_failure_predictor_1 = require("../../03-knowledge/decisions/build-failure-predictor");
+const next_action_predictor_1 = require("../../../core/next-action-predictor");
+const error_predictor_1 = require("../../03-knowledge/decisions/error-predictor");
+const security_predictor_1 = require("../../03-knowledge/decisions/security-predictor");
+const performance_predictor_1 = require("../../03-knowledge/decisions/performance-predictor");
+const merge_conflict_predictor_1 = require("../../03-knowledge/decisions/merge-conflict-predictor");
+const test_anticipator_1 = require("../../../core/test-anticipator");
+const context_restore_1 = require("../../../core/context-restore");
+const cross_project_sync_1 = require("../../../core/cross-project-sync");
+const solution_index_1 = require("../../../core/solution-index");
+const language_switch_assistant_1 = require("../../../core/language-switch-assistant");
+const interruption_recovery_1 = require("../../01-context/sessions/interruption-recovery");
+const handoff_detector_1 = require("../../../core/handoff-detector");
+const knowledge_silo_detector_1 = require("../../../core/knowledge-silo-detector");
+const pr_review_assistant_1 = require("../../04-team/review/pr-review-assistant");
+const standup_generator_1 = require("../../../core/standup-generator");
+const dead_code_detector_1 = require("../../../core/dead-code-detector");
+const circular_dependency_detector_1 = require("../../../core/circular-dependency-detector");
+const duplication_detector_1 = require("../../../core/duplication-detector");
+const complexity_analyzer_1 = require("../../../core/complexity-analyzer");
+const dependency_health_checker_1 = require("../../../core/dependency-health-checker");
+const ab_test_framework_1 = require("../../03-knowledge/decisions/ab-test-framework");
+const platt_calibration_1 = require("../../03-knowledge/decisions/platt-calibration");
+const offline_queue_1 = require("../../../core/offline-queue");
+const cross_domain_projections_1 = require("../../03-knowledge/dna/cross-domain-projections");
+const pattern_utils_1 = require("../../../core/pattern-utils");
+const cross_language_mappings_1 = require("../../03-knowledge/dna/cross-language-mappings");
+const model_intelligence_1 = require("../../03-knowledge/decisions/model-intelligence");
+const realtime_guardian_1 = require("../../03-knowledge/decisions/realtime-guardian");
+const session_recovery_1 = require("../../../core/session-recovery");
+const identity_resolver_1 = require("../../05-community/share/identity-resolver");
+const privacy_manager_1 = require("../../05-community/privacy/privacy-manager");
+const ws_client_1 = require("../../../core/ws-client");
+const workflow_tracker_1 = require("../../03-knowledge/decisions/workflow-tracker");
+const outcome_recorder_1 = require("../../03-knowledge/decisions/outcome-recorder");
+const failure_memory_1 = require("../../03-knowledge/decisions/failure-memory");
+const time_saved_1 = require("../../03-knowledge/decisions/time-saved");
+const explainability_1 = require("../../03-knowledge/dna/explainability");
+const ai_memory_1 = require("../../03-knowledge/decisions/ai-memory");
+const project_dna_1 = require("../../03-knowledge/dna/project-dna");
+const knowledge_graph_1 = require("../../03-knowledge/graph/knowledge-graph");
+const convention_detector_1 = require("../../03-knowledge/dna/convention-detector");
+const cost_optimizer_1 = require("../../03-knowledge/decisions/cost-optimizer");
+const reputation_1 = require("../../05-community/share/reputation");
+const playbook_generator_1 = require("../../05-community/stats/playbook-generator");
+const marketplace_1 = require("../../05-community/share/marketplace");
+const organization_memory_1 = require("../../../core/organization-memory");
+const workflow_outcome_graph_1 = require("../../03-knowledge/decisions/workflow-outcome-graph");
+const outcome_engine_1 = require("../../03-knowledge/decisions/outcome-engine");
+const outcome_store_1 = require("../../06-memory/stores/outcome-store");
+const developer_profile_1 = require("../../03-knowledge/decisions/developer-profile");
+const recommendation_engine_1 = require("../../03-knowledge/decisions/recommendation-engine");
+const recommendation_store_1 = require("../../06-memory/stores/recommendation-store");
+const community_intelligence_1 = require("../../../core/community-intelligence");
+const org_intelligence_1 = require("../../../core/org-intelligence");
+const cross_layer_intelligence_1 = require("../../../core/cross-layer-intelligence");
+const database_1 = require("../../06-memory/database/database");
+const logger_1 = require("../../06-memory/database/logger");
 const CELL_DIR = path.join(os.homedir(), '.fivo', 'cell');
 (0, database_1.initializeDatabase)();
 try {
-    require('../behavioral-tracker').initBehaviorTables();
+    require('../../03-knowledge/decisions/').initBehaviorTables();
 }
 catch (e) {
     console.error('Behavior tables init failed:', e);
@@ -218,7 +217,7 @@ app.post('/signal', (req, res) => {
     }
     // ─── Behavioral Signals ───────────────────────────────────────
     if (type === 'error') {
-        const { logError, getErrorPatterns } = require('../behavioral-tracker');
+        const { logError, getErrorPatterns } = require('../../03-knowledge/decisions/');
         const r = logError({ project, file, errorType, errorMessage, line });
         // Check if repeat mistake — send warning
         let warning = null;
@@ -234,17 +233,17 @@ app.post('/signal', (req, res) => {
         return;
     }
     if (type === 'error_fix') {
-        const { logErrorFix } = require('../behavioral-tracker');
+        const { logErrorFix } = require('../../03-knowledge/decisions/');
         logErrorFix({ errorId: stuckId || 0, fixApplied: fixApplied || '', worked: fixWorked || false, timeToFixMs: timeToFixMs || 0 });
         res.json({ recorded: true });
         return;
     }
     if (type === 'decision') {
-        const { logDecision } = require('../behavioral-tracker');
+        const { logDecision } = require('../../03-knowledge/decisions/');
         const r = logDecision({ project, file, decision, approach, result, worked, context: req.body.context || '' });
         // Auto-track in session memory
         try {
-            const { SessionMemory } = require('../core/session-memory');
+            const { SessionMemory } = require('../../01-context/sessions/session-memory');
             const mem = new SessionMemory();
             const lastSess = mem.getLastSessionForProject(project || '');
             if (lastSess && !lastSess.endTime) {
@@ -258,11 +257,11 @@ app.post('/signal', (req, res) => {
         return;
     }
     if (type === 'context') {
-        const { logContext } = require('../behavioral-tracker');
+        const { logContext } = require('../../03-knowledge/decisions/');
         const r = logContext({ project, task, files });
         // Auto-start session if none exists
         try {
-            const { SessionMemory } = require('../core/session-memory');
+            const { SessionMemory } = require('../../01-context/sessions/session-memory');
             const mem = new SessionMemory();
             const lastSess = mem.getLastSessionForProject(project || '');
             if (!lastSess || lastSess.endTime) {
@@ -280,13 +279,13 @@ app.post('/signal', (req, res) => {
         return;
     }
     if (type === 'stuck') {
-        const { logStuck } = require('../behavioral-tracker');
+        const { logStuck } = require('../../03-knowledge/decisions/');
         const r = logStuck({ project, file, description });
         res.json({ recorded: true, id: r.id });
         return;
     }
     if (type === 'stuck_resolved') {
-        const { logStuckResolved } = require('../behavioral-tracker');
+        const { logStuckResolved } = require('../../03-knowledge/decisions/');
         logStuckResolved(stuckId || 0, resolution || '');
         res.json({ recorded: true });
         return;
@@ -295,7 +294,7 @@ app.post('/signal', (req, res) => {
     if (type === 'model_use') {
         // Track AI model interaction
         try {
-            const { recordModelInteraction } = require('../cross-model-engine');
+            const { recordModelInteraction } = require('../../03-knowledge/decisions/');
             recordModelInteraction({
                 modelName: req.body.modelName || 'unknown',
                 taskType: req.body.taskType || req.body.type || 'general',
@@ -545,29 +544,29 @@ app.get('/dashboard', (_req, res) => {
     const moderate = patterns.filter((p) => engines.confidenceEngine.getTier(p.confidence) === 'moderate');
     const signals = engines.signalCapture.getAllSignals().length;
     const rows = patterns.slice(0, 50).map((p) => `<tr><td>${escapeHtml(p.description)}</td><td>${escapeHtml(p.from)} → ${escapeHtml(p.to)}</td><td>${p.confidence?.mean?.toFixed(2) || '0'}</td><td>${engines.confidenceEngine.getTier(p.confidence)}</td><td>${p.signals?.total || 0}</td></tr>`).join('');
-    res.send(`<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>Cell — Dashboard</title>
-<style>*{margin:0;padding:0;box-sizing:border-box}body{font-family:-apple-system,BlinkMacSystemFont,sans-serif;background:#F7F4F0;color:#2E3138;padding:24px;min-height:100vh;display:flex;flex-direction:column}
-h1{font-size:24px;margin-bottom:8px}h1 span{color:#FF5A4E}.stats{display:flex;gap:16px;margin:20px 0}
-.stat{background:#fff;border:1px solid #e8e5e0;border-radius:8px;padding:16px;flex:1;text-align:center;box-shadow:0 2px 8px rgba(255,90,78,0.06)}
-.stat .num{font-size:28px;font-weight:700;color:#FF5A4E}.stat .label{font-size:12px;color:#8b8b8b;margin-top:4px}
-table{width:100%;border-collapse:collapse;margin-top:20px;background:#fff;border-radius:8px;overflow:hidden;box-shadow:0 2px 8px rgba(0,0,0,0.04)}
-th,td{padding:10px 12px;text-align:left;border-bottom:1px solid #f0ede8}th{background:#faf8f5;font-weight:600;font-size:13px;color:#2E3138}
-tr:hover{background:#fff5f3}.tier{display:inline-block;padding:2px 8px;border-radius:12px;font-size:11px;font-weight:600}
-.tier-strong{background:#FF5A4E18;color:#FF5A4E}.tier-moderate{background:#FFB3A730;color:#d4770a}.tier-weak{background:#f0ede8;color:#8b8b8b}
-.footer{margin-top:auto;padding:16px 0;text-align:center;font-size:12px;color:#8b8b8b;border-top:1px solid #f0ede8}
-.footer a{color:#FF5A4E;text-decoration:none}.footer a:hover{text-decoration:underline}
-.glow{position:fixed;top:-100px;right:-100px;width:300px;height:300px;background:radial-gradient(circle,#FFB3A720,#FFD7D010,transparent 70%);pointer-events:none;z-index:0}
-</style></head><body>
-<div class="glow"></div>
-<h1>🧠 <span>Cell</span> — Dashboard</h1>
-<div class="stats">
-<div class="stat"><div class="num">${patterns.length}</div><div class="label">Total Patterns</div></div>
-<div class="stat"><div class="num">${strong.length}</div><div class="label">Strong (>0.80)</div></div>
-<div class="stat"><div class="num">${moderate.length}</div><div class="label">Moderate</div></div>
-<div class="stat"><div class="num">${signals}</div><div class="label">Signals</div></div>
-</div>
-<table><thead><tr><th>Pattern</th><th>Change</th><th>Confidence</th><th>Tier</th><th>Signals</th></tr></thead><tbody>${rows}</tbody></table>
-<div class="footer"><a href="https://github.com/thevinsoni/cell" target="_blank">FIVO Cell</a> — Open source. Local-first. Free forever.</div>
+    res.send(`<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>Cell — Dashboard</title>
+<style>*{margin:0;padding:0;box-sizing:border-box}body{font-family:-apple-system,BlinkMacSystemFont,sans-serif;background:#F7F4F0;color:#2E3138;padding:24px;min-height:100vh;display:flex;flex-direction:column}
+h1{font-size:24px;margin-bottom:8px}h1 span{color:#FF5A4E}.stats{display:flex;gap:16px;margin:20px 0}
+.stat{background:#fff;border:1px solid #e8e5e0;border-radius:8px;padding:16px;flex:1;text-align:center;box-shadow:0 2px 8px rgba(255,90,78,0.06)}
+.stat .num{font-size:28px;font-weight:700;color:#FF5A4E}.stat .label{font-size:12px;color:#8b8b8b;margin-top:4px}
+table{width:100%;border-collapse:collapse;margin-top:20px;background:#fff;border-radius:8px;overflow:hidden;box-shadow:0 2px 8px rgba(0,0,0,0.04)}
+th,td{padding:10px 12px;text-align:left;border-bottom:1px solid #f0ede8}th{background:#faf8f5;font-weight:600;font-size:13px;color:#2E3138}
+tr:hover{background:#fff5f3}.tier{display:inline-block;padding:2px 8px;border-radius:12px;font-size:11px;font-weight:600}
+.tier-strong{background:#FF5A4E18;color:#FF5A4E}.tier-moderate{background:#FFB3A730;color:#d4770a}.tier-weak{background:#f0ede8;color:#8b8b8b}
+.footer{margin-top:auto;padding:16px 0;text-align:center;font-size:12px;color:#8b8b8b;border-top:1px solid #f0ede8}
+.footer a{color:#FF5A4E;text-decoration:none}.footer a:hover{text-decoration:underline}
+.glow{position:fixed;top:-100px;right:-100px;width:300px;height:300px;background:radial-gradient(circle,#FFB3A720,#FFD7D010,transparent 70%);pointer-events:none;z-index:0}
+</style></head><body>
+<div class="glow"></div>
+<h1>🧠 <span>Cell</span> — Dashboard</h1>
+<div class="stats">
+<div class="stat"><div class="num">${patterns.length}</div><div class="label">Total Patterns</div></div>
+<div class="stat"><div class="num">${strong.length}</div><div class="label">Strong (>0.80)</div></div>
+<div class="stat"><div class="num">${moderate.length}</div><div class="label">Moderate</div></div>
+<div class="stat"><div class="num">${signals}</div><div class="label">Signals</div></div>
+</div>
+<table><thead><tr><th>Pattern</th><th>Change</th><th>Confidence</th><th>Tier</th><th>Signals</th></tr></thead><tbody>${rows}</tbody></table>
+<div class="footer"><a href="https://github.com/thevinsoni/cell" target="_blank">FIVO Cell</a> — Open source. Local-first. Free forever.</div>
 </body></html>`);
 });
 // ─── CROSS-LANGUAGE MAPPINGS ──────────────────────────
@@ -875,7 +874,7 @@ app.post('/playbook/generate', (req, res) => {
         res.status(400).json({ error: 'projectId required' });
         return;
     }
-    const profile = require('../core/project-dna').getProjectProfile(projectId);
+    const profile = require('../../03-knowledge/decisions/').getProjectProfile(projectId);
     if (!profile) {
         res.status(404).json({ error: 'project profile not found. Build project DNA first via POST /project/build' });
         return;
@@ -935,46 +934,14 @@ app.post('/streaming/stop', (_req, res) => {
     (0, ws_client_1.stopStreaming)();
     res.json({ status: 'stopped' });
 });
-// ─── CLOUD SYNC ────────────────────────────────────────
-app.get('/sync/cloud-url', (_req, res) => { res.json({ cloudUrl: (0, cloud_client_1.getCloudUrl)() }); });
-app.get('/sync/status', async (_req, res) => {
-    try {
-        const status = await (0, cloud_client_1.checkSyncStatus)();
-        res.json({ cloudUrl: (0, cloud_client_1.getCloudUrl)(), ...(status || { synced: false, error: 'cloud unreachable' }) });
-    }
-    catch (e) {
-        res.status(502).json({ error: 'sync check failed' });
-    }
-});
-app.post('/sync/push', async (req, res) => {
-    try {
-        const { patterns } = req.body;
-        if (!Array.isArray(patterns)) {
-            res.status(400).json({ error: 'patterns array required' });
-            return;
-        }
-        const ok = await (0, cloud_client_1.pushPatterns)(patterns, patterns.length, 'unknown', 'unknown');
-        if (!ok) {
-            res.status(502).json({ error: 'push failed' });
-            return;
-        }
-        res.json({ synced: true, count: patterns.length });
-    }
-    catch (e) {
-        res.status(502).json({ error: 'push failed' });
-    }
+app.get('/sync/queue-status', (_req, res) => {
+    res.json({ pending: engines.offlineQueue.getPendingCount?.() || 0, lastFlush: engines.offlineQueue.getLastFlush?.() || null });
 });
 app.get('/sync/queue-status', (_req, res) => {
     res.json({ pending: engines.offlineQueue.getPendingCount?.() || 0, lastFlush: engines.offlineQueue.getLastFlush?.() || null });
 });
-app.post('/sync/pull', async (_req, res) => {
-    try {
-        const prior = await (0, cloud_client_1.pullCommunityPrior)();
-        res.json({ synced: true, communityPatterns: prior?.length || 0 });
-    }
-    catch (e) {
-        res.status(502).json({ error: 'pull failed' });
-    }
+app.get('/sync/queue-status', (_req, res) => {
+    res.json({ pending: engines.offlineQueue.getPendingCount?.() || 0, lastFlush: engines.offlineQueue.getLastFlush?.() || null });
 });
 // ─── PHASE 9 ENDPOINTS ──────────────────────────────
 app.get('/models/insights', (req, res) => {
@@ -1428,8 +1395,8 @@ app.post('/intelligence/reset', (_req, res) => {
     res.json({ reset: true });
 });
 // ─── CONTEXT INJECTION ───────────────────────────────
-const prompt_builder_1 = require("../core/prompt-builder");
-const session_memory_1 = require("../core/session-memory");
+const prompt_builder_1 = require("../../01-context/context/prompt-builder");
+const session_memory_1 = require("../../01-context/sessions/session-memory");
 const sessionMemory = new session_memory_1.SessionMemory();
 app.post('/session/start', (req, res) => {
     const { toolName, project } = req.body;
@@ -1474,7 +1441,7 @@ app.get('/context/inject', (req, res) => {
 app.get('/predict', (req, res) => {
     const project = String(req.query.project || '');
     const type = String(req.query.type || '');
-    Promise.resolve().then(() => __importStar(require('../predictive-intelligence'))).then(({ getAllPredictions }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/predictive-intelligence'))).then(({ getAllPredictions }) => {
         const predictions = getAllPredictions(project || undefined);
         const filtered = type ? predictions.filter(p => p.type === type) : predictions;
         res.json({ predictions: filtered, count: filtered.length });
@@ -1482,18 +1449,18 @@ app.get('/predict', (req, res) => {
 });
 app.get('/predict-risk/:file', (req, res) => {
     const file = req.params.file;
-    Promise.resolve().then(() => __importStar(require('../predictive-intelligence'))).then(({ calculateFileRisk }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/predictive-intelligence'))).then(({ calculateFileRisk }) => {
         res.json(calculateFileRisk(file));
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/predict-time/:feature', (req, res) => {
     const feature = req.params.feature;
-    Promise.resolve().then(() => __importStar(require('../predictive-intelligence'))).then(({ estimateFeatureTime }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/predictive-intelligence'))).then(({ estimateFeatureTime }) => {
         res.json(estimateFeatureTime(feature));
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/tools/compare', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../cross-model-memory'))).then(({ compareTools }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/cross-model-memory'))).then(({ compareTools }) => {
         res.json({ tools: compareTools() });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
@@ -1503,104 +1470,89 @@ app.get('/tools/suggest', (req, res) => {
         res.status(400).json({ error: 'task query param required' });
         return;
     }
-    Promise.resolve().then(() => __importStar(require('../cross-model-memory'))).then(({ suggestTool }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/cross-model-memory'))).then(({ suggestTool }) => {
         res.json({ suggestions: suggestTool(taskType) });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/tools/history', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../cross-model-memory'))).then(({ getModelHistory }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/cross-model-memory'))).then(({ getModelHistory }) => {
         res.json({ history: getModelHistory() });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/tools/context/:tool', (req, res) => {
     const tool = req.params.tool;
-    Promise.resolve().then(() => __importStar(require('../cross-model-memory'))).then(({ buildToolSpecificContext }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/decisions/cross-model-memory'))).then(({ buildToolSpecificContext }) => {
         res.json({ context: buildToolSpecificContext(tool) });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/team/health', (req, res) => {
     const project = String(req.query.project || '') || undefined;
-    Promise.resolve().then(() => __importStar(require('../team-collaboration'))).then(({ getTeamHealth }) => {
+    Promise.resolve().then(() => __importStar(require('../../04-team/collab/team-collaboration'))).then(({ getTeamHealth }) => {
         res.json(getTeamHealth(project));
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/team/silos', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../team-collaboration'))).then(({ detectKnowledgeSilos, calculateBusFactor, suggestKnowledgeTransfer }) => {
+    Promise.resolve().then(() => __importStar(require('../../04-team/collab/team-collaboration'))).then(({ detectKnowledgeSilos, calculateBusFactor, suggestKnowledgeTransfer }) => {
         res.json({ silos: detectKnowledgeSilos(), busFactor: calculateBusFactor(), transfers: suggestKnowledgeTransfer() });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/team/style', (req, res) => {
     const project = String(req.query.project || '') || undefined;
-    Promise.resolve().then(() => __importStar(require('../team-collaboration'))).then(({ composeTeamStyle }) => {
+    Promise.resolve().then(() => __importStar(require('../../04-team/collab/team-collaboration'))).then(({ composeTeamStyle }) => {
         res.json(composeTeamStyle(project));
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/team/retro', (req, res) => {
     const days = parseInt(String(req.query.days || '14')) || 14;
     const project = String(req.query.project || '') || undefined;
-    Promise.resolve().then(() => __importStar(require('../team-collaboration'))).then(({ generateSprintRetro }) => {
+    Promise.resolve().then(() => __importStar(require('../../04-team/collab/team-collaboration'))).then(({ generateSprintRetro }) => {
         res.json(generateSprintRetro(days, project));
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/team/onboard/:team', (req, res) => {
     const team = req.params.team;
     const project = String(req.query.project || '') || undefined;
-    Promise.resolve().then(() => __importStar(require('../team-collaboration'))).then(({ generateOnboardingDoc }) => {
+    Promise.resolve().then(() => __importStar(require('../../04-team/collab/team-collaboration'))).then(({ generateOnboardingDoc }) => {
         res.json(generateOnboardingDoc(team, project));
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
-app.get('/community/compare', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../community-v2'))).then(({ benchmarkPersonal, benchmarkBlindSpots }) => {
-        res.json({ benchmarks: benchmarkPersonal(), blindSpots: benchmarkBlindSpots() });
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
-app.get('/community/trends', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../community-v2'))).then(({ detectTrends, getCommunityStats }) => {
-        res.json({ trends: detectTrends(), stats: getCommunityStats() });
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
-app.get('/community/insights', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../community-v2'))).then(({ generateInsights }) => {
-        res.json({ insights: generateInsights() });
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
 app.get('/personal/rhythm', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../personal-intelligence'))).then(({ detectCodingRhythm }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/dna/personal-intelligence'))).then(({ detectCodingRhythm }) => {
         res.json(detectCodingRhythm());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/personal/burnout', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../personal-intelligence'))).then(({ detectBurnout }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/dna/personal-intelligence'))).then(({ detectBurnout }) => {
         res.json(detectBurnout());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/personal/mastery', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../personal-intelligence'))).then(({ getTechMasteryMap }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/dna/personal-intelligence'))).then(({ getTechMasteryMap }) => {
         res.json({ mastery: getTechMasteryMap() });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/personal/growth', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../personal-intelligence'))).then(({ getCareerTrajectory }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/dna/personal-intelligence'))).then(({ getCareerTrajectory }) => {
         res.json(getCareerTrajectory());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/personal/weekly', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../personal-intelligence'))).then(({ generateWeeklyDigest }) => {
+    Promise.resolve().then(() => __importStar(require('../../03-knowledge/dna/personal-intelligence'))).then(({ generateWeeklyDigest }) => {
         res.json(generateWeeklyDigest());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/production/health', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../production'))).then(({ getHealthStatus }) => {
+    Promise.resolve().then(() => __importStar(require('../../07-runtime/setup/production'))).then(({ getHealthStatus }) => {
         res.json(getHealthStatus());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/production/metrics', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../production'))).then(({ getMetrics }) => {
+    Promise.resolve().then(() => __importStar(require('../../07-runtime/setup/production'))).then(({ getMetrics }) => {
         res.json(getMetrics());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/production/security', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../production'))).then(() => {
+    Promise.resolve().then(() => __importStar(require('../../07-runtime/setup/production'))).then(() => {
         const fs = require('fs');
         const path = require('path');
         const os = require('os');
@@ -1614,59 +1566,39 @@ app.get('/production/security', (_req, res) => {
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.post('/production/backup', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../production'))).then(({ autoBackup }) => {
+    Promise.resolve().then(() => __importStar(require('../../07-runtime/setup/production'))).then(({ autoBackup }) => {
         res.json(autoBackup());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.post('/production/optimize', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../production'))).then(({ optimizeDatabase }) => {
+    Promise.resolve().then(() => __importStar(require('../../07-runtime/setup/production'))).then(({ optimizeDatabase }) => {
         res.json(optimizeDatabase());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/ide/debug-style', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../ide-intelligence'))).then(({ initializeIDETables, getDebugStyle }) => {
+    Promise.resolve().then(() => __importStar(require('../../01-context/context/ide-intelligence'))).then(({ initializeIDETables, getDebugStyle }) => {
         initializeIDETables();
         res.json(getDebugStyle());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/ide/prompt-style', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../ide-intelligence'))).then(({ initializeIDETables, getPromptStyle }) => {
+    Promise.resolve().then(() => __importStar(require('../../01-context/context/ide-intelligence'))).then(({ initializeIDETables, getPromptStyle }) => {
         initializeIDETables();
         res.json(getPromptStyle());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/ide/focus', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../ide-intelligence'))).then(({ initializeIDETables, getFocusAnalysis }) => {
+    Promise.resolve().then(() => __importStar(require('../../01-context/context/ide-intelligence'))).then(({ initializeIDETables, getFocusAnalysis }) => {
         initializeIDETables();
         res.json(getFocusAnalysis());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/ide/insights', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../ide-intelligence'))).then(({ initializeIDETables, getIDEInsights }) => {
+    Promise.resolve().then(() => __importStar(require('../../01-context/context/ide-intelligence'))).then(({ initializeIDETables, getIDEInsights }) => {
         initializeIDETables();
         res.json(getIDEInsights());
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
-app.get('/cloud/status', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../cloud-sync'))).then(({ getSyncStatus }) => {
-        res.json(getSyncStatus());
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
-app.post('/cloud/validate', (req, res) => {
-    Promise.resolve().then(() => __importStar(require('../cloud-sync'))).then(({ validatePayload }) => {
-        res.json(validatePayload(req.body || {}));
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
-app.get('/cloud/queue', (_req, res) => {
-    Promise.resolve().then(() => __importStar(require('../cloud-sync'))).then(({ getPendingQueue, retryFailedEntries }) => {
-        res.json({ pending: getPendingQueue(), retryable: retryFailedEntries() });
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
-app.post('/cloud/push', (req, res) => {
-    Promise.resolve().then(() => __importStar(require('../cloud-sync'))).then(({ pushToCloud }) => {
-        pushToCloud(req.body?.data || {}, req.body?.type || 'pattern').then(r => res.json(r));
-    }).catch(e => res.status(500).json({ error: String(e) }));
-});
 // ─── CODE SCANNER (Deep Learning) ──────────────────────
 app.post('/scan/codebase', (req, res) => {
     const { dir, project } = req.body;
@@ -1674,13 +1606,13 @@ app.post('/scan/codebase', (req, res) => {
         res.status(400).json({ error: 'dir required' });
         return;
     }
-    Promise.resolve().then(() => __importStar(require('../code-scanner'))).then(({ scanCodebase }) => {
+    Promise.resolve().then(() => __importStar(require('../../02-scanner/blindspots/code-scanner'))).then(({ scanCodebase }) => {
         const result = scanCodebase(dir, project || require('path').basename(dir));
         res.json(result);
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/scan/profile/:project', (req, res) => {
-    Promise.resolve().then(() => __importStar(require('../code-scanner'))).then(({ getDeveloperProfile }) => {
+    Promise.resolve().then(() => __importStar(require('../../02-scanner/blindspots/code-scanner'))).then(({ getDeveloperProfile }) => {
         const profile = getDeveloperProfile(req.params.project);
         if (!profile) {
             res.status(404).json({ error: 'no profile — run scan first' });
@@ -1691,12 +1623,12 @@ app.get('/scan/profile/:project', (req, res) => {
 });
 app.get('/scan/patterns/:project', (req, res) => {
     const category = req.query.category;
-    Promise.resolve().then(() => __importStar(require('../code-scanner'))).then(({ getCodePatterns }) => {
+    Promise.resolve().then(() => __importStar(require('../../02-scanner/blindspots/code-scanner'))).then(({ getCodePatterns }) => {
         res.json({ patterns: getCodePatterns(req.params.project, category) });
     }).catch(e => res.status(500).json({ error: String(e) }));
 });
 app.get('/scan/report/:project', (req, res) => {
-    Promise.resolve().then(() => __importStar(require('../code-scanner'))).then(({ getDeveloperProfile, getCodePatterns }) => {
+    Promise.resolve().then(() => __importStar(require('../../02-scanner/blindspots/code-scanner'))).then(({ getDeveloperProfile, getCodePatterns }) => {
         const profile = getDeveloperProfile(req.params.project);
         const patterns = getCodePatterns(req.params.project);
         res.json({ project: req.params.project, profile, patterns, patternCount: patterns.length });
@@ -1704,23 +1636,23 @@ app.get('/scan/report/:project', (req, res) => {
 });
 // ─── BEHAVIORAL TRACKING ──────────────────────────────────────
 app.get('/behavior/summary', (req, res) => {
-    const { getBehaviorSummary } = require('../behavioral-tracker');
+    const { getBehaviorSummary } = require('../../03-knowledge/decisions/');
     res.json(getBehaviorSummary(String(req.query.project || undefined)));
 });
 app.get('/behavior/errors', (req, res) => {
-    const { getErrorPatterns, getRecentErrors } = require('../behavioral-tracker');
+    const { getErrorPatterns, getRecentErrors } = require('../../03-knowledge/decisions/');
     res.json({ patterns: getErrorPatterns(String(req.query.project || undefined)), recent: getRecentErrors(10, String(req.query.project || undefined)) });
 });
 app.get('/behavior/decisions', (req, res) => {
-    const { getDecisions } = require('../behavioral-tracker');
+    const { getDecisions } = require('../../03-knowledge/decisions/');
     res.json({ decisions: getDecisions(String(req.query.project || undefined), 20) });
 });
 app.get('/behavior/context', (req, res) => {
-    const { getCurrentContext } = require('../behavioral-tracker');
+    const { getCurrentContext } = require('../../03-knowledge/decisions/');
     res.json(getCurrentContext(String(req.query.project || undefined)) || { task: 'none', files: [] });
 });
 app.get('/behavior/stuck', (req, res) => {
-    const { getStuckPatterns } = require('../behavioral-tracker');
+    const { getStuckPatterns } = require('../../03-knowledge/decisions/');
     res.json({ stuck: getStuckPatterns(String(req.query.project || undefined)) });
 });
 // ─── Session Bridge Helper ────────────────────────────────────────────────
@@ -1855,7 +1787,7 @@ async function handleMCPToolCall(name, args) {
                 return { project: args.project, profile, patterns, patternCount: patterns.length };
             }
             case 'cell_send_signal': {
-                const { logError, logDecision, logContext, logStuck } = require('../behavioral-tracker');
+                const { logError, logDecision, logContext, logStuck } = require('../../03-knowledge/decisions/');
                 const type = args.type;
                 if (type === 'error')
                     return logError({ project: args.project, file: args.file, errorType: 'manual', errorMessage: String(args.editedCode || ''), line: 0 });
@@ -1868,7 +1800,7 @@ async function handleMCPToolCall(name, args) {
                 return { recorded: true };
             }
             case 'cell_get_context': {
-                const { buildContext, formatContextForTool } = require('../core/prompt-builder');
+                const { buildContext, formatContextForTool } = require('../../01-context/context/prompt-builder');
                 // Auto-detect project name when AI doesn't know it. Order of resolution:
                 //   1. args.project (explicit) — highest priority
                 //   2. args.cwd (IDE's current dir basename) — Antigravity/Cursor pass this
@@ -1901,7 +1833,7 @@ async function handleMCPToolCall(name, args) {
                 // If not, return a useful error with the list of known projects.
                 if (resolvedProject) {
                     try {
-                        const { ProjectRegistry } = require('../core/project-registry');
+                        const { ProjectRegistry } = require('../../../core/project-registry');
                         const reg = new ProjectRegistry();
                         const projects = reg.listProjects();
                         const known = projects.find((p) => p.name === resolvedProject || p.path === path.resolve(resolvedProject || ''));
@@ -1930,37 +1862,37 @@ async function handleMCPToolCall(name, args) {
                 };
             }
             case 'cell_scan_full_pc': {
-                const { scanFullPC } = require('../pc-scanner');
+                const { scanFullPC } = require('../../02-scanner/stack/pc-scanner');
                 const result = scanFullPC();
                 return { totalProjects: result.totalProjects, totalFiles: result.totalFiles, totalLines: result.totalLines, profile: result.aggregatedProfile };
             }
             case 'cell_behavior_summary': {
-                const { getBehaviorSummary } = require('../behavioral-tracker');
+                const { getBehaviorSummary } = require('../../03-knowledge/decisions/');
                 return getBehaviorSummary(args.project);
             }
             case 'cell_log_error': {
-                const { logError } = require('../behavioral-tracker');
+                const { logError } = require('../../03-knowledge/decisions/');
                 return logError({ project: args.project, file: args.file, errorType: args.errorType, errorMessage: args.errorMessage, line: args.line });
             }
             case 'cell_log_fix': {
-                const { logErrorFix } = require('../behavioral-tracker');
+                const { logErrorFix } = require('../../03-knowledge/decisions/');
                 logErrorFix({ errorId: args.errorId, fixApplied: args.fixApplied, worked: args.worked, timeToFixMs: args.timeToFixMs });
                 return { recorded: true };
             }
             case 'cell_log_decision': {
-                const { logDecision } = require('../behavioral-tracker');
+                const { logDecision } = require('../../03-knowledge/decisions/');
                 return logDecision({ project: args.project, file: args.file, decision: args.decision, approach: args.approach, worked: args.worked });
             }
             case 'cell_log_context': {
-                const { logContext } = require('../behavioral-tracker');
+                const { logContext } = require('../../03-knowledge/decisions/');
                 return logContext({ project: args.project, task: args.task, files: args.files });
             }
             case 'cell_log_stuck': {
-                const { logStuck } = require('../behavioral-tracker');
+                const { logStuck } = require('../../03-knowledge/decisions/');
                 return logStuck({ project: args.project, file: args.file, description: args.description });
             }
             case 'cell_session_bridge': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 const project = args.project;
                 const tool = args.tool || 'unknown';
@@ -2007,7 +1939,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_session_end': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 const sessionId = args.sessionId;
                 try {
@@ -2024,7 +1956,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_session_log': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 try {
                     const sessionId = args.sessionId || 0;
@@ -2064,7 +1996,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_session_start': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 try {
                     const project = args.project || 'unknown';
@@ -2084,7 +2016,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_session_status': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 try {
                     const sessionId = args.sessionId;
@@ -2114,7 +2046,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_session_recent': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 try {
                     const project = args.project;
@@ -2141,7 +2073,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_session_recommendations': {
-                const { SessionMemory } = require('../core/session-memory');
+                const { SessionMemory } = require('../../01-context/sessions/session-memory');
                 const memory = new SessionMemory();
                 try {
                     const project = args.project || 'unknown';
@@ -2178,7 +2110,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_list_projects': {
-                const { ProjectRegistry } = require('../core/project-registry');
+                const { ProjectRegistry } = require('../../../core/project-registry');
                 const registry = new ProjectRegistry();
                 try {
                     const projects = registry.listProjects();
@@ -2199,7 +2131,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_get_project': {
-                const { ProjectRegistry } = require('../core/project-registry');
+                const { ProjectRegistry } = require('../../../core/project-registry');
                 const registry = new ProjectRegistry();
                 try {
                     const name = args.name || '';
@@ -2220,7 +2152,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_detect_project': {
-                const { ProjectRegistry } = require('../core/project-registry');
+                const { ProjectRegistry } = require('../../../core/project-registry');
                 const registry = new ProjectRegistry();
                 try {
                     const cwd = args.cwd || '';
@@ -2247,7 +2179,7 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_register_project': {
-                const { ProjectRegistry } = require('../core/project-registry');
+                const { ProjectRegistry } = require('../../../core/project-registry');
                 const registry = new ProjectRegistry();
                 try {
                     const id = registry.registerProject({
@@ -2267,7 +2199,7 @@ async function handleMCPToolCall(name, args) {
                 try {
                     const project = args.project || '';
                     const limit = args.limit || 20;
-                    const { getFileKnowledgeGraph } = require('../core/knowledge-graph-store');
+                    const { getFileKnowledgeGraph } = require('../../06-memory/stores/knowledge-graph-store');
                     const graph = getFileKnowledgeGraph(project);
                     return {
                         stats: graph.stats,
@@ -2285,7 +2217,7 @@ async function handleMCPToolCall(name, args) {
                 try {
                     const project = args.project || '';
                     const file = args.file || '';
-                    const { computeBlastRadius } = require('../core/knowledge-graph-store');
+                    const { computeBlastRadius } = require('../../06-memory/stores/knowledge-graph-store');
                     const radius = computeBlastRadius(project, file);
                     return radius;
                 }
@@ -2297,7 +2229,7 @@ async function handleMCPToolCall(name, args) {
             case 'cell_graph_tech': {
                 try {
                     const project = args.project || '';
-                    const { getTechProficiency } = require('../core/knowledge-graph-store');
+                    const { getTechProficiency } = require('../../06-memory/stores/knowledge-graph-store');
                     const techs = getTechProficiency(project);
                     const strong = techs.filter((t) => t.proficiencyScore >= 70);
                     const learning = techs.filter((t) => t.proficiencyScore < 50);
@@ -2319,7 +2251,7 @@ async function handleMCPToolCall(name, args) {
             case 'cell_graph_stats': {
                 try {
                     const project = args.project || '';
-                    const { getPatternGraphStats, getFileKnowledgeGraph, getTechProficiency } = require('../core/knowledge-graph-store');
+                    const { getPatternGraphStats, getFileKnowledgeGraph, getTechProficiency } = require('../../06-memory/stores/knowledge-graph-store');
                     const patternStats = getPatternGraphStats(project);
                     const fileGraph = getFileKnowledgeGraph(project);
                     const techs = getTechProficiency(project);
@@ -2337,7 +2269,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_silos': {
                 try {
-                    const { detectKnowledgeSilos } = require('../team-collaboration');
+                    const { detectKnowledgeSilos } = require('../../04-team/collab/team-collaboration');
                     const silos = detectKnowledgeSilos();
                     return {
                         count: silos.length,
@@ -2355,7 +2287,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_bus_factor': {
                 try {
-                    const { calculateBusFactor } = require('../team-collaboration');
+                    const { calculateBusFactor } = require('../../04-team/collab/team-collaboration');
                     return calculateBusFactor();
                 }
                 catch (err) {
@@ -2365,7 +2297,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_health': {
                 try {
-                    const { getTeamHealth } = require('../team-collaboration');
+                    const { getTeamHealth } = require('../../04-team/collab/team-collaboration');
                     return getTeamHealth(args.project || undefined);
                 }
                 catch (err) {
@@ -2375,7 +2307,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_onboard': {
                 try {
-                    const { generateOnboardingDoc } = require('../team-collaboration');
+                    const { generateOnboardingDoc } = require('../../04-team/collab/team-collaboration');
                     const teamName = args.teamName || 'Team';
                     const project = args.project || undefined;
                     return generateOnboardingDoc(teamName, project);
@@ -2387,7 +2319,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_retro': {
                 try {
-                    const { generateSprintRetro } = require('../team-collaboration');
+                    const { generateSprintRetro } = require('../../04-team/collab/team-collaboration');
                     const days = args.days || 14;
                     const project = args.project || undefined;
                     return generateSprintRetro(days, project);
@@ -2399,7 +2331,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_handoff': {
                 try {
-                    const { generateHandoff } = require('../team-collaboration');
+                    const { generateHandoff } = require('../../04-team/collab/team-collaboration');
                     return generateHandoff(args.from || '', args.to || '', args.project || '');
                 }
                 catch (err) {
@@ -2409,7 +2341,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_knowledge_transfer': {
                 try {
-                    const { suggestKnowledgeTransfer } = require('../team-collaboration');
+                    const { suggestKnowledgeTransfer } = require('../../04-team/collab/team-collaboration');
                     const suggestions = suggestKnowledgeTransfer();
                     return {
                         count: suggestions.length,
@@ -2426,7 +2358,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_style': {
                 try {
-                    const { composeTeamStyle } = require('../team-collaboration');
+                    const { composeTeamStyle } = require('../../04-team/collab/team-collaboration');
                     return composeTeamStyle(args.project || undefined);
                 }
                 catch (err) {
@@ -2436,7 +2368,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_team_dashboard': {
                 try {
-                    const { detectKnowledgeSilos, calculateBusFactor, getTeamHealth, composeTeamStyle } = require('../team-collaboration');
+                    const { detectKnowledgeSilos, calculateBusFactor, getTeamHealth, composeTeamStyle } = require('../../04-team/collab/team-collaboration');
                     const project = args.project || undefined;
                     const silos = detectKnowledgeSilos();
                     const busFactor = calculateBusFactor();
@@ -2457,7 +2389,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_stats': {
                 try {
-                    const { getCommunityStats } = require('../core/community-store');
+                    const { getCommunityStats } = require('../../06-memory/stores/community-store');
                     return getCommunityStats();
                 }
                 catch (err) {
@@ -2467,7 +2399,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_share': {
                 try {
-                    const { shareCommunityPattern, validatePrivacy } = require('../core/community-store');
+                    const { shareCommunityPattern, validatePrivacy } = require('../../06-memory/stores/community-store');
                     const rule = args.rule || '';
                     const validation = validatePrivacy(rule);
                     if (!validation.safe) {
@@ -2489,7 +2421,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_patterns': {
                 try {
-                    const { getCommunityPatterns } = require('../core/community-store');
+                    const { getCommunityPatterns } = require('../../06-memory/stores/community-store');
                     const patterns = getCommunityPatterns({
                         category: args.category,
                         language: args.language,
@@ -2505,7 +2437,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_vote': {
                 try {
-                    const { voteCommunityPattern } = require('../core/community-store');
+                    const { voteCommunityPattern } = require('../../06-memory/stores/community-store');
                     return voteCommunityPattern(args.patternId || '', args.upvote !== false);
                 }
                 catch (err) {
@@ -2515,7 +2447,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_insights': {
                 try {
-                    const { getCommunityInsights } = require('../core/community-store');
+                    const { getCommunityInsights } = require('../../06-memory/stores/community-store');
                     const insights = getCommunityInsights({
                         severity: args.severity,
                         category: args.category,
@@ -2530,7 +2462,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_benchmarks': {
                 try {
-                    const { getBenchmarks } = require('../core/community-store');
+                    const { getBenchmarks } = require('../../06-memory/stores/community-store');
                     const benchmarks = getBenchmarks({
                         category: args.category,
                         limit: args.limit || 50,
@@ -2544,7 +2476,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_trends': {
                 try {
-                    const { getTechEvolution } = require('../core/community-store');
+                    const { getTechEvolution } = require('../../06-memory/stores/community-store');
                     return getTechEvolution();
                 }
                 catch (err) {
@@ -2554,7 +2486,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_failures': {
                 try {
-                    const { getFailurePatterns } = require('../core/community-store');
+                    const { getFailurePatterns } = require('../../06-memory/stores/community-store');
                     const failures = getFailurePatterns({
                         language: args.language,
                         limit: args.limit || 10,
@@ -2568,7 +2500,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_validate': {
                 try {
-                    const { validatePrivacy } = require('../core/community-store');
+                    const { validatePrivacy } = require('../../06-memory/stores/community-store');
                     return validatePrivacy(args.rule || '');
                 }
                 catch (err) {
@@ -2578,7 +2510,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_community_dashboard': {
                 try {
-                    const { getCommunityStats, getTechEvolution, getCommunityInsights, getBenchmarks } = require('../core/community-store');
+                    const { getCommunityStats, getTechEvolution, getCommunityInsights, getBenchmarks } = require('../../06-memory/stores/community-store');
                     const stats = getCommunityStats();
                     const trends = getTechEvolution();
                     const insights = getCommunityInsights({ severity: 'critical', limit: 5 });
@@ -2598,7 +2530,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_decision_log': {
                 try {
-                    const { logDecisionOutcome } = require('../core/usage-intelligence-store');
+                    const { logDecisionOutcome } = require('../../06-memory/stores/usage-intelligence-store');
                     return logDecisionOutcome({
                         project: args.project || 'unknown',
                         technology: args.technology || '',
@@ -2615,7 +2547,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_decision_patterns': {
                 try {
-                    const { getDecisionPatterns } = require('../core/usage-intelligence-store');
+                    const { getDecisionPatterns } = require('../../06-memory/stores/usage-intelligence-store');
                     const patterns = getDecisionPatterns(args.project || 'unknown');
                     return {
                         count: patterns.length,
@@ -2632,7 +2564,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_repeat_mistakes': {
                 try {
-                    const { detectRepeatMistakes } = require('../core/usage-intelligence-store');
+                    const { detectRepeatMistakes } = require('../../06-memory/stores/usage-intelligence-store');
                     const mistakes = detectRepeatMistakes(args.project || 'unknown');
                     return {
                         count: mistakes.length,
@@ -2650,7 +2582,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_ai_stats': {
                 try {
-                    const { getAIInteractionStats } = require('../core/usage-intelligence-store');
+                    const { getAIInteractionStats } = require('../../06-memory/stores/usage-intelligence-store');
                     return getAIInteractionStats(args.project || 'unknown');
                 }
                 catch (err) {
@@ -2660,7 +2592,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_productivity': {
                 try {
-                    const { logProductivitySignal, getProductivitySignals } = require('../core/usage-intelligence-store');
+                    const { logProductivitySignal, getProductivitySignals } = require('../../06-memory/stores/usage-intelligence-store');
                     const project = args.project || 'unknown';
                     // If signalType + duration provided, log; otherwise just read
                     if (args.signalType && args.durationMinutes !== undefined) {
@@ -2682,7 +2614,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_skills': {
                 try {
-                    const { getSkillProgression } = require('../core/usage-intelligence-store');
+                    const { getSkillProgression } = require('../../06-memory/stores/usage-intelligence-store');
                     return getSkillProgression(args.project || 'unknown');
                 }
                 catch (err) {
@@ -2692,7 +2624,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_burnout': {
                 try {
-                    const { getBurnoutSignals } = require('../core/usage-intelligence-store');
+                    const { getBurnoutSignals } = require('../../06-memory/stores/usage-intelligence-store');
                     return getBurnoutSignals(args.project || 'unknown');
                 }
                 catch (err) {
@@ -2702,7 +2634,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_usage_dashboard': {
                 try {
-                    const { getUsageDashboard } = require('../core/usage-intelligence-store');
+                    const { getUsageDashboard } = require('../../06-memory/stores/usage-intelligence-store');
                     return getUsageDashboard(args.project || 'unknown');
                 }
                 catch (err) {
@@ -2712,7 +2644,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_watch_start': {
                 try {
-                    const { startWatcher } = require('../core/live-watcher');
+                    const { startWatcher } = require('../watcher/live-watcher');
                     return startWatcher(args.project || 'unknown', args.dir || process.cwd());
                 }
                 catch (err) {
@@ -2722,7 +2654,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_watch_stop': {
                 try {
-                    const { stopWatcher } = require('../core/live-watcher');
+                    const { stopWatcher } = require('../watcher/live-watcher');
                     return stopWatcher(args.project || 'unknown');
                 }
                 catch (err) {
@@ -2732,7 +2664,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_watch_status': {
                 try {
-                    const { getWatcherStatus, getActiveWatchers } = require('../core/live-watcher');
+                    const { getWatcherStatus, getActiveWatchers } = require('../watcher/live-watcher');
                     if (args.project) {
                         const status = getWatcherStatus(args.project);
                         if (!status)
@@ -2749,7 +2681,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_watch_events': {
                 try {
-                    const { getLiveEvents } = require('../core/live-watcher');
+                    const { getLiveEvents } = require('../watcher/live-watcher');
                     return { events: getLiveEvents(args.project || 'unknown', args.limit || 50, args.eventType) };
                 }
                 catch (err) {
@@ -2759,7 +2691,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_watch_refresh': {
                 try {
-                    const { performAutoRefresh } = require('../core/live-watcher');
+                    const { performAutoRefresh } = require('../watcher/live-watcher');
                     return performAutoRefresh(args.project || 'unknown', args.force === true);
                 }
                 catch (err) {
@@ -2769,7 +2701,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_watch_check': {
                 try {
-                    const { checkIfNeedsRefresh } = require('../core/live-watcher');
+                    const { checkIfNeedsRefresh } = require('../watcher/live-watcher');
                     return checkIfNeedsRefresh(args.project || 'unknown');
                 }
                 catch (err) {
@@ -2779,7 +2711,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_blindspots_scan': {
                 try {
-                    const { scanDirectoryForBlindSpots } = require('../core/enhanced-blind-spots');
+                    const { scanDirectoryForBlindSpots } = require('../../../core/enhanced-blind-spots');
                     const dir = args.dir || process.cwd();
                     const max = args.maxFiles || 200;
                     const spots = scanDirectoryForBlindSpots(dir, max);
@@ -2792,7 +2724,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_blindspots_report': {
                 try {
-                    const { scanDirectoryForBlindSpots, formatBlindSpotReport, summarizeBlindSpots } = require('../core/enhanced-blind-spots');
+                    const { scanDirectoryForBlindSpots, formatBlindSpotReport, summarizeBlindSpots } = require('../../../core/enhanced-blind-spots');
                     const dir = args.dir || process.cwd();
                     const max = args.maxFiles || 200;
                     const spots = scanDirectoryForBlindSpots(dir, max);
@@ -2810,7 +2742,7 @@ async function handleMCPToolCall(name, args) {
             }
             case 'cell_blindspots_summary': {
                 try {
-                    const { getCategoryCounts } = require('../core/enhanced-blind-spots');
+                    const { getCategoryCounts } = require('../../../core/enhanced-blind-spots');
                     const dir = args.dir || process.cwd();
                     return { directory: dir, byCategory: getCategoryCounts(dir) };
                 }
@@ -2820,11 +2752,11 @@ async function handleMCPToolCall(name, args) {
                 }
             }
             case 'cell_predict': {
-                const { generatePredictions } = require('../predictive-engine');
+                const { generatePredictions } = require('../../03-knowledge/decisions/');
                 return generatePredictions(args.project);
             }
             case 'cell_model_track': {
-                const { recordModelInteraction } = require('../cross-model-engine');
+                const { recordModelInteraction } = require('../../03-knowledge/decisions/');
                 recordModelInteraction({
                     modelName: args.modelName,
                     taskType: args.taskType,
@@ -2836,7 +2768,7 @@ async function handleMCPToolCall(name, args) {
                 return { recorded: true };
             }
             case 'cell_model_recommend': {
-                const { getModelRecommendations } = require('../cross-model-engine');
+                const { getModelRecommendations } = require('../../03-knowledge/decisions/');
                 return { recommendations: getModelRecommendations() };
             }
             default:
@@ -2854,7 +2786,7 @@ app.post('/mcp', async (req, res) => {
     // Wrap entire handler in try/catch so uncaught errors don't 500 silently
     try {
         // ─── Security: rate limit + input validation ─────────────────────────
-        const { checkRateLimit, getClientId, validateToolArgs, securityHeaders } = require('../core/security');
+        const { checkRateLimit, getClientId, validateToolArgs, securityHeaders } = require('../../05-community/privacy/security');
         for (const [k, v] of Object.entries(securityHeaders()))
             res.setHeader(k, v);
         const clientId = getClientId(req);
@@ -2950,6 +2882,16 @@ const server = app.listen(PORT, () => {
     console.log(`Cell Daemon running on http://localhost:${PORT}`);
     console.log(`MCP endpoint: POST http://localhost:${PORT}/mcp`);
     console.log(`Health: http://localhost:${PORT}/health`);
+    try {
+        const { restoreActiveWatchers } = require('../watcher/live-watcher');
+        const restored = restoreActiveWatchers();
+        console.log(`[cell] Restored ${restored.restored} watcher(s).`);
+        if (restored.failed.length > 0)
+            console.log(`[cell] Watcher restore skipped ${restored.failed.length} stale entry(s).`);
+    }
+    catch (e) {
+        console.log('[cell] Watcher restore skipped: ' + String(e));
+    }
 });
 server.on('error', (err) => {
     if (err.code === 'EADDRINUSE') {