thuban 0.3.2 → 0.3.3

package/cli.js

@@ -14,6 +14,9 @@
  *   npx thuban report [path]        Full scan + deps + drift combined report
  *   npx thuban hallucinate [path]   Detect AI hallucinations and phantom imports
  *   npx thuban watch [path]         Live sentinel — continuous file monitoring
+ *   npx thuban monitor [path]       Recurring scans with saved history and alerts
+ *   npx thuban history [path]       View recurring scan history for a repo
+ *   npx thuban trend [path]         Show issue trends across recurring scans
  *   npx thuban dashboard [path]     Generate visual HTML dashboard report
  *   npx thuban diff [path]          Scan only git-changed files
  */
@@ -41,6 +44,9 @@ const CopyPasteDriftDetector = require('./packages/scanner/copy-paste-detector.j
 const CodebasePassport = require('./packages/scanner/codebase-passport.js');
 const ExecutiveReport = require('./packages/scanner/executive-report.js');
 const BaselineManager = require('./packages/scanner/baseline-manager.js');
+const MonitorStore = require('./packages/scanner/monitor-store.js');
+const { MonitorService, resolveIntervalMs } = require('./packages/scanner/monitor-service.js');
+const { collectFiles } = require('./packages/scanner/file-collector.js');
 
 // ─── Helpers ───────────────────────────────────────────────
 
@@ -67,7 +73,7 @@ function banner() {
   console.log('');
   console.log(c('cyan', '  ╔══════════════════════════════════════╗'));
   console.log(c('cyan', '  ║') + c('bold', '        THUBAN Code Health Engine     ') + c('cyan', '║'));
-  console.log(c('cyan', '  ║') + c('gray', '     Scan · Map · Detect · Fix        ') + c('cyan', '║'));
+  console.log(c('cyan', '  ║') + c('gray', '   v0.3.3 · Public Beta · thuban.dev  ') + c('cyan', '║'));
   console.log(c('cyan', '  ╚══════════════════════════════════════╝'));
   console.log('');
 }
@@ -116,6 +122,9 @@ function printHelp() {
   console.log(`    ${c('cyan', 'inject')} [path]            Add Mother Code DNA to every file`);
   console.log(`    ${c('cyan', 'gate')}                     Install pre-commit hook ${c('gray', '(blocks hallucinations)')}`);
   console.log(`    ${c('cyan', 'watch')} [path]             Live sentinel — scans files as you save`);
+  console.log(`    ${c('cyan', 'monitor')} [path]           Recurring scans with saved history and alerts ${c('gray', '(Pro)')}`);
+  console.log(`    ${c('cyan', 'history')} [path]           View recurring scan history for a repo ${c('gray', '(Pro)')}`);
+  console.log(`    ${c('cyan', 'trend')} [path]             Show issue trends across recurring scans ${c('gray', '(Pro)')}`);
   console.log(`    ${c('cyan', 'baseline')} [path]          Snapshot issues so future scans show only NEW ones`);
   console.log('');
 
@@ -188,6 +197,10 @@ function parseArgs(args) {
     licenseKey: null,
     baseline: false,
     baselineCreate: false,
+    frequency: 'daily',
+    intervalMs: null,
+    notify: 'inbox',
+    once: false,
   };
 
   const noPathCommands = ['activate', 'status', 'upgrade', 'help', 'version'];
@@ -202,6 +215,10 @@ function parseArgs(args) {
     else if (arg === '--git-commit' || arg === '--commit') { opts.gitCommit = true; }
     else if (arg === '--baseline') { opts.baseline = true; }
     else if (arg === '--baseline-create') { opts.baselineCreate = true; }
+    else if (arg === '--frequency' && args[i + 1]) { opts.frequency = args[++i]; }
+    else if (arg === '--interval-ms' && args[i + 1]) { opts.intervalMs = parseInt(args[++i], 10); }
+    else if (arg === '--notify' && args[i + 1]) { opts.notify = args[++i]; }
+    else if (arg === '--once') { opts.once = true; }
     else if (arg === '--verbose') { opts.verbose = true; }
     else if (arg === '--ignore' && args[i + 1]) { opts.ignore.push(args[++i]); }
     else if (arg === '--max-issues' && args[i + 1]) { opts.maxIssues = parseInt(args[++i], 10); }
@@ -225,43 +242,98 @@ function parseArgs(args) {
 
 // ─── Collect files recursively ───────────────────────────────
 
-function collectFiles(dir, ignorePatterns = []) {
-  const defaultIgnore = ['node_modules', '.git', 'dist', 'build', '.next', '__pycache__', '.venv', 'venv', 'coverage', '.cache', '.turbo'];
-  const allIgnore = [...defaultIgnore, ...ignorePatterns];
-  const extensions = ['.js', '.ts', '.jsx', '.tsx', '.mjs', '.cjs', '.py', '.pyw', '.go', '.rs', '.java', '.kt', '.cs', '.json'];
-  const MAX_FILE_SIZE = 1024 * 1024; // 1MB per file — skip anything larger
-  const MAX_FILES = 50000;           // Hard cap to prevent memory issues
-  const files = [];
-
-  function walk(currentDir) {
-    if (files.length >= MAX_FILES) return;
-    let entries;
-    try {
-      entries = fs.readdirSync(currentDir, { withFileTypes: true });
-    } catch (e) {
-      return;
+function summarizeRemainingFiles(scannedFiles, allFiles, rootPath) {
+  const scannedSet = new Set(scannedFiles);
+  const remainingFiles = allFiles.filter(file => !scannedSet.has(file));
+  const directoryCounts = new Map();
+
+  for (const file of remainingFiles) {
+    const relativePath = path.relative(rootPath, file);
+    const segments = relativePath.split(path.sep).filter(Boolean);
+    const directory = segments.length > 1 ? segments[0] : '(root)';
+    directoryCounts.set(directory, (directoryCounts.get(directory) || 0) + 1);
+  }
+
+  const topDirectories = Array.from(directoryCounts.entries())
+    .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
+    .slice(0, 3)
+    .map(([directory, count]) => ({ directory, count }));
+
+  return {
+    remainingFiles,
+    remainingCount: remainingFiles.length,
+    topDirectories,
+    previewFiles: remainingFiles.slice(0, 5).map(file => path.relative(rootPath, file)),
+  };
+}
+
+function requireProFeature(featureName) {
+  const lm = new LicenseManager();
+  const access = lm.canUseProFeature(featureName);
+  if (!access.allowed) {
+    const upgradeUrl = 'https://thuban.dev/pricing';
+    console.log('');
+    console.log(c('yellow', '  ╔══════════════════════════════════════════════════════════════╗'));
+    console.log(c('yellow', '  ║') + c('bold', '  PRO FEATURE REQUIRED                                         ') + c('yellow', '║'));
+    console.log(c('yellow', '  ╠══════════════════════════════════════════════════════════════╣'));
+    console.log(c('yellow', '  ║') + `  ${featureName} is available on Thuban Pro.`.padEnd(62) + c('yellow', '║'));
+    console.log(c('yellow', '  ║') + '  Free Thuban gives you a one-off checkup. Pro gives you'.padEnd(62) + c('yellow', '║'));
+    console.log(c('yellow', '  ║') + '  a pair of eyes on your codebase all day every day with'.padEnd(62) + c('yellow', '║'));
+    console.log(c('yellow', '  ║') + '  recurring scans, saved history, trends, and alerts.'.padEnd(62) + c('yellow', '║'));
+    console.log(c('yellow', '  ║') + '                                                              ' + c('yellow', '║'));
+    console.log(c('yellow', '  ║') + `  Upgrade now: ${upgradeUrl}`.padEnd(62) + c('yellow', '║'));
+    console.log(c('yellow', '  ║') + '  CLI shortcut: thuban upgrade'.padEnd(62) + c('yellow', '║'));
+    console.log(c('yellow', '  ╚══════════════════════════════════════════════════════════════╝'));
+    console.log('');
+    process.exit(0);
+  }
+  return lm;
+}
+
+function resolveRepoConfigOrExit(store, targetPath) {
+  const repo = store.getRepo(targetPath);
+  if (!repo) {
+    console.log('');
+    console.log(c('yellow', '  No monitor configuration found for this repo.'));
+    console.log(c('gray', '  Run `thuban monitor <path> --once` or `thuban monitor <path>` first.'));
+    console.log('');
+    process.exit(0);
+  }
+  return repo;
+}
+
+function printFileCapUpgradePrompt({ scannedCount, totalCount, remainingSummary, upgradeUrl }) {
+  const criticalDirectoryCount = remainingSummary.topDirectories.length;
+
+  console.log(c('yellow', '  ╔══════════════════════════════════════════════════════════════╗'));
+  console.log(c('yellow', '  ║') + c('bold', '  FREE TIER LIMIT REACHED                                     ') + c('yellow', '║'));
+  console.log(c('yellow', '  ╠══════════════════════════════════════════════════════════════╣'));
+  console.log(c('yellow', '  ║') + `  You have scanned ${scannedCount} of ${totalCount} files.`.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + '  Upgrade to Thuban Pro for continuous monitoring —'.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + '  a pair of eyes on your codebase, all day, every day.'.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + '  Your always-on guardian with unlimited scans.'.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + `  ${remainingSummary.remainingCount} more files remaining including ${criticalDirectoryCount}`.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + `  critical director${criticalDirectoryCount === 1 ? 'y' : 'ies'}.`.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + '                                                              ' + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + `  Upgrade now: ${upgradeUrl}`.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ║') + `  CLI shortcut: thuban upgrade`.padEnd(62) + c('yellow', '║'));
+  console.log(c('yellow', '  ╚══════════════════════════════════════════════════════════════╝'));
+  console.log('');
+
+  if (remainingSummary.topDirectories.length > 0) {
+    console.log(c('bold', '  Remaining scan preview'));
+    for (const item of remainingSummary.topDirectories) {
+      console.log(`    ${c('yellow', '•')} ${c('cyan', item.directory)} ${c('gray', `(${item.count} files)`)}`);
     }
-    for (const entry of entries) {
-      if (files.length >= MAX_FILES) return;
-      if (allIgnore.some(p => entry.name === p || entry.name.match(p))) continue;
-      const fullPath = path.join(currentDir, entry.name);
-      if (entry.isDirectory()) {
-        walk(fullPath);
-      } else if (extensions.some(ext => entry.name.endsWith(ext))) {
-        try {
-          const stat = fs.statSync(fullPath);
-          if (stat.size <= MAX_FILE_SIZE) {
-            files.push(fullPath);
-          }
-        } catch (e) {
-          // Skip files we can't stat
-        }
+    if (remainingSummary.previewFiles.length > 0) {
+      console.log('');
+      console.log(c('gray', '  Next files that would be scanned:'));
+      for (const file of remainingSummary.previewFiles) {
+        console.log(`    ${c('gray', '·')} ${file}`);
       }
     }
+    console.log('');
   }
-
-  walk(dir);
-  return files;
 }
 
 // ─── Commands ───────────────────────────────────────────────
@@ -281,9 +353,9 @@ async function cmdScan(opts) {
       console.log(c('gray', `  ${opts.targetPath}`));
     }
     const tmpDir = path.join(os.tmpdir(), 'thuban-scan-' + Date.now());
-    const { execSync } = require('child_process');
+    const { execFileSync } = require('child_process');
     try {
-      execSync(`git clone --depth 1 "${opts.targetPath}" "${tmpDir}"`, { stdio: 'pipe', timeout: 60000 });
+      execFileSync('git', ['clone', '--depth', '1', opts.targetPath, tmpDir], { stdio: 'pipe', timeout: 60000 });
       targetPath = tmpDir;
       clonedRepo = tmpDir;
       if (!opts.json) {
@@ -301,6 +373,7 @@ async function cmdScan(opts) {
   const lm = new LicenseManager();
   const tier = lm.getTierConfig();
   const scanCheck = lm.canScan();
+  const upgradeUrl = 'https://thuban.dev/pricing';
 
   if (!scanCheck.allowed && !opts.json) {
     console.log('');
@@ -311,8 +384,8 @@ async function cmdScan(opts) {
     console.log(`  You've used ${c('bold', scanCheck.used + '/' + scanCheck.limit)} free scans this month.`);
     console.log(`  Resets on ${c('cyan', scanCheck.resetsOn)}.`);
     console.log('');
-    console.log(`  ${c('cyan', 'Upgrade to Pro')} for unlimited scans, full reports, and auto-fix:`);
-    console.log(`  ${c('bold', 'https://thuban.dev/pricing')}`);
+    console.log(`  ${c('cyan', 'Upgrade to Pro')} for unlimited scans, full reports, auto-fix, and an always-on pair of eyes via thuban monitor:`);
+    console.log(`  ${c('bold', upgradeUrl)}`);
     console.log('');
     console.log(`  Or activate a key: ${c('cyan', 'thuban activate <your-key>')}`);
     console.log('');
@@ -348,10 +421,11 @@ async function cmdScan(opts) {
   // File limit gating
   const files = tier.maxFiles < Infinity ? allFiles.slice(0, tier.maxFiles) : allFiles;
   const isFileCapped = totalFileCount > tier.maxFiles;
+  const remainingSummary = isFileCapped ? summarizeRemainingFiles(files, allFiles, targetPath) : null;
 
   if (!opts.json && isFileCapped) {
     console.log(c('yellow', `  Free tier: scanning ${tier.maxFiles} of ${totalFileCount} files`));
-    console.log(c('gray', `  Upgrade to Pro to scan your entire codebase`));
+    console.log(c('gray', `  Partial results below. Upgrade to scan your entire codebase.`));
     console.log('');
   } else if (!opts.json) {
     console.log(c('gray', `  Found ${files.length} files to scan...`));
@@ -377,12 +451,8 @@ async function cmdScan(opts) {
 
   // ─── Collect all issues ──────────────────────────────────
   const allIssues = [];
-  for (const [file, fileResults] of Object.entries(scanResults)) {
-    if (fileResults.issues) {
-      for (const issue of fileResults.issues) {
-        allIssues.push({ file: path.relative(targetPath, file), ...issue });
-      }
-    }
+  for (const issue of (scanResults.issues || [])) {
+    allIssues.push({ file: path.relative(targetPath, issue.file), ...issue });
   }
 
   // Add hallucination results as issues
@@ -428,6 +498,11 @@ async function cmdScan(opts) {
       issues: tier.showFullDetails ? allIssues : allIssues.slice(0, tier.teaserIssues),
       totalIssues: allIssues.length,
       gated: !tier.showFullDetails,
+      fileLimitReached: isFileCapped,
+      upgradeUrl: isFileCapped ? upgradeUrl : null,
+      remainingFiles: remainingSummary ? remainingSummary.remainingCount : 0,
+      remainingDirectories: remainingSummary ? remainingSummary.topDirectories : [],
+      remainingPreview: remainingSummary ? remainingSummary.previewFiles : [],
     }, null, 2));
     return;
   }
@@ -466,6 +541,7 @@ async function cmdScan(opts) {
 
   console.log(c('cyan', '  ╔══════════════════════════════════════════════════════╗'));
   console.log(c('cyan', '  ║') + c('bold', '  THUBAN SCAN RESULTS                                ') + c('cyan', '║'));
+  console.log(c('cyan', '  ║') + c('gray', '  v0.3.3 · Public Beta                               ') + c('cyan', '║'));
   console.log(c('cyan', '  ╠══════════════════════════════════════════════════════╣'));
   console.log(c('cyan', '  ║') + `  Files scanned:     ${c('bold', String(files.length).padEnd(6))}` + (isFileCapped ? c('yellow', ` of ${totalFileCount}`) : '              ') + c('cyan', '       ║'));
   console.log(c('cyan', '  ║') + `  Health score:      ${c(scoreColor, (grade + ' (' + Math.round(score) + '/100)').padEnd(20))}` + c('cyan', '           ║'));
@@ -475,6 +551,15 @@ async function cmdScan(opts) {
   console.log(c('cyan', '  ╚══════════════════════════════════════════════════════╝'));
   console.log('');
 
+  // ─── Python/non-JS scoring disclosure ───────────────────
+  const hasNonJsFiles = files.some(f => !f.endsWith('.js') && !f.endsWith('.ts') && !f.endsWith('.jsx') && !f.endsWith('.tsx') && !f.endsWith('.mjs'));
+  if (hasNonJsFiles) {
+    const nonJsExts = [...new Set(files.filter(f => !/\.(js|ts|jsx|tsx|mjs)$/.test(f)).map(f => path.extname(f)).filter(Boolean))];
+    console.log(c('gray', `  Note: Score includes Security + Hallucination + Code Quality categories.`));
+    console.log(c('gray', `  Architecture + Dependency analysis evaluated for JS/TS only. Detected non-JS: ${nonJsExts.join(', ')}`));
+    console.log('');
+  }
+
   // ─── CRITICAL: Hallucinated APIs (will crash) ────────────
   if (hallucinations.length > 0) {
     console.log(c('bgRed', ' CRITICAL ') + c('red', c('bold', ` ${hallucinations.length} Hallucinated API${hallucinations.length > 1 ? 's' : ''}`)));
@@ -672,9 +757,12 @@ async function cmdScan(opts) {
   }
 
   if (isFileCapped) {
-    console.log(c('yellow', `  ⚠ ${totalFileCount - tier.maxFiles} files were not scanned (free tier limit: ${tier.maxFiles} files)`));
-    console.log(c('gray', `  Your actual score may be worse. Upgrade to scan everything.`));
-    console.log('');
+    printFileCapUpgradePrompt({
+      scannedCount: files.length,
+      totalCount: totalFileCount,
+      remainingSummary,
+      upgradeUrl,
+    });
   }
 
   // ─── Continuous monitoring pitch ────────────────────────
@@ -759,6 +847,109 @@ async function cmdDeps(opts) {
   }
 }
 
+async function cmdMonitor(opts) {
+  requireProFeature('Scheduled monitoring');
+  const targetPath = path.resolve(opts.targetPath);
+  const service = new MonitorService();
+  const repoConfig = service.configureRepo({
+    repoPath: targetPath,
+    frequency: opts.frequency,
+    intervalMs: resolveIntervalMs(opts.frequency, opts.intervalMs),
+    notification: { channels: String(opts.notify || 'inbox').split(',').map(item => item.trim()).filter(Boolean) },
+  });
+
+  if (opts.once) {
+    const result = await service.runRepoScan(repoConfig);
+    if (opts.json) {
+      console.log(JSON.stringify(result.run, null, 2));
+      return;
+    }
+    console.log('');
+    console.log(c('bold', '  THUBAN MONITOR RUN'));
+    console.log(`  Repo: ${repoConfig.repoPath}`);
+    console.log(`  New issues: ${result.diff.added.length}`);
+    console.log(`  Resolved issues: ${result.diff.resolved.length}`);
+    console.log(`  History saved: ${result.runPath}`);
+    console.log('');
+    return;
+  }
+
+  console.log('');
+  console.log(c('bold', '  THUBAN MONITOR ACTIVE'));
+  console.log(`  Repo: ${repoConfig.repoPath}`);
+  console.log(`  Frequency: ${repoConfig.frequency} (${repoConfig.intervalMs}ms)`);
+  console.log(`  Notifications: ${(repoConfig.notification.channels || []).join(', ')}`);
+  console.log(c('gray', '  Press Ctrl+C to stop.'));
+  console.log('');
+
+  service.start(repoConfig);
+  process.on('SIGINT', () => {
+    service.stopAll();
+    process.exit(0);
+  });
+}
+
+async function cmdHistory(opts) {
+  requireProFeature('Scan history');
+  const store = new MonitorStore();
+  const repo = resolveRepoConfigOrExit(store, opts.targetPath);
+  const runs = store.listRuns(repo.repoId);
+
+  if (opts.json) {
+    console.log(JSON.stringify({ repo, runs }, null, 2));
+    return;
+  }
+
+  console.log('');
+  console.log(c('bold', '  THUBAN HISTORY'));
+  console.log(`  Repo: ${repo.repoPath}`);
+  console.log(`  Runs: ${runs.length}`);
+  console.log('');
+
+  for (const run of runs.slice(-10).reverse()) {
+    console.log(`  ${c('cyan', run.timestamp)}  issues=${run.metrics.issueCount}  new=${run.diff?.added?.length || 0}  resolved=${run.diff?.resolved?.length || 0}`);
+  }
+
+  const notifications = store.getNotifications(10).filter(item => item.repoId === repo.repoId);
+  if (notifications.length) {
+    console.log('');
+    console.log(c('bold', '  RECENT ALERTS'));
+    for (const notification of notifications) {
+      console.log(`  ${c('yellow', notification.timestamp)}  ${notification.summary}`);
+    }
+  }
+  console.log('');
+}
+
+async function cmdTrend(opts) {
+  requireProFeature('Trend reporting');
+  const store = new MonitorStore();
+  const repo = resolveRepoConfigOrExit(store, opts.targetPath);
+  const runs = store.listRuns(repo.repoId);
+  const trend = runs.map(run => ({
+    timestamp: run.timestamp,
+    issueCount: run.metrics.issueCount,
+    hallucinations: run.metrics.hallucinations,
+    secrets: run.metrics.secrets,
+    techDebtScore: run.metrics.techDebtScore,
+    techDebtHours: run.metrics.techDebtHours,
+  }));
+
+  if (opts.json) {
+    console.log(JSON.stringify({ repo, trend }, null, 2));
+    return;
+  }
+
+  console.log('');
+  console.log(c('bold', '  THUBAN TREND'));
+  console.log(`  Repo: ${repo.repoPath}`);
+  console.log('');
+  for (const point of trend.slice(-12)) {
+    console.log(`  ${c('cyan', point.timestamp)}  issues=${point.issueCount}  hallucinations=${point.hallucinations}  secrets=${point.secrets}  debtScore=${point.techDebtScore ?? 'n/a'}  debtHours=${point.techDebtHours ?? 'n/a'}`);
+  }
+  console.log('');
+}
+
 async function cmdDrift(opts) {
   const startTime = Date.now();
   const targetPath = path.resolve(opts.targetPath);
@@ -829,7 +1020,11 @@ async function cmdInject(opts) {
     console.log('');
   }
 
-  const files = collectFiles(targetPath, opts.ignore).filter(f => f.endsWith('.js') || f.endsWith('.ts'));
+  const files = collectFiles(targetPath, opts.ignore).filter(f =>
+    f.endsWith('.js') || f.endsWith('.ts') || f.endsWith('.jsx') || f.endsWith('.tsx') ||
+    f.endsWith('.py') || f.endsWith('.java') || f.endsWith('.cs') || f.endsWith('.go') ||
+    f.endsWith('.kt') || f.endsWith('.rs') || f.endsWith('.php') || f.endsWith('.rb')
+  );
   const graph = new DependencyGraph({ rootPath: targetPath });
   await graph.build(files);
 
@@ -848,8 +1043,26 @@ async function cmdInject(opts) {
         continue;
       }
 
-      const widget = generator.generateWidget(file, content);
-      if (!widget) { skipped++; continue; }
+      const rawWidget = await generator.generateWidget(file, content);
+      if (!rawWidget) { skipped++; continue; }
+      // generateWidget returns an object with { widgetString, ... }
+      const rawWidgetStr = (rawWidget && rawWidget.widgetString) ? rawWidget.widgetString : String(rawWidget);
+
+      // Select correct comment style by file extension
+      const ext = path.extname(file).toLowerCase();
+      let widget;
+      if (ext === '.py' || ext === '.rb') {
+        // Python and Ruby use # line comments
+        widget = rawWidgetStr.replace(/^\/\*\*\n/, '').replace(/\s*\*\/\s*$/, '')
+          .split('\n').map(l => l.replace(/^\s*\*\s?/, '# ')).join('\n');
+      } else if (ext === '.go' || ext === '.rs') {
+        // Go and Rust use // line comments
+        widget = rawWidgetStr.replace(/^\/\*\*\n/, '').replace(/\s*\*\/\s*$/, '')
+          .split('\n').map(l => l.replace(/^\s*\*\s?/, '// ')).join('\n');
+      } else {
+        // Java, Kotlin, C#, PHP all support /** */ block comments natively
+        widget = rawWidgetStr;
+      }
 
       if (opts.fix) {
         // Actually inject
@@ -885,7 +1098,7 @@ async function cmdInject(opts) {
   } else {
     console.log(c('green', `  ✓ Injected Mother Code into ${injected} files`));
   }
-  console.log(`  ${c('gray', `Skipped: ${skipped} (already annotated or non-JS/TS)`)}`);
+  console.log(`  ${c('gray', `Skipped: ${skipped} (already annotated or unsupported)`)}`);
   console.log('');
 }
 
@@ -930,12 +1143,10 @@ async function cmdReport(opts) {
   let totalIssues = 0;
   let criticalCount = 0;
   let highCount = 0;
-  for (const [, r] of Object.entries(scanResults)) {
-    if (r.issues) {
-      totalIssues += r.issues.length;
-      criticalCount += r.issues.filter(i => i.severity === 'critical').length;
-      highCount += r.issues.filter(i => i.severity === 'high').length;
-    }
+  for (const i of (scanResults.issues || [])) {
+    totalIssues++;
+    if (i.severity === 'critical') criticalCount++;
+    if (i.severity === 'high') highCount++;
   }
 
   const orphans = graph.getOrphanFiles();
@@ -1006,10 +1217,7 @@ async function cmdReport(opts) {
     console.log('');
   }
 
-  // Clean up cloned repo
-  if (clonedRepo) {
-    try { fs.rmSync(clonedRepo, { recursive: true, force: true }); } catch {}
-  }
+  // Clean up cloned repo (clonedRepo only exists in cmdScan scope)
 }
 
 // ─── Tech Debt & Fix Commands ────────────────────────────
@@ -1157,13 +1365,24 @@ async function cmdFix(opts) {
     console.log(c('cyan', '  ╔══════════════════════════════════════════════════════╗'));
     console.log(c('cyan', '  ║') + c('bold', '  FIX RESULTS                                        ') + c('cyan', '║'));
     console.log(c('cyan', '  ╠══════════════════════════════════════════════════════╣'));
-    console.log(c('cyan', '  ║') + `  Fixed:             ${c('green', String(result.fixed).padEnd(20))}` + c('cyan', '           ║'));
+    // Split annotations (inject_widget/regenerate_widget) from real code fixes
+    const annotationsAdded = (result.fixes || []).filter(f => f.status === 'fixed' && (f.fixAction === 'inject_widget' || f.fixAction === 'regenerate_widget')).length;
+    const issuesFixed = result.fixed - annotationsAdded;
+    if (annotationsAdded > 0) {
+      console.log(c('cyan', '  ║') + `  Annotations added:  ${c('green', String(annotationsAdded).padEnd(19))}` + c('cyan', '           ║'));
+    }
+    if (issuesFixed > 0) {
+      console.log(c('cyan', '  ║') + `  Issues fixed:      ${c('green', String(issuesFixed).padEnd(20))}` + c('cyan', '           ║'));
+    }
+    if (annotationsAdded === 0 && issuesFixed === 0) {
+      console.log(c('cyan', '  ║') + `  Fixed:             ${c('green', String(result.fixed).padEnd(20))}` + c('cyan', '           ║'));
+    }
     console.log(c('cyan', '  ║') + `  Flagged for review: ${c('yellow', String(result.flagged).padEnd(19))}` + c('cyan', '           ║'));
     if (result.failed > 0) {
       console.log(c('cyan', '  ║') + `  Failed:            ${c('red', String(result.failed).padEnd(20))}` + c('cyan', '           ║'));
     }
-    if (result.skippedUnsafe > 0) {
-      console.log(c('cyan', '  ║') + `  Skipped (unsafe):  ${c('gray', String(result.skippedUnsafe).padEnd(20))}` + c('cyan', '           ║'));
+    if (result.skipped > 0) {
+      console.log(c('cyan', '  ║') + `  Skipped:           ${c('gray', String(result.skipped).padEnd(20))}` + c('cyan', '           ║'));
     }
     console.log(c('cyan', '  ╚══════════════════════════════════════════════════════╝'));
     console.log('');
@@ -1180,9 +1399,9 @@ async function cmdFix(opts) {
       console.log('');
     }
 
-    if (result.skippedUnsafe > 0) {
-      console.log(c('gray', `  ${result.skippedUnsafe} unsafe fixes were skipped. These change runtime behaviour.`));
-      console.log(c('gray', '  Review them with: ') + c('cyan', 'npx thuban fix . --fix --unsafe'));
+    if (result.skipped > 0) {
+      console.log(c('gray', `  ${result.skipped} items were skipped (no auto-fix available or pattern not matched).`));
+      console.log(c('gray', '  Review them manually or run: ') + c('cyan', 'npx thuban dashboard .'));
       console.log('');
     }
 
@@ -1407,12 +1626,11 @@ async function cmdDiff(opts) {
   let totalIssues = 0;
   const fileIssues = {};
 
-  for (const [file, result] of Object.entries(scanResults)) {
-    if (result.issues && result.issues.length > 0) {
-      const relFile = path.relative(targetPath, file);
-      fileIssues[relFile] = result.issues;
-      totalIssues += result.issues.length;
-    }
+  for (const issue of (scanResults.issues || [])) {
+    const relFile = path.relative(targetPath, issue.file);
+    if (!fileIssues[relFile]) fileIssues[relFile] = [];
+    fileIssues[relFile].push(issue);
+    totalIssues++;
   }
 
   totalIssues += hallResults.stats.totalIssues;
@@ -1515,7 +1733,7 @@ function cmdUpgrade() {
   console.log(c('bold', '  THUBAN PRICING'));
   console.log('');
   console.log(`  ${c('gray', 'FREE')}          ${c('bold', '£0/mo')}`);
-  console.log(`    3 scans/month, 100 files, summary only`);
+  console.log(`    5 scans/month, 100 files, summary only`);
   console.log('');
   console.log(`  ${c('cyan', 'PRO')}           ${c('bold', '£19/mo')}  ${c('gray', '(or £149/year — save 35%)')}`);
   console.log(`    Unlimited scans, full details, auto-fix, HTML dashboard`);
@@ -1629,12 +1847,8 @@ async function cmdCost(opts) {
 
   // Collect all issues
   const allIssues = [];
-  for (const [file, fileResults] of Object.entries(scanResults)) {
-    if (fileResults.issues) {
-      for (const issue of fileResults.issues) {
-        allIssues.push({ file: path.relative(targetPath, file), ...issue });
-      }
-    }
+  for (const issue of (scanResults.issues || [])) {
+    allIssues.push({ file: path.relative(targetPath, issue.file), ...issue });
   }
   for (const item of hallResults.phantomAPIs) {
     allIssues.push({ category: 'hallucination', severity: 'critical', message: item.name });
@@ -1875,12 +2089,8 @@ async function cmdExecutive(opts) {
 
   // Collect all issues for cost calculator
   const allIssues = [];
-  for (const [file, fileResults] of Object.entries(scanResults)) {
-    if (fileResults.issues) {
-      for (const issue of fileResults.issues) {
-        allIssues.push({ file: path.relative(targetPath, file), ...issue });
-      }
-    }
+  for (const issue of (scanResults.issues || [])) {
+    allIssues.push({ file: path.relative(targetPath, issue.file), ...issue });
   }
   for (const item of hallResults.phantomAPIs) {
     allIssues.push({ category: 'hallucination', severity: 'critical', message: item.name });
@@ -1954,12 +2164,8 @@ async function cmdBaseline(opts) {
     ]);
 
     const allIssues = [];
-    for (const [file, fileResults] of Object.entries(scanResults)) {
-      if (fileResults.issues) {
-        for (const issue of fileResults.issues) {
-          allIssues.push({ file: path.relative(targetPath, file), ...issue });
-        }
-      }
+    for (const issue of (scanResults.issues || [])) {
+      allIssues.push({ file: path.relative(targetPath, issue.file), ...issue });
     }
     for (const item of hallResults.phantomAPIs) {
       allIssues.push({ file: item.file, category: 'hallucination', severity: 'critical', id: item.id, message: item.name });
@@ -2082,8 +2288,8 @@ async function runScanSilent(targetInput) {
 
   if (isGitUrl) {
     const tmpDir = path.join(os.tmpdir(), 'thuban-compare-' + Date.now() + '-' + Math.random().toString(36).slice(2,6));
-    const { execSync } = require('child_process');
-    execSync(`git clone --depth 1 "${targetInput}" "${tmpDir}"`, { stdio: 'pipe', timeout: 60000 });
+    const { execFileSync } = require('child_process');
+    execFileSync('git', ['clone', '--depth', '1', targetInput, tmpDir], { stdio: 'pipe', timeout: 60000 });
     targetPath = tmpDir;
     clonedRepo = tmpDir;
     // Extract repo name for label
@@ -2335,6 +2541,15 @@ async function main() {
       case 'watch':
         await cmdWatch(opts);
         break;
+      case 'monitor':
+        await cmdMonitor(opts);
+        break;
+      case 'history':
+        await cmdHistory(opts);
+        break;
+      case 'trend':
+        await cmdTrend(opts);
+        break;
       case 'dashboard':
       case 'dash':
         await cmdDashboard(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thuban",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "The safety layer for AI-coded software. Detect hallucinated APIs, ghost code, tech debt, and architecture drift. One command. Zero dependencies.",
   "bin": {
     "thuban": "./cli.js"
@@ -45,5 +45,8 @@
     "packages/scanner/*.js",
     "README.md",
     "LICENSE"
-  ]
+  ],
+  "dependencies": {
+    "docx": "^9.7.1"
+  }
 }