claude-git-hooks 2.6.3 → 2.8.0

package/lib/config.js

@@ -1,101 +1,98 @@
 /**
  * File: config.js
- * Purpose: Centralized configuration management
+ * Purpose: Simplified configuration management (v2.8.0)
  *
- * Priority: preset config > .claude/config.json > defaults
+ * Priority: preset config > .claude/config.json > hardcoded defaults
  *
- * Key features:
- * - Single source of truth for all configurable values
- * - No environment variables (except OS for platform detection)
- * - Preset-aware (allowedExtensions come from preset templates)
- * - User config (.claude/config.json) provides general preferences per project
- * - Preset config provides tech-stack-specific overrides (highest priority)
+ * v2.8.0 Changes:
+ * - Removed 21 redundant parameters (hardcoded sensible defaults)
+ * - Only 5 user-configurable parameters remain
+ * - Preset can override: subagents.batchSize
+ * - User can override: github.pr.*, subagents.batchSize
+ * - Advanced params moved to config.advanced.example.json
+ *
+ * User-configurable:
+ * - preset (required)
+ * - github.pr.defaultBase
+ * - github.pr.reviewers
+ * - github.pr.labelRules
+ * - subagents.batchSize
+ *
+ * Advanced (in example file only):
+ * - analysis.ignoreExtensions
+ * - commitMessage.taskIdPattern
+ * - subagents.model
  */
 
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import logger from './utils/logger.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 /**
- * Default configuration
- * All values can be overridden via .claude/config.json
+ * Hardcoded defaults (v3.0.0)
+ * These are NOT user-configurable - sensible defaults that work for everyone
  */
