arh-pr-workflow Skill

Expert guidance for arh CLI — Uber's PR and feature branch management tool.

Create Claude task list using TaskCreate for all items below. Mark tasks complete via TaskUpdate as you go.

• - [ ] Parse user request (which arh operation?)
• [ ] Detect environment (Uber production repo?)
• [ ] Execute requested operation
• [ ] Verify result
• [ ] Report outcome

Branch Naming & Commit Templates

See references/uber-commit-template.md for branch naming convention, commit template format, and PR metadata gathering.

Initial Setup

CODEBLOCK0

Opens browser for GitHub authorization. Select all needed orgs (e.g., uber-code, uber-objectconfig). GitHub username must end with _UBER suffix.

Core Capabilities

1. Creating Feature Branches

Create a new feature branch from main:
CODEBLOCK1

Create a stacked feature (branch off current feature):
CODEBLOCK2

Create feature with specific parent:
CODEBLOCK3

2. Publishing Pull Requests

Publish PR for current feature:
CODEBLOCK4

Publish entire feature stack (root to leaf):
CODEBLOCK5

Publish without interactive prompts (auto-apply lint fixes):
CODEBLOCK6

Publish as draft PR:
CODEBLOCK7

Publish with auto-merge enabled:
CODEBLOCK8

Publish with combined flags:
CODEBLOCK9

3. Viewing PR Status

View feature tree:
CODEBLOCK10

View feature tree with PR status:
CODEBLOCK11

View with commit history (ahead/behind status):
CODEBLOCK12

4. Merging Pull Requests

Merge current feature and all ancestors:
CODEBLOCK13

How it works:

• - If on branch A (main -> C -> B -> A), merges A, B, and C
• If on branch B, merges B and C
• Requires all checks to pass (Builds, Required Approvers)
• Merges ancestors first, then current branch

5. Navigating Features

Checkout existing feature:
CODEBLOCK14

Checkout PR from URL (v0.0.38+):
CODEBLOCK15

This fetches the PR branch from remote and sets up upstream tracking.

Navigate feature stack:
CODEBLOCK16

6. Rebasing Features

Rebase current feature tree to latest parent:
CODEBLOCK17

Pull and rebase from default branch:

arh pull -r

Important for go-code monorepo: After any git pull or arh pull, always run:
CODEBLOCK19

Rebase to new parent:
CODEBLOCK20

Rebase specific feature:
CODEBLOCK21

Rebase entire stack:
CODEBLOCK22

Rebase subtree:
CODEBLOCK23

Rebase all features:
CODEBLOCK24

7. Discarding Features

Discard a feature branch:
CODEBLOCK25

Important: This deletes both local and remote branches. Any PRs open from this branch will be closed.

Discard local only (keep remote):
CODEBLOCK26

Use --skip-remote when checking out someone else's PR branch that you want to discard locally.

8. Cleaning Up Merged Features

Clean up merged/closed feature branches:
CODEBLOCK27

Clean up without prompts:
CODEBLOCK28

How it works:

• - Lists all closed/merged features
• Asks for confirmation to discard
• Updates upstream tracking for dependent branches
• Example: main -> A -> B -> C, if B is closed, tidy discards B and updates C's parent to A

9. Running Quality Checks

Run linters on changed files:
CODEBLOCK29

Run tests on changed files:
CODEBLOCK30

10. Version Management

Check arh version:
CODEBLOCK31

Common Workflows

• - New feature: arh feature NAME -> commit -> INLINECODE5
• Stacked PRs: arh feature NAME -> commit -> arh feature next NAME2 -> commit -> INLINECODE8
• Update after review: commit fixes -> INLINECODE9
• Merge stack: arh checkout last -> arh merge -> INLINECODE12
• Rebase on main: arh rebase or arh rebase --all, then INLINECODE15

Troubleshooting

PR publish fails due to lint errors:
CODEBLOCK32

Skip pre-push coverage check (/opt/uber/etc/custom-hooks/coverage-check.sh):

arh publish --no-coverage             # Skip coverage via wrapper (preferred)
SKIP_COVERAGE=1 arh publish           # Skip coverage via env var
COVERAGE_THRESHOLD=70 arh publish     # Lower threshold (default: 80%)

Feature tree is messy:
CODEBLOCK34

Cannot merge due to failing checks:

• - Check build status: INLINECODE24
• Ensure all required approvals are received
• Verify all builds are passing
• Fix issues and update PR: INLINECODE25

Tips

• - Always create features with arh feature for proper parent tracking
• Use arh -s frequently to monitor PR status
• Use --no-interactive in automated/CI contexts
• Use --changes-planned for WIP/draft PRs
• Run arh tidy regularly to keep feature tree clean
• Use --full-stack for dependent changes
• go-code monorepo: After git pull or arh pull, MUST run INLINECODE34