kynjal-cli 3.1.3 → 3.1.4

package/.claude/helpers/statusline.cjs

@@ -1,48 +1,30 @@
 #!/usr/bin/env node
 /**
- * KynjalFlow Statusline Generator
+ * KynjalFlow Statusline Generator (Optimized)
  * Displays real-time V3 implementation progress and system status
  *
- * Usage: node statusline.cjs [options]
+ * Usage: node statusline.cjs [--json] [--compact]
  *
- * Options:
- *   (default)   Safe multi-line output with collision zone avoidance
- *   --single    Single-line output (completely avoids collision)
- *   --unsafe    Legacy multi-line without collision avoidance
- *   --legacy    Alias for --unsafe
- *   --json      JSON output with pretty printing
- *   --compact   JSON output without formatting
- *
- * Collision Zone Fix (Issue #985):
- * Claude Code writes its internal status (e.g., "7s • 1p") at absolute
- * terminal coordinates (columns 15-25 on second-to-last line). The safe
- * mode pads the collision line with spaces to push content past column 25.
- *
- * IMPORTANT: This file uses .cjs extension to work in ES module projects.
- * The require() syntax is intentional for CommonJS compatibility.
+ * Performance notes:
+ * - Single git execSync call (combines branch + status + upstream)
+ * - No recursive file reading (only stat/readdir, never read test contents)
+ * - No ps aux calls (uses process.memoryUsage() + file-based metrics)
+ * - Strict 2s timeout on all execSync calls
+ * - Shared settings cache across functions
  */
 
 /* eslint-disable @typescript-eslint/no-var-requires */
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
+const os = require('os');
 
 // Configuration
 const CONFIG = {
-  enabled: true,
-  showProgress: true,
-  showSecurity: true,
-  showSwarm: true,
-  showHooks: true,
-  showPerformance: true,
-  refreshInterval: 5000,
   maxAgents: 15,
-  topology: 'hierarchical-mesh',
 };
 
