claude-dev-env 8.78.0 → 8.78.1

package/.agents/skills/pr-lifecycle/reference/review-loop-before-merge.md

@@ -8,4 +8,4 @@ A pull request the agent made merges only after a code review of its head comes
 4. Repeat until a pass records `CLEAN`.
 5. Merge pinned to that head: `expectedHeadSha` on the merge tool, or `--match-head-commit` on `gh pr merge`.
 
-`hooks/blocking/merge_review_gate.py` denies any other merge and any auto-merge. A repository whose own CI and merge queue review and merge its pull requests is listed in `CLAUDE_MERGE_REVIEW_EXEMPT_REPOSITORIES`, comma separated as `owner/name`, and skips the gate.
+`hooks/blocking/merge_review_gate.py` denies any other merge. In a merge-queue repository, enqueue with `gh pr merge <number> --repo <owner>/<name> --auto --match-head-commit <head sha>`; auto-merge that names no head is denied. A repository whose own CI and merge queue review and merge its pull requests is listed in `CLAUDE_MERGE_REVIEW_EXEMPT_REPOSITORIES`, comma separated as `owner/name`, and skips the gate.

package/hooks/blocking/merge_review_gate.py

@@ -8,7 +8,8 @@ names that exact head::
     merge, receipt at abc123, merge pinned to def456                 -> deny, review again
     merge, receipt at abc123, merge names no head                    -> deny, pin it
     merge, no receipt or the receipt counts findings                 -> deny, run the loop
-    auto-merge                                                        -> deny, merge pinned instead
+    auto-merge or enqueue pinned to the clean head                    -> allow
+    auto-merge that names no head                                     -> deny, pin it
     repository listed in CLAUDE_MERGE_REVIEW_EXEMPT_REPOSITORIES      -> allow
 
 The deny reason names the review command CLAUDE_MERGE_REVIEW_COMMAND sets,
@@ -256,11 +257,11 @@ def deny_reason(request: MergeRequest) -> str | None:
     if _is_exempt(request):
         return None
     fields = {"slug": request.slug, "number": request.number}
-    if request.is_auto_merge:
-        return AUTO_MERGE_REASON_TEMPLATE.format(**fields)
     clean_head = _clean_head(request)
     if clean_head is None:
         return NO_CLEAN_REVIEW_REASON_TEMPLATE.format(review_command=_review_command(), **fields)
+    if request.pinned_head is None and request.is_auto_merge:
+        return AUTO_MERGE_REASON_TEMPLATE.format(head=clean_head, **fields)
     if request.pinned_head is None:
         return UNPINNED_MERGE_REASON_TEMPLATE.format(head=clean_head, **fields)
     if not _same_commit(clean_head, request.pinned_head):

package/hooks/blocking/test_merge_review_gate.py

@@ -68,13 +68,13 @@ def test_should_deny_an_unpinned_merge_after_a_clean_review() -> None:
     assert "names no head" in _reason(_merge_tool())
 
 
-def test_should_deny_auto_merge_even_after_a_clean_review() -> None:
+def test_should_deny_auto_merge_that_names_no_head() -> None:
     merge_review_receipt.record_review("acme/tools", 12, CLEAN_HEAD, 0)
     payload = {
         "tool_name": "mcp__github__enable_pr_auto_merge",
         "tool_input": {"owner": "acme", "repo": "tools", "pullNumber": 12},
     }
