claude-git-hooks 1.5.4 → 2.0.0

package/bin/claude-hooks

@@ -1,11 +1,25 @@
 #!/usr/bin/env node
 
-const { execSync, spawn } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const readline = require('readline');
-const https = require('https');
+import { execSync, spawn } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+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';
+
+// Why: ES6 modules don't have __dirname, need to recreate it
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Helper to read package.json
+// Why: ES6 modules can't use require() for JSON files
+const getPackageJson = () => {
+  const packagePath = path.join(__dirname, '..', 'package.json');
+  return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+};
 
 // Function to get the latest version from NPM
 function getLatestVersion(packageName) {
@@ -40,26 +54,26 @@ function getLatestVersion(packageName) {
 // Function to check version (used by hooks)
 async function checkVersionAndPromptUpdate() {
   try {
-    const currentVersion = require('../package.json').version;
+    const currentVersion = getPackageJson().version;
     const latestVersion = await getLatestVersion('claude-git-hooks');
-    
+
     if (currentVersion === latestVersion) {
       return true; // Already updated
     }
-    
+
     console.log('');
     warning(`New version available: ${latestVersion} (current: ${currentVersion})`);
-    
+
     // Interactive prompt compatible with all consoles
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout
     });
-    
+
     return new Promise((resolve) => {
       rl.question('Do you want to update now? (y/n): ', (answer) => {
         rl.close();
-        
+
         if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
           info('Updating claude-git-hooks...');
           try {
@@ -82,11 +96,6 @@ async function checkVersionAndPromptUpdate() {
   }
 }
 
-// Export for use in hooks
-if (typeof module !== 'undefined' && module.exports) {
-  module.exports = { checkVersionAndPromptUpdate };
-}
-
 // Colors for output
 const colors = {
   reset: '\x1b[0m',
@@ -124,7 +133,7 @@ function readPassword(prompt) {
       input: process.stdin,
       output: process.stdout
     });
-    
+
     // Disable echo
     rl.stdoutMuted = true;
     rl._writeToOutput = function _writeToOutput(stringToWrite) {
@@ -133,7 +142,7 @@ function readPassword(prompt) {
       else
         rl.output.write(stringToWrite);
     };
-    
+
     rl.question(prompt, (password) => {
       rl.close();
       console.log(); // New line
@@ -142,45 +151,6 @@ function readPassword(prompt) {
   });
 }
 
-// Check if sudo password is correct
-function testSudoPassword(password) {
-  try {
-    execSync('echo "' + password + '" | sudo -S true', { 
-      stdio: 'ignore',
-      timeout: 5000
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-// Install package with automatic sudo
-function installPackage(packageName, sudoPassword = null) {
-  try {
-    if (sudoPassword) {
-      if (os.platform() === 'linux') {
-        execSync(`echo "${sudoPassword}" | sudo -S apt-get update && echo "${sudoPassword}" | sudo -S apt-get install -y ${packageName}`, {
-          stdio: 'inherit'
-        });
-      }
-    } else {
-      if (os.platform() === 'linux') {
-        execSync(`sudo apt-get update && sudo apt-get install -y ${packageName}`, {
-          stdio: 'inherit'
-        });
-      } else if (os.platform() === 'darwin') {
-        execSync(`brew install ${packageName}`, {
-          stdio: 'inherit'
-        });
-      }
-    }
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
 // Entertainment system
 class Entertainment {
   static jokes = [
@@ -231,26 +201,26 @@ class Entertainment {
     // Get first joke from API without blocking
     this.getJoke().then(joke => {
       if (!isFinished) currentJoke = joke;
-    }).catch(() => {}); // If it fails, keep the local one
+    }).catch(() => { }); // If it fails, keep the local one
 
     // Hide cursor
     process.stdout.write('\x1B[?25l');
-    
+
     // Reserve space for the 3 lines
     process.stdout.write('\n\n\n');
-    
+
     const interval = setInterval(() => {
       if (isFinished) {
         clearInterval(interval);
         return;
       }
-      
+
       spinnerIndex++;
-      
+
       // Update countdown every second (10 iterations of 100ms)
       if (spinnerIndex % 10 === 0) {
         jokeCountdown--;
-        
+
         // Refresh joke every 10 seconds
         if (jokeCountdown <= 0) {
           this.getJoke().then(joke => {
@@ -263,19 +233,19 @@ class Entertainment {
           jokeCountdown = 10;
         }
       }
-      
+
       // Always go back exactly 3 lines up
       process.stdout.write('\x1B[3A');
-      
+
       // Render the 3 lines from the beginning
       const spinner = spinners[spinnerIndex % spinners.length];
-      
+
       // Line 1: Spinner
       process.stdout.write('\r\x1B[2K' + `${colors.yellow}${spinner} ${message}${colors.reset}\n`);
-      
+
       // Line 2: Joke  
       process.stdout.write('\r\x1B[2K' + `${colors.green}🎭 ${currentJoke}${colors.reset}\n`);
-      
+
       // Line 3: Countdown
       process.stdout.write('\r\x1B[2K' + `${colors.yellow}⏱️  Next joke in: ${jokeCountdown}s${colors.reset}\n`);
     }, 100);
@@ -284,7 +254,7 @@ class Entertainment {
       const result = await promise;
       isFinished = true;
       clearInterval(interval);
-      
+
       // Clean exactly 3 lines completely
       process.stdout.write('\x1B[3A'); // Go up 3 lines
       process.stdout.write('\r\x1B[2K'); // Clean line 1
@@ -292,15 +262,15 @@ class Entertainment {
       process.stdout.write('\n\r\x1B[2K'); // Go down and clean line 3
       process.stdout.write('\x1B[2A'); // Go up 2 lines to end up on the first
       process.stdout.write('\r'); // Go to beginning of line
-      
+
       // Show cursor
       process.stdout.write('\x1B[?25h');
-      
+
       return result;
     } catch (error) {
       isFinished = true;
       clearInterval(interval);
-      
+
       // Clean exactly 3 lines completely
       process.stdout.write('\x1B[3A'); // Go up 3 lines
       process.stdout.write('\r\x1B[2K'); // Clean line 1
@@ -308,21 +278,42 @@ class Entertainment {
       process.stdout.write('\n\r\x1B[2K'); // Go down and clean line 3
       process.stdout.write('\x1B[2A'); // Go up 2 lines to end up on the first
       process.stdout.write('\r'); // Go to beginning of line
-      
+
       // Show cursor
       process.stdout.write('\x1B[?25h');
-      
+
       throw error;
     }
   }
 }
 
-// Check if we are in a git repository
+// Check if we are in a git repository (including worktrees created in PowerShell)
 function checkGitRepo() {
   try {
     execSync('git rev-parse --git-dir', { stdio: 'ignore' });
     return true;
   } catch (e) {
+    // Try to detect worktree created in PowerShell
+    try {
+      if (fs.existsSync('.git')) {
+        const gitContent = fs.readFileSync('.git', 'utf8').trim();
+        // Check if it's a worktree pointer (gitdir: ...)
+        if (gitContent.startsWith('gitdir:')) {
+          let gitdir = gitContent.substring(8).trim();
+          // Convert Windows path to WSL if needed (C:\ -> /mnt/c/)
+          if (/^[A-Za-z]:/.test(gitdir)) {
+            gitdir = gitdir.replace(/^([A-Za-z]):/, (_, drive) => `/mnt/${drive.toLowerCase()}`);
+            gitdir = gitdir.replace(/\\/g, '/');
+          }
+          // Verify the gitdir exists
+          if (fs.existsSync(gitdir)) {
+            return true;
+          }
+        }
+      }
+    } catch (worktreeError) {
+      // Ignore worktree detection errors
+    }
     return false;
   }
 }
@@ -340,32 +331,16 @@ async function install(args) {
 
   const isForce = args.includes('--force');
   const skipAuth = args.includes('--skip-auth');
-  
+
   if (isForce) {
     info('Installing Claude Git Hooks (force mode)...');
   } else {
     info('Installing Claude Git Hooks...');
   }
 
-  // Request sudo password at the beginning if necessary
-  let sudoPassword = null;
-  if (os.platform() === 'linux') {
-    const needsInstall = await checkIfInstallationNeeded();
-    if (needsInstall) {
-      info('Sudo access is needed for automatic dependency installation, please enter password');
-      sudoPassword = await readPassword('Enter your Ubuntu password for sudo: ');
-      
-      if (sudoPassword && !testSudoPassword(sudoPassword)) {
-        warning('Incorrect password. Continuing without automatic installation.');
-        sudoPassword = null;
-      } else if (sudoPassword) {
-        success('Password verified. Proceeding with automatic installation.');
-      }
-    }
-  }
-
-  // Check dependencies with automatic installation
-  await checkAndInstallDependencies(sudoPassword, skipAuth);
+  // v2.0.0+: No sudo needed (pure Node.js, no system packages required)
+  // Check dependencies
+  await checkAndInstallDependencies(null, skipAuth);
 
   const templatesPath = getTemplatesPath();
   const hooksPath = '.git/hooks';
@@ -375,32 +350,41 @@ async function install(args) {
     fs.mkdirSync(hooksPath, { recursive: true });
   }
 
+  // Helper function to copy file with LF line endings
+  // Why: Bash scripts must have LF (Unix) line endings, not CRLF (Windows)
+  const copyWithLF = (sourcePath, destPath) => {
+    let content = fs.readFileSync(sourcePath, 'utf8');
+    // Convert CRLF to LF
+    content = content.replace(/\r\n/g, '\n');
+    fs.writeFileSync(destPath, content, 'utf8');
+  };
+
   // Hooks to install
   const hooks = ['pre-commit', 'prepare-commit-msg'];
-  
+
   hooks.forEach(hook => {
     const sourcePath = path.join(templatesPath, hook);
     const destPath = path.join(hooksPath, hook);
-    
+
     // Make backup if it exists
     if (fs.existsSync(destPath)) {
       const backupPath = `${destPath}.backup.${Date.now()}`;
       fs.copyFileSync(destPath, backupPath);
       info(`Backup created: ${backupPath}`);
     }
-    
-    // Copy hook
-    fs.copyFileSync(sourcePath, destPath);
+
+    // Copy hook with LF line endings (critical for bash)
+    copyWithLF(sourcePath, destPath);
     fs.chmodSync(destPath, '755');
     success(`${hook} installed`);
   });
 
-  // Copy version verification script
+  // Copy version verification script with LF line endings
   const checkVersionSource = path.join(templatesPath, 'check-version.sh');
   const checkVersionDest = path.join(hooksPath, 'check-version.sh');
-  
+
   if (fs.existsSync(checkVersionSource)) {
-    fs.copyFileSync(checkVersionSource, checkVersionDest);
+    copyWithLF(checkVersionSource, checkVersionDest);
     fs.chmodSync(checkVersionDest, '755');
     success('Version verification script installed');
   }
@@ -418,11 +402,11 @@ async function install(args) {
     'CLAUDE_ANALYSIS_PROMPT_SONAR.md',
     'CLAUDE_RESOLUTION_PROMPT.md'
   ];
-  
+
   claudeFiles.forEach(file => {
     const destPath = path.join(claudeDir, file);
     const sourcePath = path.join(templatesPath, file);
-    
+
     // In force mode or if it doesn't exist, copy the file
     if (isForce || !fs.existsSync(destPath)) {
       if (fs.existsSync(sourcePath)) {
@@ -450,13 +434,19 @@ async function install(args) {
   console.log('  // SKIP_ANALYSIS_BLOCK  # Exclude block until finding another equal one');
   console.log('  ...excluded code...');
   console.log('  // SKIP_ANALYSIS_BLOCK');
+  console.log('\nNEW: Parallel analysis for faster multi-file commits:');
+  console.log('  export CLAUDE_USE_SUBAGENTS=true       # Enable subagents');
+  console.log('  export CLAUDE_SUBAGENT_MODEL=haiku     # haiku/sonnet/opus');
+  console.log('  export CLAUDE_SUBAGENT_BATCH_SIZE=3    # Parallel per batch (default: 3)');
+  console.log('  # Example: 4 files, BATCH_SIZE=1 → 4 sequential batches');
+  console.log('  # Example: 4 files, BATCH_SIZE=3 → 2 batches (3 parallel + 1)');
   console.log('\nFor more options: claude-hooks --help');
 }
 
 // Check complete dependencies (like setup-wsl.sh)
 async function checkAndInstallDependencies(sudoPassword = null, skipAuth = false) {
   info('Checking system dependencies...');
-  
+
   // Check Node.js
   try {
     const nodeVersion = execSync('node --version', { encoding: 'utf8' }).trim();
@@ -464,7 +454,7 @@ async function checkAndInstallDependencies(sudoPassword = null, skipAuth = false
   } catch (e) {
     error('Node.js is not installed. Install Node.js and try again.');
   }
-  
+
   // Check npm
   try {
     const npmVersion = execSync('npm --version', { encoding: 'utf8' }).trim();
@@ -472,43 +462,9 @@ async function checkAndInstallDependencies(sudoPassword = null, skipAuth = false
   } catch (e) {
     error('npm is not installed.');
   }
-  
-  // Check and install jq
-  try {
-    const jqVersion = execSync('jq --version', { encoding: 'utf8' }).trim();
-    success(`jq ${jqVersion}`);
-  } catch (e) {
-    warning('jq is not installed. Installing...');
-    if (installPackage('jq', sudoPassword)) {
-      success('jq installed successfully');
-    } else {
-      warning('Could not install jq automatically');
-      if (os.platform() === 'linux') {
-        console.log('Install it manually with: sudo apt install jq');
-      } else if (os.platform() === 'darwin') {
-        console.log('Install it manually with: brew install jq');
-      }
-    }
-  }
-  
-  // Check and install curl
-  try {
-    const curlVersion = execSync('curl --version', { encoding: 'utf8' }).split('\n')[0];
-    success(`curl ${curlVersion.split(' ')[1]}`);
-  } catch (e) {
-    warning('curl is not installed. Installing...');
-    if (installPackage('curl', sudoPassword)) {
-      success('curl installed successfully');
-    } else {
-      warning('Could not install curl automatically');
-      if (os.platform() === 'linux') {
-        console.log('Install it manually with: sudo apt install curl');
-      } else if (os.platform() === 'darwin') {
-        console.log('Install it manually with: brew install curl');
-      }
-    }
-  }
-  
+
+  // v2.0.0+: jq and curl are no longer needed (pure Node.js implementation)
+
   // Check Git
   try {
     const gitVersion = execSync('git --version', { encoding: 'utf8' }).trim();
@@ -516,95 +472,98 @@ async function checkAndInstallDependencies(sudoPassword = null, skipAuth = false
   } catch (e) {
     error('Git is not installed. Install Git and try again.');
   }
-  
-  // Check standard Unix tools
-  const unixTools = ['sed', 'awk', 'grep', 'head', 'tail', 'stat', 'tput'];
-  const missingTools = [];
-  
-  unixTools.forEach(tool => {
-    try {
-      execSync(`which ${tool}`, { stdio: 'ignore' });
-    } catch (e) {
-      missingTools.push(tool);
-    }
-  });
-  
-  if (missingTools.length === 0) {
-    success('Standard Unix tools verified');
-  } else {
-    error(`Missing standard Unix tools: ${missingTools.join(', ')}. Retry installation in an Ubuntu console`);
-  }
-  
+
+  // v2.0.0+: Unix tools (sed, awk, grep, etc.) no longer needed (pure Node.js implementation)
+
   // Check and install Claude CLI
   await checkAndInstallClaude();
-  
+
   // Check Claude authentication (if not skipped)
   if (!skipAuth) {
     await checkClaudeAuth();
   } else {
     warning('Skipping Claude authentication verification (--skip-auth)');
   }
-  
+
   // Clear password from memory
   sudoPassword = null;
 }
 
+// Detect if running on Windows
+// Why: Need to use 'wsl claude' instead of 'claude' on Windows
+function isWindows() {
+  return os.platform() === 'win32' || process.env.OS === 'Windows_NT';
+}
+
+// Get Claude command based on platform
+// Why: On Windows, Claude CLI runs in WSL, so we need 'wsl claude'
+function getClaudeCommand() {
+  return isWindows() ? 'wsl claude' : 'claude';
+}
+
 // Check if we need to install dependencies
 async function checkIfInstallationNeeded() {
-  const dependencies = ['jq', 'curl'];
-  
-  for (const dep of dependencies) {
-    try {
-      execSync(`which ${dep}`, { stdio: 'ignore' });
-    } catch (e) {
-      return true; // Needs installation
-    }
-  }
-  
-  // Verificar Claude CLI
+  // v2.0.0+: Only check Claude CLI (jq and curl no longer needed)
+  const claudeCmd = getClaudeCommand();
+
   try {
-    execSync('claude --version', { stdio: 'ignore' });
+    execSync(`${claudeCmd} --version`, { stdio: 'ignore' });
   } catch (e) {
     return true; // Needs Claude installation
   }
-  
+
   return false;
 }
 
-// Check and install Claude CLI
+// Check Claude CLI availability
 async function checkAndInstallClaude() {
+  const claudeCmd = getClaudeCommand();
+  const platform = isWindows() ? 'Windows (via WSL)' : os.platform();
+
   try {
-    execSync('claude --version', { stdio: 'ignore' });
-    success('Claude CLI detected');
+    execSync(`${claudeCmd} --version`, { stdio: 'ignore' });
+    success(`Claude CLI detected (${platform})`);
   } catch (e) {
-    info('Claude CLI not detected. Installing...');
-    try {
-      execSync('npm install -g @anthropic-ai/claude-cli', { stdio: 'inherit' });
-      success('Claude CLI installed successfully');
-    } catch (installError) {
-      error('Error installing Claude CLI. Install manually: npm install -g @anthropic-ai/claude-cli');
+    error(`Claude CLI not detected on ${platform}`);
+
+    if (isWindows()) {
+      console.log('\n⚠️  On Windows, Claude CLI must be installed in WSL:');
+      console.log('1. Open WSL terminal (wsl or Ubuntu from Start Menu)');
+      console.log('2. Follow installation at: https://docs.anthropic.com/claude/docs/claude-cli');
+      console.log('3. Verify with: wsl claude --version');
+    } else {
+      console.log('\nClaude CLI installation: https://docs.anthropic.com/claude/docs/claude-cli');
     }
+
+    console.log('\nAfter installation, run: claude-hooks install --force');
+    process.exit(1);
   }
 }
 
 // Check Claude authentication with entertainment
 async function checkClaudeAuth() {
   info('Checking Claude authentication...');
-  
+
+  // Get correct Claude command for platform
+  const claudeCmd = getClaudeCommand();
+  const cmdParts = claudeCmd.split(' ');
+  const command = cmdParts[0];
+  const args = [...cmdParts.slice(1), 'auth', 'status'];
+
   // Use spawn to not block, but with stdio: 'ignore' like the original
   const authPromise = new Promise((resolve, reject) => {
-    const child = spawn('claude', ['auth', 'status'], {
+    const child = spawn(command, args, {
       stdio: 'ignore',  // Igual que el original
       detached: false,
       windowsHide: true
     });
-    
+
     // Manual timeout since spawn doesn't have native timeout
     const timeout = setTimeout(() => {
       child.kill();
       reject(new Error('timeout'));
     }, 120000); // 2 minutos
-    
+
     child.on('exit', (code) => {
       clearTimeout(timeout);
       if (code === 0) {
@@ -613,7 +572,7 @@ async function checkClaudeAuth() {
         reject(new Error('not_authenticated'));
       }
     });
-    
+
     child.on('error', (err) => {
       clearTimeout(timeout);
       reject(err);
@@ -633,7 +592,7 @@ async function checkClaudeAuth() {
 // Update .gitignore with Claude entries
 function updateGitignore() {
   info('Updating .gitignore...');
-  
+
   const gitignorePath = '.gitignore';
   const claudeEntries = [
     '# Claude Git Hooks',
@@ -642,16 +601,16 @@ function updateGitignore() {
     'claude_resolution_prompt.md',
     '.claude-pr-analysis.json',
   ];
-  
+
   let gitignoreContent = '';
   let fileExists = false;
-  
+
   // Read existing .gitignore if it exists
   if (fs.existsSync(gitignorePath)) {
     gitignoreContent = fs.readFileSync(gitignorePath, 'utf8');
     fileExists = true;
   }
-  
+
   // Check which entries are missing
   const missingEntries = [];
   claudeEntries.forEach(entry => {
@@ -668,31 +627,31 @@ function updateGitignore() {
       }
     }
   });
-  
+
   // If there are missing entries, add them
   if (missingEntries.length > 0) {
     // Ensure there's a newline at the end if the file exists and is not empty
     if (fileExists && gitignoreContent.length > 0 && !gitignoreContent.endsWith('\n')) {
       gitignoreContent += '\n';
     }
-    
+
     // If the file is not empty, add a blank line before
     if (gitignoreContent.length > 0) {
       gitignoreContent += '\n';
     }
-    
+
     // Add the missing entries
     gitignoreContent += missingEntries.join('\n') + '\n';
-    
+
     // Write the updated file
     fs.writeFileSync(gitignorePath, gitignoreContent);
-    
+
     if (fileExists) {
       success('.gitignore updated with Claude entries');
     } else {
       success('.gitignore created with Claude entries');
     }
-    
+
     // Show what was added
     missingEntries.forEach(entry => {
       if (!entry.startsWith('#')) {
@@ -707,22 +666,22 @@ function updateGitignore() {
 // Configure Git (line endings, etc.)
 function configureGit() {
   info('Configuring Git...');
-  
+
   try {
-    // Configure line endings for WSL
-    execSync('git config core.autocrlf input', { stdio: 'ignore' });
-    success('Line endings configured for WSL (core.autocrlf = input)');
-    
-    // Try to configure on Windows through PowerShell
-    try {
-      execSync('powershell.exe -Command "git config core.autocrlf true"', { stdio: 'ignore' });
+    // Configure line endings based on platform
+    // Why: CRLF/LF handling differs between Windows and Unix
+    if (isWindows()) {
+      // On Windows: Keep CRLF in working directory, convert to LF in repo
+      execSync('git config core.autocrlf true', { stdio: 'ignore' });
       success('Line endings configured for Windows (core.autocrlf = true)');
-    } catch (psError) {
-      info('Could not configure automatically on Windows');
+    } else {
+      // On Unix: Keep LF everywhere, convert CRLF to LF on commit
+      execSync('git config core.autocrlf input', { stdio: 'ignore' });
+      success('Line endings configured for Unix (core.autocrlf = input)');
     }
-    
+
   } catch (e) {
-    warning('Error configuring Git');
+    warning('Error configuring Git: ' + e.message);
   }
 }
 
@@ -736,7 +695,7 @@ function uninstall() {
 
   const hooksPath = '.git/hooks';
   const hooks = ['pre-commit', 'prepare-commit-msg'];
-  
+
   hooks.forEach(hook => {
     const hookPath = path.join(hooksPath, hook);
     if (fs.existsSync(hookPath)) {
@@ -755,11 +714,11 @@ function enable(hookName) {
   }
 
   const hooks = hookName ? [hookName] : ['pre-commit', 'prepare-commit-msg'];
-  
+
   hooks.forEach(hook => {
     const disabledPath = `.git/hooks/${hook}.disabled`;
     const enabledPath = `.git/hooks/${hook}`;
-    
+
     if (fs.existsSync(disabledPath)) {
       fs.renameSync(disabledPath, enabledPath);
       success(`${hook} enabled`);
@@ -778,11 +737,11 @@ function disable(hookName) {
   }
 
   const hooks = hookName ? [hookName] : ['pre-commit', 'prepare-commit-msg'];
-  
+
   hooks.forEach(hook => {
     const enabledPath = `.git/hooks/${hook}`;
     const disabledPath = `.git/hooks/${hook}.disabled`;
-    
+
     if (fs.existsSync(enabledPath)) {
       fs.renameSync(enabledPath, disabledPath);
       success(`${hook} disabled`);
@@ -795,14 +754,14 @@ function disable(hookName) {
 }
 
 // Analyze-diff command
-function analyzeDiff(args) {
+async function analyzeDiff(args) {
   if (!checkGitRepo()) {
     error('You are not in a Git repository.');
     return;
   }
 
   const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();
-  
+
   if (!currentBranch) {
     error('You are not in a valid branch.');
     return;
@@ -819,7 +778,7 @@ function analyzeDiff(args) {
     baseBranch = `origin/${targetBranch}`;
     compareWith = `${baseBranch}...HEAD`;
     contextDescription = `${currentBranch} vs ${baseBranch}`;
-    
+
     // Check that the origin branch exists
     try {
       execSync(`git rev-parse --verify ${baseBranch}`, { stdio: 'ignore' });
@@ -832,7 +791,7 @@ function analyzeDiff(args) {
     baseBranch = `origin/${currentBranch}`;
     compareWith = `${baseBranch}...HEAD`;
     contextDescription = `${currentBranch} vs ${baseBranch}`;
-    
+
     // Check that the origin branch exists
     try {
       execSync(`git rev-parse --verify ${baseBranch}`, { stdio: 'ignore' });
@@ -841,7 +800,7 @@ function analyzeDiff(args) {
       baseBranch = 'origin/develop';
       compareWith = `${baseBranch}...HEAD`;
       contextDescription = `${currentBranch} vs ${baseBranch} (fallback)`;
-      
+
       try {
         execSync(`git rev-parse --verify ${baseBranch}`, { stdio: 'ignore' });
         warning(`Branch origin/${currentBranch} does not exist. Using ${baseBranch} as fallback.`);
@@ -850,7 +809,7 @@ function analyzeDiff(args) {
         baseBranch = 'origin/main';
         compareWith = `${baseBranch}...HEAD`;
         contextDescription = `${currentBranch} vs ${baseBranch} (fallback)`;
-        
+
         try {
           execSync(`git rev-parse --verify ${baseBranch}`, { stdio: 'ignore' });
           warning(`No origin/develop branch. Using ${baseBranch} as fallback.`);
@@ -868,12 +827,12 @@ function analyzeDiff(args) {
   let diffFiles;
   try {
     diffFiles = execSync(`git diff ${compareWith} --name-only`, { encoding: 'utf8' }).trim();
-    
+
     if (!diffFiles) {
       // Check if there are staged or unstaged changes
       const stagedFiles = execSync('git diff --cached --name-only', { encoding: 'utf8' }).trim();
       const unstagedFiles = execSync('git diff --name-only', { encoding: 'utf8' }).trim();
-      
+
       if (stagedFiles || unstagedFiles) {
         warning('No differences with remote, but you have uncommitted local changes.');
         console.log('Staged changes:', stagedFiles || 'none');
@@ -902,19 +861,26 @@ function analyzeDiff(args) {
     error('Error getting diff or commits: ' + e.message);
     return;
   }
-  
-  // Create the prompt for Claude
-  const tempDir = `/tmp/claude-analyze-${Date.now()}`;
-  fs.mkdirSync(tempDir, { recursive: true });
-  
-  const promptFile = path.join(tempDir, 'prompt.txt');
-  const prompt = `Analyze the following changes. CONTEXT: ${contextDescription}
 
+  // Check if subagents should be used
+  const useSubagents = process.env.CLAUDE_USE_SUBAGENTS === 'true';
+  const subagentModel = process.env.CLAUDE_SUBAGENT_MODEL || 'haiku';
+  let subagentBatchSize = parseInt(process.env.CLAUDE_SUBAGENT_BATCH_SIZE || '3');
+  // Validate batch size (must be >= 1)
+  if (subagentBatchSize < 1) {
+    subagentBatchSize = 1;
+  }
+  const subagentInstruction = useSubagents
+    ? `\n\nIMPORTANT PARALLEL PROCESSING: If analyzing 3+ files, process them in batches of ${subagentBatchSize}. For EACH batch, create that many subagents in parallel using Task tool (send single message with multiple Task calls). Each subagent analyzes one file and provides insights. After ALL batches complete, consolidate into SINGLE JSON with ONE cohesive PR title/description. Model: ${subagentModel}. Example: 4 files with BATCH_SIZE=1 → 4 sequential batches of 1 subagent each. Example: 4 files with BATCH_SIZE=3 → batch 1 has 3 parallel subagents (files 1-3), batch 2 has 1 subagent (file 4).\n`
+    : '';
+
+  const prompt = `Analyze the following changes. CONTEXT: ${contextDescription}
+${subagentInstruction}
 Please generate:
 1. A concise and descriptive PR title (maximum 72 characters)
 2. A detailed PR description that includes:
    - Summary of changes
-   - Motivation/context  
+   - Motivation/context
    - Type of change (feature/fix/refactor/docs/etc)
    - Recommended testing
 3. A suggested branch name following the format: type/short-description (example: feature/add-user-auth, fix/memory-leak)
@@ -940,67 +906,53 @@ ${diffFiles}
 === FULL DIFF ===
 ${fullDiff.substring(0, 50000)} ${fullDiff.length > 50000 ? '\n... (truncated diff)' : ''}`;
 
-  fs.writeFileSync(promptFile, prompt);
-
   info('Sending to Claude for analysis...');
-  
+  const startTime = Date.now();
+
   try {
-    const response = execSync(`claude < "${promptFile}"`, { encoding: 'utf8', maxBuffer: 1024 * 1024 * 10 });
-    
-    // Extraer el JSON de la respuesta
-    const jsonMatch = response.match(/\{[\s\S]*\}/);
-    if (!jsonMatch) {
-      error('Did not receive a valid JSON response from Claude.');
-      console.log('Complete response:', response);
-      return;
-    }
-    
-    let result;
-    try {
-      result = JSON.parse(jsonMatch[0]);
-    } catch (e) {
-      error('Error parsing JSON response: ' + e.message);
-      console.log('JSON received:', jsonMatch[0]);
-      return;
-    }
-    
+    // Use cross-platform executeClaude from claude-client.js
+    const response = await executeClaude(prompt, { timeout: 180000 }); // 3 minutes for diff analysis
+
+    // Extract JSON from response using claude-client utility
+    const result = extractJSON(response);
+
     // Show the results
     console.log('');
     console.log('════════════════════════════════════════════════════════════════');
     console.log('                      DIFFERENCES ANALYSIS                      ');
     console.log('════════════════════════════════════════════════════════════════');
     console.log('');
-    
+
     console.log(`🔍 ${colors.blue}Context:${colors.reset} ${contextDescription}`);
     console.log(`📊 ${colors.blue}Changed Files:${colors.reset} ${diffFiles.split('\n').length}`);
     console.log('');
-    
+
     console.log(`📝 ${colors.green}Pull Request Title:${colors.reset}`);
     console.log(`   ${result.prTitle}`);
     console.log('');
-    
+
     console.log(`🌿 ${colors.green}Suggested branch name:${colors.reset}`);
     console.log(`   ${result.suggestedBranchName}`);
     console.log('');
-    
+
     console.log(`📋 ${colors.green}Type of change:${colors.reset} ${result.changeType}`);
-    
+
     if (result.breakingChanges) {
       console.log(`⚠️  ${colors.yellow}Breaking Changes: SÍ${colors.reset}`);
     }
-    
+
     console.log('');
     console.log(`📄 ${colors.green}Pull Request Description:${colors.reset}`);
     console.log('───────────────────────────────────────────────────────────────');
     console.log(result.prDescription);
     console.log('───────────────────────────────────────────────────────────────');
-    
+
     if (result.testingNotes) {
       console.log('');
       console.log(`🧪 ${colors.green}Testing notes:${colors.reset}`);
       console.log(result.testingNotes);
     }
-    
+
     // Guardar los resultados en un archivo con contexto
     const outputData = {
       ...result,
@@ -1012,12 +964,17 @@ ${fullDiff.substring(0, 50000)} ${fullDiff.length > 50000 ? '\n... (truncated di
         timestamp: new Date().toISOString()
       }
     };
-    
+
     const outputFile = '.claude-pr-analysis.json';
     fs.writeFileSync(outputFile, JSON.stringify(outputData, null, 2));
+
+    const elapsed = Date.now() - startTime;
+    const seconds = Math.floor(elapsed / 1000);
+    const ms = elapsed % 1000;
     console.log('');
+    console.log(`${colors.blue}⏱️  Analysis completed in ${seconds}.${ms}s${colors.reset}`);
     info(`Results saved in ${outputFile}`);
-    
+
     // Sugerencias contextuales
     console.log('');
     if (!args[0] && contextDescription.includes('local changes without push')) {
@@ -1030,14 +987,11 @@ ${fullDiff.substring(0, 50000)} ${fullDiff.length > 50000 ? '\n... (truncated di
       console.log(`💡 ${colors.yellow}For renaming your current branch:${colors.reset}`);
       console.log(`   git branch -m ${result.suggestedBranchName}`);
     }
-    
+
     console.log(`💡 ${colors.yellow}Tip:${colors.reset} Use this information to create your PR on GitHub.`);
-    
+
   } catch (e) {
     error('Error executing Claude: ' + e.message);
-  } finally {
-    // Clean temporary files
-    fs.rmSync(tempDir, { recursive: true, force: true });
   }
 }
 
@@ -1053,7 +1007,7 @@ function status() {
   hooks.forEach(hook => {
     const enabledPath = `.git/hooks/${hook}`;
     const disabledPath = `.git/hooks/${hook}.disabled`;
-    
+
     if (fs.existsSync(enabledPath)) {
       success(`${hook}: enabled`);
     } else if (fs.existsSync(disabledPath)) {
@@ -1084,7 +1038,7 @@ function status() {
     const gitignoreContent = fs.readFileSync(gitignorePath, 'utf8');
     const claudeIgnores = ['.claude/', 'debug-claude-response.json', '.claude-pr-analysis.json'];
     let allPresent = true;
-    
+
     claudeIgnores.forEach(entry => {
       const regex = new RegExp(`^${entry.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`, 'm');
       if (regex.test(gitignoreContent)) {
@@ -1094,7 +1048,7 @@ function status() {
         allPresent = false;
       }
     });
-    
+
     if (!allPresent) {
       info('\nRun "claude-hooks install" to update .gitignore');
     }
@@ -1116,12 +1070,12 @@ function compareVersions(v1, v2) {
     // Usar el script compartido para mantener consistencia
     const result = execSync(`bash -c 'source "${getTemplatesPath()}/check-version.sh" && compare_versions "${v1}" "${v2}"; echo $?'`, { encoding: 'utf8' }).trim();
     const exitCode = parseInt(result);
-    
+
     // Convertir los códigos de retorno del script bash a valores JS
     if (exitCode === 0) return 0;      // iguales
     if (exitCode === 1) return 1;      // v1 > v2  
     if (exitCode === 2) return -1;     // v1 < v2
-    
+
     // Fallback: comparación simple si el script falla
     if (v1 === v2) return 0;
     const sorted = [v1, v2].sort((a, b) => {
@@ -1145,13 +1099,13 @@ function compareVersions(v1, v2) {
 // Update command - update to the latest version
 async function update() {
   info('Checking latest available version...');
-  
+
   try {
-    const currentVersion = require('../package.json').version;
+    const currentVersion = getPackageJson().version;
     const latestVersion = await getLatestVersion('claude-git-hooks');
-    
+
     const comparison = compareVersions(currentVersion, latestVersion);
-    
+
     if (comparison === 0) {
       success(`You already have the latest version installed (${currentVersion})`);
       return;
@@ -1161,20 +1115,20 @@ async function update() {
       success(`You already have the latest version installed (${currentVersion})`);
       return;
     }
-    
+
     info(`Current version: ${currentVersion}`);
     info(`Available version: ${latestVersion}`);
-    
+
     // Actualizar el paquete
     info('Updating claude-git-hooks...');
     try {
       execSync('npm install -g claude-git-hooks@latest', { stdio: 'inherit' });
       success(`Successfully updated to version ${latestVersion}`);
-      
+
       // Reinstall hooks with the new version
       info('Reinstalling hooks with the new version...');
       await install(['--force']);
-      
+
     } catch (updateError) {
       error('Error updating. Try running: npm install -g claude-git-hooks@latest');
     }
@@ -1241,6 +1195,18 @@ Exclude code from analysis:
   ...excluded code...
   // SKIP_ANALYSIS_BLOCK
 
+Performance optimization (NEW in v1.5.5):
+  export CLAUDE_USE_SUBAGENTS=true        # Enable parallel analysis for 3+ files
+  export CLAUDE_SUBAGENT_MODEL=haiku      # Model: haiku (fast), sonnet, opus
+  export CLAUDE_SUBAGENT_BATCH_SIZE=3     # Parallel subagents per batch (default: 3)
+
+  # Batching examples:
+  # BATCH_SIZE=1 with 4 files → 4 sequential batches (1 subagent each)
+  # BATCH_SIZE=3 with 4 files → 2 batches (3 parallel, then 1)
+  # BATCH_SIZE=4 with 4 files → 1 batch (4 parallel subagents)
+
+  # Benefits: Faster for multi-file commits, shows execution time
+
 More information: https://github.com/pablorovito/claude-git-hooks
 `);
 }
@@ -1270,7 +1236,7 @@ async function main() {
       status();
       break;
     case 'analyze-diff':
-      analyzeDiff(args.slice(1));
+      await analyzeDiff(args.slice(1));
       break;
     case 'help':
     case '--help':