cherrypick-interactive 1.4.3 → 1.6.0

package/README.md

@@ -7,13 +7,15 @@
 ## 🚧 Motivation
 
 When you maintain long-lived branches like `dev` and `main`, keeping them in sync can get messy.  
-Sometimes you rebase, sometimes you cherry-pick, sometimes you merge release branches — and every time, it’s easy to lose track of which commits actually made it into production.
+Sometimes you rebase, sometimes you cherry-pick, sometimes you merge release branches — and every time, it's easy to lose track of which commits actually made it into production.
 
 **This CLI solves that pain point:**
 
 - It compares two branches (e.g. `origin/dev` vs `origin/main`)
 - Lists commits in `dev` that are *not yet* in `main`
 - Lets you choose which ones to cherry-pick interactively
+- Handles merge conflicts with an interactive resolution wizard
+- Preserves original commit messages perfectly (even with squashed commits)
 - (Optionally) bumps your semantic version, creates a release branch, updates `package.json`, and opens a GitHub draft PR for review
 
 No manual `git log` diffing. No risky merges. No guesswork.
@@ -25,6 +27,8 @@ No manual `git log` diffing. No risky merges. No guesswork.
 - 🔍 Finds commits in `dev` not present in `main`
 - 🗂️ Lets you select which commits to cherry-pick (or pick all)
 - 🪜 Cherry-picks in the correct order (oldest → newest)
+- ⚔️ **Interactive conflict resolution wizard** with multiple strategies
+- 🎯 **Preserves exact commit messages** from squashed commits
 - 🪄 Detects **semantic version bump** (`major`, `minor`, `patch`) from conventional commits
 - 🧩 Creates a `release/x.y.z` branch from `main`
 - 🧾 Generates a Markdown changelog from commits
@@ -48,7 +52,12 @@ npm install -g cherrypick-interactive
 ## 🚀 Quick Start
 
 ```bash
-cherrypick-interactive   --semantic-versioning   --version-file ./package.json   --create-release   --push-release   --draft-pr
+cherrypick-interactive \
+  --semantic-versioning \
+  --version-file ./package.json \
+  --create-release \
+  --push-release \
+  --draft-pr
 ```
 
 ✅ This will:
@@ -57,7 +66,7 @@ cherrypick-interactive   --semantic-versioning   --version-file ./package.json
 3. Let you select which to cherry-pick
 4. Compute the next version from commit messages
 5. Create `release/<next-version>` from `main`
-6. Cherry-pick the selected commits
+6. Cherry-pick the selected commits (with conflict resolution if needed)
 7. Update your `package.json` version and commit it
 8. Push the branch and open a **draft PR** on GitHub
 
@@ -71,7 +80,7 @@ cherrypick-interactive   --semantic-versioning   --version-file ./package.json
 cherrypick-interactive
 ```
 
-Lists commits in `origin/dev` that aren’t in `origin/main`, filtered by the last week.
+Lists commits in `origin/dev` that aren't in `origin/main`, filtered by the last week.
 
 ### 2. Cherry-pick all missing commits automatically
 
@@ -85,6 +94,22 @@ cherrypick-interactive --all-yes
 cherrypick-interactive --dry-run
 ```
 
+### 4. Filter commits by pattern
+
+```bash
+cherrypick-interactive --ignore-commits "^chore\(deps\)|^ci:"
+```
+
+Excludes commits starting with `chore(deps)` or `ci:` from the selection list.
+
+### 5. Ignore certain commits from semantic versioning
+
+```bash
+cherrypick-interactive --ignore-semver "bump|dependencies"
+```
+
+Treats commits containing "bump" or "dependencies" as chores (no version bump).
+
 ---
 
 ## ⚙️ Options
@@ -97,13 +122,15 @@ cherrypick-interactive --dry-run
 | `--no-fetch` | Skip `git fetch --prune` | `false` |
 | `--all-yes` | Cherry-pick all missing commits without prompt | `false` |
 | `--dry-run` | Show what would happen without applying changes | `false` |
-| `--semantic-versioning` | Detect semantic version bump from commits | `false` |
+| `--semantic-versioning` | Detect semantic version bump from commits | `true` |
 | `--current-version` | Current version (if not reading from file) | — |
-| `--version-file` | Path to `package.json` (to read & update version) | — |
-| `--create-release` | Create `release/x.y.z` branch from `main` | `false` |
+| `--version-file` | Path to `package.json` (to read & update version) | `./package.json` |
+| `--create-release` | Create `release/x.y.z` branch from `main` | `true` |
 | `--push-release` | Push release branch to origin | `true` |
 | `--draft-pr` | Create the GitHub PR as a draft | `false` |
 | `--version-commit-message` | Template for version bump commit | `chore(release): bump version to {{version}}` |
