claude-dev-env 8.46.14 → 8.46.16

package/hooks/workflow/test_auto_formatter.py

@@ -12,6 +12,7 @@ rather than the OS temp directory, matching the sibling workflow-hook tests.
 import contextlib
 import functools
 import importlib.util
+import inspect
 import json
 import os
 import shutil
@@ -59,9 +60,15 @@ def _strip_read_only_and_retry(removal_function, target_path, *_exc_info):
         pass
 
 
+_rmtree_supports_onexc = "onexc" in inspect.signature(shutil.rmtree).parameters
+
+
 def _force_rmtree(target_path: str) -> None:
     with contextlib.suppress(OSError):
-        shutil.rmtree(target_path, onexc=_strip_read_only_and_retry)
+        if _rmtree_supports_onexc:
+            shutil.rmtree(target_path, onexc=_strip_read_only_and_retry)
+        else:
+            shutil.rmtree(target_path, onerror=_strip_read_only_and_retry)
 
 
 @functools.lru_cache(maxsize=1)

package/package.json

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

package/scripts/agent_merge_check.py

@@ -82,6 +82,7 @@ from dev_env_scripts_constants.agent_merge_check_constants import (
     JSON_CONTENT_TYPE,
     MERGE_EXIT_CODE,
     MERGE_QUEUE_EJECTION_HOLD_TEMPLATE,
+    MERGE_QUEUE_GRAPHQL_FAILURE_TEMPLATE,
     MERGE_QUEUE_REMOVAL_PAGE_SIZE,
     MERGE_QUEUE_REMOVAL_QUERY,
     MERGE_QUEUE_RULE_TYPE,
@@ -877,36 +878,60 @@ def _field_at(document: object, all_fields: object, key: str) -> object:
     return all_fields.get(key)
 
 
-def read_merge_queue_ejection(slug: str, number: int, token: str) -> bool:
+def read_merge_queue_ejection(
+    slug: str, number: int, base_ref: str, token: str
+) -> bool:
     """Read whether the merge queue ejected the pull request's current head.
 
-    Only GraphQL reports why a pull request left the merge queue. A
-    repository with no merge queue reports no removal events.
+    Only GraphQL reports a merge queue removal, and a Claude Code session's
+    proxy refuses GraphQL. So the base branch rules come first, over REST.
+    Rules that show no merge queue skip the GraphQL query.
 
     Args:
         slug: The repository as ``owner/name``.
         number: The pull request number.
+        base_ref: The branch the pull request merges into.
         token: The GitHub token the request authenticates with.
 
     Returns:
         True when a ``failed_checks`` removal is newer than the head commit.
+        False when the base branch rules show no merge queue.
 
     Raises:
-        MergeCheckError: The query failed, or answered with another shape.
+        MergeCheckError: A read failed, or answered with another shape. A
+            refused GraphQL query names the merge queue that needed it.
     """
-    document = _request_json(
-        GITHUB_GRAPHQL_ENDPOINT,
-        token,
-        _pull_request_query_payload(
-            MERGE_QUEUE_REMOVAL_QUERY, MERGE_QUEUE_REMOVAL_PAGE_SIZE, slug, number
-        ),
-    )
+    if not _may_merge_through_a_queue(slug, base_ref, token):
+        return False
+    document = _merge_queue_removal_document(slug, number, base_ref, token)
     return _is_ejected_on_head(
         _list_along(document, ALL_MERGE_QUEUE_REMOVAL_NODE_KEYS),
         _head_committed_at(document),
     )
 
 
+def _merge_queue_removal_document(
+    slug: str, number: int, base_ref: str, token: str
+) -> object:
+    payload = _pull_request_query_payload(
+        MERGE_QUEUE_REMOVAL_QUERY, MERGE_QUEUE_REMOVAL_PAGE_SIZE, slug, number
+    )
+    try:
+        return _request_json(GITHUB_GRAPHQL_ENDPOINT, token, payload)
+    except MergeCheckError as failure:
+        raise MergeCheckError(
+            MERGE_QUEUE_GRAPHQL_FAILURE_TEMPLATE.format(base=base_ref, failure=failure)
+        ) from failure
+
+
+def _may_merge_through_a_queue(slug: str, base_ref: str, token: str) -> bool:
+    try:
+        all_rules = _read_branch_rules(slug, urllib.parse.quote(base_ref), token)
+    except MergeCheckError:
+        return True
+    return has_merge_queue_rule(all_rules)
+
+
 def _list_along(document: object, all_keys: Sequence[str]) -> list[object]:
     all_records = functools.reduce(
         functools.partial(_field_at, document), all_keys, document
@@ -985,7 +1010,10 @@ def main(all_arguments: Sequence[str]) -> int:
             parsed.slug, parsed.number, token
         )
         is_ejected_from_merge_queue = read_merge_queue_ejection(
-            parsed.slug, parsed.number, token
+            parsed.slug,
+            parsed.number,
+            str(_nested_field(all_pull_request_fields, BASE_KEY, REF_KEY)),
+            token,
         )
     except MergeCheckError as failure:
         print(failure, file=sys.stderr)

package/scripts/dev_env_scripts_constants/agent_merge_check_constants.py

@@ -142,6 +142,10 @@ HOLD_EXIT_CODE = 1
 ERROR_EXIT_CODE = 2
 
 NO_SIGN_IN_MESSAGE = "No GitHub token in the environment. Set GH_TOKEN or GITHUB_TOKEN."
+MERGE_QUEUE_GRAPHQL_FAILURE_TEMPLATE = (
+    "The {base} branch merges through a merge queue, and only the GitHub GraphQL"
+    " API reports a merge queue ejection. That GraphQL read failed: {failure}"
+)
 SLUG_SEPARATOR = "/"
 SLUG_ARGUMENT_HELP = "Repository as owner/name, such as jl-cmd/claude-dev-env."
 NUMBER_ARGUMENT_HELP = "Pull request number."

package/scripts/test_agent_merge_check.py

@@ -29,6 +29,7 @@ CLEAN_PULL_REQUEST = {
     "number": 1442,
     "draft": False,
     "mergeable_state": "clean",
+    "base": {"ref": "main"},
     "head": {"sha": "ab845eb6945650055ebe852312a9057b9f067d6a"},
 }
 
@@ -293,7 +294,7 @@ def test_a_ready_pull_request_exits_zero(monkeypatch: pytest.MonkeyPatch) -> Non
     monkeypatch.setattr(
         agent_merge_check,
         "read_merge_queue_ejection",
-        lambda slug, number, token: False,
+        lambda slug, number, base_ref, token: False,
     )
     assert agent_merge_check.main(["jl-cmd/claude-dev-env", "1442"]) == 0
 
@@ -313,7 +314,7 @@ def test_a_held_pull_request_exits_one(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(
         agent_merge_check,
         "read_merge_queue_ejection",
-        lambda slug, number, token: False,
+        lambda slug, number, base_ref, token: False,
     )
     assert agent_merge_check.main(["jl-cmd/claude-dev-env", "1442"]) == 1
 
@@ -655,12 +656,15 @@ def _removal(created_at: str, reason: str) -> dict[str, object]:
 
 def _merge_queue_answers(
     all_removals: list[dict[str, object]],
+    all_rules: list[object] = MAIN_BRANCH_RULES,
 ) -> object:
     def _answer(url: str, token: str, all_payload_fields: object) -> object:
         if url.endswith("/pulls/1442"):
             return QUEUED_PULL_REQUEST
         if url.endswith("/ccr/review_threads"):
             return []
+        if "/rules/branches/" in url:
+            return all_rules
         if url.endswith("/graphql"):
             return _merge_queue_document(all_removals)
         raise AssertionError(url)
@@ -668,6 +672,47 @@ def _merge_queue_answers(
     return _answer
 
 
+def _refuse_graphql(answer: object) -> object:
+    def _answer(url: str, token: str, all_payload_fields: object) -> object:
+        if url.endswith("/graphql"):
+            raise agent_merge_check.MergeCheckError("HTTP Error 403: Forbidden")
+        return answer(url, token, all_payload_fields)
+
+    return _answer
+
+
+def test_a_base_without_a_merge_queue_may_merge_when_graphql_is_refused(
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    monkeypatch.setenv("GH_TOKEN", "token")
+    monkeypatch.setattr(
+        agent_merge_check,
+        "_request_json",
+        _refuse_graphql(_merge_queue_answers([], all_rules=[])),
+    )
+    exit_code = agent_merge_check.main(["jl-cmd/claude-dev-env", "1442"])
+    assert exit_code == 0
+    assert capsys.readouterr().out.startswith(MERGE_VERDICT_LABEL)
+
+
+def test_a_merge_queue_base_names_the_refused_graphql_read(
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    monkeypatch.setenv("GH_TOKEN", "token")
+    monkeypatch.setattr(
+        agent_merge_check, "_request_json", _refuse_graphql(_merge_queue_answers([]))
+    )
+    exit_code = agent_merge_check.main(["jl-cmd/claude-dev-env", "1442"])
+    captured = capsys.readouterr()
+    assert exit_code == 2
+    assert captured.out == ""
+    assert "merge queue" in captured.err
+    assert "GraphQL" in captured.err
+    assert "HTTP Error 403: Forbidden" in captured.err
+
+
 def _run_queued_main(
     monkeypatch: pytest.MonkeyPatch,
     capsys: pytest.CaptureFixture[str],
@@ -772,13 +817,11 @@ def test_read_merge_queue_ejection_compares_failed_checks_removals_to_the_head(
     expected_ejection: bool,
 ) -> None:
     monkeypatch.setattr(
-        agent_merge_check,
-        "_request_json",
-        lambda url, token, all_payload_fields: _merge_queue_document(all_removals),
+        agent_merge_check, "_request_json", _merge_queue_answers(all_removals)
     )
     assert (
         agent_merge_check.read_merge_queue_ejection(
-            "jl-cmd/claude-dev-env", 1442, "token"
+            "jl-cmd/claude-dev-env", 1442, "main", "token"
         )
         is expected_ejection
     )
@@ -915,8 +958,8 @@ def _unstable_answers(
             return PULL_REQUEST_5330
         if parsed.path.endswith("/ccr/review_threads"):
             return all_threads or []
-        if parsed.path.endswith("/graphql"):
-            return _merge_queue_document([])
+        if "/rules/branches/" in parsed.path:
+            return []
         if parsed.path.endswith("/check-runs"):
             return {"check_runs": _requested_page(parsed.query, all_check_runs)}
         if parsed.path.endswith("/status"):