-    assert "Auto-merge" in _reason(payload)
+    assert f"--match-head-commit {CLEAN_HEAD}" in _reason(payload)
 
 
 def test_should_allow_any_merge_in_an_exempt_repository(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -113,3 +113,20 @@ def test_should_ignore_commands_that_merge_nothing() -> None:
 def test_should_name_the_configured_review_command(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("CLAUDE_MERGE_REVIEW_COMMAND", "/team-review")
     assert "`/team-review`" in _reason(_merge_tool(CLEAN_HEAD))
+
+
+def test_should_allow_auto_merge_pinned_to_the_clean_head() -> None:
+    merge_review_receipt.record_review("acme/tools", 12, CLEAN_HEAD, 0)
+    command = f"gh pr merge 12 --repo acme/tools --auto --match-head-commit {CLEAN_HEAD}"
+    assert _reason(_bash(command)) is None
+
+
+def test_should_deny_pinned_auto_merge_with_no_clean_review() -> None:
+    command = f"gh pr merge 12 --repo acme/tools --auto --match-head-commit {CLEAN_HEAD}"
+    assert "no clean review" in _reason(_bash(command))
+
+
+def test_should_deny_auto_merge_pinned_to_a_newer_head() -> None:
+    merge_review_receipt.record_review("acme/tools", 12, CLEAN_HEAD, 0)
+    command = f"gh pr merge 12 --repo acme/tools --auto --match-head-commit {NEW_HEAD}"
+    assert "Review the new head" in _reason(_bash(command))

package/hooks/features/conduct-gates.md

@@ -11,7 +11,7 @@ This family stops a chat reply, edited message, or tool call when its payload br
 - `blocking/step_note_gate.py` requires a status line before a tool call while its opt-in flag is on.
 - `blocking/verify_before_acting.py` blocks a completed mutating call when the agent's reasoning contains an unchecked claim.
 - `blocking/pr_lifecycle_skill_gate.py` denies a commit, push, pull request action, or merge until the `pr-lifecycle` skill appears in the transcript since the last compaction.
-- `blocking/merge_review_gate.py` denies an agent's merge until a review pass on the merged head reported zero findings. It reads the receipt `scripts/merge_review_receipt.py` writes, requires the merge to be pinned to that head, denies auto-merge, and skips repositories listed in `CLAUDE_MERGE_REVIEW_EXEMPT_REPOSITORIES`. Its deny reason names the review command `CLAUDE_MERGE_REVIEW_COMMAND` sets.
+- `blocking/merge_review_gate.py` denies an agent's merge until a review pass on the merged head reported zero findings. It reads the receipt `scripts/merge_review_receipt.py` writes, requires the merge, auto-merge or merge-queue entry to be pinned to that head, and skips repositories listed in `CLAUDE_MERGE_REVIEW_EXEMPT_REPOSITORIES`. Its deny reason names the review command `CLAUDE_MERGE_REVIEW_COMMAND` sets.
 - `blocking/artifact_dark_mode_gate.py` denies an Artifact page publish when the page, inside the publish wrapper, keeps a light body or shows text under 4.5:1 contrast in dark mode. `blocking/artifact_dark_mode_render.cjs` renders the page in headless Chromium for it.
 
 ## When it fires
@@ -39,7 +39,7 @@ Preconditions:
 - **Step note.** Input is a tool call after a transcript message without a status line while the flag is on. Run `python -m pytest packages/claude-dev-env/hooks/blocking/test_step_note_gate.py -q`. The adjacent test observes a block until a status line appears.
 - **Checked claim.** Input is a Write after hedged reasoning in the transcript. Run `python -m pytest packages/claude-dev-env/hooks/blocking/test_verify_before_acting.py -q`. The adjacent test observes a block and a logged blocked outcome.
 - **Lifecycle skill.** Input is a `git commit` or `gh pr create` command with no `pr-lifecycle` invocation in the transcript. Run `python -m pytest packages/claude-dev-env/hooks/blocking/test_pr_lifecycle_skill_gate.py -q`. The adjacent test observes a denial, then a silent allow once the skill or its slash command appears.
-- **Clean review.** Input is a merge with no receipt, a receipt with findings, a merge pinned to a newer head, an unpinned merge, or auto-merge. Run `python -m pytest packages/claude-dev-env/hooks/blocking/test_merge_review_gate.py -q`. The adjacent test observes a denial for each; a merge pinned to the clean head and a merge in an exempt repository pass.
+- **Clean review.** Input is a merge with no receipt, a receipt with findings, a merge pinned to a newer head, an unpinned merge, or auto-merge with no head. Run `python -m pytest packages/claude-dev-env/hooks/blocking/test_merge_review_gate.py -q`. The adjacent test observes a denial for each; a merge or auto-merge pinned to the clean head and a merge in an exempt repository pass.
 - **Dark mode page.** Input is an Artifact publish of a page that themes `html` but leaves `body` to the publish wrapper. Run `python -m pytest packages/claude-dev-env/hooks/blocking/test_artifact_dark_mode_gate.py -q`. The adjacent test observes a denial that names the text and its contrast; a page that themes `body` passes. The render tests skip on a host with no Node Playwright and Chromium.
 
 ## Gotchas

package/hooks/hooks_constants/merge_review_gate_constants.py

@@ -63,8 +63,9 @@ STALE_REVIEW_REASON_TEMPLATE = (
     "Review the new head until a pass reports zero findings, record it, then merge."
 )
 AUTO_MERGE_REASON_TEMPLATE = (
-    "Auto-merge on {slug}#{number} merges a future head no review has seen. Run the "
-    "review loop until it is clean, then merge directly, pinned to the reviewed head."
+    "Auto-merge on {slug}#{number} names no head, so it could merge a head no review "
+    "has seen. Run `gh pr merge {number} --repo {slug} --auto --match-head-commit {head}`, "
+    "which arms auto-merge or joins the merge queue only while the head is {head}."
 )
 UNKNOWN_TARGET_REASON = (
     "This merge names no repository and pull request number the review gate can read. "

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-dev-env",
-    "version": "8.78.0",
+    "version": "8.78.1",
     "description": "Claude Code development standards — rules, hooks, agents, commands, and skills",
     "type": "module",
     "bin": {