claude-dev-env 1.44.0 → 1.46.0

package/skills/pr-converge/reference/per-tick.md

@@ -49,6 +49,16 @@ Capture `number`, `head.sha` (= `current_head`), owner/repo, branch.
 
 ### `phase == BUGBOT`
 
+**Opt-out gate (runs first, before any fetch or trigger).**
+`python "$HOME/.claude/_shared/pr-loop/scripts/reviews_disabled.py" --reviewer bugbot`
+
+- Exit 0 (`CLAUDE_REVIEWS_DISABLED` lists `bugbot`) → set `bugbot_down = true`,
+  `phase = BUGTEAM`, continue BUGTEAM in the same tick; skip steps a–c below.
+- Exit 1 → proceed to step a.
+
+Because `bugbot_down` resets on every push, this gate re-runs on every
+BUGBOT entry and keeps Cursor Bugbot skipped for the entire run.
+
 a. Fetch Cursor Bugbot reviews newest-first, walk back until first clean:
 
    ```
@@ -207,11 +217,10 @@ BUGBOT.
 
 ## Step 3: Re-trigger bugbot
 
-- [ ] **Opt-out gate.** When `CLAUDE_REVIEWS_DISABLED` (comma-separated,
-  case-insensitive, whitespace-tolerant) contains `bugbot`, set
-  `bugbot_down = true`, skip every check below, set `phase = BUGTEAM`,
-  and continue BUGTEAM in the same tick. The downstream loop branches on
-  `bugbot_down` exactly the way it does when bugbot CI is unavailable.
+- [ ] **Opt-out gate.** Enforced at BUGBOT entry (see `### phase == BUGBOT`).
+  When `CLAUDE_REVIEWS_DISABLED` lists `bugbot`, the entry gate sets
+  `bugbot_down = true` and routes to BUGTEAM before any trigger flow runs,
+  so the checks below are skipped.
 - [ ] **Silent-pass pre-check.** Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --check-clean --owner <O> --repo <R> --sha <current_head>`
 - [ ] Exit 0 → bugbot CI completed clean with no review (silent pass); set `bugbot_clean_at = current_head`, `phase = BUGTEAM`, continue BUGTEAM same tick
 - [ ] Exit 1 (not a silent pass) or Exit 2 (gh CLI error — silent pass not confirmable) → continue with the trigger flow below

package/skills/pr-converge/reference/state-schema.md

@@ -23,9 +23,13 @@ live ONLY in the single-PR `$CLAUDE_JOB_DIR/pr-converge-state.json` file
   matching. Reset to `0` on any other branch outcome.
 - `bugbot_down`: boolean, init `false`. Set `true` when bugbot fails to
   acknowledge a trigger comment; forces phase to BUGTEAM. Also set `true`
-  when an acknowledged trigger has been outstanding more than 30 minutes
-  with no surfaced review at `current_head` (per Step 2 BUGBOT (c)
-  30-minute budget — see `per-tick.md`). Reset to `false` on every push.
+  at every BUGBOT-phase entry when `CLAUDE_REVIEWS_DISABLED` lists the
+  `bugbot` token (env opt-out via the BUGBOT entry gate in `per-tick.md`),
+  which routes straight to BUGTEAM before any bugbot fetch or trigger. Also
+  set `true` when an acknowledged trigger has been outstanding more than 30
+  minutes with no surfaced review at `current_head` (per Step 2 BUGBOT (c)
+  30-minute budget — see `per-tick.md`). Reset to `false` on every push;
+  the entry gate re-applies the env opt-out on the next BUGBOT entry.
   Once set, remains `true` until the next push; if bugbot stays down
   across ticks, the flag persists and BUGTEAM continues.
 - `bugbot_acknowledged_at`: ISO 8601 timestamp string or `null`. Records

package/skills/pr-converge/scripts/check_convergence.py

@@ -4,6 +4,10 @@ Usage:
   python scripts/check_convergence.py --owner <O> --repo <R> --pr-number <N>
                                       [--bugbot-down]
 
+The bugbot check-run gate is bypassed when either ``--bugbot-down`` is
+passed OR the ``CLAUDE_REVIEWS_DISABLED`` environment variable lists the
+``bugbot`` token, so a Bugbot opt-out closes the gate without the flag.
+
 Exit codes:
   0 — all pre-conditions met
   1 — one or more conditions not met (FAIL lines printed to stdout)
@@ -48,6 +52,14 @@ from pr_converge_skill_constants.constants import (
     UNRESOLVED_THREAD_DETAIL_MAX,
 )
 
+_shared_pr_loop_scripts_dir = (
+    Path(__file__).absolute().parents[3] / "_shared" / "pr-loop" / "scripts"
+)
+if str(_shared_pr_loop_scripts_dir) not in sys.path:
+    sys.path.insert(0, str(_shared_pr_loop_scripts_dir))
+
+from reviews_disabled import is_bugbot_disabled_via_env
+
 
 def _is_bugteam_review(review_body: str) -> bool:
     """Return True when a review body opens with a bugteam audit header.
@@ -621,6 +633,20 @@ def parse_arguments(all_argv: list[str]) -> argparse.Namespace:
     return parser.parse_args(all_argv)
 
 
+def _resolve_bugbot_down(bugbot_down_flag: bool) -> bool:
+    """Combine the explicit flag with the CLAUDE_REVIEWS_DISABLED env opt-out.
+
+    Args:
+        bugbot_down_flag: Value of the ``--bugbot-down`` CLI flag.
+
+    Returns:
+        True when the flag is set OR ``CLAUDE_REVIEWS_DISABLED`` lists the
+        ``bugbot`` token, so the env opt-out bypasses the bugbot gates even
+        when the caller omits the flag.
+    """
+    return bugbot_down_flag or is_bugbot_disabled_via_env()
+
+
 def main(all_arguments: list[str]) -> int:
     """Run the script end-to-end against parsed CLI arguments.
 
@@ -635,7 +661,7 @@ def main(all_arguments: list[str]) -> int:
         owner=arguments.owner,
         repo=arguments.repo,
         number=getattr(arguments, "pr_number"),
-        bugbot_down=arguments.bugbot_down,
+        bugbot_down=_resolve_bugbot_down(arguments.bugbot_down),
     )
 
 

package/skills/pr-converge/scripts/test_check_convergence.py

@@ -217,6 +217,34 @@ def test_private_helpers_recognize_dirty_legacy_header_body() -> None:
     assert check_convergence._is_clean_bugteam_review(DIRTY_LEGACY_BUGTEAM_BODY) is False
 
 
+def should_resolve_bugbot_down_true_when_flag_set(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    assert check_convergence._resolve_bugbot_down(True) is True
+
+
+def should_resolve_bugbot_down_true_when_env_disables_bugbot(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugbot")
+    assert check_convergence._resolve_bugbot_down(False) is True
+
+
+def should_resolve_bugbot_down_false_when_flag_unset_and_env_empty(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    assert check_convergence._resolve_bugbot_down(False) is False
+
+
+def should_resolve_bugbot_down_false_when_env_disables_only_bugteam(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugteam")
+    assert check_convergence._resolve_bugbot_down(False) is False
+
+
 def should_bypass_bugbot_gates_when_bugbot_down_is_true(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None: