claude-git-hooks 2.21.0 → 2.30.2

package/lib/commands/diff-batch-info.js

@@ -19,19 +19,15 @@ import logger from '../utils/logger.js';
  * understand the adaptive batch system behavior without needing debug mode.
  */
 export async function runDiffBatchInfo() {
-    console.log(
-        '\n╔════════════════════════════════════════════════════════════════════╗'
-    );
-    console.log(
-        '║              INTELLIGENT ANALYSIS ORCHESTRATION INFO               ║'
-    );
-    console.log(
-        '╚════════════════════════════════════════════════════════════════════╝\n'
-    );
+    console.log('\n╔════════════════════════════════════════════════════════════════════╗');
+    console.log('║              INTELLIGENT ANALYSIS ORCHESTRATION INFO               ║');
+    console.log('╚════════════════════════════════════════════════════════════════════╝\n');
 
     console.log('━━━ ORCHESTRATION CONFIGURATION ━━━');
     console.log('  Orchestration model:     opus (internal, not user-configurable)');
-    console.log('  Orchestrator threshold:  3 files (commits with ≥3 files use intelligent grouping)');
+    console.log(
+        '  Orchestrator threshold:  3 files (commits with ≥3 files use intelligent grouping)'
+    );
     console.log();
 
     console.log('━━━ HOW IT WORKS ━━━');
@@ -80,9 +76,7 @@ export async function runDiffBatchInfo() {
         if (stats.avgOrchestrationTime > 0) {
             const orchSeconds = (stats.avgOrchestrationTime / 1000).toFixed(1);
             console.log(`  Avg orchestration overhead: ${orchSeconds}s`);
-            console.log(
-                '  (Orchestrator call for semantic grouping — one-time per commit)'
-            );
+            console.log('  (Orchestrator call for semantic grouping — one-time per commit)');
             console.log();
         }
 

package/lib/commands/help.js

@@ -105,9 +105,7 @@ function formatCommandLines(cmds) {
             name = `${cmd.name}, ${cmd.aliases.join(', ')}`;
         }
         if (cmd.args) {
-            const argLabel = cmd.args.values
-                ? cmd.args.values.join(' | ')
-                : cmd.args.name;
+            const argLabel = cmd.args.values ? cmd.args.values.join(' | ') : cmd.args.name;
             name += ` [${argLabel}]`;
         }
         if (cmd.subcommands) {
@@ -220,7 +218,7 @@ async function runAiHelp(question) {
         const pkg = getPackageJson();
         const localVersion = `v${pkg.version}`;
 
-        const response = await executeClaudeWithRetry(prompt, { timeout: 30000 });
+        const response = await executeClaudeWithRetry(prompt, { timeout: 60000 });
         const trimmedResponse = response.trim();
 
         // Check for NEED_MORE_CONTEXT second pass
@@ -308,7 +306,7 @@ async function handleNeedMoreContext(needMoreLine, question, claudeMdContent) {
             QUESTION: question
         });
 
-        const enrichedResponse = await executeClaudeWithRetry(enrichedPrompt, { timeout: 30000 });
+        const enrichedResponse = await executeClaudeWithRetry(enrichedPrompt, { timeout: 60000 });
         return enrichedResponse.trim();
     } catch (error) {
         logger.debug('help - handleNeedMoreContext', 'Enrichment failed', { error: error.message });
@@ -384,7 +382,7 @@ async function runReportIssue() {
         });
 
         console.log('\nAnalyzing template...\n');
-        const questionsResponse = await executeClaudeWithRetry(questionsPrompt, { timeout: 30000 });
+        const questionsResponse = await executeClaudeWithRetry(questionsPrompt, { timeout: 60000 });
 
         // Parse questions JSON from response
         let questions;
@@ -422,7 +420,7 @@ async function runReportIssue() {
         });
 
         console.log('\nComposing issue...\n');
-        const composeResponse = await executeClaudeWithRetry(composePrompt, { timeout: 30000 });
+        const composeResponse = await executeClaudeWithRetry(composePrompt, { timeout: 60000 });
 
         let issueData;
         try {

package/lib/commands/install.js

@@ -1052,11 +1052,7 @@ export function installCompletions() {
             appendLineIfMissing(bashrc, '# claude-hooks completions', bashSourceLine);
             const bashProfile = path.join(home, '.bash_profile');
             if (fs.existsSync(bashProfile)) {
-                appendLineIfMissing(
-                    bashProfile,
-                    '# claude-hooks completions',
-                    bashSourceLine
-                );
+                appendLineIfMissing(bashProfile, '# claude-hooks completions', bashSourceLine);
             }
             installed++;
         } catch (e) {

package/lib/commands/revert-feature.js

@@ -0,0 +1,436 @@
+/**
+ * File: revert-feature.js
+ * Purpose: Revert a squash-merged feature by task ID in a release-candidate branch
+ *
+ * Flow:
+ * 1. Validate: on release-candidate/V* branch, working directory clean
+ * 2. Search commits by task ID using git log --grep (fixed-string, case-insensitive)
+ * 3. Handle 0/1/2+ matches
+ * 4. Get target commit files and check coupling with other RC commits
+ * 5. Show details + coupling warnings → single confirmation
+ * 6. git revert --no-edit <hash>
+ * 7. Push to RC branch
+ * 8. Write to .claude/revert-log.json (append, array)
+ * 9. Optionally sync shadow (--update-shadow)
+ * 10. Display summary + revert-the-revert reminder
+ */
+
+import { execSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import {
+    getCurrentBranch,
+    isWorkingDirectoryClean,
+    pushBranch,
+    getRepoRoot,
+    getCommitFiles
+} from '../utils/git-operations.js';
+import { promptConfirmation, promptMenu } from '../utils/interactive-ui.js';
+import logger from '../utils/logger.js';
+
+const REVERT_LOG_RELATIVE_PATH = '.claude/revert-log.json';
+
+/** Matches Jira/Linear-style task IDs: AUT-3179, ISSUE-95, etc. */
+const TASK_ID_REGEX = /[A-Z]+-\d+/;
+
+// ─── Argument parsing ────────────────────────────────────────────────────────
+
+/**
+ * Parse CLI args into structured options
+ * @param {string[]} args
+ * @returns {{ taskId: string|null, updateShadow: boolean, dryRun: boolean }}
+ */
+function _parseArgs(args) {
+    const positional = args.filter((a) => !a.startsWith('--'));
+    return {
+        taskId: positional[0] || null,
+        updateShadow: args.includes('--update-shadow'),
+        dryRun: args.includes('--dry-run')
+    };
+}
+
+// ─── Git log helpers ─────────────────────────────────────────────────────────
+
+/**
+ * Search for commits matching a task ID in origin/main..HEAD
+ *
+ * @param {string} taskId - Task ID to search for (e.g., 'AUT-3179')
+ * @returns {Array<{ hash: string, message: string, author: string, date: string }>}
+ */
+function _searchCommits(taskId) {
+    logger.debug('revert-feature - _searchCommits', 'Searching for commits', { taskId });
+
+    try {
+        // Use | separator; join message parts back together to handle rare | in subjects
+        const output = execSync(
+            `git log --format="%H|%s|%an|%ai" --fixed-strings -i --grep="${taskId}" origin/main..HEAD`,
+            { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }
+        ).trim();
+
+        if (!output) return [];
+
+        return output
+            .split('\n')
+            .filter((line) => line.trim())
+            .map((line) => {
+                const parts = line.split('|');
+                const hash = parts[0];
+                const date = parts[parts.length - 1];
+                const author = parts[parts.length - 2];
+                const message = parts.slice(1, parts.length - 2).join('|');
+                return {
+                    hash: hash.trim(),
+                    message: message.trim(),
+                    author: author.trim(),
+                    date: date.trim()
+                };
+            });
+    } catch (err) {
+        logger.debug('revert-feature - _searchCommits', 'git log failed', { error: err.message });
+        return [];
+    }
+}
+
+/**
+ * Get all non-merge commits in the RC (origin/main..HEAD) as hash+message pairs
+ * @returns {Array<{ hash: string, message: string }>}
+ */
+function _getRCCommits() {
+    try {
+        const output = execSync('git log --format="%H|%s" origin/main..HEAD', {
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe']
+        }).trim();
+
+        if (!output) return [];
+
+        return output
+            .split('\n')
+            .filter((line) => line.trim())
+            .map((line) => {
+                const idx = line.indexOf('|');
+                return {
+                    hash: line.substring(0, idx).trim(),
+                    message: line.substring(idx + 1).trim()
+                };
+            });
+    } catch (err) {
+        logger.debug('revert-feature - _getRCCommits', 'git log failed', { error: err.message });
+        return [];
+    }
+}
+
+/**
+ * Get HEAD commit hash
+ * @returns {string}
+ */
+function _getHeadHash() {
+    return execSync('git rev-parse HEAD', {
+        encoding: 'utf8',
+        stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+}
+
+// ─── Coupling detection ──────────────────────────────────────────────────────
+
+/**
+ * Extract a task ID from a commit message (first match wins)
+ * @param {string} message
+ * @returns {string|null}
+ */
+function _extractTaskId(message) {
+    const match = message.match(TASK_ID_REGEX);
+    return match ? match[0] : null;
+}
+
+/**
+ * Find other RC commits that share files with the target commit
+ *
+ * @param {string} targetHash - Full hash of the commit being reverted
+ * @param {string[]} targetFiles - Files changed by the target commit
+ * @returns {Array<{ hash: string, taskId: string|null, message: string, sharedFiles: string[] }>}
+ */
+function _checkCoupling(targetHash, targetFiles) {
+    logger.debug('revert-feature - _checkCoupling', 'Checking coupling', {
+        targetHash,
+        targetFileCount: targetFiles.length
+    });
+
+    if (targetFiles.length === 0) return [];
+
+    const targetFileSet = new Set(targetFiles);
+    const rcCommits = _getRCCommits();
+    const coupled = [];
+
+    for (const commit of rcCommits) {
+        if (commit.hash === targetHash) continue;
+        // Skip revert commits — they intentionally touch the same files
+        if (commit.message.startsWith('Revert ')) continue;
+
+        try {
+            const files = getCommitFiles(commit.hash);
+            const shared = files.filter((f) => targetFileSet.has(f));
+            if (shared.length > 0) {
+                coupled.push({
+                    hash: commit.hash.substring(0, 7),
+                    taskId: _extractTaskId(commit.message),
+                    message: commit.message,
+                    sharedFiles: shared
+                });
+            }
+        } catch {
+            logger.debug('revert-feature - _checkCoupling', 'Could not get files for commit', {
+                hash: commit.hash
+            });
+        }
+    }
+
+    logger.debug('revert-feature - _checkCoupling', 'Coupling check complete', {
+        coupledCount: coupled.length
+    });
+
+    return coupled;
+}
+
+// ─── Revert log ──────────────────────────────────────────────────────────────
+
+/**
+ * Read .claude/revert-log.json (returns [] if missing or unreadable)
+ * @param {string} repoRoot
+ * @returns {Array}
+ */
+function _readRevertLog(repoRoot) {
+    const logPath = path.join(repoRoot, REVERT_LOG_RELATIVE_PATH);
+    if (!fs.existsSync(logPath)) return [];
+    try {
+        return JSON.parse(fs.readFileSync(logPath, 'utf8'));
+    } catch {
+        return [];
+    }
+}
+
+/**
+ * Append a revert entry to .claude/revert-log.json
+ *
+ * @param {string} repoRoot
+ * @param {{ taskId: string, originalHash: string, revertHash: string, rcBranch: string, timestamp: string }} entry
+ */
+function _appendRevertLog(repoRoot, entry) {
+    const logPath = path.join(repoRoot, REVERT_LOG_RELATIVE_PATH);
+    const dir = path.join(repoRoot, '.claude');
+
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+
+    const existing = _readRevertLog(repoRoot);
+    existing.push(entry);
+    fs.writeFileSync(logPath, JSON.stringify(existing, null, 2), 'utf8');
+
+    logger.debug('revert-feature - _appendRevertLog', 'Revert log updated', { logPath });
+}
+
+// ─── Display helpers ─────────────────────────────────────────────────────────
+
+/**
+ * Print a formatted box with commit details
+ * @param {{ hash: string, message: string, author: string, date: string }} commit
+ * @param {string[]} files
+ */
+function _displayCommitDetails(commit, files) {
+    console.log('');
+    console.log('┌─────────────────────────────────────────────────────────────┐');
+    console.log(' Commit to revert');
+    console.log('├─────────────────────────────────────────────────────────────┤');
+    console.log(` Hash:    ${commit.hash.substring(0, 7)}`);
+    console.log(` Message: ${commit.message}`);
+    console.log(` Author:  ${commit.author}`);
+    console.log(` Date:    ${commit.date.substring(0, 10)}`);
+    console.log(` Files:   ${files.length} file(s) changed`);
+
+    const displayFiles = files.length <= 10 ? files : files.slice(0, 10);
+    displayFiles.forEach((f) => console.log(`          - ${f}`));
+    if (files.length > 10) {
+        console.log(`          ... and ${files.length - 10} more`);
+    }
+
+    console.log('└─────────────────────────────────────────────────────────────┘');
+}
+
+// ─── Main command ─────────────────────────────────────────────────────────────
+
+/**
+ * Main entry point for `claude-hooks revert-feature <task-id>`
+ * @param {string[]} args - CLI args after 'revert-feature'
+ */
+export async function runRevertFeature(args) {
+    const { taskId, updateShadow, dryRun } = _parseArgs(args);
+
+    if (!taskId) {
+        console.error(
+            '❌ Usage: claude-hooks revert-feature <task-id> [--update-shadow] [--dry-run]'
+        );
+        console.error('   Example: claude-hooks revert-feature AUT-3179');
+        process.exit(1);
+    }
+
+    // 1. Validate: must be on a release-candidate/V* branch
+    const currentBranch = getCurrentBranch();
+    if (!currentBranch.startsWith('release-candidate/')) {
+        console.error('❌ Must be on a release-candidate/V* branch.');
+        console.error(`   Current branch: ${currentBranch}`);
+        process.exit(1);
+    }
+
+    // 2. Validate: working directory must be clean
+    if (!isWorkingDirectoryClean()) {
+        console.error('❌ Working directory has uncommitted changes.');
+        console.error('   Please commit or stash your changes before reverting.');
+        process.exit(1);
+    }
+
+    // 3. Search for commits matching the task ID
+    console.log(`\n🔍 Searching for "${taskId}" in ${currentBranch}...`);
+    const commits = _searchCommits(taskId);
+
+    if (commits.length === 0) {
+        console.error(`❌ No commits found for "${taskId}" in this release-candidate.`);
+        console.error(`   Searched: origin/main..HEAD on ${currentBranch}`);
+        process.exit(1);
+    }
+
+    // 4. Select target commit
+    let targetCommit;
+    if (commits.length === 1) {
+        targetCommit = commits[0];
+    } else {
+        console.log(`\n⚠️  Found ${commits.length} commits matching "${taskId}".`);
+        const options = commits.map((c, i) => ({
+            key: String(i + 1),
+            label: `${c.hash.substring(0, 7)}  ${c.message}  (${c.author}, ${c.date.substring(0, 10)})`
+        }));
+        const selectedKey = await promptMenu('Select the commit to revert:', options, '1');
+        const selectedIndex = parseInt(selectedKey, 10) - 1;
+        targetCommit = commits[Math.max(0, selectedIndex)];
+    }
+
+    // 5. Get target commit files (for display and coupling)
+    let targetFiles = [];
+    try {
+        targetFiles = getCommitFiles(targetCommit.hash);
+    } catch {
+        logger.debug('revert-feature - runRevertFeature', 'Could not get commit files', {
+            hash: targetCommit.hash
+        });
+    }
+
+    // 6. Coupling check
+    const coupledCommits = _checkCoupling(targetCommit.hash, targetFiles);
+
+    // 7. Dry-run: preview only
+    if (dryRun) {
+        console.log('\n📋 Dry-run preview (no changes will be made)\n');
+        _displayCommitDetails(targetCommit, targetFiles);
+
+        if (coupledCommits.length > 0) {
+            console.log('\n⚠️  Coupling warnings:');
+            coupledCommits.forEach((c) => {
+                const label = c.taskId ? `[${c.taskId}]` : c.hash;
+                console.log(`   ${label} also modifies: ${c.sharedFiles.join(', ')}`);
+            });
+        }
+
+        console.log('\nActions that would be performed:');
+        console.log(`  1. git revert --no-edit ${targetCommit.hash.substring(0, 7)}`);
+        console.log(`  2. git push origin ${currentBranch}`);
+        console.log('  3. Update .claude/revert-log.json');
+        if (updateShadow) {
+            console.log(`  4. claude-hooks shadow sync ${currentBranch}`);
+        }
+        return;
+    }
+
+    // 8. Display details + coupling warnings + single confirmation
+    _displayCommitDetails(targetCommit, targetFiles);
+
+    if (coupledCommits.length > 0) {
+        console.log('\n⚠️  Coupling warnings:');
+        coupledCommits.forEach((c) => {
+            const label = c.taskId ? `[${c.taskId}]` : c.hash;
+            console.log(
+                `   ${label} also modifies: ${c.sharedFiles.join(', ')} — consider reverting both`
+            );
+        });
+    }
+
+    const confirmed = await promptConfirmation('\nProceed with revert?', false);
+    if (!confirmed) {
+        console.log('Aborted.');
+        process.exit(0);
+    }
+
+    // 9. Revert
+    console.log('\n⏳ Reverting commit...');
+    try {
+        execSync(`git revert --no-edit ${targetCommit.hash}`, {
+            encoding: 'utf8',
+            stdio: 'inherit'
+        });
+    } catch (err) {
+        console.error(`❌ git revert failed: ${err.message}`);
+        console.error('   Resolve conflicts manually or run: git revert --abort');
+        process.exit(1);
+    }
+
+    const revertHash = _getHeadHash();
+
+    // 10. Push
+    console.log('⏳ Pushing to remote...');
+    const pushResult = pushBranch(currentBranch);
+    if (!pushResult.success) {
+        console.error(`❌ Push failed: ${pushResult.error}`);
+        console.error('   Revert commit created locally. Push manually:');
+        console.error(`   git push origin ${currentBranch}`);
+        process.exit(1);
+    }
+
+    // 11. Write revert log
+    const repoRoot = getRepoRoot();
+    _appendRevertLog(repoRoot, {
+        taskId,
+        originalHash: targetCommit.hash,
+        revertHash,
+        rcBranch: currentBranch,
+        timestamp: new Date().toISOString()
+    });
+
+    // 12. Update shadow (optional)
+    if (updateShadow) {
+        console.log('\n⏳ Updating shadow branch...');
+        try {
+            const { runShadow } = await import('./shadow.js');
+            await runShadow(['sync', currentBranch]);
+        } catch (err) {
+            console.warn(`⚠️  Shadow sync failed: ${err.message}`);
+            console.warn(`   Re-deploy manually: claude-hooks shadow sync ${currentBranch}`);
+        }
+    }
+
+    // 13. Summary + revert-the-revert reminder
+    console.log('\n✅ Feature reverted successfully!\n');
+    console.log('┌─────────────────────────────────────────────────────────────┐');
+    console.log(` Task ID:  ${taskId}`);
+    console.log(
+        ` Reverted: ${targetCommit.hash.substring(0, 7)} → revert ${revertHash.substring(0, 7)}`
+    );
+    console.log(` Branch:   ${currentBranch}`);
+    if (updateShadow) {
+        console.log(' Shadow:   synced ✅');
+    } else {
+        console.log(' Shadow:   not updated (use --update-shadow to deploy)');
+    }
+    console.log('├─────────────────────────────────────────────────────────────┤');
+    console.log(' 💡 After the release, run in develop:');
+    console.log(`    git revert ${revertHash.substring(0, 7)}    # Restores ${taskId} for next sprint`);
+    console.log('└─────────────────────────────────────────────────────────────┘\n');
+}