-const defaults = {
-    // Analysis configuration
+const HARDCODED = {
     analysis: {
-        maxFileSize: 1000000,              // 1MB - max file size to analyze
-        maxFiles: 20,                      // Max number of files per commit
-        timeout: 300000,                   // 3 minutes - Claude analysis timeout
-        contextLines: 3,                   // Git diff context lines
-        ignoreExtensions: [],              // Extensions to exclude (e.g., ['.min.js', '.lock'])
-        // NOTE: allowedExtensions comes from preset/template, not here
+        maxFileSize: 1000000,              // 1MB - sufficient for most files
+        maxFiles: 20,                      // Reasonable limit per commit
+        timeout: 300000,                   // 5 minutes - adequate for Claude API
+        contextLines: 3,                   // Git default
+        ignoreExtensions: [],              // Can be set in advanced config only
     },
-
-    // Commit message generation
     commitMessage: {
-        autoKeyword: 'auto',               // Keyword to trigger auto-generation
-        timeout: 300000,
-        // Task-ID detection pattern (from branch name)
-        // Default: 1-3 uppercase letters + separator + 3-5 digits
-        // Examples: "ABC-12345", "IX-123", "DE 4567"
-        // Regex is case-insensitive and extracted from branch name
-        taskIdPattern: '([A-Z]{1,3}[-\\s]\\d{3,5})'
+        autoKeyword: 'auto',               // Standard keyword
+        timeout: 300000,                   // Use same timeout as analysis
+        taskIdPattern: '([A-Z]{1,3}[-\\s]\\d{3,5})', // Jira/GitHub/Linear pattern
     },
-
-    // Subagent configuration (parallel analysis)
     subagents: {
-        enabled: false,                    // Enable parallel file analysis
-        model: 'haiku',                    // haiku (fast), sonnet (balanced), opus (thorough)
-        batchSize: 1,                      // Parallel subagents per batch
+        enabled: true,                     // Enable by default (faster analysis)
+        model: 'haiku',                    // Fast and cost-effective
+        batchSize: 3,                      // Reasonable parallelization
     },
-
-    // Template paths
     templates: {
-        baseDir: '.claude',                                    // Base directory for all templates
-        analysis: 'CLAUDE_ANALYSIS_PROMPT_SONAR.md',          // Pre-commit analysis prompt
-        guidelines: 'CLAUDE_PRE_COMMIT_SONAR.md',             // Analysis guidelines
-        commitMessage: 'COMMIT_MESSAGE.md',                   // Commit message prompt
-        analyzeDiff: 'ANALYZE_DIFF.md',                       // PR analysis prompt
-        resolution: 'CLAUDE_RESOLUTION_PROMPT.md',            // Issue resolution prompt
-        subagentInstruction: 'SUBAGENT_INSTRUCTION.md',       // Parallel analysis instruction
-        createGithubPR: 'CREATE_GITHUB_PR.md',                // GitHub PR creation via MCP
+        baseDir: '.claude/prompts',
+        analysis: 'CLAUDE_ANALYSIS_PROMPT.md',
+        guidelines: 'CLAUDE_PRE_COMMIT.md',
+        commitMessage: 'COMMIT_MESSAGE.md',
+        analyzeDiff: 'ANALYZE_DIFF.md',
+        resolution: 'CLAUDE_RESOLUTION_PROMPT.md',
+        subagentInstruction: 'SUBAGENT_INSTRUCTION.md',
+        createGithubPR: 'CREATE_GITHUB_PR.md',
     },
-
-    // Output file paths (relative to repo root)
     output: {
-        outputDir: '.claude/out',                                    // Output directory for all generated files
-        debugFile: '.claude/out/debug-claude-response.json',         // Debug response dump
-        resolutionFile: '.claude/out/claude_resolution_prompt.md',   // Generated resolution prompt
-        prAnalysisFile: '.claude/out/pr-analysis.json',              // PR analysis result
+        outputDir: '.claude/out',
+        debugFile: '.claude/out/debug-claude-response.json',
+        resolutionFile: '.claude/out/claude_resolution_prompt.md',
+        prAnalysisFile: '.claude/out/pr-analysis.json',
     },
-
-    // System behavior
     system: {
-        debug: false,                      // Enable debug logging and file dumps
-        wslCheckTimeout: 3000,             // 3 seconds - quick WSL availability check
+        debug: false,                      // Controlled by --debug flag
+        wslCheckTimeout: 15000,            // System behavior
     },
-
-    // Git operations
     git: {
-        diffFilter: 'ACM',                 // Added, Copied, Modified (excludes Deleted)
+        diffFilter: 'ACM',                 // Standard: Added, Copied, Modified
     },
-
-    // GitHub integration (v2.5.0+)
     github: {
-        enabled: true,                     // Changed from false - enable by default since Octokit works without MCP
+        enabled: true,                     // Always enabled
+    },
+};
 
-        // Pull Request configuration
+/**
+ * Default user-configurable values (v2.8.0)
+ * Only these can be overridden in .claude/config.json
+ */
+const defaults = {
+    // GitHub PR configuration (user-specific)
+    github: {
         pr: {
-            defaultBase: 'develop',        // Default base branch for PRs
-
-            // Reviewers (usernames without @)
-            reviewers: [],                 // Example: ["juan.perez", "maria.garcia"]
-
-            // Labels by preset
-            labelRules: {
+            defaultBase: 'develop',        // Project default branch
+            reviewers: [],                 // Project reviewers
+            labelRules: {                  // Labels by preset
                 backend: ['backend', 'java'],
                 frontend: ['frontend', 'react'],
                 fullstack: ['fullstack'],
@@ -105,13 +102,21 @@ const defaults = {
             },
         },
     },
+
+    // Subagent configuration (preset can override)
+    subagents: {
+        batchSize: 3,                      // Files per parallel batch
+    },
 };
 
 /**
- * Loads user configuration from .claude/config.json
- * Merges with defaults and preset config (preset takes highest priority)
+ * Loads user configuration from .claude/config.json (v2.8.0)
+ *
+ * Format detection:
+ * - v2.8.0: { version: "2.8.0", preset: "...", overrides: {...} }
+ * - Legacy: { preset: "...", analysis: {...}, ... } (auto-migrates with warning)
  *
- * Priority: defaults < user config < preset config
+ * Merge priority: HARDCODED < defaults < preset config < user overrides
  *
  * @param {string} baseDir - Base directory to search for config (default: cwd)
  * @returns {Promise<Object>} Merged configuration
@@ -119,31 +124,119 @@ const defaults = {
 const loadUserConfig = async (baseDir = process.cwd()) => {
     const configPath = path.join(baseDir, '.claude', 'config.json');
 
-    let userConfig = {};
+    let rawConfig = {};
+    let configFormat = 'default';
+
     try {
         if (fs.existsSync(configPath)) {
-            userConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+            rawConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+            // Detect format
+            if (rawConfig.version === '2.8.0') {
+                configFormat = 'v3';
+            } else if (rawConfig.version) {
+                throw new Error(`Unsupported config version: ${rawConfig.version}. Please run 'claude-hooks migrate-config'`);
+            } else if (Object.keys(rawConfig).length > 0 && rawConfig.preset) {
+                configFormat = 'legacy';
+                logger.warning('⚠️  Legacy config format detected. Run "claude-hooks migrate-config" to update to v2.8.0');
+            }
         }
     } catch (error) {
-        console.warn(`⚠️  Warning: Could not load .claude/config.json: ${error.message}`);
-        console.warn('Using default configuration');
+        if (error.message.includes('Unsupported config version')) {
+            throw error;
+        }
+        logger.warning(`⚠️  Warning: Could not load .claude/config.json: ${error.message}`);
+        logger.warning('Using default configuration');
+    }
+
+    // Extract user overrides based on format
+    let userOverrides = {};
+    let presetName = null;
+
+    if (configFormat === 'v3') {
+        presetName = rawConfig.preset;
+        userOverrides = rawConfig.overrides || {};
+    } else if (configFormat === 'legacy') {
+        presetName = rawConfig.preset;
+        // Legacy format: extract only allowed parameters
+        userOverrides = extractAllowedParams(rawConfig);
     }
 
     // Load preset if specified
     let presetConfig = {};
-    if (userConfig.preset) {
+    if (presetName) {
         try {
-            // Dynamic import to avoid circular dependency
             const { loadPreset } = await import('./utils/preset-loader.js');
-            const { config } = await loadPreset(userConfig.preset);
+            const { config } = await loadPreset(presetName);
             presetConfig = config;
         } catch (error) {
-            console.warn(`⚠️  Warning: Preset "${userConfig.preset}" not found, using defaults`);
+            logger.warning(`⚠️  Warning: Preset "${presetName}" not found, using defaults`);
         }
     }
 
-    // Merge: defaults < user < preset
-    return deepMerge(deepMerge(defaults, userConfig), presetConfig);
+    // Merge priority: HARDCODED < defaults < preset < user overrides
+    const baseConfig = deepMerge(HARDCODED, defaults);
+    const withPreset = deepMerge(baseConfig, presetConfig);
+    const final = deepMerge(withPreset, userOverrides);
+
+    // Add preset name to final config (so hooks can display it)
+    if (presetName) {
+        final.preset = presetName;
+    }
+
+    return final;
+};
+
+/**
+ * Extracts only allowed parameters from legacy config
+ * v2.8.0 only allows: github.pr.*, subagents.batchSize
+ * Advanced: analysis.ignoreExtensions, commitMessage.taskIdPattern, subagents.model
+ *
+ * @param {Object} legacyConfig - Legacy format config
+ * @returns {Object} Allowed parameters only
+ */
+const extractAllowedParams = (legacyConfig) => {
+    const allowed = {};
+
+    // GitHub PR config (fully allowed)
+    if (legacyConfig.github?.pr) {
+        allowed.github = { pr: {} };
+        if (legacyConfig.github.pr.defaultBase !== undefined) {
+            allowed.github.pr.defaultBase = legacyConfig.github.pr.defaultBase;
+        }
+        if (legacyConfig.github.pr.reviewers !== undefined) {
+            allowed.github.pr.reviewers = legacyConfig.github.pr.reviewers;
+        }
+        if (legacyConfig.github.pr.labelRules !== undefined) {
+            allowed.github.pr.labelRules = legacyConfig.github.pr.labelRules;
+        }
+    }
+
+    // Subagent batchSize (allowed)
+    if (legacyConfig.subagents?.batchSize !== undefined) {
+        allowed.subagents = { batchSize: legacyConfig.subagents.batchSize };
+    }
+
+    // Advanced params (allowed but warn)
+    if (legacyConfig.analysis?.ignoreExtensions !== undefined) {
+        if (!allowed.analysis) allowed.analysis = {};
+        allowed.analysis.ignoreExtensions = legacyConfig.analysis.ignoreExtensions;
+        logger.warning('ℹ️  Using advanced parameter: analysis.ignoreExtensions');
+    }
+
+    if (legacyConfig.commitMessage?.taskIdPattern !== undefined) {
+        if (!allowed.commitMessage) allowed.commitMessage = {};
+        allowed.commitMessage.taskIdPattern = legacyConfig.commitMessage.taskIdPattern;
+        logger.warning('ℹ️  Using advanced parameter: commitMessage.taskIdPattern');
+    }
+
+    if (legacyConfig.subagents?.model !== undefined) {
+        if (!allowed.subagents) allowed.subagents = {};
+        allowed.subagents.model = legacyConfig.subagents.model;
+        logger.warning('ℹ️  Using advanced parameter: subagents.model');
+    }
+
+    return allowed;
 };
 
 /**
@@ -185,9 +278,9 @@ const getConfig = async () => {
     return configInstance;
 };
 
-// Export async loader
-export { getConfig, loadUserConfig, defaults };
+// Export async loader and constants
+export { getConfig, loadUserConfig, defaults, HARDCODED };
 
 // Export a sync default for backwards compatibility (loads without preset)
-// NOTE: This will be deprecated - prefer using getConfig() directly
-export default defaults;
+// NOTE: Returns HARDCODED merged with defaults
+export default deepMerge(HARDCODED, defaults);

package/lib/hooks/pre-commit.js

@@ -9,7 +9,7 @@
  * 2. Build analysis prompt with file diffs
  * 3. Send to Claude CLI for analysis
  * 4. Parse JSON response
- * 5. Display SonarQube-style results
+ * 5. Display structured analysis results
  * 6. Generate resolution prompt if issues found
  * 7. Block commit if quality gate fails
  *
@@ -52,8 +52,8 @@ import { getConfig } from '../config.js';
  */
 
 /**
- * Displays SonarQube-style analysis results
- * Why: Provides structured, visual feedback about code quality
+ * Displays structured analysis results
+ * Why: Provides clear, visual feedback about code quality
  *
  * @param {Object} result - Analysis result from Claude
  */
@@ -73,19 +73,16 @@ const displayResults = (result) => {
     }
     console.log();
 
-    // Metrics
-    if (result.metrics && typeof result.metrics === 'object') {
-        console.log('📊 METRICS');
-        console.log(`├─ Reliability: ${result.metrics.reliability || '?'}`);
-        console.log(`├─ Security: ${result.metrics.security || '?'}`);
-        console.log(`├─ Maintainability: ${result.metrics.maintainability || '?'}`);
-        console.log(`├─ Coverage: ${result.metrics.coverage || '?'}%`);
-        console.log(`├─ Duplications: ${result.metrics.duplications || '?'}%`);
-        console.log(`└─ Complexity: ${result.metrics.complexity || '?'}`);
-        console.log();
+    // Issues Summary - Simple count
+    if (Array.isArray(result.details) && result.details.length > 0) {
+        const fileCount = new Set(result.details.map(i => i.file)).size;
+        console.log(`📊 ${result.details.length} issue(s) found across ${fileCount} file(s)`);
+    } else {
+        console.log('✅ No issues found!');
     }
+    console.log();
 
-    // Issues Summary
+    // Issues Breakdown (severity counts)
     if (result.issues && typeof result.issues === 'object') {
         console.log('📋 ISSUES SUMMARY');
 

package/lib/hooks/prepare-commit-msg.js

@@ -187,9 +187,8 @@ const main = async () => {
             config: config  // Pass config for custom pattern
         });
 
-        if (taskId) {
-            logger.info(`📋 Task ID detected: ${taskId}`);
-        } else {
+        // Note: getOrPromptTaskId() already logs the task ID if found
+        if (!taskId) {
             logger.debug('prepare-commit-msg - main', 'No task ID found in branch, continuing without it');
         }