claude-git-hooks 2.14.1 → 2.14.4

package/CHANGELOG.md

@@ -5,6 +5,32 @@ Todos los cambios notables en este proyecto se documentarán en este archivo.
 El formato está basado en [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 y este proyecto adhiere a [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.14.4] - 2026-02-06
+
+### 🔧 Changed
+- The bump-version command now uses the configured default branch (from github.pr.defaultBase) in the 'Next steps' output instead of hardcoded 'main'
+
+
+## [2.14.3] - 2026-02-06
+
+
+## [2.14.2] - 2026-02-06
+
+### ✨ Added
+- New `--push` flag for `bump-version` command to explicitly push tags to remote when desired
+
+### 🔧 Changed
+- Changed `bump-version` default behavior to keep tags local instead of automatically pushing to remote (#65)
+- Tags are now pushed by `create-pr` command or manually with `--push` flag, providing better control over the release workflow
+- Updated documentation in README.md, README-NPM.md, and CLAUDE.md to reflect new tag push behavior
+
+### ⚠️ Deprecated
+- The `--no-push` flag for `bump-version` is no longer needed as tags now stay local by default
+
+### 🗑️ Removed
+- Removed RFC-001 documentation file (pr-metadata-engine-refactor.md) as the refactor has been completed
+
+
 ## [2.14.1] - 2026-02-06
 
 ### 🔧 Changed

package/README.md

@@ -111,6 +111,9 @@ claude-hooks bump-version major --update-changelog
 # Preview without applying
 claude-hooks bump-version patch --dry-run
 
+# Push tag immediately (otherwise pushed by create-pr)
+claude-hooks bump-version patch --push
+
 # Manual workflow (skip automatic commit)
 claude-hooks bump-version patch --no-commit
 ```
@@ -121,7 +124,7 @@ claude-hooks bump-version patch --no-commit
 - Generates CHANGELOG entry with Claude (analyzes commits)
 - Commits changes automatically with conventional commit format
 - Creates annotated Git tag with `v` prefix (e.g., `v2.7.0`)
-- Pushes tag to remote automatically
+- Tags stay local by default (use `--push` to push immediately, or let `create-pr` handle it)
 
 **Version workflow:**
 ```

package/lib/commands/bump-version.js

@@ -10,7 +10,7 @@
  * 5. [Optional] Generate and update CHANGELOG
  * 6. Stage and commit changes (skipped with --no-commit)
  * 7. Create annotated Git tag (skipped with --no-tag or --no-commit)
- * 8. Push tag to remote (skipped with --no-push)
+ * 8. Push tag to remote (only if --push flag provided, otherwise pushed by create-pr)
  */
 
 import { execSync } from 'child_process';
@@ -21,7 +21,6 @@ import {
     getCurrentVersion,
     incrementVersion,
     updateVersion,
-    parseVersion,
     getDiscoveredPaths
 } from '../utils/version-manager.js';
 import {
@@ -48,9 +47,7 @@ import logger from '../utils/logger.js';
 import {
     colors,
     error,
-    success,
     info,
-    warning,
     checkGitRepo
 } from './helpers.js';
 
@@ -116,7 +113,7 @@ function validatePrerequisites() {
  * Why: Extracts bump type and options from CLI args
  *
  * @param {Array<string>} args - CLI arguments
- * @returns {Object} Parsed args: { bumpType, suffix, updateChangelog, baseBranch, dryRun, noTag, noPush }
+ * @returns {Object} Parsed args: { bumpType, suffix, updateChangelog, baseBranch, dryRun, noTag, push, noCommit }
  */
 function parseArguments(args) {
     logger.debug('bump-version - parseArguments', 'Parsing arguments', { args });
@@ -128,7 +125,7 @@ function parseArguments(args) {
         baseBranch: 'main',
         dryRun: false,
         noTag: false,
-        noPush: false,
+        push: false,      // Changed: default to NOT push (use --push to enable)
         noCommit: false
     };
 
@@ -160,8 +157,8 @@ function parseArguments(args) {
             parsed.dryRun = true;
         } else if (arg === '--no-tag') {
             parsed.noTag = true;
-        } else if (arg === '--no-push') {
-            parsed.noPush = true;
+        } else if (arg === '--push') {
+            parsed.push = true;
         } else if (arg === '--no-commit') {
             parsed.noCommit = true;
         }
@@ -223,7 +220,7 @@ export async function runBumpVersion(args) {
         console.log('  --update-changelog [branch]  Generate CHANGELOG entry (default branch: main)');
         console.log('  --dry-run                Preview changes without applying');
         console.log('  --no-tag                 Skip Git tag creation');
-        console.log('  --no-push                Create tag but don\'t push to remote');
+        console.log('  --push                   Push tag to remote (default: tags stay local)');
         console.log('  --no-commit              Skip automatic commit (manual workflow)');
         console.log('');
         console.log('Examples:');
@@ -348,6 +345,11 @@ export async function runBumpVersion(args) {
     console.log('');
 
     try {
+        // Load config for default branch
+        const config = await getConfig();
+        const defaultBranch = config.github?.pr?.defaultBase || '{target-branch}';
+        logger.debug('bump-version', 'Default branch for PR', { defaultBranch });
+
         // Step 4: Update version files
         logger.debug('bump-version', 'Step 4: Updating version files');
         showInfo('Updating version files...');
@@ -364,7 +366,6 @@ export async function runBumpVersion(args) {
             logger.debug('bump-version', 'Step 5: Generating CHANGELOG');
             showInfo('Generating CHANGELOG entry...');
 
-            const config = await getConfig();
             const isReleaseVersion = !options.suffix; // Final version if no suffix
 
             const changelogResult = await generateChangelogEntry({
@@ -494,9 +495,9 @@ export async function runBumpVersion(args) {
                     showSuccess(`✓ Tag created: ${tagName}`);
                     console.log('');
 
-                    // Step 7: Push tag (if not disabled)
-                    if (!options.noPush) {
-                        logger.debug('bump-version', 'Step 7: Pushing tag to remote');
+                    // Step 8: Push tag (if --push flag provided)
+                    if (options.push) {
+                        logger.debug('bump-version', 'Step 8: Pushing tag to remote');
                         showInfo('Pushing tag to remote...');
 
                         const pushResult = pushTags(null, tagName);
@@ -510,10 +511,10 @@ export async function runBumpVersion(args) {
                             console.log(`  git push origin ${tagName}`);
                         }
                     } else {
-                        showInfo('Tag push skipped (--no-push)');
+                        showInfo('Tag created locally (use --push to push immediately)');
                         console.log('');
-                        console.log('To push the tag later:');
-                        console.log(`  git push origin ${tagName}`);
+                        console.log('Tag will be pushed automatically when you run:');
+                        console.log('  claude-hooks create-pr [branch]');
                     }
                 } else {
                     showError(`Failed to create tag: ${tagResult.error}`);
@@ -546,18 +547,18 @@ export async function runBumpVersion(args) {
             console.log(`  4. Create tag: git tag -a ${tagName} -m "Release version ${newVersion}"`);
             console.log(`  5. Push: git push origin $(git branch --show-current) ${tagName}`);
             console.log('');
-        } else if (commitCreated && !options.noTag && !options.noPush) {
-            console.log('All done! Changes committed and tag pushed to remote.');
+        } else if (commitCreated && !options.noTag && options.push) {
+            console.log('All done! Changes committed, tagged, and pushed to remote.');
             console.log('');
             console.log('Next steps:');
-            console.log('  1. Create PR: claude-hooks create-pr main');
+            console.log(`  1. Create PR: claude-hooks create-pr ${defaultBranch}`);
             console.log('');
         } else {
             console.log('Next steps:');
-            if (commitCreated && options.noPush) {
-                console.log(`  1. Push changes: git push origin $(git branch --show-current) ${tagName}`);
+            if (commitCreated && !options.push) {
+                console.log(`  1. Create PR: claude-hooks create-pr ${defaultBranch}`);
+                console.log('     (will automatically push tag during PR creation)');
             }
-            console.log('  2. Create PR: claude-hooks create-pr main');
             console.log('');
         }
 

package/lib/commands/create-pr.js

@@ -300,39 +300,181 @@ export async function runCreatePr(args) {
             }
         }
 
-        // Step 5.7: Check for unpushed tags (Issue #44)
-        logger.debug('create-pr', 'Step 5.7: Checking for unpushed tags');
-        const { compareLocalAndRemoteTags, pushTags: pushTagsUtil } = await import('../utils/git-tag-manager.js');
+        // Step 5.7: Smart tag pushing (Issue #44)
+        logger.debug('create-pr', 'Step 5.7: Checking and pushing unpushed tags');
+        const {
+            compareLocalAndRemoteTags,
+            pushTags: pushTagsUtil,
+            getLatestLocalTag,
+            getLatestRemoteTag,
+            parseTagVersion
+        } = await import('../utils/git-tag-manager.js');
+        const { compareVersions } = await import('../utils/version-manager.js');
+
         const tagComparison = await compareLocalAndRemoteTags();
 
         if (tagComparison.localNewer.length > 0) {
-            showWarning(`Local tags not pushed: ${tagComparison.localNewer.join(', ')}`);
-            console.log('');
+            // Get latest local and remote tags for comparison
+            const latestLocalTag = getLatestLocalTag();
+            const latestRemoteTag = await getLatestRemoteTag();
+
+            const localVersion = latestLocalTag ? parseTagVersion(latestLocalTag) : null;
+            const remoteVersion = latestRemoteTag ? parseTagVersion(latestRemoteTag) : null;
+
+            logger.debug('create-pr', 'Tag comparison details', {
+                localTag: latestLocalTag,
+                remoteTag: latestRemoteTag,
+                localVersion,
+                remoteVersion,
+                unpushedTags: tagComparison.localNewer
+            });
 
-            const shouldPushTags = await promptConfirmation(
-                'Push tags to remote?',
-                true  // default yes
-            );
+            let shouldPush = false;
+            let userChoice = null;
+
+            // Case 1: Local tag > Remote tag → Auto-push
+            if (localVersion && remoteVersion && compareVersions(localVersion, remoteVersion) > 0) {
+                logger.debug('create-pr', 'Local version > remote version, auto-pushing', {
+                    localVersion,
+                    remoteVersion
+                });
+
+                showInfo(`Local tag ${latestLocalTag} is newer than remote ${latestRemoteTag}`);
+                showInfo('Auto-pushing tag to remote...');
+                shouldPush = true;
+
+            // Case 2: Local tag = Remote tag → Prompt with warning
+            } else if (localVersion && remoteVersion && compareVersions(localVersion, remoteVersion) === 0) {
+                logger.debug('create-pr', 'Local version = remote version, prompting user', {
+                    localVersion,
+                    remoteVersion
+                });
+
+                showWarning('Local and remote tags have the same version:');
+                console.log(`  Local:  ${latestLocalTag} (${localVersion})`);
+                console.log(`  Remote: ${latestRemoteTag} (${remoteVersion})`);
+                console.log('');
+                console.log('This might indicate the tag was already pushed.');
+                console.log('');
+
+                userChoice = await promptMenu(
+                    'What would you like to do?',
+                    [
+                        { key: 'c', label: 'Continue without pushing' },
+                        { key: 'p', label: 'Force push tag' },
+                        { key: 'a', label: 'Abort PR creation' }
+                    ],
+                    'c'
+                );
+
+                if (userChoice === 'a') {
+                    showInfo('PR creation cancelled');
+                    process.exit(0);
+                } else if (userChoice === 'p') {
+                    shouldPush = true;
+                }
+
+            // Case 3: Local tag < Remote tag → Prompt with error
+            } else if (localVersion && remoteVersion && compareVersions(localVersion, remoteVersion) < 0) {
+                logger.debug('create-pr', 'Local version < remote version, prompting user', {
+                    localVersion,
+                    remoteVersion
+                });
+
+                showError('Local tag is older than remote tag:');
+                console.log(`  Local:  ${latestLocalTag} (${localVersion})`);
+                console.log(`  Remote: ${latestRemoteTag} (${remoteVersion})`);
+                console.log('');
+                console.log('This usually means you need to pull latest tags:');
+                console.log('  git fetch --tags');
+                console.log('');
+
+                userChoice = await promptMenu(
+                    'What would you like to do?',
+                    [
+                        { key: 'a', label: 'Abort PR creation' },
+                        { key: 'c', label: 'Continue anyway (not recommended)' }
+                    ],
+                    'a'
+                );
+
+                if (userChoice === 'a') {
+                    showInfo('PR creation cancelled');
+                    process.exit(0);
+                }
+
+            // Case 4: No version comparison possible → Prompt with info
+            } else {
+                logger.debug('create-pr', 'Cannot compare versions, prompting user', {
+                    localTag: latestLocalTag,
+                    remoteTag: latestRemoteTag,
+                    hasLocalVersion: !!localVersion,
+                    hasRemoteVersion: !!remoteVersion
+                });
+
+                showWarning('Unable to compare tag versions:');
+                console.log(`  Local tag:  ${latestLocalTag || 'none'}`);
+                console.log(`  Remote tag: ${latestRemoteTag || 'none'}`);
+                console.log('');
+                console.log('Unpushed tags:', tagComparison.localNewer.join(', '));
+                console.log('');
+
+                userChoice = await promptMenu(
+                    'What would you like to do?',
+                    [
+                        { key: 'p', label: 'Push tags to remote' },
+                        { key: 'c', label: 'Continue without pushing' },
+                        { key: 'a', label: 'Abort PR creation' }
+                    ],
+                    'p'
+                );
+
+                if (userChoice === 'a') {
+                    showInfo('PR creation cancelled');
+                    process.exit(0);
+                } else if (userChoice === 'p') {
+                    shouldPush = true;
+                }
+            }
+
+            // Execute push if decided
+            if (shouldPush) {
+                console.log('');
+                showInfo('Pushing tags to remote...');
 
-            if (shouldPushTags) {
-                showInfo('Pushing tags...');
                 const pushResult = pushTagsUtil(null, tagComparison.localNewer);
 
                 if (pushResult.success) {
-                    showSuccess('Tags pushed successfully');
+                    showSuccess('✓ Tags pushed successfully');
+                    logger.debug('create-pr', 'Tags pushed', {
+                        pushed: tagComparison.localNewer
+                    });
                 } else {
                     showError(`Failed to push some tags: ${pushResult.error}`);
                     if (pushResult.failed.length > 0) {
                         console.log('Failed tags:');
                         pushResult.failed.forEach(f => console.log(`  - ${f.tag}: ${f.error}`));
                     }
+
+                    const shouldContinue = await promptConfirmation(
+                        'Continue creating PR despite push failure?',
+                        false
+                    );
+
+                    if (!shouldContinue) {
+                        showInfo('PR creation cancelled');
+                        process.exit(0);
+                    }
                 }
 
                 console.log('');
-            } else {
-                showInfo('Tag push skipped');
+            } else if (userChoice !== 'c') {
+                // Auto-push failed or user chose to continue
+                logger.debug('create-pr', 'Tag push skipped', { reason: 'user choice or condition' });
                 console.log('');
             }
+        } else {
+            logger.debug('create-pr', 'No unpushed tags found, continuing');
         }
 
         // Step 6: Generate PR metadata using engine

package/package.json

@@ -1,60 +1,60 @@
-{
-    "name": "claude-git-hooks",
-    "version": "2.14.1",
-    "description": "Git hooks with Claude CLI for code analysis and automatic commit messages",
-    "type": "module",
-    "bin": {
-        "claude-hooks": "./bin/claude-hooks"
-    },
-    "scripts": {
-        "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-        "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
-        "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
-        "lint": "eslint lib/ bin/",
-        "lint:fix": "eslint lib/ bin/ --fix",
-        "format": "prettier --write \"lib/**/*.js\" \"bin/**\""
-    },
-    "keywords": [
-        "git",
-        "hooks",
-        "claude",
-        "ai",
-        "code-review",
-        "commit-messages",
-        "pre-commit",
-        "automation"
-    ],
-    "author": "Pablo Rovito",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/pablorovito/claude-git-hooks.git"
-    },
-    "engines": {
-        "node": ">=16.9.0"
-    },
-    "engineStrict": false,
-    "os": [
-        "darwin",
-        "linux",
-        "win32"
-    ],
-    "preferGlobal": true,
-    "files": [
-        "bin/",
-        "lib/",
-        "templates/",
-        "README.md",
-        "CHANGELOG.md",
-        "LICENSE"
-    ],
-    "dependencies": {
-        "@octokit/rest": "^21.0.0"
-    },
-    "devDependencies": {
-        "@types/jest": "^29.5.0",
-        "eslint": "^8.57.0",
-        "jest": "^29.7.0",
-        "prettier": "^3.2.0"
-    }
-}
+{
+    "name": "claude-git-hooks",
+    "version": "2.14.4",
+    "description": "Git hooks with Claude CLI for code analysis and automatic commit messages",
+    "type": "module",
+    "bin": {
+        "claude-hooks": "./bin/claude-hooks"
+    },
+    "scripts": {
+        "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+        "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
+        "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
+        "lint": "eslint lib/ bin/",
+        "lint:fix": "eslint lib/ bin/ --fix",
+        "format": "prettier --write \"lib/**/*.js\" \"bin/**\""
+    },
+    "keywords": [
+        "git",
+        "hooks",
+        "claude",
+        "ai",
+        "code-review",
+        "commit-messages",
+        "pre-commit",
+        "automation"
+    ],
+    "author": "Pablo Rovito",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/pablorovito/claude-git-hooks.git"
+    },
+    "engines": {
+        "node": ">=16.9.0"
+    },
+    "engineStrict": false,
+    "os": [
+        "darwin",
+        "linux",
+        "win32"
+    ],
+    "preferGlobal": true,
+    "files": [
+        "bin/",
+        "lib/",
+        "templates/",
+        "README.md",
+        "CHANGELOG.md",
+        "LICENSE"
+    ],
+    "dependencies": {
+        "@octokit/rest": "^21.0.0"
+    },
+    "devDependencies": {
+        "@types/jest": "^29.5.0",
+        "eslint": "^8.57.0",
+        "jest": "^29.7.0",
+        "prettier": "^3.2.0"
+    }
+}