+| `--ignore-semver` | Comma-separated regex patterns to ignore for semver | — |
+| `--ignore-commits` | Comma-separated regex patterns to exclude commits | — |
 
 ---
 
@@ -117,6 +144,39 @@ The tool analyzes commit messages using **Conventional Commits**:
 | `feat:` | `feat(ui): add dark mode` | **minor** |
 | `fix:` / `perf:` | `fix(api): correct pagination offset` | **patch** |
 
+Use `--ignore-semver` to treat certain commits as chores:
+
+```bash
+cherrypick-interactive --ignore-semver "^chore\(deps\)|bump|merge"
+```
+
+---
+
+## ⚔️ Interactive Conflict Resolution
+
+When cherry-picking encounters conflicts, the tool provides an **interactive wizard**:
+
+### Conflict Resolution Options:
+
+**Per-file resolution:**
+- **Use ours** — Keep the current branch's version
+- **Use theirs** — Accept the cherry-picked commit's version
+- **Open in editor** — Manually resolve conflicts in your editor
+- **Show diff** — View the conflicting changes
+- **Mark resolved** — Stage the file as-is
+
+**Bulk actions:**
+- **Use ours for ALL** — Apply current branch's version to all conflicts
+- **Use theirs for ALL** — Accept cherry-picked version for all conflicts
+- **Stage ALL** — Mark all files as resolved
+- **Launch mergetool** — Use Git's configured merge tool
+
+### Key Features:
+
+✅ **Preserves original commit messages** — Even when resolving conflicts, the commit message from the original commit in `dev` is maintained exactly  
+✅ **Handles squashed commits** — Works correctly with squashed commits that contain multiple changes  
+✅ **Resume cherry-picking** — After resolving conflicts, automatically continues with remaining commits
+
 ---
 
 ## 🪵 Example Run
@@ -129,18 +189,47 @@ Comparing subjects since 1 week ago
 Dev:  origin/dev
 Main: origin/main
 
