claude-git-hooks 2.51.2 → 2.66.1

package/lib/commands/back-merge.js

@@ -39,7 +39,8 @@ import {
     checkoutBranch,
     pushBranch,
     deleteRemoteBranch,
-    createCommit
+    createCommit,
+    stageFiles
 } from '../utils/git-operations.js';
 import {
     getLatestLocalTag,
@@ -650,6 +651,53 @@ export async function runBackMerge(args) {
     showSuccess(`✓ Merge committed: ${commitMsg}`);
     console.log('');
 
+    // 14b. Co-change correlation pipeline (AUT-3777)
+    let coChangeReport = null;
+    try {
+        const { coChangePipeline } = await import('../../.library/librarian/index.js');
+
+        showInfo('Running co-change correlation pipeline...');
+        const summary = coChangePipeline({ repoCtx: {} });
+        const { modifiedFiles, perStep, report, warnings, mode } = summary;
+
+        // Surface summary to stdout
+        showInfo(
+            `Co-change: mode=${mode}, detected=${perStep.detection.modifications}, ` +
+            `injected=${perStep.injection.modifications}, warnings=${warnings.length}`
+        );
+        for (const w of warnings) {
+            showWarning(w);
+        }
+
+        // Save report for PR body attachment after push
+        coChangeReport = report;
+
+        if (modifiedFiles.length === 0) {
+            showInfo('Co-change pipeline produced no Library changes');
+        } else {
+            const root = getRepoRoot();
+            const absFiles = modifiedFiles.map(f => path.isAbsolute(f) ? f : path.join(root, f));
+            const stageResult = stageFiles(absFiles);
+
+            if (!stageResult.success) {
+                showWarning(`Failed to stage co-change files: ${stageResult.error}`);
+            } else {
+                const windowDesc = tagName ? `${tagName}..HEAD` : 'full history';
+                const libCommitMsg = `chore(library): co-change correlations for ${windowDesc}`;
+                const libCommit = createCommit(libCommitMsg);
+
+                if (!libCommit.success) {
+                    showWarning(`Failed to commit co-change files: ${libCommit.error}`);
+                } else {
+                    showSuccess(`Co-change committed: ${libCommitMsg} (${modifiedFiles.length} file(s))`);
+                }
+            }
+        }
+    } catch (err) {
+        logger.warning(`co-change pipeline skipped: ${err.message}`);
+        logger.debug('back-merge', 'Co-change pipeline skipped', { error: err.message });
+    }
+
     // 15. Verify sync
     try {
         const postMergeDivergence = getDivergence(opts.into, `origin/${opts.from}`);
@@ -719,18 +767,50 @@ export async function runBackMerge(args) {
         await _revertFollowup(rcBranchForLog, repoRoot);
     }
 
-    // 18b. Co-change injection — refresh library references with newly merged history
-    if (pushStatus === 'pushed') {
+    // 18b. Attach co-change report to PR body (AUT-3777)
+    if (coChangeReport && pushStatus === 'pushed') {
         try {
-            const { main: injectCoChange } = await import('../../.library/tools/inject-co-change.js');
-            showInfo('📚 Refreshing library co-change references...');
-            await injectCoChange(['node', 'inject-co-change.js']);
-            showSuccess('✓ Co-change references updated');
-        } catch (err) {
-            showWarning('📚 Co-change injection unavailable — .library/ tools not found');
-            logger.debug('back-merge', 'Co-change injection skipped', { error: err.message });
+            const { parseGitHubRepo } = await import('../utils/github-client.js');
+            const { findExistingPR, updatePullRequestBody } = await import('../utils/github-api.js');
+            const repoInfo = parseGitHubRepo();
+
+            const existingPR = await findExistingPR({
+                owner: repoInfo.owner,
+                repo: repoInfo.repo,
+                head: opts.from,
+                base: opts.into,
+            });
+
+            if (existingPR) {
+                const OPEN_MARKER = '<!-- LIBRARY_COCHANGE_REPORT -->';
+                const CLOSE_MARKER = '<!-- /LIBRARY_COCHANGE_REPORT -->';
+                const section = `${OPEN_MARKER}\n${coChangeReport}\n${CLOSE_MARKER}`;
+                const markerRegex = new RegExp(
+                    `${OPEN_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${CLOSE_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`
+                );
+
+                let newBody;
+                if (markerRegex.test(existingPR.body || '')) {
+                    // Re-run: replace existing section
+                    newBody = (existingPR.body).replace(markerRegex, section);
+                } else {
+                    // First run: append section
+                    newBody = `${existingPR.body || ''}\n\n${section}`;
+                }
+
+                await updatePullRequestBody(repoInfo.owner, repoInfo.repo, existingPR.number, newBody);
+                showSuccess('Co-change report attached to PR body');
+            } else {
+                logger.debug('back-merge', 'No existing PR found for report attachment', {
+                    head: opts.from,
+                    base: opts.into,
+                });
+            }
+        } catch (prErr) {
+            logger.debug('back-merge', 'Could not attach co-change report to PR', {
+                error: prErr.message,
+            });
         }
-        console.log('');
     }
 
     // 19. Summary

package/lib/commands/bump-version.js

@@ -48,12 +48,14 @@ import {
     showError,
     showWarning,
     promptConfirmation,
-    promptMenu,
-    promptToggleList,
-    promptEditField
+    promptToggleList
 } from '../utils/interactive-ui.js';
 import logger from '../utils/logger.js';
 import { colors, error, checkGitRepo } from './helpers.js';
+import {
+    CONSOLE_WARNING_TEMPLATE,
+    LIBRARY_VERIFY_SKIPPED_WARNING
+} from '../messages/library-warnings.js';
 
 /**
  * Validates prerequisites before version bump
@@ -205,7 +207,9 @@ function displayDiscoveryTable(discovery) {
     );
     console.log('');
 
-    if (discovery.files.length === 0) {
+    const visibleFiles = discovery.files.filter((f) => f.selected);
+
+    if (visibleFiles.length === 0) {
         console.log('  No version files found.');
         console.log('');
         return;
@@ -217,8 +221,8 @@ function displayDiscoveryTable(discovery) {
     );
     console.log(`  ${'-'.repeat(3)} ${'-'.repeat(35)} ${'-'.repeat(15)} ${'-'.repeat(15)}`);
 
-    // Table rows
-    discovery.files.forEach((file, index) => {
+    // Table rows (only semver files)
+    visibleFiles.forEach((file, index) => {
         const num = `${index + 1}`.padEnd(3);
         const filePath = file.relativePath.padEnd(35);
         const fileType = file.projectLabel.padEnd(15);
@@ -289,70 +293,20 @@ function showDryRunPreview(info) {
  */
 async function promptFileSelection(discovery) {
     console.log('');
-    showWarning('Version mismatch detected or interactive mode enabled');
-    console.log('');
 
-    const options = [
-        { key: 'a', label: 'Update all files' },
-        { key: 's', label: 'Select which files to update' },
-        { key: 'e', label: 'Edit version per file (advanced)' },
-        { key: 'c', label: 'Cancel' }
-    ];
-
-    const choice = await promptMenu('Choose action:', options, 'a');
-
-    if (choice === 'c') {
-        showInfo('Version bump cancelled');
-        process.exit(0);
-    }
-
-    if (choice === 'a') {
-        // All files selected
-        return discovery.files;
-    }
-
-    if (choice === 's') {
-        // Toggle list selection
-        const items = discovery.files.map((file, index) => ({
-            key: `${index}`,
-            label: `${file.relativePath} (${file.projectLabel}) - ${file.version || 'N/A'}`,
-            selected: file.selected
-        }));
-
-        const selectedKeys = await promptToggleList(
-            'Select files to update (type number to toggle, Enter to confirm):',
-            items
-        );
+    const semverFiles = discovery.files.filter((f) => f.selected);
+    const items = semverFiles.map((file, index) => ({
+        key: `${index}`,
+        label: `${file.relativePath} (${file.projectLabel}) - ${file.version || 'N/A'}`,
+        selected: true
+    }));
 
-        // Filter files by selected keys
-        return discovery.files.filter((_, index) => selectedKeys.includes(`${index}`));
-    }
-
-    if (choice === 'e') {
-        // Per-file version editing
-        showInfo('Enter target version for each file (press Enter to keep calculated version)');
-        console.log('');
-
-        for (const file of discovery.files) {
-            const input = await promptEditField(
-                `${file.relativePath} (${file.projectLabel})`,
-                file.version || 'N/A'
-            );
-
-            // If user entered something different from current version, store it
-            if (input !== file.version && input !== 'N/A') {
-                if (!validateVersionFormat(input)) {
-                    showWarning(`Invalid version format: ${input} — skipping ${file.relativePath}`);
-                    continue;
-                }
-                file.targetVersion = input;
-            }
-        }
-
-        return discovery.files;
-    }
+    const selectedKeys = await promptToggleList(
+        'Select files to update (type number to toggle, Enter to confirm):',
+        items
+    );
 
-    return discovery.files;
+    return semverFiles.filter((_, index) => selectedKeys.includes(`${index}`));
 }
 
 /**
@@ -374,6 +328,25 @@ function restoreSnapshot(snapshot) {
     });
 }
 
+/**
+ * Emit a loud Library staleness warning to stderr.
+ * Content comes from the wording constant + verify result data.
+ * Formatting uses ANSI codes for visual emphasis on TTY stderr.
+ *
+ * @param {import('../../.library/librarian/index.js').VerifyResult} result
+ * @private
+ */
+function _emitLibraryWarning(result) {
+    const y = colors.yellow;
+    const r = colors.reset;
+    const bar = `${y}${'='.repeat(63)}${r}`;
+    const content = CONSOLE_WARNING_TEMPLATE(result, { autoRegen: 'deferred' });
+
+    const lines = ['', bar, '', `${y}${content}${r}`, '', bar, ''];
+
+    process.stderr.write(lines.join('\n'));
+}
+
 /**
  * Bump version command
  * @param {Array<string>} args - Command arguments
@@ -441,6 +414,22 @@ export async function runBumpVersion(args) {
 
     showSuccess('Prerequisites validated');
 
+    // Library verification gate — silent on clean, loud-warn on stale, never-hard-fail
+    logger.debug('bump-version', 'Running Library verification gate');
+    try {
+        const { verify } = await import('../../.library/librarian/index.js');
+        const verifyResult = await verify();
+
+        if (verifyResult.clean) {
+            logger.debug('bump-version', 'Library is clean — no warning needed');
+        } else {
+            _emitLibraryWarning(verifyResult);
+        }
+    } catch (verifyErr) {
+        const msg = `\n${colors.yellow}  ${LIBRARY_VERIFY_SKIPPED_WARNING} ${verifyErr.message}${colors.reset}\n\n`;
+        process.stderr.write(msg);
+    }
+
     // Step 2: Discover all version files
     logger.debug('bump-version', 'Step 2: Discovering version files');
     const discovery = discoverVersionFiles();
@@ -465,15 +454,6 @@ export async function runBumpVersion(args) {
     // Display discovery table
     displayDiscoveryTable(discovery);
 
-    const currentVersion = discovery.resolvedVersion;
-
-    if (!currentVersion) {
-        showError('Could not determine current version from discovered files');
-        process.exit(1);
-    }
-
-    showInfo(`Current version: ${currentVersion}`);
-
     // Step 3: File selection (if mismatch or interactive mode)
     let selectedFiles = discovery.files.filter((f) => f.selected);
 
@@ -489,6 +469,22 @@ export async function runBumpVersion(args) {
         console.log('');
     }
 
+    // Derive current version from selected files (not from discovery.resolvedVersion)
+    const selectedVersions = selectedFiles
+        .filter((f) => f.version !== null)
+        .map((f) => f.version);
+    const uniqueSelected = [...new Set(selectedVersions)];
+    const currentVersion = uniqueSelected.length === 1
+        ? uniqueSelected[0]
+        : discovery.resolvedVersion;
+
+    if (!currentVersion || !validateVersionFormat(currentVersion)) {
+        showError('Could not determine a valid semver version from selected files');
+        process.exit(1);
+    }
+
+    showInfo(`Current version: ${currentVersion}`);
+
     // Step 4: Calculate new version or apply suffix operation
     logger.debug('bump-version', 'Step 4: Calculating new version');
     let newVersion;

package/lib/commands/create-pr.js

@@ -22,7 +22,7 @@ import {
     showWarning,
     promptConfirmation
 } from '../utils/interactive-ui.js';
-import { getBranchPushStatus, pushBranch } from '../utils/git-operations.js';
+import { getBranchPushStatus, pushBranch, stageFiles, createCommit, getRepoRoot } from '../utils/git-operations.js';
 import logger from '../utils/logger.js';
 import { resolveLabels } from '../utils/label-resolver.js';
 import { CostTracker } from '../utils/cost-tracker.js';
@@ -364,7 +364,7 @@ export async function runCreatePr(args) {
         // Step 5.6: Version alignment validation (Issue #44)
         logger.debug('create-pr', 'Step 5.6: Validating version alignment');
         const { validateVersionAlignment } = await import('../utils/version-manager.js');
-        const versionCheck = await validateVersionAlignment();
+        const versionCheck = await validateVersionAlignment(baseBranch);
 
         if (!versionCheck.aligned) {
             showWarning('Version misalignment detected:');
@@ -451,23 +451,135 @@ export async function runCreatePr(args) {
             }
         }
 
-        // Step 5.7: Smart tag pushing (Issue #44)
-        logger.debug('create-pr', 'Step 5.7: Checking and pushing unpushed tags');
+        // Step 5.7: Library maintenance pipeline (AUT-3764)
+        // Runs BEFORE tag push so that library regen is included in the tagged commit.
+        // Guard: only run if the current repo has its own .library/ setup.
+        // When claude-hooks is installed in a foreign repo (npm link / file: ref),
+        // the relative import resolves to git-hooks' .library/ — not this repo's.
+        let libraryCommitted = false;
+        const root = getRepoRoot();
+        const libraryResolverPath = path.join(root, '.library', 'resolver.yaml');
+        if (!fs.existsSync(libraryResolverPath)) {
+            logger.debug('create-pr', 'No .library/resolver.yaml in current repo — skipping Library pipeline');
+        } else {
+            logger.debug('create-pr', 'Step 5.7: Running Library maintenance pipeline');
+            try {
+                showInfo('Running Library maintenance pipeline...');
+                const { createPrPipeline } = await import('../../.library/librarian/index.js');
+
+                const pipelineSummary = await createPrPipeline({ repoRoot: root });
+                const {
+                    modifiedFiles: libraryFiles,
+                    perStep,
+                    pendingDueToApiDown,
+                    warnings: pipelineWarnings,
+                } = pipelineSummary;
+
+                // Surface pipeline summary
+                logger.debug('create-pr', 'Pipeline completed', {
+                    modifiedCount: libraryFiles.length,
+                    pendingDueToApiDown,
+                    warningCount: pipelineWarnings.length,
+                });
+                showInfo(`Staleness: ${perStep.staleness.staleCount} stale, ${perStep.staleness.unbookedCount} unbooked`);
+                if (perStep.regen.changed > 0) {
+                    showInfo(`Regenerated: ${perStep.regen.changed} book(s)`);
+                }
+                if (perStep.addRemoveRename.created > 0) {
+                    showInfo(`Created: ${perStep.addRemoveRename.created} new book(s)`);
+                }
+                if (pendingDueToApiDown > 0) {
+                    showWarning(`Gotchas pending (API down): ${pendingDueToApiDown}`);
+                }
+                for (const w of pipelineWarnings) {
+                    showWarning(w);
+                }
+
+                if (libraryFiles.length === 0) {
+                    showInfo('Library already in sync');
+                } else {
+                    // Stage all modified Library files (stageFiles expects absolute paths)
+                    const absFiles = libraryFiles.map(f => path.join(root, f));
+                    const stageResult = stageFiles(absFiles);
+
+                    if (!stageResult.success) {
+                        showWarning(`Failed to stage Library files: ${stageResult.error}`);
+                    } else {
+                        // Commit with deterministic message — separate commit, not amend
+                        const libraryCommitMsg = `chore(library): sync books for ${currentBranch}`;
+                        const commitResult = createCommit(libraryCommitMsg);
+
+                        if (!commitResult.success) {
+                            showWarning(`Failed to commit Library changes: ${commitResult.error}`);
+                        } else {
+                            libraryCommitted = true;
+                            showSuccess(`Library committed: ${libraryCommitMsg} (${libraryFiles.length} file(s))`);
+
+                            // Push the Library commit to the PR branch's remote
+                            const libraryPushResult = pushBranch(currentBranch);
+                            if (!libraryPushResult.success) {
+                                showWarning(`Failed to push Library commit: ${libraryPushResult.error}`);
+                            } else {
+                                showSuccess('Library commit pushed');
+                            }
+                        }
+                    }
+                }
+            } catch (pipelineErr) {
+                // Pipeline failure is non-blocking — log and continue with PR creation
+                logger.warning('create-pr', 'Library pipeline failed, continuing', {
+                    error: pipelineErr.message,
+                });
+                showWarning(`Library pipeline unavailable: ${pipelineErr.message}`);
+            }
+        }
+
+        // Step 5.8: Smart tag pushing (Issue #44)
+        // Runs AFTER library maintenance so tags include the library commit.
+        logger.debug('create-pr', 'Step 5.8: Checking and pushing unpushed tags');
         const {
             compareLocalAndRemoteTags,
             pushTags: pushTagsUtil,
-            getLatestLocalTag,
-            getLatestRemoteTag,
+            createTag: createTagUtil,
+            getLatestRemoteTagOnBranch,
             parseTagVersion
         } = await import('../utils/git-tag-manager.js');
         const { compareVersions } = await import('../utils/version-manager.js');
 
+        // If library was committed after bump-version created the tag,
+        // re-point unpushed tags to HEAD so the tag includes library books.
+        if (libraryCommitted) {
+            const unpushedTags = await compareLocalAndRemoteTags();
+            for (const tag of unpushedTags.localNewer) {
+                const version = parseTagVersion(tag);
+                if (version) {
+                    logger.debug('create-pr', 'Re-pointing tag to include library commit', { tag });
+                    let origTagMsg = '';
+                    try { origTagMsg = execSync(`git tag -l --format="%(contents)" ${tag}`, { encoding: 'utf8' }).trim(); } catch { /* ignore */ }
+                    const tagMsg = origTagMsg || `Release version ${version}`;
+                    try {
+                        await createTagUtil(version, tagMsg, { force: true });
+                        showInfo(`Tag ${tag} moved to include library commit`);
+                    } catch (tagErr) {
+                        logger.warning('create-pr', 'Failed to re-point tag, continuing', { tag, error: tagErr.message });
+                    }
+                }
+            }
+        }
+
         const tagComparison = await compareLocalAndRemoteTags();
 
         if (tagComparison.localNewer.length > 0) {
-            // Get latest local and remote tags for comparison
-            const latestLocalTag = getLatestLocalTag();
-            const latestRemoteTag = await getLatestRemoteTag();
+            // Derive latest unpushed tag (scoped to what's actually being pushed)
+            const sortedUnpushed = tagComparison.localNewer
+                .map((t) => ({ tag: t, version: parseTagVersion(t) }))
+                .filter((t) => t.version !== null)
+                .sort((a, b) => compareVersions(a.version, b.version));
+            const latestLocalTag = sortedUnpushed.length > 0
+                ? sortedUnpushed[sortedUnpushed.length - 1].tag
+                : tagComparison.localNewer[0];
+            // Compare against latest remote tag on the BASE branch (not global latest)
+            const latestRemoteTag = getLatestRemoteTagOnBranch(baseBranch);
 
             const localVersion = latestLocalTag ? parseTagVersion(latestLocalTag) : null;
             const remoteVersion = latestRemoteTag ? parseTagVersion(latestRemoteTag) : null;
@@ -483,7 +595,7 @@ export async function runCreatePr(args) {
             let shouldPushTags = false;
             let userChoice = null;
 
-            // Case 1: Local tag > Remote tag → Auto-push
+            // Case 1: Local tag > Remote tag → Auto-push (normal bump-version flow)
             if (localVersion && remoteVersion && compareVersions(localVersion, remoteVersion) > 0) {
                 logger.debug('create-pr', 'Local version > remote version, auto-pushing', {
                     localVersion,
@@ -494,7 +606,7 @@ export async function runCreatePr(args) {
                 showInfo('Auto-pushing tag to remote...');
                 shouldPushTags = true;
 
-                // Case 2: Local tag = Remote tag → Prompt with warning
+                // Case 2: Local tag = Remote tag → Prompt with warning (may already be pushed)
             } else if (
                 localVersion &&
                 remoteVersion &&
@@ -534,7 +646,7 @@ export async function runCreatePr(args) {
                     shouldPushTags = true;
                 }
 
-                // Case 3: Local tag < Remote tag → Prompt with error
+                // Case 3: Local tag < Remote tag → Prompt with warning (someone pushed newer)
             } else if (
                 localVersion &&
                 remoteVersion &&
@@ -765,38 +877,6 @@ export async function runCreatePr(args) {
             finalBody = `> ⚠️ This PR must be merged with **merge commit** (not squash)\n\n${prBody}`;
         }
 
-        // Library staleness section — informational, non-blocking
-        try {
-            showInfo('📚 Checking library staleness...');
-            const { checkBook } = await import('../../.library/tools/staleness.js');
-            const { getBooksDir } = await import('../../.library/paths.js');
-            const { getRepoRoot } = await import('../utils/git-operations.js');
-            const booksDir = getBooksDir();
-            const root = getRepoRoot();
-            const changedSourceFiles = (filesArray || [])
-                .map(f => f.path || f)
-                .filter(p => p.startsWith('lib/') && p.endsWith('.js'));
-            const staleBooks = [];
-            for (const srcPath of changedSourceFiles) {
-                const bookName = `${srcPath.replace(/^lib\/.*\//, '').replace(/\.js$/, '')}.md`;
-                try {
-                    const result = await checkBook(path.join(booksDir, bookName), root);
-                    if (result.status === 'stale') staleBooks.push(bookName);
-                } catch {
-                    // skip
-                }
-            }
-            if (staleBooks.length > 0) {
-                const bookList = staleBooks.map(b => `- \`${b}\``).join('\n');
-                finalBody += `\n\n---\n\n### 📚 Library Staleness\n\nThe following library books may need regeneration:\n\n${bookList}\n\nRun: \`npm run library:regenerate\``;
-                showWarning(`📚 ${staleBooks.length} stale book(s) — section added to PR body`);
-            } else if (changedSourceFiles.length > 0) {
-                showSuccess('📚 Library books are current');
-            }
-        } catch {
-            showWarning('📚 Library staleness check unavailable — .library/ tools not found');
-        }
-
         // Step 10: Get reviewers from team + config fallback
         logger.debug('create-pr', 'Step 10: Selecting reviewers via team resolution');
         const reviewers = await selectReviewers({