claude-dev-env 1.92.1 → 1.93.0

package/_shared/pr-loop/scripts/terminology_sweep.py

@@ -1,22 +1,24 @@
 """Flag a prose term that names a code identifier a hair differently.
 
-A change adds the field ``premium_interactions`` while the same branch's docs
-call it the ``premium-request`` budget: one thing, two names, and a reader who
-searches one never finds the other.
+A change adds the field ``premium_request_interactions`` while the same
+branch's docs call it the ``premium-request-budget`` field: one thing, two
+names, and a reader who searches one never finds the other.
 
 ::
 
-    code adds:  premium_interactions            the identifier
-    prose adds: the premium-request budget       a hyphenated term
-    flag: premium-request  vs  premium_interactions  -- shared first word, tail diverges
-    ok:   premium-interactions                   -- exact hyphen form, agrees
-    ok:   read-only,  test files,  to a file     -- English compound, plural, or stopword
+    code adds:  premium_request_interactions            the identifier
+    prose adds: the premium-request-budget field         a hyphenated term
+    flag: premium-request-budget  vs  premium_request_interactions  -- only the final word differs
+    ok:   premium-request-interactions                   -- exact hyphen form, agrees
+    ok:   premium-report-total  vs  premium_request_interactions  -- an earlier word differs, ordinary prose
 
 The sweep reads a unified diff, collects the multi-word identifiers added on
 code lines, and scans each added prose line for a hyphen or space variant that
-shares an identifier's leading word but diverges after it. It spares ordinary
-prose: English compound tails, singular/plural forms, stopword windows, and
-words that are themselves tokens of another introduced identifier.
+renames only the final word of an identifier: it agrees on every earlier word
+and differs on the last. A term that diverges in any earlier word, or shares
+only one leading word, is ordinary prose. It also spares English compound
+tails, singular/plural forms, stopword windows, and words that are themselves
+tokens of another introduced identifier.
 """
 
 import argparse
@@ -345,6 +347,47 @@ def _tuples_match_ignoring_plural(
     )
 
 
+def _diverges_only_in_final_token(
+    candidate_tuple: IdentifierTuple, identifier_tuple: IdentifierTuple
+) -> bool:
+    """Return whether two equal-length tuples agree on every token but the last.
+
+    ::
+
+        candidate:  ("premium", "request", "budget")
+        identifier: ("premium", "request", "interactions")
+        flag: every earlier token agrees, so the prose renames the final word
+        ok:   ("premium", "report", "total")  -- an earlier token diverges too
+
+    A near-miss renames a single trailing word of an identifier, so every token
+    before the last agrees by an exact or singular/plural match while the final
+    token differs. A tuple no longer than the two-token identifier minimum
+    cannot carry two agreeing leading tokens, so it never qualifies.
+
+    Args:
+        candidate_tuple: The prose term's lowercase token tuple.
+        identifier_tuple: An introduced identifier's lowercase token tuple.
+
+    Returns:
+        True when both tuples run longer than the two-token identifier minimum,
+        share the same length, agree by exact or singular/plural match on every
+        token but the last, and differ on the final token.
+    """
+    if (
+        len(candidate_tuple) <= MINIMUM_IDENTIFIER_TOKEN_COUNT
+        or len(candidate_tuple) != len(identifier_tuple)
+    ):
+        return False
+    if _tokens_are_plural_variants(candidate_tuple[-1], identifier_tuple[-1]):
+        return False
+    return all(
+        _tokens_are_plural_variants(each_candidate_token, each_identifier_token)
+        for each_candidate_token, each_identifier_token in zip(
+            candidate_tuple[:-1], identifier_tuple[:-1]
+        )
+    )
+
+
 def _word_is_identifier_vocabulary(
     prose_word: str, all_identifier_tokens: frozenset[str]
 ) -> bool:
@@ -391,16 +434,19 @@ def _near_miss_identifier(
             lines, used to spare prose built from real code vocabulary.
 
     Returns:
-        The first identifier sharing the candidate's leading token and length
-        but differing in a later token. None marks the candidate ordinary
-        prose instead, on any of these grounds: it matches an identifier
-        exactly; it shares no prefix with one; it ends in a common English
-        compound tail word (``read-only``, ``data-driven``); it contains an
-        English stopword (``to a``, ``each image``); it differs from the
-        identifier only by a singular/plural form of one or more tokens
-        (``test files`` against ``test_file``); or every diverging word is
-        itself a token of some introduced identifier (``target box`` when
-        ``box_height`` is also in the diff).
+        The first identifier the candidate renames in only its final token. Such a
+        candidate agrees on every earlier token, matches the identifier's
+        length, and differs on the last token. None marks the candidate
+        ordinary prose instead, on any of these grounds: it matches an
+        identifier exactly; it diverges in a token before the last
+        (``premium report total`` against ``premium_request_interactions``);
+        it holds no more than the two-token identifier minimum; it ends in a
+        common English compound tail word (``read-only``, ``data-driven``); it
+        contains an English stopword (``to a``, ``each image``); it differs
+        from the identifier only by a singular/plural form of one or more
+        tokens (``test files`` against ``test_file``); or every diverging word
+        is itself a token of some introduced identifier (``target width box``
+        when ``box_height`` is also in the diff).
     """
     if not candidate_tuple or candidate_tuple in all_identifier_tuples:
         return None
@@ -415,6 +461,8 @@ def _near_miss_identifier(
             continue
         if _tuples_match_ignoring_plural(each_identifier, candidate_tuple):
             continue
+        if not _diverges_only_in_final_token(candidate_tuple, each_identifier):
+            continue
         diverging_words = [
             each_word
             for each_word, each_token in zip(candidate_tuple, each_identifier)

package/_shared/pr-loop/scripts/tests/CLAUDE.md

@@ -32,7 +32,7 @@ pytest suite for the scripts and constants in `_shared/pr-loop/scripts/`. Each t
 
 ## Fixtures
 
-`fixtures/copilot_internal_user_jonecho.json` — a captured `gh api
+`fixtures/copilot_internal_user_example.json` — a captured `gh api
 copilot_internal/user` response driving `test_copilot_quota.py`.
 
 ## Running

package/_shared/pr-loop/scripts/tests/fixtures/{copilot_internal_user_jonecho.json → copilot_internal_user_example.json}

@@ -1,5 +1,5 @@
 {
-  "login": "jonecho",
+  "login": "example-user",
   "access_type_sku": "plus_monthly_subscriber_quota",
   "assigned_date": "2026-05-09T14:08:29-04:00",
   "can_signup_for_limited": false,

package/_shared/pr-loop/scripts/tests/test_agent_config_carveout.py

@@ -336,7 +336,7 @@ def test_is_trust_entry_rejects_cross_project_path_suffix_collision() -> None:
     short_project_path = "/projects/foo"
     trust_prefix = "Trusted local workspace:"
     longer_unrelated_path_entry = (
-        "Trusted local workspace: /Users/jon/projects/foo/.claude/** unrelated path"
+        "Trusted local workspace: /Users/example/projects/foo/.claude/** unrelated path"
     )
     assert (
         common_module.is_trust_entry_for_project(

package/_shared/pr-loop/scripts/tests/test_code_rules_gate.py

@@ -337,11 +337,11 @@ def test_main_staged_mode_passes_when_only_terminology_findings_exist(
     commit_all_files(temporary_git_repository, "initial")
     write_file(
         temporary_git_repository / "quota.py",
-        "first_count = 1\npremium_interactions = 1\n",
+        "first_count = 1\npremium_request_interactions = 1\n",
     )
     write_file(
         temporary_git_repository / "README.md",
-        "The premium-request budget gates the run.\n",
+        "The premium-request-budget field gates the run.\n",
     )
     stage_file(temporary_git_repository, "quota.py")
     stage_file(temporary_git_repository, "README.md")
@@ -2043,6 +2043,88 @@ def test_run_staged_test_files_zero_when_staged_conftest_collects_no_tests(
     assert gate_module.run_staged_test_files(temporary_git_repository) == 0
 
 
+def test_staged_pytest_skipped_below_minimum_python(
+    temporary_git_repository: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    """Below the minimum Python, the staged pytest step is skipped, not run.
+
+    A staged test that would fail returns a zero exit code because the older
+    interpreter cannot run its newer-API calls, so the environment gap does not
+    block the commit.
+    """
+    write_file(
+        temporary_git_repository / "test_needs_new_python.py",
+        "def test_intentionally_fails() -> None:\n    assert False\n",
+    )
+    stage_file(temporary_git_repository, "test_needs_new_python.py")
+    monkeypatch.setattr(gate_module, "MINIMUM_STAGED_PYTEST_PYTHON_MAJOR", 99)
+
+    exit_code = gate_module._staged_pytest_exit_code_for_current_python(
+        temporary_git_repository
+    )
+
+    captured = capsys.readouterr()
+    assert exit_code == 0
+    assert "skipping the staged pytest step" in captured.err
+
+
+def test_staged_pytest_runs_at_or_above_minimum_python(
+    temporary_git_repository: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """At or above the minimum Python, the staged pytest step runs and a failing
+    staged test blocks with a non-zero exit code.
+    """
+    write_file(
+        temporary_git_repository / "test_fails.py",
+        "def test_intentionally_fails() -> None:\n    assert False\n",
+    )
+    stage_file(temporary_git_repository, "test_fails.py")
+    monkeypatch.setattr(gate_module, "MINIMUM_STAGED_PYTEST_PYTHON_MAJOR", 2)
+
+    exit_code = gate_module._staged_pytest_exit_code_for_current_python(
+        temporary_git_repository
+    )
+
+    assert exit_code != 0
+
+
+def test_main_staged_skips_pytest_but_runs_code_rules_below_minimum_python(
+    temporary_git_repository: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    """The version guard skips only the staged pytest step. A staged code-rules
+    violation still blocks the commit, so the two checks stay independent.
+    """
+    write_file(temporary_git_repository / "module.py", "first_count = 1\n")
+    commit_all_files(temporary_git_repository, "initial")
+    write_file(
+        temporary_git_repository / "module.py",
+        "first_count = 1\n"
+        "def compute_total(operand: int) -> int:\n"
+        "    result = operand + 1\n"
+        "    return result\n",
+    )
+    write_file(
+        temporary_git_repository / "test_fails.py",
+        "def test_intentionally_fails() -> None:\n    assert False\n",
+    )
+    stage_file(temporary_git_repository, "module.py")
+    stage_file(temporary_git_repository, "test_fails.py")
+    monkeypatch.setattr(gate_module, "MINIMUM_STAGED_PYTEST_PYTHON_MAJOR", 99)
+    monkeypatch.chdir(temporary_git_repository)
+
+    exit_code = gate_module.main(["--staged"])
+
+    captured = capsys.readouterr()
+    assert exit_code == 1
+    assert "skipping the staged pytest step" in captured.err
+    assert "result" in captured.err
+
+
 def test_hunk_header_pattern_captures_new_start_and_count() -> None:
     header_match = gate_module.hunk_header_pattern().match("@@ -12,3 +45,6 @@ def scope")
     assert header_match is not None
@@ -2578,3 +2660,65 @@ def test_run_staged_test_files_fails_when_one_group_fails(
     assert exit_code != 0
     captured_error = capsys.readouterr().err
     assert "failing_skill" in captured_error
+
+
+def test_resolve_gate_python_executable_prefers_env_var_over_venv(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    relative_segments = (
+        gate_module.ALL_WINDOWS_VENV_PYTHON_RELATIVE_PATH_SEGMENTS
+        if os.name == "nt"
+        else gate_module.ALL_POSIX_VENV_PYTHON_RELATIVE_PATH_SEGMENTS
+    )
+    venv_python = tmp_path.joinpath(".venv", *relative_segments)
+    venv_python.parent.mkdir(parents=True)
+    venv_python.write_text("", encoding="utf-8")
+    monkeypatch.setenv("CODE_RULES_GATE_PYTHON", "/configured/python")
+
+    resolved = gate_module._resolve_gate_python_executable(tmp_path)
+
+    assert resolved == "/configured/python"
+
+
+def test_resolve_gate_python_executable_falls_back_to_project_venv(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CODE_RULES_GATE_PYTHON", raising=False)
+    relative_segments = (
+        gate_module.ALL_WINDOWS_VENV_PYTHON_RELATIVE_PATH_SEGMENTS
+        if os.name == "nt"
+        else gate_module.ALL_POSIX_VENV_PYTHON_RELATIVE_PATH_SEGMENTS
+    )
+    venv_python = tmp_path.joinpath(".venv", *relative_segments)
+    venv_python.parent.mkdir(parents=True)
+    venv_python.write_text("", encoding="utf-8")
+
+    resolved = gate_module._resolve_gate_python_executable(tmp_path)
+
+    assert resolved == str(venv_python)
+
+
+def test_resolve_gate_python_executable_falls_back_to_sys_executable(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CODE_RULES_GATE_PYTHON", raising=False)
+
+    resolved = gate_module._resolve_gate_python_executable(tmp_path)
+
+    assert resolved == sys.executable
+
+
+def test_staged_pytest_environment_prepends_configured_pythonpath(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CODE_RULES_GATE_PYTHONPATH", "/configured/site-packages")
+    monkeypatch.setenv("PYTHONPATH", "/already/on/path")
+
+    environment = gate_module._staged_pytest_environment()
+
+    assert environment["PYTHONPATH"] == os.pathsep.join(
+        ["/configured/site-packages", "/already/on/path"]
+    )

package/_shared/pr-loop/scripts/tests/test_copilot_quota.py

@@ -2,7 +2,7 @@
 
 Every case drives the production ``main`` / ``evaluate_copilot_quota`` path with
 only the ``gh`` subprocess boundary (``_run_gh``) stubbed, fed a captured
-``copilot_internal/user`` JSON fixture in the jonecho shape.
+``copilot_internal/user`` JSON fixture in the example-account shape.
 """
 
 import importlib.util
@@ -30,7 +30,7 @@ def _load_copilot_quota_module() -> ModuleType:
 
 copilot_quota = _load_copilot_quota_module()
 
-FIXTURE_PATH = Path(__file__).parent / "fixtures" / "copilot_internal_user_jonecho.json"
+FIXTURE_PATH = Path(__file__).parent / "fixtures" / "copilot_internal_user_example.json"
 AVAILABLE_USER_JSON = FIXTURE_PATH.read_text(encoding="utf-8")
 FAKE_TOKEN_RESULT = (0, "ghp_faketoken_value\n")
 
@@ -75,7 +75,7 @@ def _isolate_account_sources(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) ->
 def test_main_runs_copilot_when_premium_quota_available(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota,
         "_run_gh",
@@ -91,7 +91,7 @@ def test_main_runs_copilot_when_premium_quota_available(
 def test_main_exits_out_of_quota_when_premium_exhausted(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota,
         "_run_gh",
@@ -106,7 +106,7 @@ def test_main_exits_out_of_quota_when_premium_exhausted(
 def test_main_exits_api_down_on_non_json_response(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota,
         "_run_gh",
@@ -121,7 +121,7 @@ def test_main_exits_api_down_on_non_json_response(
 def test_main_exits_api_down_on_missing_premium_snapshot(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota,
         "_run_gh",
@@ -136,7 +136,7 @@ def test_main_exits_api_down_on_missing_premium_snapshot(
 def test_main_exits_api_down_when_gh_token_unresolved(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota,
         "_run_gh",
@@ -180,7 +180,7 @@ def test_every_gh_backed_skip_writes_a_log_line_naming_the_scenario(
     expected_exit_code: int,
     expected_scenario: str,
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota, "_run_gh", _gh_stub(FAKE_TOKEN_RESULT, api_result)
     )

package/_shared/pr-loop/scripts/tests/test_reviewer_availability.py

@@ -33,7 +33,7 @@ def _load_module(module_name: str) -> ModuleType:
 copilot_quota = _load_module("copilot_quota")
 reviewer_availability = _load_module("reviewer_availability")
 
-FIXTURE_PATH = Path(__file__).parent / "fixtures" / "copilot_internal_user_jonecho.json"
+FIXTURE_PATH = Path(__file__).parent / "fixtures" / "copilot_internal_user_example.json"
 AVAILABLE_USER_JSON = FIXTURE_PATH.read_text(encoding="utf-8")
 FAKE_TOKEN_RESULT = (0, "ghp_faketoken_value\n")
 
@@ -67,6 +67,7 @@ def _isolate_reviewer_environment(
 ) -> None:
     monkeypatch.delenv("COPILOT_QUOTA_ACCOUNT", raising=False)
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.delenv("CLAUDE_REVIEWS_ENABLED", raising=False)
     monkeypatch.setattr(
         reviewer_availability, "COPILOT_QUOTA_DEFAULT_ENV_FILE_PATH", tmp_path / ".env"
     )
@@ -75,7 +76,7 @@ def _isolate_reviewer_environment(
 def test_main_reports_copilot_available_when_quota_confirmed_available(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota, "_run_gh", _gh_stub(FAKE_TOKEN_RESULT, (0, AVAILABLE_USER_JSON))
     )
@@ -106,7 +107,7 @@ def test_main_reports_copilot_down_when_opted_out_via_env(
 def test_main_reports_copilot_down_when_out_of_quota(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota,
         "_run_gh",
@@ -121,7 +122,7 @@ def test_main_reports_copilot_down_when_out_of_quota(
 def test_main_reports_copilot_down_when_quota_api_is_down(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "jonecho")
+    monkeypatch.setenv("COPILOT_QUOTA_ACCOUNT", "example-account")
     monkeypatch.setattr(
         copilot_quota, "_run_gh", _gh_stub(FAKE_TOKEN_RESULT, (0, "not json at all"))
     )
@@ -140,9 +141,20 @@ def test_main_reports_copilot_down_when_no_account_configured(
     assert "scenario C" in captured.err
 
 
-def test_main_reports_bugbot_available_when_not_opted_out(
+def test_main_reports_bugbot_down_when_no_env_vars_set(
     capsys: pytest.CaptureFixture[str],
 ) -> None:
+    exit_code = reviewer_availability.main(["--reviewer", "bugbot"])
+    captured = capsys.readouterr()
+    assert exit_code == reviewer_availability.EXIT_CODE_REVIEWER_DOWN
+    assert "CLAUDE_REVIEWS_ENABLED" in captured.err
+    assert "CLAUDE_REVIEWS_DISABLED" not in captured.err
+
+
+def test_main_reports_bugbot_available_when_enabled_via_env(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
     exit_code = reviewer_availability.main(["--reviewer", "bugbot"])
     captured = capsys.readouterr()
     assert exit_code == reviewer_availability.EXIT_CODE_REVIEWER_AVAILABLE
@@ -153,6 +165,7 @@ def test_main_reports_bugbot_down_when_opted_out_via_env(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugbot")
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
     exit_code = reviewer_availability.main(["--reviewer", "bugbot"])
     captured = capsys.readouterr()
     assert exit_code == reviewer_availability.EXIT_CODE_REVIEWER_DOWN

package/_shared/pr-loop/scripts/tests/test_reviews_disabled.py

@@ -43,20 +43,46 @@ def test_is_bugbot_disabled_via_env_returns_true_when_env_lists_bugbot(
     assert reviews_disabled.is_bugbot_disabled_via_env() is True
 
 
-def test_is_bugbot_disabled_via_env_returns_false_when_env_is_empty(
+def test_is_bugbot_disabled_via_env_returns_true_when_no_env_vars_set(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.delenv("CLAUDE_REVIEWS_ENABLED", raising=False)
+    assert reviews_disabled.is_bugbot_disabled_via_env() is True
+
+
+def test_is_bugbot_disabled_via_env_returns_false_when_enabled_lists_bugbot(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
     assert reviews_disabled.is_bugbot_disabled_via_env() is False
 
 
-def test_is_bugbot_disabled_via_env_returns_false_when_only_bugteam_listed(
+def test_is_bugbot_disabled_via_env_enabled_parse_is_case_and_space_tolerant(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugteam")
+    monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", " BugBot ")
     assert reviews_disabled.is_bugbot_disabled_via_env() is False
 
 
+def test_is_bugbot_disabled_via_env_true_when_disabled_overrides_enabled(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugbot")
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
+    assert reviews_disabled.is_bugbot_disabled_via_env() is True
+
+
+def test_is_bugbot_disabled_via_env_true_when_bugteam_listed_and_not_enabled(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugteam")
+    monkeypatch.delenv("CLAUDE_REVIEWS_ENABLED", raising=False)
+    assert reviews_disabled.is_bugbot_disabled_via_env() is True
+
+
 def test_is_bugbot_disabled_via_env_true_when_both_tokens_listed_mixed_case(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -65,6 +91,29 @@ def test_is_bugbot_disabled_via_env_true_when_both_tokens_listed_mixed_case(
     assert reviews_disabled.is_bugteam_disabled_via_env() is True
 
 
+def test_is_bugbot_opted_out_via_env_returns_true_when_disabled_lists_bugbot(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugbot")
+    assert reviews_disabled.is_bugbot_opted_out_via_env() is True
+
+
+def test_is_bugbot_opted_out_via_env_returns_false_when_only_enabled_lists_bugbot(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
+    assert reviews_disabled.is_bugbot_opted_out_via_env() is False
+
+
+def test_is_bugbot_opted_out_via_env_returns_false_when_no_env_vars_set(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.delenv("CLAUDE_REVIEWS_ENABLED", raising=False)
+    assert reviews_disabled.is_bugbot_opted_out_via_env() is False
+
+
 def test_is_copilot_disabled_via_env_returns_true_when_env_lists_copilot(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -101,17 +150,19 @@ def test_cli_main_returns_zero_when_named_reviewer_disabled(
     assert reviews_disabled.main(["--reviewer", "bugbot"]) == 0
 
 
-def test_cli_main_returns_one_when_named_reviewer_not_disabled(
+def test_cli_main_returns_one_when_bugbot_enabled_via_env(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
     assert reviews_disabled.main(["--reviewer", "bugbot"]) == 1
 
 
-def test_cli_main_returns_one_when_other_reviewer_disabled(
+def test_cli_main_returns_one_for_bugbot_when_enabled_despite_bugteam_optout(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugteam")
+    monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
     assert reviews_disabled.main(["--reviewer", "bugbot"]) == 1