claude-git-hooks 2.6.3 → 2.8.0

package/bin/claude-hooks

@@ -8,7 +8,7 @@ import readline from 'readline';
 import https from 'https';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
-import { executeClaude, extractJSON } from '../lib/utils/claude-client.js';
+import { executeClaude, executeClaudeWithRetry, extractJSON, analyzeCode } from '../lib/utils/claude-client.js';
 import { loadPrompt } from '../lib/utils/prompt-builder.js';
 import { listPresets } from '../lib/utils/preset-loader.js';
 import { getConfig } from '../lib/config.js';
@@ -384,28 +384,78 @@ async function install(args) {
     success('.claude directory created');
   }
 
-  // Copy ALL template files (.md and .json) to .claude directory
+  // Remove old SONAR template files if they exist (migration from v2.6.x to v2.7.0+)
+  const oldSonarFiles = [
+    'CLAUDE_PRE_COMMIT_SONAR.md',
+    'CLAUDE_ANALYSIS_PROMPT_SONAR.md'
+  ];
+
+  oldSonarFiles.forEach(oldFile => {
+    const oldPath = path.join(claudeDir, oldFile);
+    if (fs.existsSync(oldPath)) {
+      fs.unlinkSync(oldPath);
+      info(`Removed old template: ${oldFile}`);
+    }
+  });
+
+  // Create .claude/prompts directory for markdown templates
+  const promptsDir = path.join(claudeDir, 'prompts');
+  if (!fs.existsSync(promptsDir)) {
+    fs.mkdirSync(promptsDir, { recursive: true });
+    success('.claude/prompts directory created');
+  }
+
+  // Copy template files (.md and .json) to appropriate locations
   const templateFiles = fs.readdirSync(templatesPath)
     .filter(file => {
       const filePath = path.join(templatesPath, file);
-      return fs.statSync(filePath).isFile() && (file.endsWith('.md') || file.endsWith('.json'));
+      // Exclude example.json files and only include .md and .json files
+      return fs.statSync(filePath).isFile() &&
+             (file.endsWith('.md') || file.endsWith('.json')) &&
+             !file.includes('example.json');
     });
 
   templateFiles.forEach(file => {
     const sourcePath = path.join(templatesPath, file);
-    const destPath = path.join(claudeDir, file);
+    let destPath;
+    let destLocation;
+
+    // .md files go to .claude/prompts/, .json files go to .claude/
+    if (file.endsWith('.md')) {
+      destPath = path.join(promptsDir, file);
+      destLocation = '.claude/prompts/';
+    } else {
+      destPath = path.join(claudeDir, file);
+      destLocation = '.claude/';
+    }
 
     // In force mode or if it doesn't exist, copy the file
     if (isForce || !fs.existsSync(destPath)) {
       if (fs.existsSync(sourcePath)) {
         fs.copyFileSync(sourcePath, destPath);
-        success(`${file} installed in .claude/`);
+        success(`${file} installed in ${destLocation}`);
       }
     } else {
       info(`${file} already exists (skipped)`);
     }
   });
 
+  // Clean up old .md files from .claude/ root (v2.8.0 migration)
+  // .md files should now be in .claude/prompts/, not .claude/
+  const oldMdFiles = fs.readdirSync(claudeDir)
+    .filter(file => {
+      const filePath = path.join(claudeDir, file);
+      return fs.statSync(filePath).isFile() && file.endsWith('.md');
+    });
+
+  if (oldMdFiles.length > 0) {
+    oldMdFiles.forEach(file => {
+      const oldPath = path.join(claudeDir, file);
+      fs.unlinkSync(oldPath);
+      info(`Removed old template from .claude/: ${file} (now in prompts/)`);
+    });
+  }
+
   // Copy presets directory structure
   const presetsSourcePath = path.join(templatesPath, 'presets');
   const presetsDestPath = path.join(claudeDir, 'presets');