-// Cross-platform helpers
-const isWindows = process.platform === 'win32';
-const nullDevice = isWindows ? 'NUL' : '/dev/null';
+const CWD = process.cwd();
 
 // ANSI colors
 const c = {
@@ -64,533 +46,725 @@ const c = {
   brightWhite: '\x1b[1;37m',
 };
 
-// Get user info
-function getUserInfo() {
-  let name = 'user';
-  let gitBranch = '';
-  let modelName = 'Unknown';
-
+// Safe execSync with strict timeout (returns empty string on failure)
+function safeExec(cmd, timeoutMs = 2000) {
   try {
-    const gitUserCmd = isWindows
-      ? 'git config user.name 2>NUL || echo user'
-      : 'git config user.name 2>/dev/null || echo "user"';
-    const gitBranchCmd = isWindows
-      ? 'git branch --show-current 2>NUL || echo.'
-      : 'git branch --show-current 2>/dev/null || echo ""';
-    name = execSync(gitUserCmd, { encoding: 'utf-8' }).trim();
-    gitBranch = execSync(gitBranchCmd, { encoding: 'utf-8' }).trim();
-    if (gitBranch === '.') gitBranch = ''; // Windows echo. outputs a dot
-  } catch (e) {
-    // Ignore errors
+    return execSync(cmd, {
+      encoding: 'utf-8',
+      timeout: timeoutMs,
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+  } catch {
+    return '';
   }
+}
 
-  // Auto-detect model from Claude Code's config
+// Safe JSON file reader (returns null on failure)
+function readJSON(filePath) {
   try {
-    const homedir = require('os').homedir();
-    const claudeConfigPath = path.join(homedir, '.claude.json');
-    if (fs.existsSync(claudeConfigPath)) {
-      const claudeConfig = JSON.parse(fs.readFileSync(claudeConfigPath, 'utf-8'));
-      // Try to find lastModelUsage - check current dir and parent dirs
-      let lastModelUsage = null;
-      const cwd = process.cwd();
-      if (claudeConfig.projects) {
-        // Try exact match first, then check if cwd starts with any project path
-        for (const [projectPath, projectConfig] of Object.entries(claudeConfig.projects)) {
-          if (cwd === projectPath || cwd.startsWith(projectPath + '/')) {
-            lastModelUsage = projectConfig.lastModelUsage;
-            break;
-          }
-        }
-      }
-      if (lastModelUsage) {
-        const modelIds = Object.keys(lastModelUsage);
-        if (modelIds.length > 0) {
-          // Take the last model (most recently added to the object)
-          // Or find the one with most tokens (most actively used this session)
-          let modelId = modelIds[modelIds.length - 1];
-          if (modelIds.length > 1) {
-            // If multiple models, pick the one with most total tokens
-            let maxTokens = 0;
-            for (const id of modelIds) {
-              const usage = lastModelUsage[id];
-              const total = (usage.inputTokens || 0) + (usage.outputTokens || 0);
-              if (total > maxTokens) {
-                maxTokens = total;
-                modelId = id;
-              }
-            }
-          }
-          // Parse model ID to human-readable name
-          if (modelId.includes('opus-4-6') || modelId.includes('opus-4.6')) modelName = 'Opus 4.6';
-          else if (modelId.includes('opus')) modelName = 'Opus 4.5';
-          else if (modelId.includes('sonnet-4-6') || modelId.includes('sonnet-4.6')) modelName = 'Sonnet 4.6';
-          else if (modelId.includes('sonnet')) modelName = 'Sonnet 4';
-          else if (modelId.includes('haiku')) modelName = 'Haiku 4.5';
-          else modelName = modelId.split('-').slice(1, 3).join(' ');
-        }
-      }
+    if (fs.existsSync(filePath)) {
+      return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
     }
-  } catch (e) {
-    // Fallback to Unknown if can't read config
-  }
+  } catch { /* ignore */ }
+  return null;
+}
 
-  return { name, gitBranch, modelName };
+// Safe file stat (returns null on failure)
+function safeStat(filePath) {
+  try {
+    return fs.statSync(filePath);
+  } catch { /* ignore */ }
+  return null;
 }
 
-// Get learning stats from intelligence loop data (ADR-050)
-function getLearningStats() {
-  let patterns = 0;
-  let sessions = 0;
-  let trajectories = 0;
-  let edges = 0;
-  let confidenceMean = 0;
-  let accessedCount = 0;
-  let trend = 'STABLE';
-
-  // PRIMARY: Read from intelligence loop data files
-  const dataDir = path.join(process.cwd(), '.claude-flow', 'data');
-
-  // 1. graph-state.json — authoritative node/edge counts
-  const graphPath = path.join(dataDir, 'graph-state.json');
-  if (fs.existsSync(graphPath)) {
-    try {
-      const graph = JSON.parse(fs.readFileSync(graphPath, 'utf-8'));
-      patterns = graph.nodes ? Object.keys(graph.nodes).length : 0;
-      edges = Array.isArray(graph.edges) ? graph.edges.length : 0;
-    } catch (e) { /* ignore */ }
-  }
+// Shared settings cache — read once, used by multiple functions
+let _settingsCache = undefined;
+function getSettings() {
+  if (_settingsCache !== undefined) return _settingsCache;
+  _settingsCache = readJSON(path.join(CWD, '.claude', 'settings.json'))
+                || readJSON(path.join(CWD, '.claude', 'settings.local.json'))
+                || null;
+  return _settingsCache;
+}
 
-  // 2. ranked-context.json — confidence and access data
-  const rankedPath = path.join(dataDir, 'ranked-context.json');
-  if (fs.existsSync(rankedPath)) {
-    try {
-      const ranked = JSON.parse(fs.readFileSync(rankedPath, 'utf-8'));
-      if (ranked.entries && ranked.entries.length > 0) {
-        patterns = Math.max(patterns, ranked.entries.length);
-        let confSum = 0;
-        let accCount = 0;
-        for (let i = 0; i < ranked.entries.length; i++) {
-          confSum += (ranked.entries[i].confidence || 0);
-          if ((ranked.entries[i].accessCount || 0) > 0) accCount++;
-        }
-        confidenceMean = confSum / ranked.entries.length;
-        accessedCount = accCount;
-      }
-    } catch (e) { /* ignore */ }
-  }
+// ─── Data Collection (all pure-Node.js or single-exec) ──────────
 
-  // 3. intelligence-snapshot.json — trend history
-  const snapshotPath = path.join(dataDir, 'intelligence-snapshot.json');
-  if (fs.existsSync(snapshotPath)) {
-    try {
-      const snapshot = JSON.parse(fs.readFileSync(snapshotPath, 'utf-8'));
-      if (snapshot.history && snapshot.history.length >= 2) {
-        const first = snapshot.history[0];
-        const last = snapshot.history[snapshot.history.length - 1];
-        const confDrift = (last.confidenceMean || 0) - (first.confidenceMean || 0);
-        trend = confDrift > 0.01 ? 'IMPROVING' : confDrift < -0.01 ? 'DECLINING' : 'STABLE';
-        sessions = Math.max(sessions, snapshot.history.length);
-      }
-    } catch (e) { /* ignore */ }
-  }
+// Get all git info in ONE shell call
+function getGitInfo() {
+  const result = {
+    name: 'user', gitBranch: '', modified: 0, untracked: 0,
+    staged: 0, ahead: 0, behind: 0,
+  };
 
-  // 4. auto-memory-store.json — fallback entry count
-  if (patterns === 0) {
-    const autoMemPath = path.join(dataDir, 'auto-memory-store.json');
-    if (fs.existsSync(autoMemPath)) {
-      try {
-        const data = JSON.parse(fs.readFileSync(autoMemPath, 'utf-8'));
-        patterns = Array.isArray(data) ? data.length : (data.entries ? data.entries.length : 0);
-      } catch (e) { /* ignore */ }
+  // Single shell: get user.name, branch, porcelain status, and upstream diff
+  const script = [
+    'git config user.name 2>/dev/null || echo user',
+    'echo "---SEP---"',
+    'git branch --show-current 2>/dev/null',
+    'echo "---SEP---"',
+    'git status --porcelain 2>/dev/null',
+    'echo "---SEP---"',
+    'git rev-list --left-right --count HEAD...@{upstream} 2>/dev/null || echo "0 0"',
+  ].join('; ');
+
+  const raw = safeExec(`sh -c '${script}'`, 3000);
+  if (!raw) return result;
+
+  const parts = raw.split('---SEP---').map(s => s.trim());
+  if (parts.length >= 4) {
+    result.name = parts[0] || 'user';
+    result.gitBranch = parts[1] || '';
+
+    // Parse porcelain status
+    if (parts[2]) {
+      for (const line of parts[2].split('\n')) {
+        if (!line || line.length < 2) continue;
+        const x = line[0], y = line[1];
+        if (x === '?' && y === '?') { result.untracked++; continue; }
+        if (x !== ' ' && x !== '?') result.staged++;
+        if (y !== ' ' && y !== '?') result.modified++;
+      }
     }
+
+    // Parse ahead/behind
+    const ab = (parts[3] || '0 0').split(/\s+/);
+    result.ahead = parseInt(ab[0]) || 0;
+    result.behind = parseInt(ab[1]) || 0;
   }
 
-  // FALLBACK: Legacy memory.db file-size estimation
-  if (patterns === 0) {
-    const memoryPaths = [
-      path.join(process.cwd(), '.swarm', 'memory.db'),
-      path.join(process.cwd(), '.claude', 'memory.db'),
-      path.join(process.cwd(), 'data', 'memory.db'),
-    ];
-    for (let j = 0; j < memoryPaths.length; j++) {
-      if (fs.existsSync(memoryPaths[j])) {
-        try {
-          const dbStats = fs.statSync(memoryPaths[j]);
-          patterns = Math.floor(dbStats.size / 1024 / 2);
+  return result;
+}
+
+// Detect model name from Claude config (pure file reads, no exec)
+function getModelName() {
+  try {
+    const claudeConfig = readJSON(path.join(os.homedir(), '.claude.json'));
+    if (claudeConfig?.projects) {
+      for (const [projectPath, projectConfig] of Object.entries(claudeConfig.projects)) {
+        if (CWD === projectPath || CWD.startsWith(projectPath + '/')) {
+          const usage = projectConfig.lastModelUsage;
+          if (usage) {
+            const ids = Object.keys(usage);
+            if (ids.length > 0) {
+              let modelId = ids[ids.length - 1];
+              let latest = 0;
+              for (const id of ids) {
+                const ts = usage[id]?.lastUsedAt ? new Date(usage[id].lastUsedAt).getTime() : 0;
+                if (ts > latest) { latest = ts; modelId = id; }
+              }
+              if (modelId.includes('opus')) return 'Opus 4.6';
+              if (modelId.includes('sonnet')) return 'Sonnet 4.6';
+              if (modelId.includes('haiku')) return 'Haiku 4.5';
+              return modelId.split('-').slice(1, 3).join(' ');
+            }
+          }
           break;
-        } catch (e) { /* ignore */ }
+        }
       }
     }
+  } catch { /* ignore */ }
+
+  // Fallback: settings.json model field
+  const settings = getSettings();
+  if (settings?.model) {
+    const m = settings.model;
+    if (m.includes('opus')) return 'Opus 4.6';
+    if (m.includes('sonnet')) return 'Sonnet 4.6';
+    if (m.includes('haiku')) return 'Haiku 4.5';
   }
+  return 'Claude Code';
+}
 
-  // Session count from session files
-  const sessionsPath = path.join(process.cwd(), '.claude', 'sessions');
-  if (fs.existsSync(sessionsPath)) {
-    try {
-      const sessionFiles = fs.readdirSync(sessionsPath).filter(f => f.endsWith('.json'));
-      sessions = Math.max(sessions, sessionFiles.length);
-    } catch (e) { /* ignore */ }
+// Get learning stats from memory database (pure stat calls)
+function getLearningStats() {
+  const memoryPaths = [
+    path.join(CWD, '.swarm', 'memory.db'),
+    path.join(CWD, '.kynjalflow', 'memory.db'),
+    path.join(CWD, '.claude', 'memory.db'),
+    path.join(CWD, 'data', 'memory.db'),
+    path.join(CWD, '.agentdb', 'memory.db'),
+  ];
+
+  for (const dbPath of memoryPaths) {
+    const stat = safeStat(dbPath);
+    if (stat) {
+      const sizeKB = stat.size / 1024;
+      const patterns = Math.floor(sizeKB / 2);
+      return {
+        patterns,
+        sessions: Math.max(1, Math.floor(patterns / 10)),
+      };
+    }
   }
 
-  trajectories = Math.floor(patterns / 5);
+  // Check session files count
+  let sessions = 0;
+  try {
+    const sessDir = path.join(CWD, '.claude', 'sessions');
+    if (fs.existsSync(sessDir)) {
+      sessions = fs.readdirSync(sessDir).filter(f => f.endsWith('.json')).length;
+    }
+  } catch { /* ignore */ }
 
-  return { patterns, sessions, trajectories, edges, confidenceMean, accessedCount, trend };
+  return { patterns: 0, sessions };
 }
 
-// Get V3 progress from learning state (grows as system learns)
+// V3 progress from metrics files (pure file reads)
 function getV3Progress() {
   const learning = getLearningStats();
-
-  // DDD progress based on actual learned patterns
-  // New install: 0 patterns = 0/5 domains, 0% DDD
-  // As patterns grow: 10+ patterns = 1 domain, 50+ = 2, 100+ = 3, 200+ = 4, 500+ = 5
-  let domainsCompleted = 0;
-  if (learning.patterns >= 500) domainsCompleted = 5;
-  else if (learning.patterns >= 200) domainsCompleted = 4;
-  else if (learning.patterns >= 100) domainsCompleted = 3;
-  else if (learning.patterns >= 50) domainsCompleted = 2;
-  else if (learning.patterns >= 10) domainsCompleted = 1;
-
   const totalDomains = 5;
-  const dddProgress = Math.min(100, Math.floor((domainsCompleted / totalDomains) * 100));
+
+  const dddData = readJSON(path.join(CWD, '.kynjalflow', 'metrics', 'ddd-progress.json'));
+  let dddProgress = dddData?.progress || 0;
+  let domainsCompleted = Math.min(5, Math.floor(dddProgress / 20));
+
+  if (dddProgress === 0 && learning.patterns > 0) {
+    if (learning.patterns >= 500) domainsCompleted = 5;
+    else if (learning.patterns >= 200) domainsCompleted = 4;
+    else if (learning.patterns >= 100) domainsCompleted = 3;
+    else if (learning.patterns >= 50) domainsCompleted = 2;
+    else if (learning.patterns >= 10) domainsCompleted = 1;
+    dddProgress = Math.floor((domainsCompleted / totalDomains) * 100);
+  }
 
   return {
-    domainsCompleted,
-    totalDomains,
-    dddProgress,
+    domainsCompleted, totalDomains, dddProgress,
     patternsLearned: learning.patterns,
-    sessionsCompleted: learning.sessions
+    sessionsCompleted: learning.sessions,
   };
 }
 
-// Get security status based on actual scans
+// Security status (pure file reads)
 function getSecurityStatus() {
-  // Check for security scan results in memory
-  const scanResultsPath = path.join(process.cwd(), '.claude', 'security-scans');
-  let cvesFixed = 0;
-  const totalCves = 3;
-
-  if (fs.existsSync(scanResultsPath)) {
-    try {
-      const scans = fs.readdirSync(scanResultsPath).filter(f => f.endsWith('.json'));
-      // Each successful scan file = 1 CVE addressed
-      cvesFixed = Math.min(totalCves, scans.length);
-    } catch (e) {
-      // Ignore
+  const auditData = readJSON(path.join(CWD, '.kynjalflow', 'security', 'audit-status.json'));
+  if (auditData) {
+    const auditDate = auditData.lastAudit || auditData.lastScan;
+    if (!auditDate) {
+      // No audit has ever run — show as pending, not stale
+      return { status: 'PENDING', cvesFixed: 0, totalCves: 0 };
     }
+    const auditAge = Date.now() - new Date(auditDate).getTime();
+    const isStale = auditAge > 7 * 24 * 60 * 60 * 1000;
+    return {
+      status: isStale ? 'STALE' : (auditData.status || 'PENDING'),
+      cvesFixed: auditData.cvesFixed || 0,
+      totalCves: auditData.totalCves || 0,
+    };
   }
 
-  // Also check .swarm/security for audit results
-  const auditPath = path.join(process.cwd(), '.swarm', 'security');
-  if (fs.existsSync(auditPath)) {
-    try {
-      const audits = fs.readdirSync(auditPath).filter(f => f.includes('audit'));
-      cvesFixed = Math.min(totalCves, Math.max(cvesFixed, audits.length));
-    } catch (e) {
-      // Ignore
+  let scanCount = 0;
+  try {
+    const scanDir = path.join(CWD, '.claude', 'security-scans');
+    if (fs.existsSync(scanDir)) {
+      scanCount = fs.readdirSync(scanDir).filter(f => f.endsWith('.json')).length;
     }
-  }
-
-  const status = cvesFixed >= totalCves ? 'CLEAN' : cvesFixed > 0 ? 'IN_PROGRESS' : 'PENDING';
+  } catch { /* ignore */ }
 
   return {
-    status,
-    cvesFixed,
-    totalCves,
+    status: scanCount > 0 ? 'SCANNED' : 'NONE',
+    cvesFixed: 0,
+    totalCves: 0,
   };
 }
 
-// Get swarm status
+// Swarm status (pure file reads, NO ps aux)
 function getSwarmStatus() {
-  let activeAgents = 0;
-  let coordinationActive = false;
-
-  // 1. Check metrics file first (written by swarm/agents during operation)
-  try {
-    const metricsPath = path.join(process.cwd(), '.claude-flow', 'metrics', 'swarm-activity.json');
-    if (fs.existsSync(metricsPath)) {
-      const metrics = JSON.parse(fs.readFileSync(metricsPath, 'utf-8'));
-      // Only trust metrics if updated within last 60 seconds
-      const age = Date.now() - (metrics.lastUpdated || 0);
-      if (age < 60000) {
-        activeAgents = metrics.activeAgents || 0;
-        coordinationActive = metrics.coordinationActive || activeAgents > 0;
-        return { activeAgents, maxAgents: CONFIG.maxAgents, coordinationActive };
-      }
+  // Check swarm state file — only trust if recently updated (within 5 min)
+  const staleThresholdMs = 5 * 60 * 1000;
+  const now = Date.now();
+
+  const swarmStatePath = path.join(CWD, '.kynjalflow', 'swarm', 'swarm-state.json');
+  const swarmState = readJSON(swarmStatePath);
+  if (swarmState) {
+    const updatedAt = swarmState.updatedAt || swarmState.startedAt;
+    const age = updatedAt ? now - new Date(updatedAt).getTime() : Infinity;
+    if (age < staleThresholdMs) {
+      return {
+        activeAgents: swarmState.agents?.length || swarmState.agentCount || 0,
+        maxAgents: swarmState.maxAgents || CONFIG.maxAgents,
+        coordinationActive: true,
+      };
     }
-  } catch (e) {
-    // Fall through to process detection
   }
 
-  // 2. Detect running agents from processes (safe: no user input in commands)
-  try {
-    if (isWindows) {
-      const ps = execSync('tasklist 2>NUL | findstr /I "agentic-flow kynjalflow claude-flow" 2>NUL | find /C /V "" 2>NUL || echo 0', { encoding: 'utf-8' });
-      activeAgents = Math.max(0, parseInt(ps.trim()) || 0);
-    } else {
-      const ps = execSync('ps aux 2>/dev/null | grep -E "(agentic-flow|kynjalflow|claude-flow)" | grep -v grep | wc -l || echo "0"', { encoding: 'utf-8' });
-      activeAgents = Math.max(0, parseInt(ps.trim()) || 0);
+  const activityData = readJSON(path.join(CWD, '.kynjalflow', 'metrics', 'swarm-activity.json'));
+  if (activityData?.swarm) {
+    const updatedAt = activityData.timestamp || activityData.swarm.timestamp;
+    const age = updatedAt ? now - new Date(updatedAt).getTime() : Infinity;
+    if (age < staleThresholdMs) {
+      return {
+        activeAgents: activityData.swarm.agent_count || 0,
+        maxAgents: CONFIG.maxAgents,
+        coordinationActive: activityData.swarm.coordination_active || activityData.swarm.active || false,
+      };
     }
-    coordinationActive = activeAgents > 0;
-  } catch (e) {
-    // Ignore errors - default to 0 agents
   }
 
-  return {
-    activeAgents,
-    maxAgents: CONFIG.maxAgents,
-    coordinationActive,
-  };
+  return { activeAgents: 0, maxAgents: CONFIG.maxAgents, coordinationActive: false };
 }
 
-// Get system metrics (dynamic based on actual state)
+// System metrics (uses process.memoryUsage() — no shell spawn)
 function getSystemMetrics() {
-  let memoryMB = 0;
-  let subAgents = 0;
+  const memoryMB = Math.floor(process.memoryUsage().heapUsed / 1024 / 1024);
+  const learning = getLearningStats();
+  const agentdb = getAgentDBStats();
 
-  try {
-    if (isWindows) {
-      // Windows: use tasklist for memory info, fallback to process.memoryUsage
-      // tasklist memory column is complex to parse, use Node.js API instead
-      memoryMB = Math.floor(process.memoryUsage().heapUsed / 1024 / 1024);
-    } else {
-      const mem = execSync('ps aux | grep -E "(node|agentic|claude)" | grep -v grep | awk \'{sum += $6} END {print int(sum/1024)}\'', { encoding: 'utf-8' });
-      memoryMB = parseInt(mem.trim()) || 0;
-    }
-  } catch (e) {
-    // Fallback
-    memoryMB = Math.floor(process.memoryUsage().heapUsed / 1024 / 1024);
+  // Intelligence from learning.json
+  const learningData = readJSON(path.join(CWD, '.kynjalflow', 'metrics', 'learning.json'));
+  let intelligencePct = 0;
+  let contextPct = 0;
+
+  if (learningData?.intelligence?.score !== undefined) {
+    intelligencePct = Math.min(100, Math.floor(learningData.intelligence.score));
+  } else {
+    // Use actual vector/entry counts — 2000 entries = 100%
+    const fromPatterns = learning.patterns > 0 ? Math.min(100, Math.floor(learning.patterns / 20)) : 0;
+    const fromVectors = agentdb.vectorCount > 0 ? Math.min(100, Math.floor(agentdb.vectorCount / 20)) : 0;
+    intelligencePct = Math.max(fromPatterns, fromVectors);
   }
 
-  // Get learning stats for intelligence %
-  const learning = getLearningStats();
+  // Maturity fallback (pure fs checks, no git exec)
+  if (intelligencePct === 0) {
+    let score = 0;
+    if (fs.existsSync(path.join(CWD, '.claude'))) score += 15;
+    const srcDirs = ['src', 'lib', 'app', 'packages', 'v3'];
+    for (const d of srcDirs) { if (fs.existsSync(path.join(CWD, d))) { score += 15; break; } }
+    const testDirs = ['tests', 'test', '__tests__', 'spec'];
+    for (const d of testDirs) { if (fs.existsSync(path.join(CWD, d))) { score += 10; break; } }
+    const cfgFiles = ['package.json', 'tsconfig.json', 'pyproject.toml', 'Cargo.toml', 'go.mod'];
+    for (const f of cfgFiles) { if (fs.existsSync(path.join(CWD, f))) { score += 5; break; } }
+    intelligencePct = Math.min(100, score);
+  }
 
-  // Intelligence % from REAL intelligence loop data (ADR-050)
-  // Composite: 40% confidence mean + 30% access ratio + 30% pattern density
-  let intelligencePct = 0;
-  if (learning.confidenceMean > 0 || (learning.patterns > 0 && learning.accessedCount > 0)) {
-    const confScore = Math.min(100, Math.floor(learning.confidenceMean * 100));
-    const accessRatio = learning.patterns > 0 ? (learning.accessedCount / learning.patterns) : 0;
-    const accessScore = Math.min(100, Math.floor(accessRatio * 100));
-    const densityScore = Math.min(100, Math.floor(learning.patterns / 5));
-    intelligencePct = Math.floor(confScore * 0.4 + accessScore * 0.3 + densityScore * 0.3);
+  if (learningData?.sessions?.total !== undefined) {
+    contextPct = Math.min(100, learningData.sessions.total * 5);
+  } else {
+    contextPct = Math.min(100, Math.floor(learning.sessions * 5));
   }
-  // Fallback: legacy pattern count
-  if (intelligencePct === 0 && learning.patterns > 0) {
-    intelligencePct = Math.min(100, Math.floor(learning.patterns / 10));
+
+  // Sub-agents from file metrics (no ps aux)
+  let subAgents = 0;
+  const activityData = readJSON(path.join(CWD, '.kynjalflow', 'metrics', 'swarm-activity.json'));
+  if (activityData?.processes?.estimated_agents) {
+    subAgents = activityData.processes.estimated_agents;
   }
 
-  // Context % based on session history
-  const contextPct = Math.min(100, Math.floor(learning.sessions * 5));
+  return { memoryMB, contextPct, intelligencePct, subAgents };
+}
+
+// ADR status (count files only — don't read contents)
+function getADRStatus() {
+  // Count actual ADR files first — compliance JSON may be stale
+  const adrPaths = [
+    path.join(CWD, 'v3', 'implementation', 'adrs'),
+    path.join(CWD, 'docs', 'adrs'),
+    path.join(CWD, '.kynjalflow', 'adrs'),
+  ];
 
-  // Count active sub-agents from process list
-  try {
-    if (isWindows) {
-      // Windows: use tasklist and findstr for agent counting
-      const agents = execSync('tasklist 2>NUL | findstr /I "claude-flow" 2>NUL | find /C /V "" 2>NUL || echo 0', { encoding: 'utf-8' });
-      subAgents = Math.max(0, parseInt(agents.trim()) || 0);
-    } else {
-      const agents = execSync('ps aux 2>/dev/null | grep -c "claude-flow.*agent" || echo "0"', { encoding: 'utf-8' });
-      subAgents = Math.max(0, parseInt(agents.trim()) - 1);
+  for (const adrPath of adrPaths) {
+    try {
+      if (fs.existsSync(adrPath)) {
+        const files = fs.readdirSync(adrPath).filter(f =>
+          f.endsWith('.md') && (f.startsWith('ADR-') || f.startsWith('adr-') || /^\d{4}-/.test(f))
+        );
+        // Report actual count — don't guess compliance without reading files
+        return { count: files.length, implemented: files.length, compliance: 0 };
+      }
+    } catch { /* ignore */ }
+  }
+
+  return { count: 0, implemented: 0, compliance: 0 };
+}
+
+// Hooks status (shared settings cache)
+function getHooksStatus() {
+  let enabled = 0;
+  let total = 0;
+  const settings = getSettings();
+
+  if (settings?.hooks) {
+    for (const category of Object.keys(settings.hooks)) {
+      const matchers = settings.hooks[category];
+      if (!Array.isArray(matchers)) continue;
+      for (const matcher of matchers) {
+        const hooks = matcher?.hooks;
+        if (Array.isArray(hooks)) {
+          total += hooks.length;
+          enabled += hooks.length;
+        }
+      }
     }
-  } catch (e) {
-    // Ignore - default to 0
   }
 
-  return {
-    memoryMB,
-    contextPct,
-    intelligencePct,
-    subAgents,
-  };
+  try {
+    const hooksDir = path.join(CWD, '.claude', 'hooks');
+    if (fs.existsSync(hooksDir)) {
+      const hookFiles = fs.readdirSync(hooksDir).filter(f => f.endsWith('.js') || f.endsWith('.sh')).length;
+      total = Math.max(total, hookFiles);
+      enabled = Math.max(enabled, hookFiles);
+    }
+  } catch { /* ignore */ }
+
+  return { enabled, total };
 }
 
-// Generate progress bar
-function progressBar(current, total) {
-  const width = 5;
-  const filled = Math.round((current / total) * width);
-  const empty = width - filled;
-  return '[' + '\u25CF'.repeat(filled) + '\u25CB'.repeat(empty) + ']';
+// AgentDB stats — count real entries, not file-size heuristics
+function getAgentDBStats() {
+  let vectorCount = 0;
+  let dbSizeKB = 0;
+  let namespaces = 0;
+  let hasHnsw = false;
+
+  // 1. Count real entries from auto-memory-store.json
+  const storePath = path.join(CWD, '.kynjalflow', 'data', 'auto-memory-store.json');
+  const storeStat = safeStat(storePath);
+  if (storeStat) {
+    dbSizeKB += storeStat.size / 1024;
+    try {
+      const store = JSON.parse(fs.readFileSync(storePath, 'utf-8'));
+      if (Array.isArray(store)) vectorCount += store.length;
+      else if (store?.entries) vectorCount += store.entries.length;
+    } catch { /* fall back to size estimate */ }
+  }
+
+  // 2. Count entries from ranked-context.json
+  const rankedPath = path.join(CWD, '.kynjalflow', 'data', 'ranked-context.json');
+  try {
+    const ranked = readJSON(rankedPath);
+    if (ranked?.entries?.length > vectorCount) vectorCount = ranked.entries.length;
+  } catch { /* ignore */ }
+
+  // 3. Add DB file sizes
+  const dbFiles = [
+    path.join(CWD, 'data', 'memory.db'),
+    path.join(CWD, '.kynjalflow', 'memory.db'),
+    path.join(CWD, '.swarm', 'memory.db'),
+  ];
+  for (const f of dbFiles) {
+    const stat = safeStat(f);
+    if (stat) {
+      dbSizeKB += stat.size / 1024;
+      namespaces++;
+    }
+  }
+
+  // 4. Check for graph data
+  const graphPath = path.join(CWD, 'data', 'memory.graph');
+  const graphStat = safeStat(graphPath);
+  if (graphStat) dbSizeKB += graphStat.size / 1024;
+
+  // 5. HNSW index
+  const hnswPaths = [
+    path.join(CWD, '.swarm', 'hnsw.index'),
+    path.join(CWD, '.kynjalflow', 'hnsw.index'),
+  ];
+  for (const p of hnswPaths) {
+    const stat = safeStat(p);
+    if (stat) {
+      hasHnsw = true;
+      break;
+    }
+  }
+
+  // HNSW is available if memory package is present
+  if (!hasHnsw) {
+    const memPkgPaths = [
+      path.join(CWD, 'v3', '@claude-flow', 'memory', 'dist'),
+      path.join(CWD, 'node_modules', '@claude-flow', 'memory'),
+    ];
+    for (const p of memPkgPaths) {
+      if (fs.existsSync(p)) { hasHnsw = true; break; }
+    }
+  }
+
+  return { vectorCount, dbSizeKB: Math.floor(dbSizeKB), namespaces, hasHnsw };
 }
 
-// Generate full statusline
-function generateStatusline() {
-  const user = getUserInfo();
-  const progress = getV3Progress();
-  const security = getSecurityStatus();
-  const swarm = getSwarmStatus();
-  const system = getSystemMetrics();
-  const lines = [];
+// Test stats (count files only — NO reading file contents)
+function getTestStats() {
+  let testFiles = 0;
 
-  // Header Line
-  let header = `${c.bold}${c.brightPurple}▊ KynjalFlow${c.reset}`;
-  header += `${swarm.coordinationActive ? c.brightCyan : c.dim}● ${c.brightCyan}${user.name}${c.reset}`;
-  if (user.gitBranch) {
-    header += `  ${c.dim}│${c.reset}  ${c.brightBlue}⎇ ${user.gitBranch}${c.reset}`;
+  function countTestFiles(dir, depth = 0) {
+    if (depth > 6) return;
+    try {
+      if (!fs.existsSync(dir)) return;
+      const entries = fs.readdirSync(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory() && !entry.name.startsWith('.') && entry.name !== 'node_modules') {
+          countTestFiles(path.join(dir, entry.name), depth + 1);
+        } else if (entry.isFile()) {
+          const n = entry.name;
+          if (n.includes('.test.') || n.includes('.spec.') || n.includes('_test.') || n.includes('_spec.')) {
+            testFiles++;
+          }
+        }
+      }
+    } catch { /* ignore */ }
   }
-  header += `  ${c.dim}│${c.reset}  ${c.purple}${user.modelName}${c.reset}`;
-  lines.push(header);
 
-  // Separator
-  lines.push(`${c.dim}─────────────────────────────────────────────────────${c.reset}`);
+  // Scan all source directories
+  for (const d of ['tests', 'test', '__tests__', 'src', 'v3']) {
+    countTestFiles(path.join(CWD, d));
+  }
 
-  // Line 1: DDD Domain Progress
-  const domainsColor = progress.domainsCompleted >= 3 ? c.brightGreen : progress.domainsCompleted > 0 ? c.yellow : c.red;
-  lines.push(
-    `${c.brightCyan}🏗️  DDD Domains${c.reset}    ${progressBar(progress.domainsCompleted, progress.totalDomains)}  ` +
-    `${domainsColor}${progress.domainsCompleted}${c.reset}/${c.brightWhite}${progress.totalDomains}${c.reset}    ` +
-    `${c.brightYellow}⚡ 1.0x${c.reset} ${c.dim}→${c.reset} ${c.brightYellow}2.49x-7.47x${c.reset}`
-  );
+  // Estimate ~4 test cases per file (avoids reading every file)
+  return { testFiles, testCases: testFiles * 4 };
+}
 
-  // Line 2: Swarm + CVE + Memory + Context + Intelligence
-  const swarmIndicator = swarm.coordinationActive ? `${c.brightGreen}◉${c.reset}` : `${c.dim}○${c.reset}`;
-  const agentsColor = swarm.activeAgents > 0 ? c.brightGreen : c.red;
-  let securityIcon = security.status === 'CLEAN' ? '🟢' : security.status === 'IN_PROGRESS' ? '🟡' : '🔴';
-  let securityColor = security.status === 'CLEAN' ? c.brightGreen : security.status === 'IN_PROGRESS' ? c.brightYellow : c.brightRed;
+// Integration status (shared settings + file checks)
+function getIntegrationStatus() {
+  const mcpServers = { total: 0, enabled: 0 };
+  const settings = getSettings();
+
+  if (settings?.mcpServers && typeof settings.mcpServers === 'object') {
+    const servers = Object.keys(settings.mcpServers);
+    mcpServers.total = servers.length;
+    mcpServers.enabled = settings.enabledMcpjsonServers
+      ? settings.enabledMcpjsonServers.filter(s => servers.includes(s)).length
+      : servers.length;
+  }
 
-  lines.push(
-    `${c.brightYellow}🤖 Swarm${c.reset}  ${swarmIndicator} [${agentsColor}${String(swarm.activeAgents).padStart(2)}${c.reset}/${c.brightWhite}${swarm.maxAgents}${c.reset}]  ` +
-    `${c.brightPurple}👥 ${system.subAgents}${c.reset}    ` +
-    `${securityIcon} ${securityColor}CVE ${security.cvesFixed}${c.reset}/${c.brightWhite}${security.totalCves}${c.reset}    ` +
-    `${c.brightCyan}💾 ${system.memoryMB}MB${c.reset}    ` +
-    `${c.brightGreen}📂 ${String(system.contextPct).padStart(3)}%${c.reset}    ` +
-    `${c.dim}🧠 ${String(system.intelligencePct).padStart(3)}%${c.reset}`
-  );
+  // Fallback: .mcp.json
+  if (mcpServers.total === 0) {
+    const mcpConfig = readJSON(path.join(CWD, '.mcp.json'))
+                   || readJSON(path.join(os.homedir(), '.claude', 'mcp.json'));
+    if (mcpConfig?.mcpServers) {
+      const s = Object.keys(mcpConfig.mcpServers);
+      mcpServers.total = s.length;
+      mcpServers.enabled = s.length;
+    }
+  }
 
-  // Line 3: Architecture status
-  const dddColor = progress.dddProgress >= 50 ? c.brightGreen : progress.dddProgress > 0 ? c.yellow : c.red;
-  lines.push(
-    `${c.brightPurple}🔧 Architecture${c.reset}    ` +
-    `${c.cyan}DDD${c.reset} ${dddColor}●${String(progress.dddProgress).padStart(3)}%${c.reset}  ${c.dim}│${c.reset}  ` +
-    `${c.cyan}Security${c.reset} ${securityColor}●${security.status}${c.reset}  ${c.dim}│${c.reset}  ` +
-    `${c.cyan}Memory${c.reset} ${c.brightGreen}●AgentDB${c.reset}  ${c.dim}│${c.reset}  ` +
-    `${c.cyan}Integration${c.reset} ${swarm.coordinationActive ? c.brightCyan : c.dim}●${c.reset}`
-  );
+  const hasDatabase = ['.swarm/memory.db', '.kynjalflow/memory.db', 'data/memory.db']
+    .some(p => fs.existsSync(path.join(CWD, p)));
+  const hasApi = !!(process.env.ANTHROPIC_API_KEY || process.env.OPENAI_API_KEY);
 
-  return lines.join('\n');
+  return { mcpServers, hasDatabase, hasApi };
 }
 
-// Generate JSON data
-function generateJSON() {
-  return {
-    user: getUserInfo(),
-    v3Progress: getV3Progress(),
-    security: getSecurityStatus(),
-    swarm: getSwarmStatus(),
-    system: getSystemMetrics(),
-    performance: {
-      flashAttentionTarget: '2.49x-7.47x',
-      searchImprovement: '150x-12,500x',
-      memoryReduction: '50-75%',
-    },
-    lastUpdated: new Date().toISOString(),
-  };
+// Session stats (pure file reads)
+function getSessionStats() {
+  for (const p of ['.kynjalflow/session.json', '.claude/session.json']) {
+    const data = readJSON(path.join(CWD, p));
+    if (data?.startTime) {
+      const diffMs = Date.now() - new Date(data.startTime).getTime();
+      const mins = Math.floor(diffMs / 60000);
+      const duration = mins < 60 ? `${mins}m` : `${Math.floor(mins / 60)}h${mins % 60}m`;
+      return { duration };
+    }
+  }
+  return { duration: '' };
 }
 
-/**
- * Generate single-line output for Claude Code compatibility
- * This avoids the collision zone issue entirely by using one line
- * @see https://github.com/ruvnet/claude-flow/issues/985
- */
-function generateSingleLine() {
-  if (!CONFIG.enabled) return '';
+// ─── Rendering ──────────────────────────────────────────────────
 
-  const user = getUserInfo();
-  const progress = getV3Progress();
-  const security = getSecurityStatus();
+function progressBar(current, total) {
+  const width = 5;
+  const filled = Math.round((current / total) * width);
+  return '[' + '\u25CF'.repeat(filled) + '\u25CB'.repeat(width - filled) + ']';
+}
+
+// Single-line statusline for Claude Code's status bar
+function generateStatusline() {
+  const git = getGitInfo();
+  const modelName = getModelName();
   const swarm = getSwarmStatus();
   const system = getSystemMetrics();
+  const session = getSessionStats();
+  const hooks = getHooksStatus();
+  const integration = getIntegrationStatus();
+
+  const parts = [];
+
+  // Branding
+  parts.push(`${c.bold}${c.brightPurple}\u258A KynjalFlow${c.reset}`);
+
+  // User + swarm indicator
+  const dot = swarm.coordinationActive ? `${c.brightGreen}\u25CF${c.reset}` : `${c.brightCyan}\u25CF${c.reset}`;
+  parts.push(`${dot} ${c.brightCyan}${git.name}${c.reset}`);
+
+  // Git branch + changes
+  if (git.gitBranch) {
+    let branchPart = `${c.brightBlue}\u23C7 ${git.gitBranch}${c.reset}`;
+    const changes = [];
+    if (git.staged > 0) changes.push(`${c.brightGreen}+${git.staged}${c.reset}`);
+    if (git.modified > 0) changes.push(`${c.brightYellow}~${git.modified}${c.reset}`);
+    if (git.untracked > 0) changes.push(`${c.dim}?${git.untracked}${c.reset}`);
+    if (changes.length > 0) branchPart += ` ${changes.join('')}`;
+    if (git.ahead > 0) branchPart += ` ${c.brightGreen}\u2191${git.ahead}${c.reset}`;
+    if (git.behind > 0) branchPart += ` ${c.brightRed}\u2193${git.behind}${c.reset}`;
+    parts.push(branchPart);
+  }
 
-  const swarmIndicator = swarm.coordinationActive ? '●' : '○';
-  const securityStatus = security.status === 'CLEAN' ? '✓' :
-                         security.cvesFixed > 0 ? '~' : '✗';
+  // Model
+  parts.push(`${c.purple}${modelName}${c.reset}`);
 
-  return `${c.brightPurple}CF-V3${c.reset} ${c.dim}|${c.reset} ` +
-    `${c.cyan}D:${progress.domainsCompleted}/${progress.totalDomains}${c.reset} ${c.dim}|${c.reset} ` +
-    `${c.yellow}S:${swarmIndicator}${swarm.activeAgents}/${swarm.maxAgents}${c.reset} ${c.dim}|${c.reset} ` +
-    `${security.status === 'CLEAN' ? c.green : c.red}CVE:${securityStatus}${security.cvesFixed}/${security.totalCves}${c.reset} ${c.dim}|${c.reset} ` +
-    `${c.dim}🧠${system.intelligencePct}%${c.reset}`;
-}
+  // Session duration
+  if (session.duration) {
+    parts.push(`${c.cyan}\u23F1 ${session.duration}${c.reset}`);
+  }
 
-/**
- * Generate safe multi-line statusline that avoids Claude Code collision zone
- * The collision zone is columns 15-25 on the second-to-last line.
- * We pad that line with spaces to push content past column 25.
- * @see https://github.com/ruvnet/claude-flow/issues/985
- */
-function generateSafeStatusline() {
-  if (!CONFIG.enabled) return '';
+  // Intelligence %
+  const intellColor = system.intelligencePct >= 80 ? c.brightGreen : system.intelligencePct >= 40 ? c.brightYellow : c.dim;
+  parts.push(`${intellColor}\u25CF ${system.intelligencePct}%${c.reset}`);
+
+  // Swarm agents (only if active)
+  if (swarm.activeAgents > 0 || swarm.coordinationActive) {
+    parts.push(`${c.brightYellow}\u25C9 ${swarm.activeAgents}/${swarm.maxAgents}${c.reset}`);
+  }
+
+  // Hooks (compact)
+  if (hooks.enabled > 0) {
+    parts.push(`${c.brightGreen}\u2713${hooks.enabled}h${c.reset}`);
+  }
 
-  const user = getUserInfo();
+  // MCP (compact)
+  if (integration.mcpServers.total > 0) {
+    const mcpCol = integration.mcpServers.enabled === integration.mcpServers.total ? c.brightGreen : c.brightYellow;
+    parts.push(`${mcpCol}MCP${integration.mcpServers.enabled}${c.reset}`);
+  }
+
+  return parts.join(` ${c.dim}\u2502${c.reset} `);
+}
+
+// Multi-line dashboard (for --dashboard flag)
+function generateDashboard() {
+  const git = getGitInfo();
+  const modelName = getModelName();
   const progress = getV3Progress();
   const security = getSecurityStatus();
   const swarm = getSwarmStatus();
   const system = getSystemMetrics();
+  const adrs = getADRStatus();
+  const hooks = getHooksStatus();
+  const agentdb = getAgentDBStats();
+  const tests = getTestStats();
+  const session = getSessionStats();
+  const integration = getIntegrationStatus();
   const lines = [];
 
-  // Header Line
-  let header = `${c.bold}${c.brightPurple}▊ KynjalFlow${c.reset}`;
-  header += `${swarm.coordinationActive ? c.brightCyan : c.dim}● ${c.brightCyan}${user.name}${c.reset}`;
-  if (user.gitBranch) {
-    header += `  ${c.dim}│${c.reset}  ${c.brightBlue}⎇ ${user.gitBranch}${c.reset}`;
+  // Header
+  let header = `${c.bold}${c.brightPurple}\u258A KynjalFlow ${c.reset}`;
+  header += `${swarm.coordinationActive ? c.brightCyan : c.dim}\u25CF ${c.brightCyan}${git.name}${c.reset}`;
+  if (git.gitBranch) {
+    header += `  ${c.dim}\u2502${c.reset}  ${c.brightBlue}\u23C7 ${git.gitBranch}${c.reset}`;
+    const changes = git.modified + git.staged + git.untracked;
+    if (changes > 0) {
+      let ind = '';
+      if (git.staged > 0) ind += `${c.brightGreen}+${git.staged}${c.reset}`;
+      if (git.modified > 0) ind += `${c.brightYellow}~${git.modified}${c.reset}`;
+      if (git.untracked > 0) ind += `${c.dim}?${git.untracked}${c.reset}`;
+      header += ` ${ind}`;
+    }
+    if (git.ahead > 0) header += ` ${c.brightGreen}\u2191${git.ahead}${c.reset}`;
+    if (git.behind > 0) header += ` ${c.brightRed}\u2193${git.behind}${c.reset}`;
   }
-  header += `  ${c.dim}│${c.reset}  ${c.purple}${user.modelName}${c.reset}`;
+  header += `  ${c.dim}\u2502${c.reset}  ${c.purple}${modelName}${c.reset}`;
+  if (session.duration) header += `  ${c.dim}\u2502${c.reset}  ${c.cyan}\u23F1 ${session.duration}${c.reset}`;
   lines.push(header);
 
   // Separator
-  lines.push(`${c.dim}─────────────────────────────────────────────────────${c.reset}`);
+  lines.push(`${c.dim}\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500${c.reset}`);
 
-  // Line 1: DDD Domain Progress
+  // Line 1: DDD Domains + perf
   const domainsColor = progress.domainsCompleted >= 3 ? c.brightGreen : progress.domainsCompleted > 0 ? c.yellow : c.red;
+  let perfIndicator;
+  if (agentdb.hasHnsw && agentdb.vectorCount > 0) {
+    const speedup = agentdb.vectorCount > 10000 ? '12500x' : agentdb.vectorCount > 1000 ? '150x' : '10x';
+    perfIndicator = `${c.brightGreen}\u26A1 HNSW ${speedup}${c.reset}`;
+  } else if (progress.patternsLearned > 0) {
+    const pk = progress.patternsLearned >= 1000 ? `${(progress.patternsLearned / 1000).toFixed(1)}k` : String(progress.patternsLearned);
+    perfIndicator = `${c.brightYellow}\uD83D\uDCDA ${pk} patterns${c.reset}`;
+  } else {
+    perfIndicator = `${c.dim}\u26A1 target: 150x-12500x${c.reset}`;
+  }
   lines.push(
-    `${c.brightCyan}🏗️  DDD Domains${c.reset}    ${progressBar(progress.domainsCompleted, progress.totalDomains)}  ` +
-    `${domainsColor}${progress.domainsCompleted}${c.reset}/${c.brightWhite}${progress.totalDomains}${c.reset}    ` +
-    `${c.brightYellow}⚡ 1.0x${c.reset} ${c.dim}→${c.reset} ${c.brightYellow}2.49x-7.47x${c.reset}`
+    `${c.brightCyan}\uD83C\uDFD7\uFE0F  DDD Domains${c.reset}    ${progressBar(progress.domainsCompleted, progress.totalDomains)}  ` +
+    `${domainsColor}${progress.domainsCompleted}${c.reset}/${c.brightWhite}${progress.totalDomains}${c.reset}    ${perfIndicator}`
   );
 
-  // Line 2 (COLLISION LINE): Swarm status with 24 spaces padding after emoji
-  // The emoji (🤖) is 2 columns. 24 spaces pushes content to column 26, past the collision zone (15-25)
-  const swarmIndicator = swarm.coordinationActive ? `${c.brightGreen}◉${c.reset}` : `${c.dim}○${c.reset}`;
+  // Line 2: Swarm + Hooks + CVE + Memory + Intelligence
+  const swarmInd = swarm.coordinationActive ? `${c.brightGreen}\u25C9${c.reset}` : `${c.dim}\u25CB${c.reset}`;
   const agentsColor = swarm.activeAgents > 0 ? c.brightGreen : c.red;
-  let securityIcon = security.status === 'CLEAN' ? '🟢' : security.status === 'IN_PROGRESS' ? '🟡' : '🔴';
-  let securityColor = security.status === 'CLEAN' ? c.brightGreen : security.status === 'IN_PROGRESS' ? c.brightYellow : c.brightRed;
+  const secIcon = security.status === 'CLEAN' ? '\uD83D\uDFE2' : (security.status === 'IN_PROGRESS' || security.status === 'STALE') ? '\uD83D\uDFE1' : '\uD83D\uDD34';
+  const secColor = security.status === 'CLEAN' ? c.brightGreen : (security.status === 'IN_PROGRESS' || security.status === 'STALE') ? c.brightYellow : c.brightRed;
+  const hooksColor = hooks.enabled > 0 ? c.brightGreen : c.dim;
+  const intellColor = system.intelligencePct >= 80 ? c.brightGreen : system.intelligencePct >= 40 ? c.brightYellow : c.dim;
 
-  // CRITICAL: 24 spaces after 🤖 (emoji is 2 cols, so 2+24=26, past collision zone cols 15-25)
   lines.push(
-    `${c.brightYellow}🤖${c.reset}                        ` +  // 24 spaces padding
-    `${swarmIndicator} [${agentsColor}${String(swarm.activeAgents).padStart(2)}${c.reset}/${c.brightWhite}${swarm.maxAgents}${c.reset}]  ` +
-    `${c.brightPurple}👥 ${system.subAgents}${c.reset}  ` +
-    `${securityIcon} ${securityColor}CVE ${security.cvesFixed}${c.reset}/${c.brightWhite}${security.totalCves}${c.reset}  ` +
-    `${c.brightCyan}💾 ${system.memoryMB}MB${c.reset}  ` +
-    `${c.dim}🧠 ${system.intelligencePct}%${c.reset}`
+    `${c.brightYellow}\uD83E\uDD16 Swarm${c.reset}  ${swarmInd} [${agentsColor}${String(swarm.activeAgents).padStart(2)}${c.reset}/${c.brightWhite}${swarm.maxAgents}${c.reset}]  ` +
+    `${c.brightPurple}\uD83D\uDC65 ${system.subAgents}${c.reset}    ` +
+    `${c.brightBlue}\uD83E\uDE9D ${hooksColor}${hooks.enabled}${c.reset}/${c.brightWhite}${hooks.total}${c.reset}    ` +
+    `${secIcon} ${secColor}CVE ${security.cvesFixed}${c.reset}/${c.brightWhite}${security.totalCves}${c.reset}    ` +
+    `${c.brightCyan}\uD83D\uDCBE ${system.memoryMB}MB${c.reset}    ` +
+    `${intellColor}\uD83E\uDDE0 ${String(system.intelligencePct).padStart(3)}%${c.reset}`
   );
 
-  // Line 3: Architecture status (this is the last line, not in collision zone)
+  // Line 3: Architecture
   const dddColor = progress.dddProgress >= 50 ? c.brightGreen : progress.dddProgress > 0 ? c.yellow : c.red;
+  const adrColor = adrs.count > 0 ? (adrs.implemented === adrs.count ? c.brightGreen : c.yellow) : c.dim;
+  const adrDisplay = adrs.compliance > 0 ? `${adrColor}\u25CF${adrs.compliance}%${c.reset}` : `${adrColor}\u25CF${adrs.implemented}/${adrs.count}${c.reset}`;
+
+  lines.push(
+    `${c.brightPurple}\uD83D\uDD27 Architecture${c.reset}    ` +
+    `${c.cyan}ADRs${c.reset} ${adrDisplay}  ${c.dim}\u2502${c.reset}  ` +
+    `${c.cyan}DDD${c.reset} ${dddColor}\u25CF${String(progress.dddProgress).padStart(3)}%${c.reset}  ${c.dim}\u2502${c.reset}  ` +
+    `${c.cyan}Security${c.reset} ${secColor}\u25CF${security.status}${c.reset}`
+  );
+
+  // Line 4: AgentDB, Tests, Integration
+  const hnswInd = agentdb.hasHnsw ? `${c.brightGreen}\u26A1${c.reset}` : '';
+  const sizeDisp = agentdb.dbSizeKB >= 1024 ? `${(agentdb.dbSizeKB / 1024).toFixed(1)}MB` : `${agentdb.dbSizeKB}KB`;
+  const vectorColor = agentdb.vectorCount > 0 ? c.brightGreen : c.dim;
+  const testColor = tests.testFiles > 0 ? c.brightGreen : c.dim;
+
+  let integStr = '';
+  if (integration.mcpServers.total > 0) {
+    const mcpCol = integration.mcpServers.enabled === integration.mcpServers.total ? c.brightGreen :
+                   integration.mcpServers.enabled > 0 ? c.brightYellow : c.red;
+    integStr += `${c.cyan}MCP${c.reset} ${mcpCol}\u25CF${integration.mcpServers.enabled}/${integration.mcpServers.total}${c.reset}`;
+  }
+  if (integration.hasDatabase) integStr += (integStr ? '  ' : '') + `${c.brightGreen}\u25C6${c.reset}DB`;
+  if (integration.hasApi) integStr += (integStr ? '  ' : '') + `${c.brightGreen}\u25C6${c.reset}API`;
+  if (!integStr) integStr = `${c.dim}\u25CF none${c.reset}`;
+
   lines.push(
-    `${c.brightPurple}🔧 Architecture${c.reset}    ` +
-    `${c.cyan}DDD${c.reset} ${dddColor}●${String(progress.dddProgress).padStart(3)}%${c.reset}  ${c.dim}│${c.reset}  ` +
-    `${c.cyan}Security${c.reset} ${securityColor}●${security.status}${c.reset}  ${c.dim}│${c.reset}  ` +
-    `${c.cyan}Memory${c.reset} ${c.brightGreen}●AgentDB${c.reset}  ${c.dim}│${c.reset}  ` +
-    `${c.cyan}Integration${c.reset} ${swarm.coordinationActive ? c.brightCyan : c.dim}●${c.reset}`
+    `${c.brightCyan}\uD83D\uDCCA AgentDB${c.reset}    ` +
+    `${c.cyan}Vectors${c.reset} ${vectorColor}\u25CF${agentdb.vectorCount}${hnswInd}${c.reset}  ${c.dim}\u2502${c.reset}  ` +
+    `${c.cyan}Size${c.reset} ${c.brightWhite}${sizeDisp}${c.reset}  ${c.dim}\u2502${c.reset}  ` +
+    `${c.cyan}Tests${c.reset} ${testColor}\u25CF${tests.testFiles}${c.reset} ${c.dim}(~${tests.testCases} cases)${c.reset}  ${c.dim}\u2502${c.reset}  ` +
+    integStr
   );
 
   return lines.join('\n');
 }
 
-// Main
+// JSON output
+function generateJSON() {
+  const git = getGitInfo();
+  return {
+    user: { name: git.name, gitBranch: git.gitBranch, modelName: getModelName() },
+    v3Progress: getV3Progress(),
+    security: getSecurityStatus(),
+    swarm: getSwarmStatus(),
+    system: getSystemMetrics(),
+    adrs: getADRStatus(),
+    hooks: getHooksStatus(),
+    agentdb: getAgentDBStats(),
+    tests: getTestStats(),
+    git: { modified: git.modified, untracked: git.untracked, staged: git.staged, ahead: git.ahead, behind: git.behind },
+    lastUpdated: new Date().toISOString(),
+  };
+}
+
+// ─── Main ───────────────────────────────────────────────────────
 if (process.argv.includes('--json')) {
   console.log(JSON.stringify(generateJSON(), null, 2));
 } else if (process.argv.includes('--compact')) {
   console.log(JSON.stringify(generateJSON()));
-} else if (process.argv.includes('--single')) {
-  // Single-line mode - completely avoids collision zone
-  console.log(generateSingleLine());
-} else if (process.argv.includes('--unsafe') || process.argv.includes('--legacy')) {
-  // Legacy mode - original multi-line without collision avoidance
+} else if (process.argv.includes('--single-line')) {
   console.log(generateStatusline());
 } else {
-  // Default: Safe multi-line mode with collision zone avoidance
-  // Use --unsafe or --legacy to get the original behavior
-  console.log(generateSafeStatusline());
+  // Default: multi-line dashboard
+  console.log(generateDashboard());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kynjal-cli",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "type": "module",
   "description": "Claude Flow CLI - Enterprise AI agent orchestration with 60+ specialized agents, swarm coordination, MCP server, self-learning hooks, and vector memory for Claude Code",
   "main": "dist/src/index.js",