-Select commits to cherry-pick (3 missing):
-❯◯ (850aa02) fix: crypto withdrawal payload
- ◯ (2995cea) feat: OTC offer account validation
- ◯ (84fe310) chore: bump dependencies
+✔ Select commits to cherry-pick (8 missing):
+  ✔ #86c6105k9 - Add missing ATS configs in plists. (#1077)
+  ✔ chore(deps): bump actions/checkout from 3 to 6 (#1079)
+  ✔ #86c6q8y5r - Separete Corporate and Individual Registration (#1081)
+  ✔ #86c5wbbuc - Refactor splash related store initializations (#1082)
+  ✔ #86c6x2u20 - Remove deprecated reward center components (#1085)
+  ✔ #0 - Upgrade ruby version in workflows. (#1087)
+
+↷ Semver ignored (pattern: /bump/i): (chore(deps): bump actions/checkout from 3 to 6 (#1079))
+↷ Semver ignored (pattern: /bump/i): (#86c5wbbuc - Refactor splash related store initializations (#1082))
 
 Semantic Versioning
-  Current: 1.20.0  Detected bump: minor  Next: 1.21.0
+  Current: 4.36.0  Detected bump: minor  Next: 4.37.0
+
+Creating release/4.37.0 from origin/main...
+✓ Ready on release/4.37.0. Cherry-picking will apply here.
+
+Cherry-picking 6 commit(s) onto main (oldest → newest)...
+
+✓ cherry-picked (7ba30af) #86c6105k9 - Add missing ATS configs in plists. (#1077)
+✓ cherry-picked (bbc70ed) chore(deps): bump actions/checkout from 3 to 6 (#1079)
+✓ cherry-picked (287dbad) #86c6q8y5r - Separete Corporate and Individual Registration (#1081)
 
-Creating release/1.21.0 from origin/main...
-✓ Ready on release/1.21.0. Cherry-picking will apply here.
-✓ package.json updated and committed: chore(release): bump version to 1.21.0
-✅ Pull request created for release/1.21.0 → main
+✖ Cherry-pick has conflicts on 8eb07cb78148866d769684730d154e5cbeb2f331 (8eb07cb).
+Conflicted files:
+  - android/app/build.gradle
+  - ios/bilira_wallet.xcodeproj/project.pbxproj
+
+✔ Choose how to proceed: Resolve conflicts now
+✔ Select a file to resolve or a global action: Use theirs for ALL
+
+No conflicted files reported by git.
+✓ cherry-picked (8eb07cb) #86c5wbbuc - Refactor splash related store initializations (#1082)
+✓ cherry-picked (3ae27ee) #86c6x2u20 - Remove deprecated reward center components (#1085)
+✓ cherry-picked (66d0419) #0 - Upgrade ruby version in workflows. (#1087)
+
+Summary → applied: 6, skipped: 0
+
+Updating package.json version → 4.37.0 ...
+✓ package.json updated and committed: chore(release): bump version to 4.37.0
+✅ Pull request created for release/4.37.0 → main
 ```
 
 ---
@@ -150,21 +239,68 @@ Creating release/1.21.0 from origin/main...
 If your team:
 - Rebases or cherry-picks from `dev` → `main`
 - Uses temporary release branches
+- Works with squashed commits
+- Needs to handle merge conflicts gracefully
 - Tracks semantic versions via commits
 
 …this CLI saves time and reduces errors.  
 It automates a tedious, error-prone manual process into a single command that behaves like `yarn upgrade-interactive`, but for Git commits.
 
+**Special features:**
+- ✅ Preserves exact commit messages (critical for squashed commits)
+- ✅ Interactive conflict resolution without leaving the terminal
+- ✅ Smart pattern-based filtering for commits and version detection
+- ✅ Automatic changelog generation
+
 ---
 
 ## 🧰 Requirements
 
 - Node.js ≥ 18
-- GitHub CLI (`gh`) installed and authenticated
+- Git ≥ 2.0
+- **GitHub CLI (`gh`)** — *Optional, only required if using `--push-release`*
+    - Install from: https://cli.github.com/
+    - The tool will check if `gh` is installed and offer to continue without it
 - A clean working directory (no uncommitted changes)
 
 ---
 
+## 🎯 Best Practices
+
+### 1. Use `--ignore-commits` to filter noise
+
+```bash
+cherrypick-interactive --ignore-commits "^ci:|^chore\(deps\):|Merge branch"
+```
+
+Exclude CI updates, dependency bumps, and merge commits from selection.
+
+### 2. Use `--ignore-semver` for version accuracy
+
+```bash
+cherrypick-interactive --ignore-semver "bump|dependencies|merge"
+```
+
+Prevent certain commits from affecting semantic version calculation.
+
+### 3. Always use `--draft-pr` for review
+
+```bash
+cherrypick-interactive --draft-pr
+```
+
+Creates draft PRs so your team can review before merging.
+
+### 4. Test with `--dry-run` first
+
+```bash
+cherrypick-interactive --dry-run
+```
+
+See what would happen without making any changes.
+
+---
+
 ## 🧾 License
 
 **MIT** — free to use, modify, and distribute.
@@ -178,9 +314,44 @@ It automates a tedious, error-prone manual process into a single command that be
    ```bash
    node cli.js --dry-run
    ```
-3. Test edge cases before submitting PRs
+3. Test edge cases before submitting PRs:
+    - Squashed commits with conflicts
+    - Empty cherry-picks
+    - Multiple conflict resolutions
 4. Please follow Conventional Commits for your changes.
 
 ---
 
-> Created to make release management simpler and safer for teams who value clean Git history and predictable deployments.
+## 🐛 Troubleshooting
+
+### "GitHub CLI (gh) is not installed"
+The tool automatically checks for `gh` CLI when using `--push-release`. If not found, you'll be prompted to:
+- Install it from https://cli.github.com/ and try again
+- Or continue without creating a PR (the release branch will still be pushed)
+
+You can also run without `--push-release` to skip PR creation entirely:
+```bash
+cherrypick-interactive --create-release --no-push-release
+```
+
+### "Cherry-pick has conflicts"
+Use the interactive wizard to resolve conflicts file-by-file or in bulk.
+
+### "Commit message changed after conflict resolution"
+This issue has been fixed! The tool now preserves the original commit message using `git commit -C <hash>`.
+
+### "Version not detected correctly"
+Use `--ignore-semver` to exclude commits that shouldn't affect versioning:
+```bash
+cherrypick-interactive --ignore-semver "bump|chore\(deps\)"
+```
+
+### "Too many commits to review"
+Use `--ignore-commits` to filter out noise, or adjust `--since` to a shorter time window:
+```bash
+cherrypick-interactive --since "3 days ago" --ignore-commits "^ci:|^docs:"
+```
+
+---
+
+> Created to make release management simpler and safer for teams who value clean Git history, predictable deployments, and efficient conflict resolution.

package/cli.js

@@ -99,11 +99,16 @@ const argv = yargs(hideBin(process.argv))
         default: 'chore(release): bump version to {{version}}',
         describe: 'Commit message template for version bump. Use {{version}} placeholder.',
     })
-    .option('semver-ignore', {
+    .option('ignore-semver', {
         type: 'string',
         describe:
             'Comma-separated regex patterns. If a commit message matches any, it will be treated as a chore for semantic versioning.',
     })
+    .option('ignore-commits', {
+        type: 'string',
+        describe:
+            'Comma-separated regex patterns. If a commit message matches any, it will be omitted from the commit list.',
+    })
     .wrap(200)
     .help()
     .alias('h', 'help')
@@ -126,7 +131,7 @@ async function getSubjects(branch) {
 }
 
 async function getDevCommits(branch, since) {
-    const out = await gitRaw(['log', '--no-merges', '--since=' + since, '--pretty=%H %s', branch]);
+    const out = await gitRaw(['log', '--no-merges', `--since=${since}`, '--pretty=%H %s', branch]);
 
     if (!out) {
         return [];
@@ -184,7 +189,7 @@ async function handleCherryPickConflict(hash) {
 
         const { action } = await inquirer.prompt([
             {
-                type: 'list',
+                type: 'select',
                 name: 'action',
                 message: 'Choose how to proceed:',
                 choices: [
@@ -262,7 +267,7 @@ async function showConflictsList() {
     }
     err(chalk.yellow('Conflicted files:'));
     for (const f of files) {
-        err('  - ' + f);
+        err(`  - ${f}`);
     }
     return files;
 }
@@ -270,7 +275,7 @@ async function showConflictsList() {
 async function resolveSingleFileWizard(file) {
     const { action } = await inquirer.prompt([
         {
-            type: 'list',
+            type: 'select',
             name: 'action',
             message: `How to resolve "${file}"?`,
             choices: [
@@ -335,7 +340,7 @@ async function conflictsResolutionWizard(hash) {
                 err(chalk.yellow('The previous cherry-pick is now empty.'));
                 const { emptyAction } = await inquirer.prompt([
                     {
-                        type: 'list',
+                        type: 'select',
                         name: 'emptyAction',
                         message: 'No staged changes for this pick. Choose next step:',
                         choices: [
@@ -352,8 +357,9 @@ async function conflictsResolutionWizard(hash) {
                     return 'skipped';
                 }
                 if (emptyAction === 'empty-commit') {
-                    const subject = await gitRaw(['show', '--format=%s', '-s', hash]);
-                    await gitRaw(['commit', '--allow-empty', '-m', subject]);
+                    const fullMessage = await gitRaw(['show', '--format=%B', '-s', hash]);
+                    await gitRaw(['commit', '--allow-empty', '-m', fullMessage]);
+                    const subject = await gitRaw(['show', '--format=%s', '-s', 'HEAD']);
                     log(`${chalk.green('✓')} (empty) cherry-picked ${chalk.dim(`(${hash.slice(0, 7)})`)} ${subject}`);
                     return 'continued';
                 }
@@ -364,8 +370,9 @@ async function conflictsResolutionWizard(hash) {
                 // (re-loop)
             } else {
                 try {
-                    await gitRaw(['cherry-pick', '--continue']);
-                    const subject = await gitRaw(['show', '--format=%s', '-s', hash]);
+                    // Use -C to copy the original commit message
+                    await gitRaw(['commit', '-C', hash]);
+                    const subject = await gitRaw(['show', '--format=%s', '-s', 'HEAD']);
                     log(`${chalk.green('✓')} cherry-picked ${chalk.dim(`(${hash.slice(0, 7)})`)} ${subject}`);
                     return 'continued';
                 } catch (e) {
@@ -378,7 +385,7 @@ async function conflictsResolutionWizard(hash) {
 
         const { choice } = await inquirer.prompt([
             {
-                type: 'list',
+                type: 'select',
                 name: 'choice',
                 message: 'Select a file to resolve or a global action:',
                 pageSize: Math.min(20, Math.max(8, files.length + 5)),
@@ -432,7 +439,7 @@ async function conflictsResolutionWizard(hash) {
                     err(chalk.yellow('No staged changes found for this cherry-pick.'));
                     const { emptyAction } = await inquirer.prompt([
                         {
-                            type: 'list',
+                            type: 'select',
                             name: 'emptyAction',
                             message: 'This pick seems empty. Choose next step:',
                             choices: [
@@ -448,9 +455,11 @@ async function conflictsResolutionWizard(hash) {
                         log(chalk.yellow(`↷ Skipped empty pick ${chalk.dim(`(${hash.slice(0, 7)})`)}`));
                         return 'skipped';
                     }
+
                     if (emptyAction === 'empty-commit') {
-                        const subject = await gitRaw(['show', '--format=%s', '-s', hash]);
-                        await gitRaw(['commit', '--allow-empty', '-m', subject]);
+                        const fullMessage = await gitRaw(['show', '--format=%B', '-s', hash]);
+                        await gitRaw(['commit', '--allow-empty', '-m', fullMessage]);
+                        const subject = await gitRaw(['show', '--format=%s', '-s', 'HEAD']);
                         log(`${chalk.green('✓')} (empty) cherry-picked ${chalk.dim(`(${hash.slice(0, 7)})`)} ${subject}`);
                         return 'continued';
                     }
@@ -461,8 +470,9 @@ async function conflictsResolutionWizard(hash) {
                 }
 
                 try {
-                    await gitRaw(['cherry-pick', '--continue']);
-                    const subject = await gitRaw(['show', '--format=%s', '-s', hash]);
+                    // Use -C to copy the original commit message
+                    await gitRaw(['commit', '-C', hash]);
+                    const subject = await gitRaw(['show', '--format=%s', '-s', 'HEAD']);
                     log(`${chalk.green('✓')} cherry-picked ${chalk.dim(`(${hash.slice(0, 7)})`)} ${subject}`);
                     return 'continued';
                 } catch (e) {
@@ -585,21 +595,16 @@ async function computeSemanticBumpForCommits(hashes, gitRawFn, semverignore) {
     }
 
     const levels = [];
+    const semverIgnorePatterns = parseSemverIgnore(semverignore);
 
     for (const h of hashes) {
         const msg = await gitRawFn(['show', '--format=%B', '-s', h]);
         const subject = msg.split(/\r?\n/)[0].trim();
         let level = classifySingleCommit(msg);
 
-        // 🔹 Apply --semverignore
-        const semverIgnorePatterns = parseSemverIgnore(semverignore);
-
-        if (semverIgnorePatterns.length > 0) {
-            const matched = matchesAnyPattern(subject, semverIgnorePatterns);
-            if (matched) {
-                // Treat as "chore" (no version bump influence)
-                level = null;
-            }
+        // 🔹 Apply --semverignore (treat matched commits as chores). Use full message (subject + body).
+        if (semverIgnorePatterns.length > 0 && matchesAnyPattern(msg, semverIgnorePatterns)) {
+            level = null;
         }
 
         if (level) {
@@ -613,6 +618,34 @@ async function computeSemanticBumpForCommits(hashes, gitRawFn, semverignore) {
 
 async function main() {
     try {
+        // Check if gh CLI is installed when push-release is enabled
+        if (argv['push-release']) {
+            const ghInstalled = await checkGhCli();
+            if (!ghInstalled) {
+                err(chalk.yellow('\n⚠️  GitHub CLI (gh) is not installed or not in PATH.'));
+                err(chalk.gray('   The --push-release flag requires gh CLI to create pull requests.\n'));
+                err(chalk.cyan('   Install it from: https://cli.github.com/'));
+                err(chalk.cyan('   Or run without --push-release to skip PR creation.\n'));
+
+                const { proceed } = await inquirer.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'proceed',
+                        message: 'Continue without creating a PR?',
+                        default: false,
+                    },
+                ]);
+
+                if (!proceed) {
+                    log(chalk.yellow('Aborted by user.'));
+                    return;
+                }
+
+                // Disable push-release if user chooses to continue
+                argv['push-release'] = false;
+            }
+        }
+
         if (!argv['no-fetch']) {
             log(chalk.gray('Fetching remotes (git fetch --prune)...'));
             await git.fetch(['--prune']);
@@ -628,18 +661,26 @@ async function main() {
 
         const missing = filterMissing(devCommits, mainSubjects);
 
-        if (missing.length === 0) {
+        // Filter out commits matching --ignore-commits patterns
+        const ignoreCommitsPatterns = parseIgnoreCommits(argv['ignore-commits']);
+        const filteredMissing =
+            ignoreCommitsPatterns.length > 0
+                ? missing.filter(({ subject }) => !shouldIgnoreCommit(subject, ignoreCommitsPatterns))
+                : missing;
+
+        if (filteredMissing.length === 0) {
             log(chalk.green('✅ No missing commits found in the selected window.'));
             return;
         }
 
-        const indexByHash = new Map(missing.map((c, i) => [c.hash, i])); // 0=newest, larger=older
+        const semverIgnore = argv['ignore-semver'];
+        const indexByHash = new Map(filteredMissing.map((c, i) => [c.hash, i])); // 0=newest, larger=older
 
         let selected;
         if (argv['all-yes']) {
-            selected = missing.map((m) => m.hash);
+            selected = filteredMissing.map((m) => m.hash);
         } else {
-            selected = await selectCommitsInteractive(missing);
+            selected = await selectCommitsInteractive(filteredMissing);
             if (!selected.length) {
                 log(chalk.yellow('No commits selected. Exiting.'));
                 return;
@@ -669,7 +710,7 @@ async function main() {
             }
 
             // Bump is based on the commits you are about to apply (selected).
-            const bump = await computeSemanticBumpForCommits(bottomToTop, gitRaw, argv.semverignore);
+            const bump = await computeSemanticBumpForCommits(bottomToTop, gitRaw, semverIgnore);
 
             computedNextVersion = bump ? incrementVersion(argv['current-version'], bump) : argv['current-version'];
 
@@ -691,14 +732,14 @@ async function main() {
             }
 
             const releaseBranch = `release/${computedNextVersion}`;
-            await ensureBranchDoesNotExistLocally(releaseBranch);
             const startPoint = argv.main; // e.g., 'origin/main' or a local ref
+            await ensureReleaseBranchFresh(releaseBranch, startPoint);
 
             const changelogBody = await buildChangelogBody({
                 version: computedNextVersion,
                 hashes: bottomToTop,
                 gitRawFn: gitRaw,
-                semverIgnore: argv.semverignore, // raw flag value
+                semverIgnore, // raw flag value
             });
 
             await fsPromises.writeFile('RELEASE_CHANGELOG.md', changelogBody, 'utf8');
@@ -787,12 +828,53 @@ main();
  * Utils
  */
 
-async function ensureBranchDoesNotExistLocally(branchName) {
+async function ensureReleaseBranchFresh(branchName, startPoint) {
     const branches = await git.branchLocal();
-    if (branches.all.includes(branchName)) {
-        throw new Error(
-            `Release branch "${branchName}" already exists locally. Please delete it or choose a different version.`,
-        );
+    const localExists = branches.all.includes(branchName);
+    const remoteRef = await gitRaw(['ls-remote', '--heads', 'origin', branchName]);
+    const remoteExists = Boolean(remoteRef);
+
+    if (!localExists && !remoteExists) {
+        return;
+    }
+
+    const { action } = await inquirer.prompt([
+        {
+            type: 'select',
+            name: 'action',
+            message: `Release branch "${branchName}" already exists${localExists ? ' locally' : ''}${
+                remoteExists ? ' on origin' : ''
+            }. How do you want to proceed? (override, abort)`,
+            choices: [
+                { name: 'Override (delete existing branch and recreate)', value: 'override' },
+                { name: 'Abort', value: 'abort' },
+            ],
+        },
+    ]);
+
+    if (action === 'abort') {
+        throw new Error(`Aborted: release branch "${branchName}" already exists.`);
+    }
+
+    // Ensure we are not on the branch before deleting local copy
+    if (localExists) {
+        if (branches.current === branchName) {
+            const target = startPoint || 'HEAD';
+            log(chalk.gray(`Switching to ${target} before deleting ${branchName}...`));
+            await gitRaw(['checkout', target]);
+        }
+        await gitRaw(['branch', '-D', branchName]);
+        log(chalk.yellow(`↷ Deleted existing local branch ${branchName}`));
+    }
+
+    if (remoteExists) {
+        try {
+            await gitRaw(['push', 'origin', '--delete', branchName]);
+            log(chalk.yellow(`↷ Deleted existing remote branch origin/${branchName}`));
+        } catch (e) {
+            err(chalk.red(`Failed to delete remote branch origin/${branchName}: ${e.message || e}`));
+            throw e;
+        }
     }
 }
 
@@ -815,8 +897,8 @@ async function buildChangelogBody({ version, hashes, gitRawFn, semverIgnore }) {
         // normal classification first
         let level = classifySingleCommit(msg);
 
-        // ⬇ Apply semver-ignore logic
-        const matched = matchesAnyPattern(subject, semverIgnorePatterns);
+        // ⬇ Apply ignore-semver logic
+        const matched = matchesAnyPattern(msg, semverIgnorePatterns); // evaluate against full message
         if (matched) {
             level = null; // drop it into "Other"
         }
@@ -861,6 +943,14 @@ function stripOrigin(ref) {
     return ref.startsWith('origin/') ? ref.slice('origin/'.length) : ref;
 }
 
+async function checkGhCli() {
+    return new Promise((resolve) => {
+        const p = spawn('gh', ['--version'], { stdio: 'pipe' });
+        p.on('error', () => resolve(false));
+        p.on('close', (code) => resolve(code === 0));
+    });
+}
+
 async function runGh(args) {
     return new Promise((resolve, reject) => {
         const p = spawn('gh', args, { stdio: 'inherit' });
@@ -874,14 +964,14 @@ async function readJson(filePath) {
 }
 
 async function writeJson(filePath, data) {
-    const text = JSON.stringify(data, null, 2) + '\n';
+    const text = `${JSON.stringify(data, null, 2)}\n`;
     await fsPromises.writeFile(filePath, text, 'utf8');
 }
 
 /** Read package.json version; throw if missing */
 async function getPkgVersion(pkgPath) {
     const pkg = await readJson(pkgPath);
-    const v = pkg && pkg.version;
+    const v = pkg?.version;
     if (!v) {
         throw new Error(`No "version" field found in ${pkgPath}`);
     }
@@ -900,16 +990,55 @@ function parseSemverIgnore(argvValue) {
     return argvValue
         .split(',')
         .map((p) => p.trim())
+        .filter(Boolean)
+        .map((pattern) => {
+            try {
+                return new RegExp(pattern, 'i'); // case-insensitive on full message
+            } catch (e) {
+                err(chalk.red(`Invalid --ignore-semver pattern "${pattern}": ${e.message || e}`));
+                return null;
+            }
+        })
         .filter(Boolean);
 }
 
 function matchesAnyPattern(text, patterns) {
     if (!patterns || patterns.length === 0) return false;
 
-    const result = patterns.some((rx) => text.includes(rx));
+    const matched = patterns.find((rx) => rx.test(text));
+    if (matched) {
+        log(chalk.cyan(`↷ Semver ignored (pattern: /${matched.source}/i):  ${chalk.dim(`(${text.split('\n')[0]})`)}`));
+        return true;
+    }
+
+    return false;
+}
+
+function parseIgnoreCommits(argvValue) {
+    if (!argvValue) return [];
+    return argvValue
+        .split(',')
+        .map((p) => p.trim())
+        .filter(Boolean)
+        .map((pattern) => {
+            try {
+                return new RegExp(pattern, 'i'); // case-insensitive matching
+            } catch (e) {
+                err(chalk.red(`Invalid --ignore-commits pattern "${pattern}": ${e.message || e}`));
+                return null;
+            }
+        })
+        .filter(Boolean);
+}
 
-    if (result) {
-        log(chalk.cyan(`↷ Semver ignored:  ${chalk.dim(`(${text})`)}`));
+function shouldIgnoreCommit(subject, patterns) {
+    if (!patterns || patterns.length === 0) return false;
+
+    const matched = patterns.find((rx) => rx.test(subject));
+    if (matched) {
+        log(chalk.gray(`↷ Ignoring commit (pattern: /${matched.source}/i): ${chalk.dim(subject.slice(0, 80))}`));
+        return true;
     }
-    return result;
+
+    return false;
 }

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.4.3",
+  "version": "1.6.0",
   "description": "Interactively cherry-pick commits that are in dev but not in main, using subject-based comparison.",
   "main": "cli.js",
-  "bin": {
-    "cherrypick-interactive": "cli.js"
-  },
+  "bin": "cli.js",
   "type": "module",
   "scripts": {
     "lint": "biome lint .",
@@ -19,9 +17,9 @@
   },
   "dependencies": {
     "chalk": "^5.6.2",
-    "inquirer": "^12.9.6",
+    "inquirer": "^13.0.2",
     "semver": "^7.7.3",
-    "simple-git": "^3.28.0",
+    "simple-git": "^3.30.0",
     "update-notifier": "^7.3.1",
     "yargs": "^18.0.0"
   },

package/cli.backup.js

@@ -1,193 +0,0 @@
-#!/usr/bin/env node
-
-import chalk from "chalk";
-import inquirer from "inquirer";
-import simpleGit from "simple-git";
-import yargs from "yargs";
-
-import { hideBin } from "yargs/helpers";
-
-const git = simpleGit();
-
-const argv = yargs(hideBin(process.argv))
-  .scriptName("cherrypick-interactive")
-  .usage("$0 [options]")
-  .option("dev", {
-    type: "string",
-    default: "origin/dev",
-    describe: "Source branch (contains commits you want).",
-  })
-  .option("main", {
-    type: "string",
-    default: "origin/main",
-    describe: "Comparison branch (commits present here will be filtered out).",
-  })
-  .option("since", {
-    type: "string",
-    default: "1 week ago",
-    describe: 'Time window passed to git --since (e.g. "2 weeks ago", "1 month ago").',
-  })
-  .option("no-fetch", {
-    type: "boolean",
-    default: false,
-    describe: "Skip 'git fetch --prune'.",
-  })
-  .option("all-yes", {
-    type: "boolean",
-    default: false,
-    describe: "Non-interactive: cherry-pick ALL missing commits (oldest → newest).",
-  })
-  .option("dry-run", {
-    type: "boolean",
-    default: false,
-    describe: "Print what would be cherry-picked and exit.",
-  })
-  .help()
-  .alias("h", "help")
-  .alias("v", "version").argv;
-
-const log = (...a) => console.log(...a);
-const err = (...a) => console.error(...a);
-
-async function gitRaw(args) {
-  const out = await git.raw(args);
-  return out.trim();
-}
-
-async function getSubjects(branch) {
-  const out = await gitRaw(["log", "--no-merges", "--pretty=%s", branch]);
-  if (!out) {
-    return new Set();
-  }
-  return new Set(out.split("\n").filter(Boolean));
-}
-
-async function getDevCommits(branch, since) {
-  const out = await gitRaw(["log", "--no-merges", "--since=" + since, "--pretty=%H %s", branch]);
-
-  if (!out) {
-    return [];
-  }
-  return out.split("\n").map((line) => {
-    const firstSpace = line.indexOf(" ");
-    const hash = line.slice(0, firstSpace);
-    const subject = line.slice(firstSpace + 1);
-    return { hash, subject };
-  });
-}
-
-function filterMissing(devCommits, mainSubjects) {
-  return devCommits.filter(({ subject }) => !mainSubjects.has(subject));
-}
-
-async function selectCommitsInteractive(missing) {
-  const choices = [
-    new inquirer.Separator(chalk.gray("── Newest commits ──")),
-    ...missing.map(({ hash, subject }, idx) => {
-      // display-only trim to avoid accidental leading spaces
-      const displaySubject = subject.replace(/^[\s\u00A0]+/, "");
-      return {
-        name: `${chalk.dim(`(${hash.slice(0, 7)})`)} ${displaySubject}`,
-        value: hash,
-        short: displaySubject,
-        idx, // we keep index for oldest→newest ordering later
-      };
-    }),
-    new inquirer.Separator(chalk.gray("── Oldest commits ──")),
-  ];
-
-  const { selected } = await inquirer.prompt([
-    {
-      type: "checkbox",
-      name: "selected",
-      message: `Select commits to cherry-pick (${missing.length} missing):`,
-      choices,
-      pageSize: Math.min(20, Math.max(8, missing.length)),
-    },
-  ]);
-
-  return selected;
-}
-
-async function cherryPickSequential(hashes) {
-  for (const hash of hashes) {
-    try {
-      await gitRaw(["cherry-pick", hash]);
-      const subject = await gitRaw(["show", "--format=%s", "-s", hash]);
-      log(`${chalk.green("✓")} cherry-picked ${chalk.dim(`(${hash.slice(0, 7)})`)} ${subject}`);
-    } catch (e) {
-      err(chalk.red(`✖ Cherry-pick failed on ${hash}`));
-      err(chalk.yellow("Resolve conflicts, then run:"));
-      err(chalk.yellow("  git add -A && git cherry-pick --continue"));
-      err(chalk.yellow("Or abort:"));
-      err(chalk.yellow("  git cherry-pick --abort"));
-      throw e;
-    }
-  }
-}
-
-async function main() {
-  try {
-    if (!argv["no-fetch"]) {
-      log(chalk.gray("Fetching remotes (git fetch --prune)..."));
-      await git.fetch(["--prune"]);
-    }
-
-    const currentBranch = (await gitRaw(["rev-parse", "--abbrev-ref", "HEAD"])) || "HEAD";
-
-    log(chalk.gray(`Comparing subjects since ${argv.since}`));
-    log(chalk.gray(`Dev:  ${argv.dev}`));
-    log(chalk.gray(`Main: ${argv.main}`));
-
-    const [devCommits, mainSubjects] = await Promise.all([
-      getDevCommits(argv.dev, argv.since),
-      getSubjects(argv.main),
-    ]);
-
-    const missing = filterMissing(devCommits, mainSubjects);
-
-    if (missing.length === 0) {
-      log(chalk.green("✅ No missing commits found in the selected window."));
-      return;
-    }
-
-    // Prepare bottom→top ordering support
-    const indexByHash = new Map(missing.map((c, i) => [c.hash, i])); // 0=newest, larger=older
-
-    let selected;
-    if (argv.yes) {
-      selected = missing.map((m) => m.hash);
-    } else {
-      selected = await selectCommitsInteractive(missing);
-      if (!selected.length) {
-        log(chalk.yellow("No commits selected. Exiting."));
-        return;
-      }
-    }
-
-    // Bottom → Top (oldest → newest)
-    const bottomToTop = [...selected].sort((a, b) => indexByHash.get(b) - indexByHash.get(a));
-
-    if (argv.dry_run || argv["dry-run"]) {
-      log(chalk.cyan("\n--dry-run: would cherry-pick (oldest → newest):"));
-      for (const h of bottomToTop) {
-        const subj = await gitRaw(["show", "--format=%s", "-s", h]);
-        log(`- ${chalk.dim(`(${h.slice(0, 7)})`)} ${subj}`);
-      }
-      return;
-    }
-
-    log(
-      chalk.cyan(
-        `\nCherry-picking ${bottomToTop.length} commit(s) onto ${currentBranch} (oldest → newest)...\n`,
-      ),
-    );
-    await cherryPickSequential(bottomToTop);
-    log(chalk.green(`\n✅ Done on ${currentBranch}`));
-  } catch (e) {
-    err(chalk.red(`\n❌ Error: ${e.message || e}`));
-    process.exit(1);
-  }
-}
-
-main();