@nerviq/cli 1.8.6 → 1.8.8

package/src/opencode/activity.js

@@ -1,286 +1,286 @@
-/**
- * OpenCode Repeat-Usage Surfaces — 6 repeat-usage surfaces
- *
- * Adapts the shared activity/snapshot backend for OpenCode platform.
- * Provides: history, compare, trend, watch, feedback, insights.
- *
- * OpenCode snapshots are stored alongside Claude snapshots in
- * .nerviq/snapshots/ (legacy: .claude/claudex-setup/snapshots/) but filtered by platform='opencode'.
- */
-
-const path = require('path');
-const {
-  readSnapshotIndex,
-  writeSnapshotArtifact,
-  exportTrendReport: sharedExportTrendReport,
-  recordRecommendationOutcome,
-  readOutcomeIndex,
-  summarizeOutcomeEntries,
-} = require('../activity');
-const { version } = require('../../package.json');
-
-// --- History ---
-
-function getOpenCodeHistory(dir, limit = 20) {
-  const entries = readSnapshotIndex(dir);
-  return entries
-    .filter(e => e.snapshotKind === 'audit' && (e.platform === 'opencode' || e.summary?.platform === 'opencode'))
-    .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
-    .slice(0, limit);
-}
-
-function formatOpenCodeHistory(dir) {
-  const history = getOpenCodeHistory(dir, 10);
-  if (history.length === 0) {
-    return 'No OpenCode snapshots found. Run `npx nerviq --platform opencode --snapshot` to save one.';
-  }
-
-  const lines = ['OpenCode Score History (most recent first):', ''];
-  for (const entry of history) {
-    const date = entry.createdAt?.split('T')[0] || 'unknown';
-    const score = entry.summary?.score ?? '?';
-    const passed = entry.summary?.passed ?? '?';
-    const total = entry.summary?.checkCount ?? '?';
-    lines.push(`  ${date}  ${score}/100  (${passed}/${total} passing)`);
-  }
-
-  const comparison = compareOpenCodeLatest(dir);
-  if (comparison) {
-    lines.push('');
-    const sign = comparison.delta.score >= 0 ? '+' : '';
-    lines.push(`  Trend: ${comparison.trend} (${sign}${comparison.delta.score} since previous)`);
-    if (comparison.improvements.length > 0) lines.push(`  Fixed: ${comparison.improvements.join(', ')}`);
-    if (comparison.regressions.length > 0) lines.push(`  New gaps: ${comparison.regressions.join(', ')}`);
-  }
-
-  return lines.join('\n');
-}
-
-// --- Compare ---
-
-function compareOpenCodeLatest(dir) {
-  const audits = getOpenCodeHistory(dir, 2);
-  if (audits.length < 2) return null;
-
-  const current = audits[0];
-  const previous = audits[1];
-
-  const delta = {
-    score: (current.summary?.score || 0) - (previous.summary?.score || 0),
-    organic: (current.summary?.organicScore || 0) - (previous.summary?.organicScore || 0),
-    passed: (current.summary?.passed || 0) - (previous.summary?.passed || 0),
-  };
-
-  const regressions = [];
-  const improvements = [];
-  const prevKeys = new Set(previous.summary?.topActionKeys || []);
-  const currKeys = new Set(current.summary?.topActionKeys || []);
-  for (const key of currKeys) { if (!prevKeys.has(key)) regressions.push(key); }
-  for (const key of prevKeys) { if (!currKeys.has(key)) improvements.push(key); }
-
-  return {
-    platform: 'opencode',
-    current: { date: current.createdAt, score: current.summary?.score, passed: current.summary?.passed },
-    previous: { date: previous.createdAt, score: previous.summary?.score, passed: previous.summary?.passed },
-    delta,
-    regressions,
-    improvements,
-    trend: delta.score > 0 ? 'improving' : delta.score < 0 ? 'regressing' : 'stable',
-  };
-}
-
-// --- Trend ---
-
-function exportOpenCodeTrendReport(dir) {
-  const history = getOpenCodeHistory(dir, 50);
-  if (history.length === 0) return null;
-
-  const comparison = compareOpenCodeLatest(dir);
-  const lines = [
-    '# OpenCode Setup Trend Report',
-    '',
-    `**Project:** ${path.basename(dir)}`,
-    '**Platform:** OpenCode',
-    `**Generated:** ${new Date().toISOString().split('T')[0]}`,
-    `**Snapshots:** ${history.length}`,
-    '',
-    '## Score History',
-    '',
-    '| Date | Score | Passed | Checks |',
-    '|------|-------|--------|--------|',
-  ];
-
-  for (const entry of history) {
-    const date = entry.createdAt?.split('T')[0] || '?';
-    lines.push(`| ${date} | ${entry.summary?.score ?? '?'}/100 | ${entry.summary?.passed ?? '?'} | ${entry.summary?.checkCount ?? '?'} |`);
-  }
-
-  if (comparison) {
-    lines.push('');
-    lines.push('## Latest Comparison');
-    lines.push('');
-    lines.push(`- **Previous:** ${comparison.previous.score}/100 (${comparison.previous.date?.split('T')[0]})`);
-    lines.push(`- **Current:** ${comparison.current.score}/100 (${comparison.current.date?.split('T')[0]})`);
-    lines.push(`- **Delta:** ${comparison.delta.score >= 0 ? '+' : ''}${comparison.delta.score} points`);
-    lines.push(`- **Trend:** ${comparison.trend}`);
-    if (comparison.improvements.length > 0) lines.push(`- **Fixed:** ${comparison.improvements.join(', ')}`);
-    if (comparison.regressions.length > 0) lines.push(`- **New gaps:** ${comparison.regressions.join(', ')}`);
-  }
-
-  if (history.length >= 3) {
-    lines.push('');
-    lines.push('## Trend Chart');
-    lines.push('');
-    lines.push('```');
-    const scores = history.slice().reverse().map(e => e.summary?.score ?? 0);
-    const max = Math.max(...scores, 100);
-    const chartHeight = 10;
-    for (let row = chartHeight; row >= 0; row--) {
-      const threshold = (row / chartHeight) * max;
-      const rowLabel = String(Math.round(threshold)).padStart(3);
-      const bar = scores.map(s => s >= threshold ? '#' : ' ').join('');
-      lines.push(`${rowLabel} |${bar}`);
-    }
-    lines.push(`    +${'─'.repeat(scores.length)}`);
-    lines.push('```');
-  }
-
-  lines.push('');
-  lines.push('---');
-  lines.push(`*Generated by nerviq v${version} for OpenCode*`);
-  return lines.join('\n');
-}
-
-// --- Feedback ---
-
-function recordOpenCodeFeedback(dir, payload) {
-  return recordRecommendationOutcome(dir, {
-    ...payload,
-    source: payload.source || 'opencode-cli',
-    platform: 'opencode',
-  });
-}
-
-function getOpenCodeFeedbackSummary(dir) {
-  const entries = readOutcomeIndex(dir)
-    .filter(e => e.source === 'opencode-cli' || e.platform === 'opencode');
-  return summarizeOutcomeEntries(entries);
-}
-
-function formatOpenCodeFeedback(dir) {
-  const summary = getOpenCodeFeedbackSummary(dir);
-  if (!summary || Object.keys(summary).length === 0) {
-    return 'No OpenCode feedback recorded yet.';
-  }
-
-  const lines = ['OpenCode Recommendation Feedback:', ''];
-  const entries = Array.isArray(summary) ? summary : Object.values(summary);
-  for (const entry of entries) {
-    const key = entry.key || 'unknown';
-    const accepted = entry.accepted || 0;
-    const rejected = entry.rejected || 0;
-    const total = entry.total || 0;
-    lines.push(`  ${key}: ${accepted} accepted, ${rejected} rejected (${total} total)`);
-  }
-  return lines.join('\n');
-}
-
-// --- Insights ---
-
-function generateOpenCodeInsights(dir) {
-  const history = getOpenCodeHistory(dir, 50);
-  const feedback = getOpenCodeFeedbackSummary(dir);
-  const insights = [];
-
-  if (history.length >= 3) {
-    const recentFailKeys = new Map();
-    for (const entry of history.slice(0, 5)) {
-      for (const key of (entry.summary?.topActionKeys || [])) {
-        recentFailKeys.set(key, (recentFailKeys.get(key) || 0) + 1);
-      }
-    }
-    for (const [key, count] of recentFailKeys) {
-      if (count >= 3) {
-        insights.push({
-          type: 'persistent-failure',
-          severity: 'high',
-          key,
-          message: `Check ${key} has failed in ${count} of the last ${Math.min(history.length, 5)} audits.`,
-        });
-      }
-    }
-  }
-
-  if (history.length >= 2) {
-    const scores = history.map(e => e.summary?.score ?? 0);
-    if (scores[0] < scores[1]) {
-      insights.push({
-        type: 'regression-pattern',
-        severity: 'medium',
-        message: `Score dropped from ${scores[1]} to ${scores[0]} in the most recent audit.`,
-        delta: scores[0] - scores[1],
-      });
-    }
-  }
-
-  if (history.length >= 5) {
-    const recentScores = history.slice(0, 5).map(e => e.summary?.score ?? 0);
-    const range = Math.max(...recentScores) - Math.min(...recentScores);
-    if (range <= 2) {
-      insights.push({
-        type: 'velocity-stall',
-        severity: 'low',
-        message: `Score has been flat (range: ${range} points) over the last 5 audits.`,
-      });
-    }
-  }
-
-  const feedbackEntries = Array.isArray(feedback) ? feedback : Object.values(feedback || {});
-  for (const entry of feedbackEntries) {
-    if (entry.rejected > entry.accepted && entry.total >= 2) {
-      insights.push({
-        type: 'feedback-signal',
-        severity: 'medium',
-        key: entry.key,
-        message: `Recommendation ${entry.key} has been rejected more than accepted (${entry.rejected}/${entry.total}).`,
-      });
-    }
-  }
-
-  return {
-    platform: 'opencode',
-    generatedAt: new Date().toISOString(),
-    snapshotCount: history.length,
-    feedbackCount: feedbackEntries.length,
-    insights,
-    summary: insights.length === 0
-      ? 'No actionable insights detected. Keep running audits to build pattern data.'
-      : `${insights.length} insight(s) detected across ${history.length} snapshots.`,
-  };
-}
-
-function formatOpenCodeInsights(dir) {
-  const result = generateOpenCodeInsights(dir);
-  if (result.insights.length === 0) return result.summary;
-
-  const lines = ['OpenCode Insights:', ''];
-  for (const insight of result.insights) {
-    const severity = insight.severity.toUpperCase();
-    lines.push(`  [${severity}] ${insight.message}`);
-  }
-  lines.push('');
-  lines.push(result.summary);
-  return lines.join('\n');
-}
-
-module.exports = {
-  getOpenCodeHistory,
-  formatOpenCodeHistory,
-  compareOpenCodeLatest,
-  exportOpenCodeTrendReport,
-  recordOpenCodeFeedback,
-  getOpenCodeFeedbackSummary,
-  formatOpenCodeFeedback,
-  generateOpenCodeInsights,
-  formatOpenCodeInsights,
-};
+/**
+ * OpenCode Repeat-Usage Surfaces — 6 repeat-usage surfaces
+ *
+ * Adapts the shared activity/snapshot backend for OpenCode platform.
+ * Provides: history, compare, trend, watch, feedback, insights.
+ *
+ * OpenCode snapshots are stored alongside Claude snapshots in
+ * .nerviq/snapshots/ (legacy: .claude/nerviq-cli/snapshots/) but filtered by platform='opencode'.
+ */
+
+const path = require('path');
+const {
+  readSnapshotIndex,
+  writeSnapshotArtifact,
+  exportTrendReport: sharedExportTrendReport,
+  recordRecommendationOutcome,
+  readOutcomeIndex,
+  summarizeOutcomeEntries,
+} = require('../activity');
+const { version } = require('../../package.json');
+
+// --- History ---
+
+function getOpenCodeHistory(dir, limit = 20) {
+  const entries = readSnapshotIndex(dir);
+  return entries
+    .filter(e => e.snapshotKind === 'audit' && (e.platform === 'opencode' || e.summary?.platform === 'opencode'))
+    .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
+    .slice(0, limit);
+}
+
+function formatOpenCodeHistory(dir) {
+  const history = getOpenCodeHistory(dir, 10);
+  if (history.length === 0) {
+    return 'No OpenCode snapshots found. Run `npx nerviq --platform opencode --snapshot` to save one.';
+  }
+
+  const lines = ['OpenCode Score History (most recent first):', ''];
+  for (const entry of history) {
+    const date = entry.createdAt?.split('T')[0] || 'unknown';
+    const score = entry.summary?.score ?? '?';
+    const passed = entry.summary?.passed ?? '?';
+    const total = entry.summary?.checkCount ?? '?';
+    lines.push(`  ${date}  ${score}/100  (${passed}/${total} passing)`);
+  }
+
+  const comparison = compareOpenCodeLatest(dir);
+  if (comparison) {
+    lines.push('');
+    const sign = comparison.delta.score >= 0 ? '+' : '';
+    lines.push(`  Trend: ${comparison.trend} (${sign}${comparison.delta.score} since previous)`);
+    if (comparison.improvements.length > 0) lines.push(`  Fixed: ${comparison.improvements.join(', ')}`);
+    if (comparison.regressions.length > 0) lines.push(`  New gaps: ${comparison.regressions.join(', ')}`);
+  }
+
+  return lines.join('\n');
+}
+
+// --- Compare ---
+
+function compareOpenCodeLatest(dir) {
+  const audits = getOpenCodeHistory(dir, 2);
+  if (audits.length < 2) return null;
+
+  const current = audits[0];
+  const previous = audits[1];
+
+  const delta = {
+    score: (current.summary?.score || 0) - (previous.summary?.score || 0),
+    organic: (current.summary?.organicScore || 0) - (previous.summary?.organicScore || 0),
+    passed: (current.summary?.passed || 0) - (previous.summary?.passed || 0),
+  };
+
+  const regressions = [];
+  const improvements = [];
+  const prevKeys = new Set(previous.summary?.topActionKeys || []);
+  const currKeys = new Set(current.summary?.topActionKeys || []);
+  for (const key of currKeys) { if (!prevKeys.has(key)) regressions.push(key); }
+  for (const key of prevKeys) { if (!currKeys.has(key)) improvements.push(key); }
+
+  return {
+    platform: 'opencode',
+    current: { date: current.createdAt, score: current.summary?.score, passed: current.summary?.passed },
+    previous: { date: previous.createdAt, score: previous.summary?.score, passed: previous.summary?.passed },
+    delta,
+    regressions,
+    improvements,
+    trend: delta.score > 0 ? 'improving' : delta.score < 0 ? 'regressing' : 'stable',
+  };
+}
+
+// --- Trend ---
+
+function exportOpenCodeTrendReport(dir) {
+  const history = getOpenCodeHistory(dir, 50);
+  if (history.length === 0) return null;
+
+  const comparison = compareOpenCodeLatest(dir);
+  const lines = [
+    '# OpenCode Setup Trend Report',
+    '',
+    `**Project:** ${path.basename(dir)}`,
+    '**Platform:** OpenCode',
+    `**Generated:** ${new Date().toISOString().split('T')[0]}`,
+    `**Snapshots:** ${history.length}`,
+    '',
+    '## Score History',
+    '',
+    '| Date | Score | Passed | Checks |',
+    '|------|-------|--------|--------|',
+  ];
+
+  for (const entry of history) {
+    const date = entry.createdAt?.split('T')[0] || '?';
+    lines.push(`| ${date} | ${entry.summary?.score ?? '?'}/100 | ${entry.summary?.passed ?? '?'} | ${entry.summary?.checkCount ?? '?'} |`);
+  }
+
+  if (comparison) {
+    lines.push('');
+    lines.push('## Latest Comparison');
+    lines.push('');
+    lines.push(`- **Previous:** ${comparison.previous.score}/100 (${comparison.previous.date?.split('T')[0]})`);
+    lines.push(`- **Current:** ${comparison.current.score}/100 (${comparison.current.date?.split('T')[0]})`);
+    lines.push(`- **Delta:** ${comparison.delta.score >= 0 ? '+' : ''}${comparison.delta.score} points`);
+    lines.push(`- **Trend:** ${comparison.trend}`);
+    if (comparison.improvements.length > 0) lines.push(`- **Fixed:** ${comparison.improvements.join(', ')}`);
+    if (comparison.regressions.length > 0) lines.push(`- **New gaps:** ${comparison.regressions.join(', ')}`);
+  }
+
+  if (history.length >= 3) {
+    lines.push('');
+    lines.push('## Trend Chart');
+    lines.push('');
+    lines.push('```');
+    const scores = history.slice().reverse().map(e => e.summary?.score ?? 0);
+    const max = Math.max(...scores, 100);
+    const chartHeight = 10;
+    for (let row = chartHeight; row >= 0; row--) {
+      const threshold = (row / chartHeight) * max;
+      const rowLabel = String(Math.round(threshold)).padStart(3);
+      const bar = scores.map(s => s >= threshold ? '#' : ' ').join('');
+      lines.push(`${rowLabel} |${bar}`);
+    }
+    lines.push(`    +${'─'.repeat(scores.length)}`);
+    lines.push('```');
+  }
+
+  lines.push('');
+  lines.push('---');
+  lines.push(`*Generated by nerviq v${version} for OpenCode*`);
+  return lines.join('\n');
+}
+
+// --- Feedback ---
+
+function recordOpenCodeFeedback(dir, payload) {
+  return recordRecommendationOutcome(dir, {
+    ...payload,
+    source: payload.source || 'opencode-cli',
+    platform: 'opencode',
+  });
+}
+
+function getOpenCodeFeedbackSummary(dir) {
+  const entries = readOutcomeIndex(dir)
+    .filter(e => e.source === 'opencode-cli' || e.platform === 'opencode');
+  return summarizeOutcomeEntries(entries);
+}
+
+function formatOpenCodeFeedback(dir) {
+  const summary = getOpenCodeFeedbackSummary(dir);
+  if (!summary || Object.keys(summary).length === 0) {
+    return 'No OpenCode feedback recorded yet.';
+  }
+
+  const lines = ['OpenCode Recommendation Feedback:', ''];
+  const entries = Array.isArray(summary) ? summary : Object.values(summary);
+  for (const entry of entries) {
+    const key = entry.key || 'unknown';
+    const accepted = entry.accepted || 0;
+    const rejected = entry.rejected || 0;
+    const total = entry.total || 0;
+    lines.push(`  ${key}: ${accepted} accepted, ${rejected} rejected (${total} total)`);
+  }
+  return lines.join('\n');
+}
+
+// --- Insights ---
+
+function generateOpenCodeInsights(dir) {
+  const history = getOpenCodeHistory(dir, 50);
+  const feedback = getOpenCodeFeedbackSummary(dir);
+  const insights = [];
+
+  if (history.length >= 3) {
+    const recentFailKeys = new Map();
+    for (const entry of history.slice(0, 5)) {
+      for (const key of (entry.summary?.topActionKeys || [])) {
+        recentFailKeys.set(key, (recentFailKeys.get(key) || 0) + 1);
+      }
+    }
+    for (const [key, count] of recentFailKeys) {
+      if (count >= 3) {
+        insights.push({
+          type: 'persistent-failure',
+          severity: 'high',
+          key,
+          message: `Check ${key} has failed in ${count} of the last ${Math.min(history.length, 5)} audits.`,
+        });
+      }
+    }
+  }
+
+  if (history.length >= 2) {
+    const scores = history.map(e => e.summary?.score ?? 0);
+    if (scores[0] < scores[1]) {
+      insights.push({
+        type: 'regression-pattern',
+        severity: 'medium',
+        message: `Score dropped from ${scores[1]} to ${scores[0]} in the most recent audit.`,
+        delta: scores[0] - scores[1],
+      });
+    }
+  }
+
+  if (history.length >= 5) {
+    const recentScores = history.slice(0, 5).map(e => e.summary?.score ?? 0);
+    const range = Math.max(...recentScores) - Math.min(...recentScores);
+    if (range <= 2) {
+      insights.push({
+        type: 'velocity-stall',
+        severity: 'low',
+        message: `Score has been flat (range: ${range} points) over the last 5 audits.`,
+      });
+    }
+  }
+
+  const feedbackEntries = Array.isArray(feedback) ? feedback : Object.values(feedback || {});
+  for (const entry of feedbackEntries) {
+    if (entry.rejected > entry.accepted && entry.total >= 2) {
+      insights.push({
+        type: 'feedback-signal',
+        severity: 'medium',
+        key: entry.key,
+        message: `Recommendation ${entry.key} has been rejected more than accepted (${entry.rejected}/${entry.total}).`,
+      });
+    }
+  }
+
+  return {
+    platform: 'opencode',
+    generatedAt: new Date().toISOString(),
+    snapshotCount: history.length,
+    feedbackCount: feedbackEntries.length,
+    insights,
+    summary: insights.length === 0
+      ? 'No actionable insights detected. Keep running audits to build pattern data.'
+      : `${insights.length} insight(s) detected across ${history.length} snapshots.`,
+  };
+}
+
+function formatOpenCodeInsights(dir) {
+  const result = generateOpenCodeInsights(dir);
+  if (result.insights.length === 0) return result.summary;
+
+  const lines = ['OpenCode Insights:', ''];
+  for (const insight of result.insights) {
+    const severity = insight.severity.toUpperCase();
+    lines.push(`  [${severity}] ${insight.message}`);
+  }
+  lines.push('');
+  lines.push(result.summary);
+  return lines.join('\n');
+}
+
+module.exports = {
+  getOpenCodeHistory,
+  formatOpenCodeHistory,
+  compareOpenCodeLatest,
+  exportOpenCodeTrendReport,
+  recordOpenCodeFeedback,
+  getOpenCodeFeedbackSummary,
+  formatOpenCodeFeedback,
+  generateOpenCodeInsights,
+  formatOpenCodeInsights,
+};

