claude-dev-env 8.12.0 → 8.13.0

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

@@ -29,9 +29,10 @@ The frozen process env is only a fallback when that disk read fails (logged once
 A probe error does not waive the gate; the live GitHub checks still run.
 
 The Codex gate is conditional-required: it demands
-``codex_clean_at == current_head`` only when the weekly usage probe reports
-more than the probe's threshold percent left. At or below that threshold, null
-usage, the codex token, or ``codex_down`` never blocks ready.
+``codex_clean_at == current_head`` only when the Codex account picker
+(``scripts/codex_account_choice.py choose``) answers the ``normal`` tier, so
+one signed-in account has room for a review. A ``luna`` or ``wait`` answer, an
+unreadable picker, the codex token, or ``codex_down`` never blocks ready.
 """
 
 from __future__ import annotations
@@ -62,13 +63,12 @@ from check_convergence_thread_gates import (
     _check_no_pending_reviews,
     _count_unresolved_bot_threads,
 )
-from codex_review_scripts_constants.codex_usage_probe_constants import (
-    USAGE_REPORT_KEY_PERCENT_LEFT,
-)
-from codex_usage_probe import is_codex_review_required, probe_weekly_usage_via_subprocess
 from pr_converge_scripts_constants.convergence_gate_constants import (
+    ALL_CODEX_ACCOUNT_PICKER_RELATIVE_PARTS,
     BUGBOT_DOWN_BYPASS_NOTE,
     CLAUDE_JOB_DIR_ENV_VAR_NAME,
+    CODEX_ACCOUNT_PICK_TIMEOUT_SECONDS,
+    CODEX_ACCOUNT_PICKER_CHOOSE_COMMAND,
     CODEX_BYPASS_DETAIL,
     CODEX_CLEAN_AT_STATE_KEY,
     CODEX_CLEAN_DETAIL_TEMPLATE,
@@ -76,11 +76,13 @@ from pr_converge_scripts_constants.convergence_gate_constants import (
     CODEX_GATE_LABEL,
     CODEX_MISSING_CLEAN_DETAIL_TEMPLATE,
     CODEX_SKIPPED_USAGE_DETAIL,
+    CODEX_TIER_KEY,
+    CODEX_TIER_NORMAL,
     COPILOT_DOWN_BYPASS_NOTE,
     FIXTURE_DEFAULT_PENDING_DETAIL,
     FIXTURE_DEFAULT_THREADS_DETAIL,
     FIXTURE_KEY_CODEX_CLEAN_AT,
-    FIXTURE_KEY_CODEX_PERCENT_LEFT,
+    FIXTURE_KEY_CODEX_TIER,
     FIXTURE_KEY_HEAD_SHA,
     FIXTURE_KEY_PENDING_REVIEWS_DETAIL,
     FIXTURE_KEY_PENDING_REVIEWS_PASSED,
@@ -90,6 +92,7 @@ from pr_converge_scripts_constants.convergence_gate_constants import (
     FIXTURE_KEY_UNRESOLVED_BOT_THREADS_PASSED,
     MINIMUM_ABBREVIATED_SHA_LENGTH,
     PR_CONVERGE_STATE_FILENAME,
+    SHARED_PACKAGE_ROOT_PARENT_INDEX,
 )
 from pr_converge_skill_constants.constants import (
     ALL_COPILOT_CLEAN_REVIEW_STATES,
@@ -128,7 +131,7 @@ class ConvergenceFixture(NamedTuple):
     unresolved_bot_threads_detail: str
     is_no_pending_reviews: bool
     pending_reviews_detail: str
-    codex_percent_left: float | None
+    codex_tier: str | None
     codex_clean_at: str | None
 
 
@@ -333,24 +336,24 @@ def _sha_matches_head(stamp_sha: str, head_sha: str) -> bool:
 
 def _evaluate_codex_clean(
     *,
-    read_percent_left: Callable[[], float | None],
+    read_codex_tier: Callable[[], str | None],
     codex_clean_at: str | None,
     head_sha: str,
 ) -> tuple[bool, str]:
-    """Return whether the conditional Codex gate passes for the given stamp and usage.
+    """Return whether the conditional Codex gate passes for the given stamp and account tier.
 
     ::
 
-        clean stamp on head                -> pass  (usage never read)
-        no stamp, percent None or <= limit -> skip  (never blocks)
-        no stamp, percent > limit          -> fail
+        clean stamp on head                  -> pass  (picker never runs)
+        no stamp, tier luna, wait, or None   -> skip  (never blocks)
+        no stamp, tier normal                -> fail
 
-    A stamp on the current HEAD settles the gate on its own, so the usage read
-    stays behind it: the weekly probe spawns a Codex subprocess, and the common
-    already-clean tick has no reason to pay for one.
+    A stamp on the current HEAD settles the gate on its own, so the picker
+    stays behind it: the picker starts one Codex app server per account, and
+    the common already-clean tick has no reason to pay for them.
 
     Args:
-        read_percent_left: Reads weekly Codex percent remaining, or None when unknown.
+        read_codex_tier: Returns the picker's tier, or None when the picker cannot say.
         codex_clean_at: HEAD SHA where Codex last reported clean, or None.
         head_sha: Current PR HEAD commit SHA.
 
@@ -359,32 +362,38 @@ def _evaluate_codex_clean(
     """
     if codex_clean_at is not None and _sha_matches_head(codex_clean_at, head_sha):
         return True, CODEX_CLEAN_DETAIL_TEMPLATE % _short_sha(head_sha)
-    if not is_codex_review_required(read_percent_left()):
+    if read_codex_tier() != CODEX_TIER_NORMAL:
         return True, CODEX_SKIPPED_USAGE_DETAIL
     return False, CODEX_MISSING_CLEAN_DETAIL_TEMPLATE % _short_sha(head_sha)
 
 
-def _probe_codex_percent_left() -> float | None:
-    """Probe weekly Codex usage and return percent remaining, or None when unknown."""
+def _codex_account_picker_path() -> Path:
+    """Return the installed Codex account picker beside this shared tree."""
+    shared_root = Path(__file__).resolve().parents[SHARED_PACKAGE_ROOT_PARENT_INDEX]
+    return shared_root.joinpath(*ALL_CODEX_ACCOUNT_PICKER_RELATIVE_PARTS)
+
+
+def _read_codex_tier() -> str | None:
+    """Ask the Codex account picker which tier a review runs on, or None when it cannot say."""
     try:
-        usage_report = probe_weekly_usage_via_subprocess()
-    except (
-        FileNotFoundError,
-        OSError,
-        subprocess.TimeoutExpired,
-        subprocess.SubprocessError,
-        json.JSONDecodeError,
-        ValueError,
-        TypeError,
-        KeyError,
-    ):
+        completed = subprocess.run(
+            [
+                sys.executable,
+                str(_codex_account_picker_path()),
+                CODEX_ACCOUNT_PICKER_CHOOSE_COMMAND,
+            ],
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=CODEX_ACCOUNT_PICK_TIMEOUT_SECONDS,
+        )
+        answer = json.loads(completed.stdout)
+    except (OSError, subprocess.SubprocessError, json.JSONDecodeError):
         return None
-    raw_percent = usage_report.get(USAGE_REPORT_KEY_PERCENT_LEFT)
-    if isinstance(raw_percent, bool):
+    if completed.returncode != 0 or not isinstance(answer, dict):
         return None
-    if isinstance(raw_percent, (int, float)):
-        return float(raw_percent)
-    return None
+    tier = answer.get(CODEX_TIER_KEY)
+    return tier if isinstance(tier, str) else None
 
 
 def _read_job_state() -> dict[str, object]:
@@ -468,11 +477,11 @@ def _codex_condition(context: GateContext) -> GateCondition:
     if context.is_codex_down:
         return (CODEX_GATE_LABEL, (True, CODEX_BYPASS_DETAIL))
     if context.fixture is not None:
-        fixture_percent_left = context.fixture.codex_percent_left
+        fixture_codex_tier = context.fixture.codex_tier
         return (
             CODEX_GATE_LABEL,
             _evaluate_codex_clean(
-                read_percent_left=lambda: fixture_percent_left,
+                read_codex_tier=lambda: fixture_codex_tier,
                 codex_clean_at=context.fixture.codex_clean_at,
                 head_sha=context.head_sha,
             ),
@@ -480,7 +489,7 @@ def _codex_condition(context: GateContext) -> GateCondition:
     return (
         CODEX_GATE_LABEL,
         _evaluate_codex_clean(
-            read_percent_left=_probe_codex_percent_left,
+            read_codex_tier=_read_codex_tier,
             codex_clean_at=context.live_codex_clean_at,
             head_sha=context.head_sha,
         ),
@@ -623,17 +632,13 @@ def _load_convergence_fixture(from_path: Path) -> ConvergenceFixture:
         raise ValueError("fixture pending_reviews_passed must be a bool")
     if not isinstance(pending_detail, str):
         raise ValueError("fixture pending_reviews_detail must be a string")
-    codex_percent_left = payload.get(FIXTURE_KEY_CODEX_PERCENT_LEFT)
+    codex_tier = payload.get(FIXTURE_KEY_CODEX_TIER)
     codex_clean_at = payload.get(FIXTURE_KEY_CODEX_CLEAN_AT)
-    if isinstance(codex_percent_left, bool):
-        raise ValueError("fixture codex_percent_left must be a number or null")
-    if codex_percent_left is not None and not isinstance(codex_percent_left, (int, float)):
-        raise ValueError("fixture codex_percent_left must be a number or null")
+    if codex_tier is not None and not isinstance(codex_tier, str):
+        raise ValueError("fixture codex_tier must be a string or null")
     if codex_clean_at is not None and not isinstance(codex_clean_at, str):
         raise ValueError("fixture codex_clean_at must be a string or null")
-    typed_percent_left: float | None = (
-        float(codex_percent_left) if isinstance(codex_percent_left, (int, float)) else None
-    )
+    typed_codex_tier: str | None = codex_tier if isinstance(codex_tier, str) else None
     typed_codex_clean_at: str | None = codex_clean_at if isinstance(codex_clean_at, str) else None
     return ConvergenceFixture(
         head_sha=head_sha,
@@ -643,7 +648,7 @@ def _load_convergence_fixture(from_path: Path) -> ConvergenceFixture:
         unresolved_bot_threads_detail=threads_detail,
         is_no_pending_reviews=is_pending_ok,
         pending_reviews_detail=pending_detail,
-        codex_percent_left=typed_percent_left,
+        codex_tier=typed_codex_tier,
         codex_clean_at=typed_codex_clean_at,
     )
 

package/_shared/pr-loop/scripts/codex_review_scripts_constants/run_constants.py

@@ -3,6 +3,10 @@
 from __future__ import annotations
 
 CODEX_BINARY_NAME = "codex"
+WINDOWS_OS_NAME = "nt"
+WINDOWS_COMMAND_SHELL = "cmd"
+WINDOWS_COMMAND_SHELL_RUN_FLAG = "/c"
+ALL_WINDOWS_SCRIPT_SUFFIXES = (".cmd", ".bat")
 EXEC_SUBCOMMAND = "exec"
 REVIEW_SUBCOMMAND = "review"
 HELP_FLAG = "--help"

package/_shared/pr-loop/scripts/pr_converge_scripts_constants/convergence_gate_constants.py

@@ -45,7 +45,7 @@ FIXTURE_KEY_UNRESOLVED_BOT_THREADS_PASSED: str = "unresolved_bot_threads_passed"
 FIXTURE_KEY_UNRESOLVED_BOT_THREADS_DETAIL: str = "unresolved_bot_threads_detail"
 FIXTURE_KEY_PENDING_REVIEWS_PASSED: str = "pending_reviews_passed"
 FIXTURE_KEY_PENDING_REVIEWS_DETAIL: str = "pending_reviews_detail"
-FIXTURE_KEY_CODEX_PERCENT_LEFT: str = "codex_percent_left"
+FIXTURE_KEY_CODEX_TIER: str = "codex_tier"
 FIXTURE_KEY_CODEX_CLEAN_AT: str = "codex_clean_at"
 FIXTURE_DEFAULT_THREADS_DETAIL: str = "0 unresolved"
 FIXTURE_DEFAULT_PENDING_DETAIL: str = "none pending"
@@ -68,3 +68,12 @@ PR_CONVERGE_STATE_FILENAME: str = "pr-converge-state.json"
 CODEX_CLEAN_AT_STATE_KEY: str = "codex_clean_at"
 CODEX_DOWN_STATE_KEY: str = "codex_down"
 MINIMUM_ABBREVIATED_SHA_LENGTH: int = 7
+SHARED_PACKAGE_ROOT_PARENT_INDEX: int = 3
+ALL_CODEX_ACCOUNT_PICKER_RELATIVE_PARTS: tuple[str, ...] = (
+    "scripts",
+    "codex_account_choice.py",
+)
+CODEX_ACCOUNT_PICKER_CHOOSE_COMMAND: str = "choose"
+CODEX_ACCOUNT_PICK_TIMEOUT_SECONDS: float = 150.0
+CODEX_TIER_KEY: str = "tier"
+CODEX_TIER_NORMAL: str = "normal"

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

@@ -44,14 +44,9 @@ from process_tree_kill import (  # noqa: E402
     terminate_process_tree,
 )
 
-from codex_review_scripts_constants.codex_usage_probe_constants import (  # noqa: E402
-    ALL_WINDOWS_SCRIPT_SUFFIXES,
-    WINDOWS_COMMAND_SHELL,
-    WINDOWS_COMMAND_SHELL_RUN_FLAG,
-    WINDOWS_OS_NAME,
-)
 from codex_review_scripts_constants.run_constants import (  # noqa: E402
     ALL_SHAPE_PROBE_REQUIRED_FLAGS,
+    ALL_WINDOWS_SCRIPT_SUFFIXES,
     BASE_TARGET_FLAG,
     CAPTURE_STREAMS_KEYWORD,
     CHECK_KEYWORD,
@@ -88,6 +83,9 @@ from codex_review_scripts_constants.run_constants import (  # noqa: E402
     UTF8_ENCODING,
     VERSION_FLAG,
     VERSION_PROBE_PATTERN,
+    WINDOWS_COMMAND_SHELL,
+    WINDOWS_COMMAND_SHELL_RUN_FLAG,
+    WINDOWS_OS_NAME,
 )
 
 from subprocess_window_access import hidden_window_creation_flags

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

@@ -107,14 +107,14 @@ def _raise_if_called(gate_label: str) -> Callable[..., tuple[bool, str]]:
     return _stub
 
 
-def _null_codex_percent_left() -> float | None:
+def _unread_codex_tier() -> str | None:
     return None
 
 
 def _patch_all_gates_passing(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(check_convergence, "_get_pr_head_sha", _passing_head_sha)
     monkeypatch.setattr(
-        check_convergence, "_probe_codex_percent_left", _null_codex_percent_left
+        check_convergence, "_read_codex_tier", _unread_codex_tier
     )
     for each_gate_name in _ALL_LEAF_GATE_NAMES:
         monkeypatch.setattr(check_convergence, each_gate_name, _passing_gate)
@@ -135,7 +135,7 @@ def should_pass_when_clean_bugteam_review_present_on_current_head(
         check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is True
     assert "clean bugteam audit" in detail
@@ -157,7 +157,7 @@ def should_fail_when_dirty_bugteam_review_present_on_current_head(
         check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "dirty bugteam audit" in detail
@@ -185,7 +185,7 @@ def should_fail_when_no_bugteam_review_present_on_current_head(
         check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "no bugteam review found" in detail
@@ -204,7 +204,7 @@ def should_fail_with_shape_detail_when_gh_returns_non_list_payload(
         check_convergence, "_gh_api_paginated", stub_gh_api_paginated_returning_object
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "unexpected gh api response shape" in detail

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

@@ -1,8 +1,8 @@
 """Fixture-driven tests for the conditional Codex convergence gate.
 
-Covers: required-and-clean, required-and-dirty, skipped-by-threshold,
-skipped-by-token, skipped-by-down. Threshold comes from the probe constant
-via ``is_codex_review_required`` — this module never inlines the percent.
+Covers: required-and-clean, required-and-dirty, skipped-by-tier,
+skipped-by-token, skipped-by-down, and the read of the Codex account picker's
+``choose`` answer. The required tier comes from ``CODEX_TIER_NORMAL``.
 """
 
 from __future__ import annotations
@@ -16,10 +16,8 @@ from types import ModuleType
 import pytest
 
 import _pr_converge_path_setup  # noqa: F401
-from codex_review_scripts_constants.codex_usage_probe_constants import (
-    WEEKLY_USAGE_GATE_THRESHOLD_PERCENT,
-)
 from pr_converge_scripts_constants.convergence_gate_constants import (
+    CODEX_TIER_NORMAL,
     MINIMUM_ABBREVIATED_SHA_LENGTH,
 )
 
@@ -33,8 +31,7 @@ CLEAN_BODY = (
 )
 HEAD_SHA = "ae8005aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 OTHER_SHA = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
-PERCENT_ABOVE_THRESHOLD = float(WEEKLY_USAGE_GATE_THRESHOLD_PERCENT) + 1.0
-PERCENT_AT_THRESHOLD = float(WEEKLY_USAGE_GATE_THRESHOLD_PERCENT)
+ALL_TIERS_WITHOUT_ROOM_FOR_REVIEW = ("luna", "wait")
 
 
 def _load_module() -> ModuleType:
@@ -64,7 +61,7 @@ check_convergence = _load_module()
 def _write_fixture(
     tmp_path: Path,
     *,
-    codex_percent_left: float | None,
+    codex_tier: str | None,
     codex_clean_at: str | None,
     filename: str = "codex-gate.json",
 ) -> Path:
@@ -83,7 +80,7 @@ def _write_fixture(
         "unresolved_bot_threads_detail": "0 unresolved",
         "pending_reviews_passed": True,
         "pending_reviews_detail": "none pending",
-        "codex_percent_left": codex_percent_left,
+        "codex_tier": codex_tier,
         "codex_clean_at": codex_clean_at,
     }
     fixture_path.write_text(json.dumps(payload), encoding="utf-8")
@@ -95,7 +92,7 @@ def should_pass_when_codex_required_and_clean(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=HEAD_SHA,
         filename="required-clean.json",
     )
@@ -120,20 +117,18 @@ def should_pass_when_codex_required_and_clean(
     assert "All pre-conditions met" in captured
 
 
-def should_pass_without_reading_usage_when_the_clean_stamp_is_on_head(
+def should_pass_without_running_the_picker_when_the_clean_stamp_is_on_head(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    def _probe_that_must_not_run() -> float | None:
+    def _picker_that_must_not_run() -> str | None:
         raise AssertionError(
-            "the weekly usage probe must not run when codex_clean_at is on HEAD"
+            "the Codex account picker must not run when codex_clean_at is on HEAD"
         )
 
-    monkeypatch.setattr(
-        check_convergence, "_probe_codex_percent_left", _probe_that_must_not_run
-    )
+    monkeypatch.setattr(check_convergence, "_read_codex_tier", _picker_that_must_not_run)
 
     is_passed, detail = check_convergence._evaluate_codex_clean(
-        read_percent_left=check_convergence._probe_codex_percent_left,
+        read_codex_tier=check_convergence._read_codex_tier,
         codex_clean_at=HEAD_SHA,
         head_sha=HEAD_SHA,
     )
@@ -151,7 +146,7 @@ def should_fail_when_codex_clean_stamp_is_shorter_than_an_abbreviated_sha(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=HEAD_SHA[:1],
         filename="required-short-stamp.json",
     )
@@ -179,7 +174,7 @@ def should_pass_when_codex_clean_stamp_is_an_abbreviated_head_sha(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=HEAD_SHA[:MINIMUM_ABBREVIATED_SHA_LENGTH],
         filename="required-abbreviated-stamp.json",
     )
@@ -207,7 +202,7 @@ def should_fail_when_codex_required_and_dirty(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=OTHER_SHA,
         filename="required-dirty.json",
     )
@@ -232,14 +227,15 @@ def should_fail_when_codex_required_and_dirty(
     assert "do not mark ready" in captured
 
 
-def should_skip_when_usage_at_or_below_threshold(
-    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+@pytest.mark.parametrize("tier_without_room", ALL_TIERS_WITHOUT_ROOM_FOR_REVIEW)
+def should_skip_when_the_picker_names_no_account_with_room_for_review(
+    tier_without_room: str, tmp_path: Path, capsys: pytest.CaptureFixture[str]
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_AT_THRESHOLD,
+        codex_tier=tier_without_room,
         codex_clean_at=None,
-        filename="skipped-threshold.json",
+        filename="skipped-tier.json",
     )
     exit_code = check_convergence.main(
         [
@@ -261,12 +257,12 @@ def should_skip_when_usage_at_or_below_threshold(
     assert "skipped (codex review not required)" in captured
 
 
-def should_skip_when_codex_percent_left_is_null(
+def should_skip_when_codex_tier_is_null(
     tmp_path: Path, capsys: pytest.CaptureFixture[str]
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=None,
+        codex_tier=None,
         codex_clean_at=None,
         filename="skipped-null.json",
     )
@@ -297,7 +293,7 @@ def should_bypass_when_codex_token_disables_reviewer(
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "codex")
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="skipped-token.json",
     )
@@ -326,7 +322,7 @@ def should_bypass_when_codex_down_flag_set(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="skipped-down.json",
     )
@@ -433,7 +429,7 @@ def should_bypass_when_job_state_codex_down_is_true(
     )
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="job-state-codex-down.json",
     )
@@ -470,7 +466,7 @@ def should_fail_when_job_state_lacks_codex_down_and_clean_stamp(
     )
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="job-state-no-down.json",
     )
@@ -515,3 +511,49 @@ def should_accept_codex_clean_at_flag_in_parsed_arguments() -> None:
         ]
     )
     assert arguments.codex_clean_at == HEAD_SHA
+
+
+def _install_fake_picker(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, picker_source: str
+) -> None:
+    picker_path = tmp_path / "codex_account_choice.py"
+    picker_path.write_text(picker_source, encoding="utf-8")
+    monkeypatch.setattr(check_convergence, "_codex_account_picker_path", lambda: picker_path)
+
+
+def should_read_the_tier_the_picker_chooses(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    _install_fake_picker(
+        tmp_path,
+        monkeypatch,
+        "import json, sys\n"
+        "assert sys.argv[1:] == ['choose']\n"
+        "print(json.dumps({'tier': 'normal', 'account': 'codex-2'}))\n",
+    )
+
+    assert check_convergence._read_codex_tier() == CODEX_TIER_NORMAL
+
+
+@pytest.mark.parametrize(
+    "picker_source",
+    [
+        "import sys\nprint('{\"tier\": \"normal\"}')\nsys.exit(1)\n",
+        "print('not json')\n",
+        "print('[\"normal\"]')\n",
+        "print('{\"tier\": 1}')\n",
+    ],
+)
+def should_read_no_tier_when_the_picker_fails_or_answers_out_of_shape(
+    picker_source: str, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    _install_fake_picker(tmp_path, monkeypatch, picker_source)
+
+    assert check_convergence._read_codex_tier() is None
+
+
+def should_locate_the_packaged_codex_account_picker() -> None:
+    picker_path = check_convergence._codex_account_picker_path()
+
+    assert picker_path.name == "codex_account_choice.py"
+    assert picker_path.is_file()

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

@@ -118,14 +118,14 @@ def _refuse_bugteam_clean(**_call_keywords: object) -> tuple[bool, str]:
     )
 
 
-def _null_codex_percent_left() -> float | None:
+def _unread_codex_tier() -> str | None:
     return None
 
 
 def _patch_gates_clean(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(check_convergence, "_get_pr_head_sha", _clean_head)
     monkeypatch.setattr(
-        check_convergence, "_probe_codex_percent_left", _null_codex_percent_left
+        check_convergence, "_read_codex_tier", _unread_codex_tier
     )
     for each_gate_name in _ALL_LEAF_GATE_NAMES:
         monkeypatch.setattr(check_convergence, each_gate_name, _clean_gate)

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

@@ -127,10 +127,10 @@ def test_path_contains_glob_metacharacters_accepts_windows_paths_with_parens() -
     `(`, `)`, and `,` are not glob metacharacters in Claude Code's permission
     rule matching. Including them in the metacharacter set causes
     get_current_project_path to raise ValueError for any user whose home
-    directory contains parentheses (e.g. `C:/Users/Jon (Admin)/...`).
+    directory contains parentheses (e.g. `C:/Users/Example (Admin)/...`).
     """
     assert common.path_contains_glob_metacharacters("C:/Program Files (x86)/app") is False
-    assert common.path_contains_glob_metacharacters("C:/Users/Jon (Admin)/project") is False
+    assert common.path_contains_glob_metacharacters("C:/Users/Example (Admin)/project") is False
     assert common.path_contains_glob_metacharacters("C:/Projects/a,b/file.py") is False
 
 

package/bin/git_hooks_installer.test.mjs

@@ -227,7 +227,7 @@ test('generated advisory shims keep temporary Git commit and push available afte
     const { temporaryRoot, gitHooksDirectory } = makeTemporaryGitHooksDirectory();
     const repositoryRoot = join(temporaryRoot, 'repository');
     const bareRepositoryRoot = join(temporaryRoot, 'remote.git');
-    const targetRemote = 'https://github.com/JonEcho/python-automation.git';
+    const targetRemote = 'https://github.com/example-owner/example-repo.git';
     try {
         writeFileSync(
             join(gitHooksDirectory, 'broken_advisory.py'),

package/bin/install-constants.mjs

@@ -159,15 +159,10 @@ export const CODEX_RULES_SHIPPED_FILE_NAME = 'claude-dev-env.rules';
 export const DEFAULT_CURSOR_DIRECTORY_NAME = '.cursor';
 
 /**
- * Directory name under the Cursor home that holds generated `.mdc` rule files.
+ * Directory name for rule files, under the Cursor home and under the agents home.
  */
 export const CURSOR_RULES_DIRECTORY_NAME = 'rules';
 
-/**
- * Installed script that writes Cursor `.mdc` files from Claude rules.
- */
-export const CURSOR_SYNC_SCRIPT_FILE_NAME = 'sync_to_cursor.py';
-
 /**
  * Windows Python launcher command the installer may bake into hook settings.
  */