cherrypick-interactive 1.12.0 → 1.13.1

package/README.md

@@ -1,174 +1,288 @@
-# cherrypick-interactive
+# 🪶 cherrypick-interactive
 
-Cherry-pick missing commits from one branch to another — interactively and safely.
+### Cherry-pick missing commits from `dev` to `main` — interactively and safely.
 
-## What it does
+---
 
-Compares two branches, shows what's missing, lets you pick which commits to move over, and handles the rest: conflicts, versioning, changelog, PR.
+## 🚧 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.
+
+**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.
+
+---
+
+## 🧭 What it does
+
+- 🔍 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
+- 🔗 Links ticket IDs to your issue tracker (ClickUp, Jira, Linear, or custom)
+- 🖥️ Rich **TUI dashboard** with diff preview, search, and keyboard shortcuts
+- 🤖 **CI mode** for fully non-interactive pipeline execution
+- ↩️ **Undo / rollback** with checkpoint-based session recovery
+- 📋 **Changelog preview** before cherry-pick with confirmation gate
+- ⚠️ **Dependency detection** warns when selected commits depend on unselected ones
+- 💾 **Profiles** to save and reuse CLI flag combinations
+- 🧰 Optionally:
+    - updates `package.json` version
+    - commits and pushes it
+    - opens a **GitHub PR** (draft or normal)
+
+---
+
+## 📦 Installation
 
 ```bash
-npx cherrypick-interactive
+npm install -g cherrypick-interactive
 ```
 
-## Install
+(You can also run it directly without installing globally using `npx`.)
+
+---
+
+## 🚀 Quick Start
 
 ```bash
-npm install -g cherrypick-interactive
+cherrypick-interactive \
+  --semantic-versioning \
+  --version-file ./package.json \
+  --create-release \
+  --push-release \
+  --draft-pr
 ```
 
-## Quick Start
+✅ This will:
+1. Fetch `origin/dev` and `origin/main`
+2. List commits in `dev` missing from `main`
+3. Let you select which to cherry-pick (TUI dashboard with diff preview)
+4. Detect potential dependencies between commits
+5. Show a changelog preview with version bump info
+6. Compute the next version from commit messages
+7. Create `release/<next-version>` from `main`
+8. Cherry-pick the selected commits (with conflict resolution if needed)
+9. Update your `package.json` version and commit it
+10. Push the branch and open a **draft PR** on GitHub
+
+---
+
+## 🧩 Common Use Cases
+
+### 1. Compare branches manually
 
 ```bash
-# Interactive selection with all defaults
 cherrypick-interactive
+```
 
-# Preview without applying
-cherrypick-interactive --dry-run
+Lists commits in `origin/dev` that aren't in `origin/main`, filtered by the last week.
 
-# Pick everything, no prompts
+### 2. Cherry-pick all missing commits automatically
+
+```bash
 cherrypick-interactive --all-yes
 ```
 
-Full workflow with release branch and PR:
+### 3. Preview changes without applying them
 
 ```bash
-cherrypick-interactive \
-  --semantic-versioning \
-  --version-file ./package.json \
-  --create-release \
-  --push-release \
-  --draft-pr
+cherrypick-interactive --dry-run
 ```
 
-## Features
-
-**Core:**
-- Finds commits in source branch not present in target branch
-- Interactive commit selection (TUI dashboard or simple checkbox)
-- Cherry-picks in correct order (oldest to newest)
-- Interactive conflict resolution wizard (per-file or bulk)
-- Preserves original commit messages
-
-**Versioning & Release:**
-- Detects semantic version bump from conventional commits
-- Creates `release/x.y.z` branch
-- Generates markdown changelog
-- Updates `package.json` version
-- Opens GitHub PR (draft or normal)
-
-**Profiles:**
-- Save and reuse CLI flag combinations
-- `--save-profile hotfix` saves current flags
-- `--profile hotfix` loads them back
-- `--list-profiles` shows available profiles
-- Stored in `.cherrypickrc.json`
-
-**Tracker Integration:**
-- Links ticket IDs in changelog to your issue tracker
-- Built-in presets: `--tracker clickup`, `--tracker jira`, `--tracker linear`
-- Custom patterns: `--ticket-pattern "#([a-z0-9]+)" --tracker-url "https://app.clickup.com/t/{{id}}"`
-- ReDoS-safe regex validation
-
-**CI Mode:**
-- `--ci` for fully non-interactive execution
-- `--conflict-strategy ours|theirs|skip|fail`
-- `--format json` for structured output (stdout=JSON, stderr=logs)
-- Distinct exit codes: 0=success, 1=conflict, 2=no commits, 3=auth error, 4=dependency
-
-**Dependency Detection:**
-- Warns when selected commits depend on unselected ones (file-level heuristic)
-- Options: include missing commits, go back to selection, or continue anyway
-- `--dependency-strategy warn|fail|ignore`
-
-**Undo / Rollback:**
-- `--undo` resets release branch to pre-cherry-pick state
-- Checkpoint saved automatically before each session
-- Validates branch integrity before reset
-- Uses `--force-with-lease` (not `--force`)
+### 4. Filter commits by pattern
 
-**Changelog Preview:**
-- Shows full changelog before cherry-pick starts
-- Includes version bump info and ticket links
-- Confirmation defaults to No — must explicitly approve
+```bash
+cherrypick-interactive --ignore-commits "^chore\(deps\)|^ci:"
+```
 
-## Options
+Excludes commits starting with `chore(deps)` or `ci:` from the selection list.
 
-### Cherry-pick
+### 5. Ignore certain commits from semantic versioning
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--dev` | `origin/dev` | Source branch |
-| `--main` | `origin/main` | Target branch |
-| `--since` | `1 week ago` | Time window for commits |
-| `--no-fetch` | `false` | Skip `git fetch --prune` |
-| `--all-yes` | `false` | Select all commits without prompt |
-| `--ignore-commits` | — | Regex patterns to exclude commits |
+```bash
+cherrypick-interactive --ignore-semver "bump|dependencies"
+```
 
-### Version
+Treats commits containing "bump" or "dependencies" as chores (no version bump).
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--semantic-versioning` | `true` | Auto-detect version bump |
-| `--current-version` | — | Current X.Y.Z version |
-| `--version-file` | `./package.json` | Read/write version from file |
-| `--version-commit-message` | `chore(release): bump version to {{version}}` | Commit message template |
-| `--ignore-semver` | — | Regex patterns to exclude from versioning |
+### 6. Use a saved profile
 
-### Release
+```bash
+# Save your flags once
+cherrypick-interactive --save-profile hotfix --dev origin/develop --main origin/release --since "2 weeks ago"
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--create-release` | `true` | Create release branch |
-| `--push-release` | `true` | Push and create PR |
-| `--draft-pr` | `false` | Create PR as draft |
+# Reuse anytime
+cherrypick-interactive --profile hotfix
+```
+
+### 7. Run in CI/CD pipeline
+
+```bash
+cherrypick-interactive --ci --conflict-strategy theirs --format json > result.json
+```
+
+### 8. Link ticket IDs in changelog
+
+```bash
+cherrypick-interactive --tracker clickup --tracker-url "https://app.clickup.com/t/{{id}}"
+```
+
+### 9. Undo the last cherry-pick session
+
+```bash
+cherrypick-interactive --undo
+```
+
+---
+
+## ⚙️ Options
+
+### Cherry-pick options
+
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--dev` | Source branch (commits to copy) | `origin/dev` |
+| `--main` | Target branch (commits already merged here will be skipped) | `origin/main` |
+| `--since` | Git time window filter (e.g. `"2 weeks ago"`) | `1 week ago` |
+| `--no-fetch` | Skip `git fetch --prune` | `false` |
+| `--all-yes` | Cherry-pick all missing commits without prompt | `false` |
+| `--ignore-commits` | Comma-separated regex patterns to exclude commits | — |
+
+### Version options
+
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--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) | `./package.json` |
+| `--version-commit-message` | Template for version bump commit | `chore(release): bump version to {{version}}` |
+| `--ignore-semver` | Comma-separated regex patterns to ignore for semver | — |
 
-### CI
+### Release options
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--ci` | `false` | Non-interactive mode |
-| `--conflict-strategy` | `fail` | `fail`, `ours`, `theirs`, `skip` |
-| `--format` | `text` | `text` or `json` |
-| `--dependency-strategy` | `warn` | `warn`, `fail`, `ignore` |
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--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` |
 
-### Tracker
+### CI options
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--tracker` | — | Preset: `clickup`, `jira`, `linear` |
-| `--ticket-pattern` | — | Custom regex (one capture group) |
-| `--tracker-url` | — | URL template with `{{id}}` |
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--ci` | Enable fully non-interactive mode | `false` |
+| `--conflict-strategy` | How to handle conflicts: `fail`, `ours`, `theirs`, `skip` | `fail` |
+| `--format` | Output format: `text` or `json` | `text` |
+| `--dependency-strategy` | How to handle dependencies: `warn`, `fail`, `ignore` | `warn` |
 
-### Profile
+### Tracker options
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--profile` | — | Load named profile |
-| `--save-profile` | — | Save current flags as profile |
-| `--list-profiles` | `false` | List profiles and exit |
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--tracker` | Built-in preset: `clickup`, `jira`, `linear` | — |
+| `--ticket-pattern` | Custom regex to capture ticket ID (one capture group) | — |
+| `--tracker-url` | URL template with `{{id}}` placeholder | — |
 
-### Session
+### Profile options
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--undo` | `false` | Rollback to pre-cherry-pick state |
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--profile` | Load a named profile from `.cherrypickrc.json` | — |
+| `--save-profile` | Save current CLI flags as a named profile | — |
+| `--list-profiles` | List available profiles and exit | `false` |
 
-### UI
+### Session options
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `--no-tui` | `false` | Use simple checkbox instead of TUI |
-| `--dry-run` | `false` | Preview without applying |
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--undo` | Reset release branch to pre-cherry-pick state | `false` |
 
-## CI/CD Usage
+### UI options
 
-```yaml
-- run: npx cherrypick-interactive --ci --conflict-strategy theirs --format json > result.json
+| Flag | Description | Default |
+|------|--------------|----------|
+| `--no-tui` | Disable TUI dashboard, use simple checkbox instead | `false` |
+| `--dry-run` | Show what would happen without applying changes | `false` |
+
+---
+
+## 🧠 How Semantic Versioning Works
+
+The tool analyzes commit messages using **Conventional Commits**:
+
+| Prefix | Example | Bump |
+|---------|----------|------|
+| `BREAKING CHANGE:` | `feat(auth): BREAKING CHANGE: require MFA` | **major** |
+| `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"
 ```
 
-Exit codes: `0` success, `1` conflict, `2` no commits, `3` auth error, `4` dependency issue.
+---
+
+## ⚔️ 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
+
+In CI mode, `--conflict-strategy` handles conflicts automatically (`ours`, `theirs`, `skip`, or `fail`).
+
+---
+
+## 🖥️ TUI Dashboard
+
+The commit selection screen features a rich terminal UI:
+
+- **Arrow keys / j/k** — Navigate commits
+- **Space** — Toggle selection
+- **a / n** — Select all / deselect all
+- **/** — Search/filter commits by message
+- **d** — Full diff overlay (Esc to return)
+- **p** — Toggle preview pane
+- **Enter** — Confirm selection
+- **q** — Quit (with confirmation if commits are selected)
+
+Each commit shows its hash, subject, and relative date. Selected commits are highlighted in green.
+
+Falls back to simple `inquirer` checkbox on: Windows, small terminals, CI, or with `--no-tui`.
+
+---
 
-## Profiles
+## 💾 Profiles
+
+Save and reuse CLI flag combinations:
 
 ```bash
 # Save
@@ -177,8 +291,11 @@ cherrypick-interactive --save-profile hotfix --dev origin/develop --main origin/
 # Use
 cherrypick-interactive --profile hotfix
 
-# Override
+# Override a single flag
 cherrypick-interactive --profile hotfix --since "3 days ago"
+
+# List all profiles
+cherrypick-interactive --list-profiles
 ```
 
 Config stored in `.cherrypickrc.json`:
@@ -199,22 +316,203 @@ Config stored in `.cherrypickrc.json`:
 }
 ```
 
-## Conflict Resolution
+---
+
+## 🔗 Tracker Integration
+
+Link ticket IDs in your changelog to your issue tracker:
+
+```bash
+# Built-in presets
+cherrypick-interactive --tracker clickup --tracker-url "https://app.clickup.com/t/{{id}}"
+cherrypick-interactive --tracker jira --tracker-url "https://team.atlassian.net/browse/{{id}}"
+cherrypick-interactive --tracker linear --tracker-url "https://linear.app/my-team/issue/{{id}}"
+
+# Custom pattern
+cherrypick-interactive --ticket-pattern "#([a-z0-9]+)" --tracker-url "https://app.clickup.com/t/{{id}}"
+```
+
+Commit `#86c8w62wx - Fix login bug` becomes `[#86c8w62wx](https://app.clickup.com/t/86c8w62wx) - Fix login bug` in the changelog.
+
+---
+
+## 🤖 CI Mode
+
+Run fully non-interactive in CI/CD pipelines:
+
+```bash
+cherrypick-interactive --ci --conflict-strategy theirs --format json > result.json
+```
+
+**Exit codes:**
+
+| Code | Meaning |
+|------|---------|
+| `0` | Success |
+| `1` | Conflict (with `--conflict-strategy fail`) |
+| `2` | No commits found |
+| `3` | Auth / push error |
+| `4` | Dependency issue (with `--dependency-strategy fail`) |
+
+**JSON output** goes to stdout, all logs go to stderr. Colors auto-disabled in JSON mode.
+
+---
+
+## ↩️ Undo / Rollback
+
+Made a mistake? Roll back the entire cherry-pick session:
+
+```bash
+cherrypick-interactive --undo
+```
+
+- Checkpoint saved automatically before each session
+- Validates branch integrity before reset (ancestor check + divergence detection)
+- Uses `--force-with-lease` (not `--force`)
+- Option to re-open commit selection after undo
+
+---
+
+## 🧹 Why This Helps
+
+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 with ticket linking
+- ✅ TUI dashboard with diff preview and keyboard shortcuts
+- ✅ CI mode with structured JSON output and distinct exit codes
+- ✅ Undo/rollback with safety checks
+- ✅ Reusable profiles for common workflows
+
+---
+
+## 🧰 Requirements
+
+- Node.js ≥ 20
+- 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.
+
+### 5. Save your workflow as a profile
+
+```bash
+cherrypick-interactive --save-profile release --dev origin/dev --main origin/main --since "1 month ago" --draft-pr
+```
+
+Then just run `cherrypick-interactive --profile release` every time.
+
+---
+
+## 🧾 License
+
+**MIT** — free to use, modify, and distribute.
+
+---
+
+## 🧑‍💻 Contributing
+
+1. Clone the repo
+2. Install dependencies: `yarn install`
+3. Run locally:
+   ```bash
+   node cli.js --dry-run
+   ```
+4. Run tests:
+   ```bash
+   yarn test
+   ```
+5. Test edge cases before submitting PRs:
+    - Squashed commits with conflicts
+    - Empty cherry-picks
+    - Multiple conflict resolutions
+6. Please follow Conventional Commits for your changes.
+
+---
 
-When conflicts occur, the tool offers:
+## 🐛 Troubleshooting
 
-**Per-file:** use ours, use theirs, open in editor, show diff, mark resolved
+### "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)
 
-**Bulk:** use ours for all, use theirs for all, stage all, launch mergetool
+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. In CI, use `--conflict-strategy`.
 
-In CI mode, `--conflict-strategy` handles this automatically.
+### "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\)"
+```
 
-## Requirements
+### "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:"
+```
 
-- Node.js >= 20
-- Git >= 2.0
-- GitHub CLI (`gh`) — optional, for `--push-release`
+### "Want to undo a cherry-pick session"
+```bash
+cherrypick-interactive --undo
+```
 
-## License
+---
 
-MIT
+> Created to make release management simpler and safer for teams who value clean Git history, predictable deployments, and efficient conflict resolution.

package/cli.js

@@ -34,7 +34,7 @@ if (upd && semver.valid(upd.latest) && semver.valid(pkg.version) && semver.gt(up
 
     // Skip interactive prompt in CI or non-TTY
     if (process.stdout.isTTY && !process.env.CI) {
-        const { shouldUpdate } = await inquirer.prompt([
+        const { shouldUpdate } = await prompt([
             {
                 type: 'confirm',
                 name: 'shouldUpdate',
@@ -263,6 +263,22 @@ const ciResult = {
     pr: { url: null },
 };
 
+/**
+ * Wrap inquirer.prompt to handle Ctrl+C gracefully.
+ * Instead of throwing "User force closed the prompt", exit cleanly.
+ */
+async function prompt(questions) {
+    try {
+        return await inquirer.prompt(questions);
+    } catch (e) {
+        if (e.name === 'ExitPromptError' || e.message?.includes('force closed')) {
+            log(chalk.yellow('\nAborted by user.'));
+            process.exit(0);
+        }
+        throw e;
+    }
+}
+
 class ExitError extends Error {
     constructor(message, exitCode = 1) {
         super(message);
@@ -318,7 +334,7 @@ async function selectCommitsInteractive(missing) {
     ];
     const termHeight = process.stdout.rows || 24; // fallback for non-TTY environments
 
-    const { selected } = await inquirer.prompt([
+    const { selected } = await prompt([
         {
             type: 'checkbox',
             name: 'selected',
@@ -375,7 +391,7 @@ async function handleCherryPickConflict(hash) {
         err(chalk.red(`\n✖ Cherry-pick has conflicts on ${hash} (${shortSha(hash)}).`));
         await showConflictsList(); // prints conflicted files (if any)
 
-        const { action } = await inquirer.prompt([
+        const { action } = await prompt([
             {
                 type: 'select',
                 name: 'action',
@@ -461,7 +477,7 @@ async function showConflictsList() {
 }
 
 async function resolveSingleFileWizard(file) {
-    const { action } = await inquirer.prompt([
+    const { action } = await prompt([
         {
             type: 'select',
             name: 'action',
@@ -491,7 +507,7 @@ async function resolveSingleFileWizard(file) {
             log(chalk.cyan(`Opening ${file} in ${editor}...`));
             await runBin(editor, [file]);
             // user edits and saves, so now they can stage
-            const { stageNow } = await inquirer.prompt([
+            const { stageNow } = await prompt([
                 {
                     type: 'confirm',
                     name: 'stageNow',
@@ -526,7 +542,7 @@ async function conflictsResolutionWizard(hash) {
             // If there are no conflicted files, either continue or detect empty pick
             if (await isEmptyCherryPick()) {
                 err(chalk.yellow('The previous cherry-pick is now empty.'));
-                const { emptyAction } = await inquirer.prompt([
+                const { emptyAction } = await prompt([
                     {
                         type: 'select',
                         name: 'emptyAction',
@@ -571,7 +587,7 @@ async function conflictsResolutionWizard(hash) {
             }
         }
 
-        const { choice } = await inquirer.prompt([
+        const { choice } = await prompt([
             {
                 type: 'select',
                 name: 'choice',
@@ -625,7 +641,7 @@ async function conflictsResolutionWizard(hash) {
                 // If nothing is staged, treat as empty pick and prompt
                 if (!(await hasStagedChanges())) {
                     err(chalk.yellow('No staged changes found for this cherry-pick.'));
-                    const { emptyAction } = await inquirer.prompt([
+                    const { emptyAction } = await prompt([
                         {
                             type: 'select',
                             name: 'emptyAction',
@@ -852,7 +868,7 @@ async function saveProfile(name, flags) {
     config.profiles = config.profiles || {};
 
     if (config.profiles[name]) {
-        const { overwrite } = await inquirer.prompt([
+        const { overwrite } = await prompt([
             {
                 type: 'confirm',
                 name: 'overwrite',
@@ -1012,7 +1028,7 @@ async function handleUndo() {
     // Warn if on a different branch
     if (currentBranch !== session.branch) {
         log(chalk.yellow(`⚠ You are on "${currentBranch}" but the session was created on "${session.branch}".`));
-        const { switchBranch } = await inquirer.prompt([
+        const { switchBranch } = await prompt([
             { type: 'confirm', name: 'switchBranch', message: `Switch to ${session.branch}?`, default: true },
         ]);
         if (switchBranch) {
@@ -1049,7 +1065,7 @@ async function handleUndo() {
     log(`  Commits to discard: ${commitsSinceCheckpoint}`);
     log(chalk.gray('  This is an all-or-nothing rollback — individual commits cannot be selectively removed.\n'));
 
-    const { proceed } = await inquirer.prompt([
+    const { proceed } = await prompt([
         { type: 'confirm', name: 'proceed', message: 'Continue?', default: false },
     ]);
 
@@ -1077,7 +1093,7 @@ async function handleUndo() {
     log(chalk.green(`\nBranch ${session.branch} has been reset to ${shortSha(session.checkpoint)}. You can now re-select commits.`));
 
     // Offer to re-open selection
-    const { reopen } = await inquirer.prompt([
+    const { reopen } = await prompt([
         { type: 'confirm', name: 'reopen', message: 'Re-open commit selection?', default: true },
     ]);
 
@@ -1292,7 +1308,7 @@ async function main() {
                 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([
+                const { proceed } = await prompt([
                     {
                         type: 'confirm',
                         name: 'proceed',
@@ -1382,7 +1398,7 @@ async function main() {
                         // warn: already logged above, continue
                     } else {
                         const missingHashes = [...new Set(deps.map((d) => d.dependency))];
-                        const { choice } = await inquirer.prompt([
+                        const { choice } = await prompt([
                             {
                                 type: 'list',
                                 name: 'choice',
@@ -1401,7 +1417,7 @@ async function main() {
                                 const subj = await gitRaw(['show', '--format=%s', '-s', h]);
                                 log(`  + ${chalk.dim(`(${shortSha(h)})`)} ${subj}`);
                             }
-                            const { confirm } = await inquirer.prompt([
+                            const { confirm } = await prompt([
                                 { type: 'confirm', name: 'confirm', message: 'Add these commits?', default: true },
                             ]);
                             if (confirm) {
@@ -1487,12 +1503,16 @@ async function main() {
 
         // Confirmation (skip in CI)
         if (!argv.ci && !argv['all-yes']) {
-            const { proceed } = await inquirer.prompt([
+            // Flush stdin buffer to prevent TUI's Enter keypress from leaking into this prompt
+            await new Promise((r) => setTimeout(r, 100));
+            if (process.stdin.readable) process.stdin.read();
+
+            const { proceed } = await prompt([
                 {
                     type: 'confirm',
                     name: 'proceed',
                     message: 'Proceed with cherry-pick?',
-                    default: false,
+                    default: true,
                 },
             ]);
             if (!proceed) {
@@ -1652,7 +1672,7 @@ async function ensureReleaseBranchFresh(branchName, startPoint) {
         return;
     }
 
-    const { action } = await inquirer.prompt([
+    const { action } = await prompt([
         {
             type: 'select',
             name: 'action',
@@ -1800,7 +1820,7 @@ async function getPkgVersion(pkgPath) {
     let pkg = await readJson(pkgPath);
     if (!pkg) {
         log(chalk.yellow(`⚠ ${pkgPath} not found.`));
-        const { shouldCreate } = await inquirer.prompt([
+        const { shouldCreate } = await prompt([
             {
                 type: 'confirm',
                 name: 'shouldCreate',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "Interactively cherry-pick commits that are in dev but not in main, using subject-based comparison.",
   "main": "cli.js",
   "bin": "cli.js",

package/src/tui/KeyBar.js

@@ -1,20 +1,30 @@
 import { Text, Box } from 'ink';
 import { html } from './html.js';
 
+function Key({ k, label }) {
+    return html`<${Text}><${Text} color="cyan" bold>[${k}]</${Text}><${Text} color="gray"> ${label}  </${Text}></${Text}>`;
+}
+
 export function KeyBar({ isSearching, selectedCount }) {
     if (isSearching) {
         return html`
             <${Box} paddingX=${1}>
-                <${Text} color="yellow">[Esc] cancel search  [Enter] confirm filter</${Text}>
+                <${Key} k="Esc" label="cancel" />
+                <${Key} k="Enter" label="confirm filter" />
             </${Box}>
         `;
     }
 
     return html`
-        <${Box} paddingX=${1}>
-            <${Text} color="dim">
-                [space] toggle  [a] all  [n] none  [/] search  [d] diff  [p] preview  [enter] confirm (${selectedCount})  [q] quit
-            </${Text}>
+        <${Box} paddingX=${1} flexWrap="wrap">
+            <${Key} k="space" label="toggle" />
+            <${Key} k="a" label="all" />
+            <${Key} k="n" label="none" />
+            <${Key} k="/" label="search" />
+            <${Key} k="d" label="diff" />
+            <${Key} k="p" label="preview" />
+            <${Text}><${Text} color="green" bold>[enter]</${Text}><${Text} color="gray"> confirm (${selectedCount})  </${Text}></${Text}>
+            <${Text}><${Text} color="red" bold>[q]</${Text}><${Text} color="gray"> quit</${Text}></${Text}>
         </${Box}>
     `;
 }