package/src/setup.js

@@ -810,7 +810,7 @@ process.stdin.on('end', () => {
       console.log(JSON.stringify({ decision: 'allow' }));
     }
   } catch (e) {
-    console.log(JSON.stringify({ decision: 'allow' }));
+    console.log(JSON.stringify({ decision: 'block', reason: 'Hook error - blocking for safety' }));
   }
 });
 `,
@@ -1062,7 +1062,14 @@ Prepare a release candidate for: $ARGUMENTS
 - Mock external dependencies, not internal logic
 - Include both happy path and edge case tests
 `;
-    rules['repository.md'] = `When changing release, packaging, or workflow files:
+    rules['repository.md'] = hasPython
+      ? `When changing release, packaging, or workflow files:
+- Keep pyproject.toml (or requirements.txt), CHANGELOG.md, README.md, and docs in sync
+- Prefer tagged release references over floating branch references in public docs
+- Preserve backward compatibility in CLI flags where practical
+- Any automation that writes files must document rollback expectations
+`
+      : `When changing release, packaging, or workflow files:
 - Keep package.json, CHANGELOG.md, README.md, and docs in sync
 - Prefer tagged release references over floating branch references in public docs
 - Preserve backward compatibility in CLI flags where practical
@@ -1115,6 +1122,18 @@ async function setup(options) {
   if (options.platform === 'codex') {
     return setupCodex(options);
   }
+  if (options.platform === 'windsurf') {
+    const { setupWindsurf } = require('./windsurf/setup');
+    return setupWindsurf(options);
+  }
+  if (options.platform === 'aider') {
+    const { setupAider } = require('./aider/setup');
+    return setupAider(options);
+  }
+  if (options.platform === 'cursor') {
+    const { setupCursor } = require('./cursor/setup');
+    return setupCursor(options);
+  }
 
   const ctx = new ProjectContext(options.dir);
   const stacks = ctx.detectStacks(STACKS);
@@ -1218,21 +1237,40 @@ async function setup(options) {
     }
   }
 
