Repository navigation
feat(babysit-pr): drive a pull request to a merge-ready state - #339
Conversation
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
There was a problem hiding this comment.
🟡 Changes recommended
The change still has unresolved critical logic flaws that can falsely report merge readiness, mishandle unknown or cancelled CI states, and trigger repairs for pre-existing base failures.
4 open issues
What changed in this PR
This PR expands git:babysit-pr into a GitHub pull-request readiness workflow that coordinates review, CI, and unresolved-thread gates toward merge readiness.
Changes:
- Adds constrained CI attribution, reruns, in-scope repairs, and bounded stopping behavior.
- Handles human and unsupported-bot review feedback with permitted replies or approval-gated drafts.
- Updates create/merge handoffs, documentation, trigger fixtures, UI metadata, and the Git plugin version to 4.4.0.
| File | Description |
|---|---|
| README.md | Updates the repository-level Git plugin overview and capability summary. |
| plugins/git/skills/merge-pr/SKILL.md | Recommends git:babysit-pr for GitHub CI failures and unresolved review threads. |
| plugins/git/skills/create-pr/SKILL.md | Routes pull requests with failed initial checks or review activity into git:babysit-pr. |
| plugins/git/skills/babysit-pr/SKILL.md | Defines the review, CI, and thread gates and the expanded feedback-handling workflow. |
| plugins/git/skills/babysit-pr/references/GITHUB-CI.md | Adds GitHub required-check observation, attribution, repair, rerun, and stopping guidance. |
| plugins/git/skills/babysit-pr/evals/triggers.yaml | Expands trigger coverage for CI repair, human feedback, merge readiness, and diagnosis routing. |
| plugins/git/skills/babysit-pr/agents/openai.yaml | Updates Codex-facing display metadata and the default prompt. |
| plugins/git/README.md | Documents the expanded pull-request readiness workflow. |
| plugins/git/plugin.json | Bumps the portable Git plugin version to 4.4.0 and updates metadata. |
| plugins/git/.claude-plugin/plugin.json | Bumps the Claude extension version to 4.4.0. |
Review effort: Lite
The skill stopped at review-bot feedback, so a pull request with a failing check or a person's open thread left it with nothing to do while `git:merge-pr` still refused the merge. babysit-pr now reports three gates. It repairs a required check when the pull request caused the failure, attributed by the failing log, the base branch's latest run, and one rerun, and reports a failure that predates the pull request as blocked. It dispositions feedback from a person or a bot without an adapter when that feedback is present, publishes the reply that reports a permitted fix, and holds every other reply as a draft for the user's approval. merge-pr and create-pr hand off to it for failed checks and open threads.
9dca068 to
d0ccb1e
Compare
There was a problem hiding this comment.
🟡 Changes recommended
A critical concurrency flaw can misattribute an old CI failure and push a repair onto a newer, unreviewed commit because the workflow does not re-fetch the pull request head before reruns or repairs.
1 open issue
4 resolved since last review
Review effort: Lite


git:babysit-prstopped at review-bot feedback. A pull request with a failing check, or with an open thread from a person, left the skill with nothing to do, whilegit:merge-prrefused the merge for exactly those two reasons. Since the rename fromaddress-pr-feedback, the name has promised more than the skill did.The skill now drives a GitHub pull request to a merge-ready state and reports three gates: review, CI, and threads.
What changes
engineering:diagnosewhen the cause is unknown. It reports a failure that also occurs on the base branch asblockedand repairs nothing. A CI repair shares the round's push with review fixes, so it starts no extra review round. The steps are in the newreferences/GITHUB-CI.md.git:merge-prrecommendsgit:babysit-pron GitHub for a failed check and for any unresolved thread.git:create-prcontinues intogit:babysit-prwhen the request asked for the merge and a required check failed.The adapter statuses and the review loop are unchanged, so the reviewed-head condition in
git:merge-prreads the same report as before.Boundaries
blocked.No run has exercised CI repair or a person's thread yet, so the first version states the gates and their limits and leaves other paths to the agent.
Validation
git:babysit-prpass 14 of 14 on Claude Code and on Codex, including the dependent cases in thecreate-prandmerge-prfixtures on Claude Code. Thehuman-review-commentsandci-repaircases now expect an invocation, and the fixture declaresengineering:diagnoseas an applied skill.address-review-feedbackin thecreate-prfixture passed 4 of 5 attempts on this branch and 4 of 5 on the unchangedgitplugin. In each failing attempt Codex loadedengineering:receiving-feedbackwithoutgit:babysit-pr. This change leaves the case as it is.gitgoes from 4.3.0 to 4.4.0, a minor bump for a deliberate change to the scope the skill documents.