feat(create-pr): split verify and sync workflows

[baleen37]

Summary

• simplify me:create-pr skill for token-efficient, minimal workflow documentation
• keep verify-pr-status.sh read-only and move branch update to new sync-with-base.sh
• align tests with the new flow and add executable checks for sync script

Technical details

• plugins/me/skills/create-pr/SKILL.md
  • reduce repeated guidance into a concise minimal workflow and explicit status handling
  • keep stop conditions and minimal PR body requirements
• plugins/me/skills/create-pr/scripts/verify-pr-status.sh
  • remove state-changing git operations (merge/push)
  • on BEHIND, return actionable guidance to run sync script and re-verify
• plugins/me/skills/create-pr/scripts/sync-with-base.sh
  • new script to perform fetch + merge + push when sync is explicitly needed
• plugins/me/skills/create-pr/scripts/check-conflicts.sh
  • simplify output and base-branch resolution logic
• tests updated:
  • tests/skills/test_create_pr_verify_status.bats
  • tests/skills/test_check_conflicts.bats
  • plugins/me/tests/me-specific.bats

Test plan

• bun run bats tests/skills/test_check_conflicts.bats tests/skills/test_create_pr_verify_status.bats plugins/me/tests/me-specific.bats
• pre-push hook full suite passed during git push -u origin HEAD

Notes

• Branch: wip/create-pr-simplify
• Requested workflow exception was approved when working tree was clean, so PR was created from existing commit.

Summary by CodeRabbit

• New Features

  • Added branch synchronization functionality to align with the repository's base branch.

• Documentation

  • Streamlined pull request workflow documentation with simplified guidance and minimal steps.

• Refactor

  • Simplified conflict detection output and status verification process for improved clarity.

[coderabbitai]

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

The create-pr skill is refactored to streamline its workflow. The documentation is condensed to focus on essential steps. Three scripts are updated: check-conflicts.sh removes color output and simplifies messaging, verify-pr-status.sh is rewritten as a simplified state machine, and a new sync-with-base.sh script is introduced for branch synchronization. Tests are updated to reflect these changes.

Changes

Cohort / File(s)	Summary
Documentation plugins/me/skills/create-pr/SKILL.md	Rewrites PR workflow from comprehensive guide to streamlined narrative; removes red-flag and common-mistake sections; introduces minimal workflow sequence with simplified status handling and stop conditions.
Conflict Detection plugins/me/skills/create-pr/scripts/check-conflicts.sh, tests/skills/test_check_conflicts.bats	Simplifies check-conflicts.sh output from colorized to plain text; consolidates error handling and conflict reporting; adds test to ensure no color escape sequences are printed.
Branch Synchronization plugins/me/skills/create-pr/scripts/sync-with-base.sh	Introduces new script to synchronize current branch with repository's default/base branch; handles base determination, fetch, merge, and push operations with standardized exit codes.
Status Verification plugins/me/skills/create-pr/scripts/verify-pr-status.sh, tests/skills/test_create_pr_verify_status.bats	Rewrites verify-pr-status.sh from retry-based loop to read-only state machine; removes conflict/merge handling; consolidates status checks; updates test suite to reference new VERIFY_SCRIPT and SYNC_SCRIPT variables.
Integration Tests plugins/me/tests/me-specific.bats	Adds validation for new sync-with-base.sh script presence and executability; updates assertion to check for BLOCKED|UNSTABLE condition instead of MAX_RETRIES.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

Possibly related PRs

• feat(me): improve create-pr skill with auto update branch detection #193: Modifies create-pr workflow to add explicit branch update (merge origin/) step and adjust conflict/behind handling and messaging.
• refactor(me): optimize create-pr skill for token efficiency #172: Refactors create-pr skill documentation and check-conflicts.sh script, adding base argument acceptance and modifying conflict-check behavior.
• refactor(me): convert create-pr skill to standalone command #318: Modifies create-pr skill documentation (SKILL.md), reorganizing and condensing workflow content.

Poem

🐰 A rabbit hops through cleaner code,
No colors clutter up the road,
New sync-with-base makes branches dance,
Verify flows with streamlined chance,
The workflow's lean, the path is clear! 🎯

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch wip/create-pr-simplify

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}