Skip to content

feat: map git rebase and cherry-pick to dedicated status titles#37

Merged
brianruggieri merged 2 commits into
mainfrom
feat/rebase-cherrypick-status
Mar 16, 2026
Merged

feat: map git rebase and cherry-pick to dedicated status titles#37
brianruggieri merged 2 commits into
mainfrom
feat/rebase-cherrypick-status

Conversation

@brianruggieri

Copy link
Copy Markdown
Owner

Summary

  • Maps git rebase to 🔀 Rebasing status (priority 75) instead of falling through to 🖥️ Running
  • Maps git cherry-pick to 🍒 Cherry-picking status (priority 75) instead of falling through to 🖥️ Running
  • Adds both to status_to_priority() in monitor.sh, the known-status validation set, and the status reference docs

Test plan

  • 4 new hook_runner pre-tool tests: git rebase main, git rebase --continue, git cherry-pick abc123, git cherry-pick --abort
  • 2 new status_to_priority tests: Rebasing and Cherry-picking both resolve to 75
  • All 171 tests pass (up from 165)
  • ShellCheck clean on hook_runner.sh and monitor.sh

Closes #13

git rebase → 🔀 Rebasing (priority 75)
git cherry-pick → 🍒 Cherry-picking (priority 75)

Previously both fell through to 🖥️ Running. These are merge-adjacent
operations and deserve their own status indicators.

Closes #13
Copilot AI review requested due to automatic review settings March 16, 2026 18:01

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Maps git rebase and git cherry-pick Bash commands to dedicated status titles so the monitor/title system reflects these operations (similar to existing git merge handling), improving visibility during common refactor workflows.

Changes:

  • Add 🔀 Rebasing and 🍒 Cherry-picking status classification in lib/hook_runner.sh for Bash pre-tool commands.
  • Assign both statuses priority 75 in lib/monitor.sh and include them in the known-status validation set.
  • Extend docs and tests to cover the new statuses and priority mappings.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file
File Description
lib/hook_runner.sh Detect git rebase / git cherry-pick and set dedicated statuses instead of falling back to Running.
lib/monitor.sh Map new statuses to priority 75 and allow them in the known-status validation list.
tests/test-suite.sh Add unit tests for both status_to_priority() and pre-tool Bash classification for rebase/cherry-pick.
docs/dynamic-titles.md Document the new Bash-to-status mappings.
README.md Update the status reference table with Rebasing and Cherry-picking entries.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

@brianruggieri
brianruggieri merged commit cfce1c5 into main Mar 16, 2026
@brianruggieri
brianruggieri deleted the feat/rebase-cherrypick-status branch March 16, 2026 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

feat: map git rebase and git cherry-pick to status titles

2 participants