Skip to content

feat(babysit-pr): drive a pull request to a merge-ready state - #339

Merged
0xA3B merged 1 commit into
mainfrom
feat/babysit-pr-merge-ready
Nov 16, 2026
Merged

0xA3B merged 1 commit into
mainfrom
feat/babysit-pr-merge-ready

Conversation

@0xA3B

@0xA3B 0xA3B commented Nov 16, 2026

Copy link
Copy Markdown
Owner

git:babysit-pr stopped 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, while git:merge-pr refused the merge for exactly those two reasons. Since the rename from address-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

  • CI gate. When a required check fails, the skill decides whether the pull request caused the failure. It reads the failing log, compares the check with the base branch's latest completed run, and reruns a GitHub Actions job once. It repairs a failure the pull request caused, within the pull request's own surface, and applies engineering:diagnose when the cause is unknown. It reports a failure that also occurs on the base branch as blocked and 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 new references/GITHUB-CI.md.
  • Other feedback. A review thread from a person, or from a bot with no active adapter, is now handled when it is present. The skill never polls or waits for it. It publishes the reply that reports a permitted fix. Every other reply is a draft that the user approves before it is posted: a rejection, a deferral, an answer to a question, or a request for clarification. This replaces the earlier "unknown source" gate.
  • No active adapter. The skill no longer stops when a repository uses no review bot. It works the CI gate and the thread gate.
  • Hand offs. git:merge-pr recommends git:babysit-pr on GitHub for a failed check and for any unresolved thread. git:create-pr continues into git:babysit-pr when 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-pr reads the same report as before.

Boundaries

  • The skill does not make a check pass by disabling, skipping, or loosening the check or a test.
  • A fix that needs a change outside the pull request's surface is reported as a user decision.
  • After two repair pushes for the same check, the CI gate is blocked.
  • GitLab merge requests stay out of scope.

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

  • Trigger evals for git:babysit-pr pass 14 of 14 on Claude Code and on Codex, including the dependent cases in the create-pr and merge-pr fixtures on Claude Code. The human-review-comments and ci-repair cases now expect an invocation, and the fixture declares engineering:diagnose as an applied skill.
  • One dependent case is flaky on Codex: address-review-feedback in the create-pr fixture passed 4 of 5 attempts on this branch and 4 of 5 on the unchanged git plugin. In each failing attempt Codex loaded engineering:receiving-feedback without git:babysit-pr. This change leaves the case as it is.

git goes from 4.3.0 to 4.4.0, a minor bump for a deliberate change to the scope the skill documents.

Copilot AI lite review requested due to automatic review settings November 16, 2026 02:13
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-16T02:21:31.108625Z d0ccb1e New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

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.

🟡 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

Comment thread plugins/git/skills/babysit-pr/SKILL.md Resolved
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.
@0xA3B
0xA3B force-pushed the feat/babysit-pr-merge-ready branch from 9dca068 to d0ccb1e Compare November 16, 2026 02:19
Copilot AI lite review requested due to automatic review settings November 16, 2026 02:19

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.

🟡 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

@0xA3B
0xA3B merged commit 3106c04 into main Nov 16, 2026
2 checks passed
@0xA3B
0xA3B deleted the feat/babysit-pr-merge-ready branch November 16, 2026 02:26
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.

2 participants