@@ -446,15 +496,74 @@ async function install(args) {
     success(`${presetDirs.length} presets installed in .claude/presets/`);
   }
 
-  // Special handling for config.json: rename config.example.json → config.json
-  const configExamplePath = path.join(claudeDir, 'config.example.json');
+  // Special handling for config.json (v2.8.0+): backup old, create new simplified
   const configPath = path.join(claudeDir, 'config.json');
+  const configOldDir = path.join(claudeDir, 'config_old');
+  const configExampleDir = path.join(claudeDir, 'config_example');
+
+  // Create config_old directory if needed
+  if (!fs.existsSync(configOldDir)) {
+    fs.mkdirSync(configOldDir, { recursive: true });
+  }
 
-  if (fs.existsSync(configExamplePath) && !fs.existsSync(configPath)) {
-    fs.copyFileSync(configExamplePath, configPath);
-    success('config.json created from example (customize as needed)');
-  } else if (!fs.existsSync(configPath)) {
-    warning('config.json not found - using defaults');
+  // Create config_example directory
+  if (!fs.existsSync(configExampleDir)) {
+    fs.mkdirSync(configExampleDir, { recursive: true });
+  }
+
+  // Copy example configs to config_example/ directly from templates/
+  const exampleConfigs = ['config.example.json', 'config.advanced.example.json'];
+  exampleConfigs.forEach(exampleFile => {
+    const sourcePath = path.join(templatesPath, exampleFile);
+    const destPath = path.join(configExampleDir, exampleFile);
+    if (fs.existsSync(sourcePath)) {
+      fs.copyFileSync(sourcePath, destPath);
+    }
+  });
+  success('Example configs installed in .claude/config_example/');
+
+  // Backup existing config if it exists (legacy format migration)
+  let needsMigration = false;
+  if (fs.existsSync(configPath)) {
+    const backupPath = path.join(configOldDir, `config.json.${Date.now()}`);
+    fs.copyFileSync(configPath, backupPath);
+    info(`Existing config backed up: ${backupPath}`);
+
+    // Read old config to check if it's legacy format
+    const oldConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    if (!oldConfig.version || oldConfig.version !== '2.8.0') {
+      warning('Legacy config detected - will be replaced with v2.8.0 format');
+      needsMigration = true;
+
+      // Delete old config to force new format
+      fs.unlinkSync(configPath);
+    } else {
+      info('Config already in v2.8.0 format - keeping existing file');
+    }
+  }
+
+  // Create new config.json from minimal example if it doesn't exist
+  if (!fs.existsSync(configPath)) {
+    // Read example and extract minimal config
+    const examplePath = path.join(configExampleDir, 'config.example.json');
+    const exampleContent = fs.readFileSync(examplePath, 'utf8');
+    const exampleJson = JSON.parse(exampleContent);
+
+    // Create minimal config: just version and preset
+    const minimalConfig = {
+      version: exampleJson.version,
+      preset: exampleJson.preset
+    };
+
+    fs.writeFileSync(configPath, JSON.stringify(minimalConfig, null, 4));
+    success('config.json created with minimal v2.8.0 format');
+    info('📝 Customize: .claude/config.json (see config_example/ for examples)');
+
+    // Auto-run migration if needed to preserve settings
+    if (needsMigration) {
+      info('🔄 Auto-migrating settings from backup...');
+      await autoMigrateConfig(configPath, path.join(configOldDir, fs.readdirSync(configOldDir).sort().pop()));
+    }
   }
 
   // Create settings.local.json for sensitive data (gitignored)
@@ -479,21 +588,31 @@ async function install(args) {
   console.log('  git commit -m "auto"     # Generate message automatically');
   console.log('  git commit -m "message"  # Analyze code before commit');
   console.log('  git commit --no-verify   # Skip analysis completely');
-  console.log('\n💡 Configuration:');
+  console.log('\n💡 Configuration (v2.8.0):');
   console.log('  📁 All templates installed in .claude/');
-  console.log('  📝 Edit .claude/config.json to customize settings');
-  console.log('  🎯 Use presets: backend, frontend, fullstack, database, ai, default');
-  console.log('  🚀 Enable parallel analysis: set subagents.enabled = true');
-  console.log('  🐛 Enable debug mode: claude-hooks --debug true');
+  console.log('  📝 Edit .claude/config.json (minimal by default)');
+  console.log('  📂 Examples: .claude/config_example/');
+  console.log('  📦 Backups: .claude/config_old/');
+  console.log('  🎯 Presets: backend, frontend, fullstack, database, ai, default');
+  console.log('  🚀 Parallel analysis enabled by default (hardcoded)');
+  console.log('  🐛 Debug mode: claude-hooks --debug true');
   console.log('\n🔗 GitHub PR Creation (v2.5.0+):');
-  console.log('  claude-hooks setup-github    # Configure GitHub token for create-pr');
-  console.log('  claude-hooks create-pr main  # Create PR with auto-generated metadata');
-  console.log('\n📖 Example config.json:');
+  console.log('  claude-hooks setup-github    # Configure GitHub token');
+  console.log('  claude-hooks create-pr main  # Create PR with auto-metadata');
+  console.log('\n📖 Minimal config.json (v2.8.0):');
+  console.log('  {');
+  console.log('    "version": "2.8.0",');
+  console.log('    "preset": "backend"');
+  console.log('  }');
+  console.log('\n📖 With GitHub customization:');
   console.log('  {');
+  console.log('    "version": "2.8.0",');
   console.log('    "preset": "backend",');
-  console.log('    "subagents": { "enabled": true, "model": "haiku", "batchSize": 3 },');
-  console.log('    "github": { "pr": { "reviewers": ["your-username"] } }');
+  console.log('    "overrides": {');
+  console.log('      "github": { "pr": { "reviewers": ["your-username"] } }');
+  console.log('    }');
   console.log('  }');
+  console.log('\n🔧 Advanced: see .claude/config_example/config.advanced.example.json');
   console.log('\nFor more options: claude-hooks --help');
 }
 
@@ -954,8 +1073,8 @@ async function analyzeDiff(args) {
   const startTime = Date.now();
 
   try {
-    // Use cross-platform executeClaude from claude-client.js
-    const response = await executeClaude(prompt, { timeout: 180000 }); // 3 minutes for diff analysis
+    // Use cross-platform executeClaudeWithRetry from claude-client.js
+    const response = await executeClaudeWithRetry(prompt, { timeout: 180000 }); // 3 minutes for diff analysis
 
     // Extract JSON from response using claude-client utility
     const result = extractJSON(response);
@@ -1217,7 +1336,7 @@ async function createPr(args) {
 
     showInfo('Generating PR metadata with Claude...');
     logger.debug('create-pr', 'Calling Claude with prompt', { promptLength: prompt.length });
-    const response = await executeClaude(prompt, { timeout: 180000 });
+    const response = await executeClaudeWithRetry(prompt, { timeout: 180000 });
     logger.debug('create-pr', 'Claude response received', { responseLength: response.length });
 
     const analysisResult = extractJSON(response);
@@ -1455,7 +1574,7 @@ function status() {
 
   // Check guidelines files
   console.log('\nGuidelines files:');
-  const guidelines = ['CLAUDE_PRE_COMMIT_SONAR.md'];
+  const guidelines = ['CLAUDE_PRE_COMMIT.md'];
   guidelines.forEach(guideline => {
     const claudePath = path.join('.claude', guideline);
     if (fs.existsSync(claudePath)) {
@@ -1683,7 +1802,7 @@ Customization:
   Override prompts by copying to .claude/:
     cp templates/COMMIT_MESSAGE.md .claude/
     cp templates/ANALYZE_DIFF.md .claude/
-    cp templates/CLAUDE_PRE_COMMIT_SONAR.md .claude/
+    cp templates/CLAUDE_PRE_COMMIT.md .claude/
     # Edit as needed - system uses .claude/ version if exists
 
 More information: https://github.com/pablorovito/claude-git-hooks
@@ -1839,6 +1958,179 @@ async function currentPreset() {
   }
 }
 
+// ============================================================================
+// DEPRECATED CODE SECTION - Will be removed in v3.0.0
+// ============================================================================
+// This section contains migration code for legacy configs (pre-v2.8.0)
+// Auto-executed during install when legacy config detected
+// Manual command: claude-hooks migrate-config
+// ============================================================================
+
+/**
+ * Extracts allowed settings from legacy config format
+ * Shared by both autoMigrateConfig and migrateConfig
+ *
+ * @param {Object} rawConfig - Legacy format config
+ * @returns {Object} Allowed overrides only
+ */
+function extractLegacySettings(rawConfig) {
+  const allowedOverrides = {};
+
+  // GitHub PR config (fully allowed)
+  if (rawConfig.github?.pr) {
+    allowedOverrides.github = { pr: {} };
+    if (rawConfig.github.pr.defaultBase !== undefined) {
+      allowedOverrides.github.pr.defaultBase = rawConfig.github.pr.defaultBase;
+    }
+    if (rawConfig.github.pr.reviewers !== undefined) {
+      allowedOverrides.github.pr.reviewers = rawConfig.github.pr.reviewers;
+    }
+    if (rawConfig.github.pr.labelRules !== undefined) {
+      allowedOverrides.github.pr.labelRules = rawConfig.github.pr.labelRules;
+    }
+  }
+
+  // Subagent batchSize (allowed)
+  if (rawConfig.subagents?.batchSize !== undefined) {
+    allowedOverrides.subagents = { batchSize: rawConfig.subagents.batchSize };
+  }
+
+  // Advanced params (preserved with warning in manual migration)
+  if (rawConfig.analysis?.ignoreExtensions !== undefined) {
+    if (!allowedOverrides.analysis) allowedOverrides.analysis = {};
+    allowedOverrides.analysis.ignoreExtensions = rawConfig.analysis.ignoreExtensions;
+  }
+
+  if (rawConfig.commitMessage?.taskIdPattern !== undefined) {
+    if (!allowedOverrides.commitMessage) allowedOverrides.commitMessage = {};
+    allowedOverrides.commitMessage.taskIdPattern = rawConfig.commitMessage.taskIdPattern;
+  }
+
+  if (rawConfig.subagents?.model !== undefined) {
+    if (!allowedOverrides.subagents) allowedOverrides.subagents = {};
+    allowedOverrides.subagents.model = rawConfig.subagents.model;
+  }
+
+  return allowedOverrides;
+}
+
+/**
+ * Auto-migrates legacy config during installation
+ * Called automatically by installer when legacy format detected
+ *
+ * @param {string} newConfigPath - Path to new config.json
+ * @param {string} backupConfigPath - Path to backup of old config
+ */
+async function autoMigrateConfig(newConfigPath, backupConfigPath) {
+  try {
+    const rawConfig = JSON.parse(fs.readFileSync(backupConfigPath, 'utf8'));
+    const allowedOverrides = extractLegacySettings(rawConfig);
+
+    // Read the newly created minimal config
+    const newConfig = JSON.parse(fs.readFileSync(newConfigPath, 'utf8'));
+
+    // Add overrides if any
+    if (Object.keys(allowedOverrides).length > 0) {
+      newConfig.overrides = allowedOverrides;
+      fs.writeFileSync(newConfigPath, JSON.stringify(newConfig, null, 4));
+      success('✅ Settings migrated from legacy config');
+      info(`📋 Preserved ${Object.keys(allowedOverrides).length} custom settings`);
+    }
+  } catch (err) {
+    warning(`⚠️  Could not auto-migrate settings: ${err.message}`);
+    info('💡 Run "claude-hooks migrate-config" manually if needed');
+  }
+}
+
+/**
+ * Migrates legacy config.json to v2.8.0 format (Manual command)
+ * Why: Simplifies configuration, reduces redundancy
+ *
+ * DEPRECATED: Will be removed in v3.0.0 (most users will have migrated by then)
+ */
+async function migrateConfig() {
+  const claudeDir = '.claude';
+  const configPath = path.join(claudeDir, 'config.json');
+
+  if (!fs.existsSync(configPath)) {
+    info('ℹ️  No config file found. Nothing to migrate.');
+    console.log('\n💡 To create a new config:');
+    console.log('  1. Run: claude-hooks install --force');
+    console.log('  2. Or copy from: .claude/config_example/config.example.json');
+    return;
+  }
+
+  try {
+    const rawConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+    // Check if already in v2.8.0 format
+    if (rawConfig.version === '2.8.0') {
+      success('✅ Config is already in v2.8.0 format.');
+      return;
+    }
+
+    info('📦 Starting config migration to v2.8.0...');
+
+    // Create backup in config_old/
+    const configOldDir = path.join(claudeDir, 'config_old');
+    if (!fs.existsSync(configOldDir)) {
+      fs.mkdirSync(configOldDir, { recursive: true });
+    }
+    const backupPath = path.join(configOldDir, `config.json.${Date.now()}`);
+    fs.copyFileSync(configPath, backupPath);
+    success(`Backup created: ${backupPath}`);
+
+    // Extract only allowed parameters
+    const allowedOverrides = extractLegacySettings(rawConfig);
+
+    // Check for advanced params
+    const hasAdvancedParams = allowedOverrides.analysis?.ignoreExtensions ||
+                              allowedOverrides.commitMessage?.taskIdPattern ||
+                              allowedOverrides.subagents?.model;
+
+    // Build new config
+    const newConfig = {
+      version: '2.8.0',
+      preset: rawConfig.preset || 'default'
+    };
+
+    // Only add overrides if there are any
+    if (Object.keys(allowedOverrides).length > 0) {
+      newConfig.overrides = allowedOverrides;
+    }
+
+    // Show diff
+    console.log('\n📝 Migration preview:');
+    console.log(`  Old format: ${Object.keys(rawConfig).length} top-level keys`);
+    console.log(`  New format: ${Object.keys(newConfig).length} top-level keys`);
+    if (Object.keys(allowedOverrides).length > 0) {
+      console.log(`  Preserved: ${Object.keys(allowedOverrides).length} override sections`);
+    }
+
+    // Write new config
+    fs.writeFileSync(configPath, JSON.stringify(newConfig, null, 4));
+    success('✅ Config migrated to v2.8.0 successfully!');
+
+    if (hasAdvancedParams) {
+      warning('⚠️  Advanced parameters detected and preserved');
+      info('📖 See .claude/config.advanced.example.json for documentation');
+    }
+
+    console.log(`\n✨ New config:`);
+    console.log(JSON.stringify(newConfig, null, 2));
+    console.log(`\n💾 Old config backed up to: ${backupPath}`);
+    console.log('\n💡 Many parameters are now hardcoded with sensible defaults');
+    console.log('   See CHANGELOG.md for full list of changes');
+
+  } catch (error) {
+    error(`Failed to migrate config: ${error.message}`);
+    console.log('\n💡 Manual migration:');
+    console.log('  1. Backup your current config');
+    console.log('  2. See .claude/config.example.json for new format');
+    console.log('  3. Copy minimal example and customize');
+  }
+}
+
 /**
  * Sets debug mode
  * Why: Enables detailed logging for troubleshooting
@@ -1928,6 +2220,9 @@ async function main() {
         error(`Unknown preset subcommand: ${args[1]}`);
       }
       break;
+    case 'migrate-config':
+      await migrateConfig();
+      break;
     case '--debug':
       await setDebug(args[1]);
       break;