-  // Auto-register hooks in settings if hooks were created but no settings exist
+  // Auto-register hooks in settings — always merge hooks into settings.json
   const hooksDir = path.join(options.dir, '.claude/hooks');
   const settingsPath = path.join(options.dir, '.claude/settings.json');
-  if (fs.existsSync(hooksDir) && !fs.existsSync(settingsPath)) {
+  if (fs.existsSync(hooksDir)) {
     const hookFiles = fs.readdirSync(hooksDir).filter(f => f.endsWith('.sh') || f.endsWith('.js'));
     if (hookFiles.length > 0) {
-      const settings = buildSettingsForProfile({
+      const newSettings = buildSettingsForProfile({
         profileKey: options.profile || 'safe-write',
         hookFiles,
         mcpPackKeys: options.mcpPacks || [],
       });
-      fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
-      writtenFiles.push('.claude/settings.json');
-      log(`  \x1b[32m✅\x1b[0m Created .claude/settings.json (hooks registered)`);
-      created++;
+      // Merge new settings into existing settings.json, preserving all fields
+      let existingSettings = {};
+      if (fs.existsSync(settingsPath)) {
+        try {
+          existingSettings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+        } catch (_) {
+          // If settings.json is malformed, start fresh
+          existingSettings = {};
+        }
+      }
+      // Merge all fields from newSettings into existing, preserving existing values
+      if (newSettings.hooks) existingSettings.hooks = newSettings.hooks;
+      if (newSettings.permissions) existingSettings.permissions = { ...existingSettings.permissions, ...newSettings.permissions };
+      if (newSettings.mcpServers) existingSettings.mcpServers = { ...existingSettings.mcpServers, ...newSettings.mcpServers };
+      if (newSettings.nerviqSetup) existingSettings.nerviqSetup = { ...existingSettings.nerviqSetup, ...newSettings.nerviqSetup };
+      fs.writeFileSync(settingsPath, JSON.stringify(existingSettings, null, 2), 'utf8');
+      if (!writtenFiles.includes('.claude/settings.json') && !preservedFiles.includes('.claude/settings.json')) {
+        writtenFiles.push('.claude/settings.json');
+        log(`  \x1b[32m✅\x1b[0m Updated .claude/settings.json (hooks registered)`);
+        created++;
+      } else {
+        log(`  \x1b[32m✅\x1b[0m Merged hooks into existing .claude/settings.json`);
+      }
     }
   }