Skip to content

chore(claude): auto-sync PR base branches from the /work command #3461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmagician wants to merge 2 commits into
base: next
Choose a base branch
from
Open

chore(claude): auto-sync PR base branches from the /work command #3461

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4dbe8b
chore(claude): auto-sync PR base branches from the /work command
claude Aug 2, 2026
b9d732e
chore(claude): only auto-sync a PR when it has merge conflicts
claude Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .claude/commands/work.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,18 @@ Work on a GitHub issue and open a **draft** PR.
3. **Start in plan mode.** Produce an implementation plan and wait for approval before writing any code.
4. After approval: implement per `.claude/CLAUDE.md` (worktree, branch, commit conventions).
5. Open the draft PR against the base branch: `gh pr create --draft --base <branch> --body "Closes #<number> ..."`. Report the PR URL.
6. **Set up base auto-sync.** Create a scheduled cloud routine (via the `schedule` skill) named
`sync-pr-<number>-base`, running **every 2 hours** against this repository, with this prompt
(substitute the PR number, head branch, and base branch):

> Check PR #<number> in this repository (head `<head-branch>`, base `<base>`). If the PR is
> merged or closed, or was opened more than 48 hours ago, delete this routine and stop. If
> the PR has no merge conflicts with its base (`mergeable` is not CONFLICTING), do nothing.
> Otherwise merge the base into the PR branch and resolve the conflicts, run `make lint`
> and the test suites relevant to the changed crates, and push the merge only if everything
> passes. If a conflict or failure cannot be resolved confidently, push nothing and comment
> on the PR describing what blocked the sync.

Report the routine name alongside the PR URL so the user can find it at
claude.ai/code/routines. If routine creation fails (e.g. no scheduling available in this
environment), say so and continue - the PR itself is the deliverable.
Loading