claude-dev-env 8.84.0 → 8.85.0

package/scripts/conftest.py

@@ -18,6 +18,7 @@ is in place by the time any test module runs its top-level imports.
 from __future__ import annotations
 
 import importlib
+import site
 import subprocess
 import sys
 from collections.abc import Callable
@@ -35,25 +36,33 @@ for each_import_directory in (
     if str(each_import_directory) not in sys.path:
         sys.path.insert(0, str(each_import_directory))
 
-_live_broker_state_resolver = importlib.import_module("account_broker_support").broker_state_path
+from dev_env_scripts_constants.account_broker_constants import ALL_ACCOUNT_ENVIRONMENT_VARIABLES
 
 
 @pytest.fixture(autouse=True)
-def isolated_broker_state_path(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> Path:
-    """Point every module's ``broker_state_path`` at a per-test file.
-
-    ``account_broker`` binds ``broker_state_path`` by name from
-    ``account_broker_support``, so each bound copy is replaced. A test that
-    patches only one copy still keeps the other off the home directory.
+def isolated_home(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> Path:
+    """Point the home directory at a per-test folder for every test here.
+
+    ``Path.home()`` reads ``HOME`` on POSIX and ``USERPROFILE`` on Windows, so
+    redirecting both keeps call-time home lookups, such as
+    ``broker_state_path``, off the user's home directory. The variables in
+    ``ALL_ACCOUNT_ENVIRONMENT_VARIABLES`` are cleared, so account roots fall
+    back to the per-test home and no developer roster applies. A value built
+    from ``Path.home()`` at import time keeps the user's home.
+    ``PYTHONUSERBASE`` stays on the user base captured before the redirect, so
+    a new interpreter still imports packages installed for this user.
 
     Returns:
-        The isolated broker state path for this test.
+        The per-test home directory.
     """
-    isolated_path = tmp_path / "account-broker" / "state.json"
-    for each_module in list(sys.modules.values()):
-        if getattr(each_module, "broker_state_path", None) is _live_broker_state_resolver:
-            monkeypatch.setattr(each_module, "broker_state_path", lambda: isolated_path)
-    return isolated_path
+    user_base = site.getuserbase()
+    isolated_home_directory = tmp_path / "home"
+    monkeypatch.setenv("PYTHONUSERBASE", user_base)
+    monkeypatch.setenv("HOME", str(isolated_home_directory))
+    monkeypatch.setenv("USERPROFILE", str(isolated_home_directory))
+    for each_account_variable in ALL_ACCOUNT_ENVIRONMENT_VARIABLES:
+        monkeypatch.delenv(each_account_variable, raising=False)
+    return isolated_home_directory
 
 
 def _link_directory(*, from_link: Path, to_target: Path) -> None:

package/scripts/dev_env_scripts_constants/account_broker_constants.py

@@ -16,12 +16,15 @@ from dev_env_scripts_constants.claude_account_constants import (
     FULL_PERCENT,
     MAIN_SESSION_USED_CEILING_PERCENT,
     MAIN_WEEKLY_USED_CEILING_PERCENT,
+    PROFILES_ROOT_ENVIRONMENT_VARIABLE,
     SECOND_SESSION_USED_CEILING_PERCENT,
     SECOND_WEEKLY_USED_CEILING_PERCENT,
 )
 from dev_env_scripts_constants.codex_account_constants import (
     ALL_PRO_PLAN_TYPES,
+    CODEX_ACCOUNT_PROFILES_ENVIRONMENT_VARIABLE,
     CODEX_HOME_ENVIRONMENT_VARIABLE,
+    CODEX_PROFILES_ROOT_ENVIRONMENT_VARIABLE,
     LUNA_TIER_SHORT_WINDOW_MINIMUM_PERCENT_LEFT,
     LUNA_TIER_STOP_PERCENT_LEFT,
     MAIN_CODEX_HOME_DIRECTORY_NAME,
@@ -30,6 +33,7 @@ from dev_env_scripts_constants.codex_account_constants import (
     TIER_NORMAL,
 )
 from dev_env_scripts_constants.shared_tree_constants import (
+    CLAUDE_CONFIG_DIR_ENV_VAR,
     CODEX_CLASSIFIER_CONSTANTS_RELATIVE_PATH,
     CONSTANTS_PACKAGE_ANCHOR_DEPTH,
     PR_LOOP_DIRECTORY_NAME,
@@ -64,6 +68,14 @@ BROKER_STATE_DIRECTORY_NAME = "account-broker"
 BROKER_STATE_FILE_NAME = "state.json"
 BROKER_STATE_TEMP_SUFFIX = ".json"
 BROKER_STATE_LOCK_SUFFIX = ".lock"
+ALL_ACCOUNT_ENVIRONMENT_VARIABLES = (
+    CLAUDE_CONFIG_DIR_ENV_VAR,
+    CODEX_HOME_ENVIRONMENT_VARIABLE,
+    CODEX_ACCOUNT_PROFILES_ENVIRONMENT_VARIABLE,
+    CODEX_PROFILES_ROOT_ENVIRONMENT_VARIABLE,
+    PROFILES_ROOT_ENVIRONMENT_VARIABLE,
+)
+"""Variables that point the account tools at a developer's own account roots, Codex home and Codex roster."""
 ALL_BATCH_FILE_EXTENSIONS = frozenset({".bat", ".cmd"})
 CMD_SHELL_METACHARACTERS = "&|<>^%!\"\r\n"
 CLAUDE_BINARY_NAME = "claude"

package/scripts/dev_env_scripts_constants/test_account_broker_constants.py

@@ -15,7 +15,9 @@ from pathlib import Path
 import pytest
 
 from dev_env_scripts_constants import account_broker_constants as broker_constants
+from dev_env_scripts_constants import claude_account_constants, codex_account_constants, shared_tree_constants
 from dev_env_scripts_constants.account_broker_constants import (
+    ALL_ACCOUNT_ENVIRONMENT_VARIABLES,
     ALL_BATCH_FILE_EXTENSIONS,
     ALL_CLAUDE_FLOORS,
     ALL_CODEX_FLOORS,
@@ -57,6 +59,16 @@ def test_should_keep_codex_floors_tied_to_the_tier_limits() -> None:
     }
 
 
+def test_should_list_every_account_environment_variable() -> None:
+    all_declared_variables = {
+        each_value
+        for each_module in (claude_account_constants, codex_account_constants, shared_tree_constants)
+        for each_name, each_value in vars(each_module).items()
+        if each_name.endswith(("_ENVIRONMENT_VARIABLE", "_ENV_VAR"))
+    }
+    assert all_declared_variables == set(ALL_ACCOUNT_ENVIRONMENT_VARIABLES)
+
+
 def test_batch_command_boundaries_include_shell_metacharacters() -> None:
     assert ALL_BATCH_FILE_EXTENSIONS == frozenset({".bat", ".cmd"})
     assert set(CMD_SHELL_METACHARACTERS) == set('&|<>^%!"\r\n')

package/scripts/policy_lint/adapter_configuration.py

@@ -130,6 +130,7 @@ def _names_exempt_registration_path(registered_string: str) -> bool:
         hooks/blocking/pr_lifecycle_skill_gate.py        -> exempt
         hooks/blocking/step_note_gate.py                 -> exempt
         hooks/blocking/reply_length_gate.py              -> exempt
+        hooks/blocking/chat_reply_gate.py                -> exempt
         hooks/blocking/edit_marker_gate.py               -> exempt
         hooks/blocking/issue_close_handoff_gate.py       -> exempt
         hooks/blocking/verify_before_acting.py           -> exempt
@@ -154,7 +155,8 @@ def _names_exempt_registration_path(registered_string: str) -> bool:
     It asks for a readable status line and decides no code or safety policy.
 
     The reply length gate caps the sentences in a chat reply to the user. It
-    decides the shape of prose and no code or safety policy.
+    decides the shape of prose and no code or safety policy. The chat reply
+    gate runs the same checks on a reply typed straight into the chat.
 
     The edit marker gate keeps strikethrough and edit notes out of an edited
     chat message. It decides the shape of prose and no code or safety policy.

package/scripts/policy_lint/config/constants.py

@@ -67,6 +67,7 @@ ALL_ACTION_BOUNDARY_EXEMPT_REGISTRATION_PATHS = (
     "blocking/merge_review_gate.py",
     "blocking/step_note_gate.py",
     "blocking/reply_length_gate.py",
+    "blocking/chat_reply_gate.py",
     "blocking/edit_marker_gate.py",
     "blocking/issue_close_handoff_gate.py",
     "blocking/verify_before_acting.py",

package/scripts/test_account_broker.py

@@ -42,12 +42,6 @@ def _freeze_clock(monkeypatch: pytest.MonkeyPatch, instant: datetime) -> None:
     monkeypatch.setattr(account_broker, "datetime", _FrozenClock)
 
 
-@pytest.fixture(autouse=True)
-def isolated_state(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
-    monkeypatch.setattr(account_broker, "broker_state_path", lambda: tmp_path / "broker" / "state.json")
-    monkeypatch.setattr(account_broker.support, "broker_state_path", lambda: tmp_path / "broker" / "state.json")
-
-
 def _account(name: str, product: Product = Product.CODEX, main: bool = False) -> Account:
     return Account(product, name, Path("/profiles") / name, main, name)
 

package/scripts/test_account_broker_support.py

@@ -256,8 +256,7 @@ def _recorded_sleeps(monkeypatch: pytest.MonkeyPatch) -> list[float]:
     return all_delays
 
 
-def _first_reading(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, account: Account, read_meters: object) -> object:
-    monkeypatch.setattr(support, "broker_state_path", lambda: tmp_path / "broker" / "state.json")
+def _first_reading(account: Account, read_meters: object) -> object:
     adapter = ProductAdapter(lambda: (account,), read_meters, "HOME", ())
     state = support._load_state(support.broker_state_path())
     now = datetime(2026, 10, 3, tzinfo=timezone.utc)
@@ -272,7 +271,7 @@ def test_should_read_claude_meters_after_transient_failures_with_growing_delays(
     all_paths_read = _claude_meter_reads(monkeypatch, [unread, unread, usage])
     all_delays = _recorded_sleeps(monkeypatch)
 
-    reading = _first_reading(monkeypatch, tmp_path, Account(Product.CLAUDE, "org-jon", tmp_path), support.read_claude_meters)[0]
+    reading = _first_reading(Account(Product.CLAUDE, "org-jon", tmp_path), support.read_claude_meters)[0]
 
     assert reading.meters is not None
     assert reading.meters.weekly_percent_left == 70.0
@@ -289,7 +288,7 @@ def test_should_read_codex_meters_after_transient_failures_with_growing_delays(
     all_homes_read = _codex_meter_reads(monkeypatch, tmp_path, [unread, unread, usage])
     all_delays = _recorded_sleeps(monkeypatch)
 
-    reading = _first_reading(monkeypatch, tmp_path, Account(Product.CODEX, "one", tmp_path), support.read_codex_account_meters)[0]
+    reading = _first_reading(Account(Product.CODEX, "one", tmp_path), support.read_codex_account_meters)[0]
 
     assert reading.meters is not None
     assert reading.meters.weekly_percent_left == 70.0
@@ -307,7 +306,7 @@ def test_should_stop_at_once_when_no_codex_executable_is_found(
     monkeypatch.setattr(Path, "home", lambda: tmp_path)
     all_delays = _recorded_sleeps(monkeypatch)
 
-    reading = _first_reading(monkeypatch, tmp_path, Account(Product.CODEX, "one", tmp_path), support.read_codex_account_meters)[0]
+    reading = _first_reading(Account(Product.CODEX, "one", tmp_path), support.read_codex_account_meters)[0]
 
     assert reading.meters is None
     assert reading.unread_reason == "no codex executable on PATH or at its install path"
@@ -322,7 +321,7 @@ def test_should_keep_the_unread_reason_after_every_claude_read_fails(
     all_paths_read = _claude_meter_reads(monkeypatch, all_failures)
     all_delays = _recorded_sleeps(monkeypatch)
 
-    reading, adapter, state, now = _first_reading(monkeypatch, tmp_path, Account(Product.CLAUDE, "org-jon", tmp_path), support.read_claude_meters)
+    reading, adapter, state, now = _first_reading(Account(Product.CLAUDE, "org-jon", tmp_path), support.read_claude_meters)
     cached_reading = support.read_accounts(Product.CLAUDE, adapter, all_state=state, now=now)[0]
 
     assert reading.meters is None
@@ -340,7 +339,7 @@ def test_should_keep_the_unread_reason_after_every_codex_read_fails(
     all_homes_read = _codex_meter_reads(monkeypatch, tmp_path, [first_unread, first_unread, last_unread])
     _recorded_sleeps(monkeypatch)
 
-    reading, adapter, state, now = _first_reading(monkeypatch, tmp_path, Account(Product.CODEX, "codex-3", tmp_path), support.read_codex_account_meters)
+    reading, adapter, state, now = _first_reading(Account(Product.CODEX, "codex-3", tmp_path), support.read_codex_account_meters)
     cached_reading = support.read_accounts(Product.CODEX, adapter, all_state=state, now=now)[0]
 
     assert reading.meters is None

package/scripts/test_broker_state_isolation.py

@@ -1,4 +1,4 @@
-"""Broker state written during a test stays out of the home directory."""
+"""Broker state written during a test lands in the per-test home directory."""
 
 from __future__ import annotations
 
@@ -18,14 +18,11 @@ from dev_env_scripts_constants.account_broker_constants import (
 )
 
 
-def test_meter_cache_write_lands_outside_the_home_directory(
+def test_meter_cache_write_lands_in_the_isolated_home(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: Path,
-    isolated_broker_state_path: Path,
+    isolated_home: Path,
 ) -> None:
-    fake_home = tmp_path / "home"
-    monkeypatch.setenv("HOME", str(fake_home))
-    monkeypatch.setenv("USERPROFILE", str(fake_home))
     account = Account(Product.CLAUDE, "only", tmp_path / "only")
     reset_at = datetime(2026, 10, 5, tzinfo=timezone.utc)
     adapter = ProductAdapter(
@@ -39,10 +36,12 @@ def test_meter_cache_write_lands_outside_the_home_directory(
     def runner(argv: list[str], **options: object) -> subprocess.CompletedProcess[str]:
         return subprocess.CompletedProcess(argv, 0, "", "")
 
+    isolated_broker_state_path = account_broker.broker_state_path()
+    assert Path.home() == isolated_home
+    assert isolated_broker_state_path.is_relative_to(isolated_home)
+    assert not isolated_broker_state_path.exists()
     with account_broker.override_subprocess_runner(runner):
         account_broker.run_job(Product.CLAUDE, ["claude"])
 
-    home_state_path = fake_home / ".claude" / "account-broker" / "state.json"
-    assert not home_state_path.exists()
     state = json.loads(isolated_broker_state_path.read_text(encoding="utf-8"))
     assert f"claude:only:{account.home}" in state["meters"]

package/scripts/test_conftest.py

@@ -0,0 +1,54 @@
+import os
+import subprocess
+import sys
+from collections.abc import Iterator
+from pathlib import Path
+
+import pytest
+
+import account_broker_support
+from dev_env_scripts_constants.account_broker_constants import ALL_ACCOUNT_ENVIRONMENT_VARIABLES
+
+
+@pytest.fixture(scope="module")
+def exported_account_variables(tmp_path_factory: pytest.TempPathFactory) -> Iterator[None]:
+    exported_root = tmp_path_factory.mktemp("exported-overrides")
+    with pytest.MonkeyPatch.context() as module_monkeypatch:
+        for each_account_variable in ALL_ACCOUNT_ENVIRONMENT_VARIABLES:
+            module_monkeypatch.setenv(each_account_variable, str(exported_root / each_account_variable))
+        yield
+
+
+def test_broker_state_path_follows_the_redirected_home(
+    isolated_home: Path, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    assert Path.home() == isolated_home
+    assert account_broker_support.broker_state_path().is_relative_to(isolated_home)
+    moved_home = tmp_path / "moved-home"
+    monkeypatch.setenv("HOME", str(moved_home))
+    monkeypatch.setenv("USERPROFILE", str(moved_home))
+    assert account_broker_support.broker_state_path().is_relative_to(moved_home)
+
+
+def test_isolated_home_clears_the_exported_account_variables(
+    exported_account_variables: None, isolated_home: Path
+) -> None:
+    for each_account_variable in ALL_ACCOUNT_ENVIRONMENT_VARIABLES:
+        assert each_account_variable not in os.environ
+
+
+def test_isolated_home_keeps_the_python_user_base_for_a_new_interpreter(
+    isolated_home: Path,
+) -> None:
+    completed = subprocess.run(
+        [sys.executable, "-c", "import site; print(site.getuserbase())"],
+        check=False,
+        capture_output=True,
+        text=True,
+    )
+
+    assert completed.returncode == 0
+    child_user_base = Path(completed.stdout.strip())
+    assert str(child_user_base) == os.environ["PYTHONUSERBASE"]
+    assert child_user_base != isolated_home
+    assert isolated_home not in child_user_base.parents

package/scripts/tests/test_adapter_configuration.py

@@ -90,6 +90,14 @@ def test_new_reply_length_gate_registration_is_clean(tmp_path: Path) -> None:
     assert adapters.hook_configuration_diagnostics(current_document, tmp_path) == ()
 
 
+def test_new_chat_reply_gate_registration_is_clean(tmp_path: Path) -> None:
+    current_document = _hook_document(
+        ["hooks/blocking/chat_reply_gate.py"],
+        '{"hooks": {}}',
+    )
+    assert adapters.hook_configuration_diagnostics(current_document, tmp_path) == ()
+
+
 def test_new_edit_marker_gate_registration_is_clean(tmp_path: Path) -> None:
     current_document = _hook_document(
         ["hooks/blocking/edit_marker_gate.py"],