claude-dev-env 8.54.4 → 8.54.6

package/hooks/blocking/session_title_stop_gate.py

@@ -11,7 +11,8 @@ The hook stays silent when:
 - the stop is already a retry after a block (stop_hook_active is true);
 - the session shows no title tool: no title tool named anywhere in the
   transcript, and either no remote session id in the environment or a
-  deferred tool listing that leaves the title tool out;
+  deferred tool listing that leaves the title tool out, or an earlier
+  Stop block the session never met;
 - the transcript cannot be read.
 """
 
@@ -32,6 +33,7 @@ from hooks_constants.session_title_constants import (
     ALLOW_EXIT_CODE,
     BLOCK_DECISION,
     DEFERRED_TOOL_ATTACHMENT_TYPES,
+    HOOK_BLOCKING_ERROR_ATTACHMENT_TYPE,
     REMOTE_SESSION_ENVIRONMENT_VARIABLE,
     REMOTE_TITLE_TOOL_NAME,
     STOP_BLOCK_REASON,
@@ -85,6 +87,15 @@ def _lists_deferred_tools(all_entry_fields: dict[str, object]) -> bool:
     return isinstance(attachment, dict) and attachment.get("type") in DEFERRED_TOOL_ATTACHMENT_TYPES
 
 
+def _is_stop_block(all_entry_fields: dict[str, object]) -> bool:
+    attachment = all_entry_fields.get("attachment")
+    return (
+        isinstance(attachment, dict)
+        and attachment.get("type") == HOOK_BLOCKING_ERROR_ATTACHMENT_TYPE
+        and attachment.get("hookEvent") == STOP_GATE_EVENT_NAME
+    )
+
+
 def _is_title_call(entry_type: object, all_block_fields: dict[str, object]) -> bool:
     return (
         entry_type == "assistant"
@@ -132,6 +143,7 @@ def stop_block_reason(all_entries: list[dict[str, object]], is_remote_session: b
         prompt -> work, no title call              => block reason
         no title tool anywhere, not remote         => None
         remote, tool list lacks the title tool     => None
+        remote, earlier Stop block never met       => None
 
     Args:
         all_entries: The transcript entries, oldest first.
@@ -144,7 +156,8 @@ def stop_block_reason(all_entries: list[dict[str, object]], is_remote_session: b
         each_name for each_entry in all_entries for each_name in _title_tool_names_in(each_entry)
     ]
     if not all_seen_tool_names and (
-        not is_remote_session or any(_lists_deferred_tools(each) for each in all_entries)
+        not is_remote_session
+        or any(_lists_deferred_tools(each) or _is_stop_block(each) for each in all_entries)
     ):
         return None
     if _title_set_since(all_entries[_turn_start_index(all_entries) :]):

package/hooks/blocking/test_session_title_stop_gate.py

@@ -199,6 +199,43 @@ def test_should_block_a_remote_session_whose_tool_list_names_the_title_tool(
     assert json.loads(stdout_text)["decision"] == "block"
 
 
+def earlier_stop_block() -> dict[str, object]:
+    return {
+        "type": "attachment",
+        "attachment": {"type": "hook_blocking_error", "hookEvent": "Stop"},
+    }
+
+
+def test_should_stay_silent_in_a_remote_session_after_an_unmet_earlier_block(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str], tmp_path: Path
+) -> None:
+    monkeypatch.setenv(REMOTE_SESSION_VARIABLE, "cse_1")
+    all_entries = [
+        prompt("Fix the runner"),
+        earlier_stop_block(),
+        prompt("Next task"),
+        tool_call("t1", "Bash"),
+        tool_result("t1"),
+    ]
+    assert run_gate(monkeypatch, capsys, tmp_path, all_entries) == (0, "")
+
+
+def test_should_block_after_an_earlier_block_once_the_title_tool_is_listed(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str], tmp_path: Path
+) -> None:
+    monkeypatch.setenv(REMOTE_SESSION_VARIABLE, "cse_1")
+    all_entries = [
+        deferred_tools(REMOTE_TITLE_TOOL),
+        prompt("Fix the runner"),
+        earlier_stop_block(),
+        prompt("Next task"),
+        tool_call("t1", "Bash"),
+        tool_result("t1"),
+    ]
+    _, stdout_text = run_gate(monkeypatch, capsys, tmp_path, all_entries)
+    assert json.loads(stdout_text)["decision"] == "block"
+
+
 def test_should_stay_silent_on_the_retry_after_a_block(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str], tmp_path: Path
 ) -> None:

package/hooks/hooks_constants/session_title_constants.py

@@ -15,6 +15,7 @@ ALLOW_EXIT_CODE = 0
 BLOCK_EXIT_CODE = 2
 BLOCK_DECISION = "block"
 DEFERRED_TOOL_ATTACHMENT_TYPES = frozenset({"deferred_tools_delta", "deferred_tools_record"})
+HOOK_BLOCKING_ERROR_ATTACHMENT_TYPE = "hook_blocking_error"
 
 STATUS_PREFIX_PATTERN = re.compile("^(\U0001f6a9|\u2705|\u23f3)\ufe0f? (?=\\S)")
 MAXIMUM_NAME_LENGTH = 25

package/package.json

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

package/scripts/conftest.py

@@ -15,9 +15,32 @@ is in place by the time any test module runs its top-level imports.
 
 from __future__ import annotations
 
+import importlib
 import sys
 from pathlib import Path
 
+import pytest
+
 _scripts_directory = str(Path(__file__).resolve().parent)
 if _scripts_directory not in sys.path:
     sys.path.insert(0, _scripts_directory)
+
+_live_broker_state_resolver = importlib.import_module("account_broker_support").broker_state_path
+
+
+@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.
+
+    Returns:
+        The isolated broker state path for this test.
+    """
+    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

package/scripts/test_broker_state_isolation.py

@@ -0,0 +1,48 @@
+"""Broker state written during a test stays out of the home directory."""
+
+from __future__ import annotations
+
+import subprocess
+from datetime import datetime, timezone
+from pathlib import Path
+
+import pytest
+
+import account_broker
+from dev_env_scripts_constants.account_broker_constants import (
+    Account,
+    Meters,
+    Product,
+    ProductAdapter,
+)
+
+
+def test_meter_cache_write_lands_outside_the_home_directory(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+    isolated_broker_state_path: 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(
+        lambda: (account,),
+        lambda each_account: Meters(80, reset_at, 80, reset_at),
+        "CLAUDE_CONFIG_DIR",
+        ("usage limit",),
+    )
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CLAUDE, adapter)
+
+    def runner(argv: list[str], **options: object) -> subprocess.CompletedProcess[str]:
+        return subprocess.CompletedProcess(argv, 0, "", "")
+
+    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()
+    assert f"claude:only:{account.home}" in isolated_broker_state_path.read_text(
+        encoding="utf-8"
+    )

package/scripts/test_resolve_worker_spawn.py

@@ -1129,7 +1129,6 @@ def test_usage_limit_fallover_delivers_full_prompt_to_each_account(
         return subprocess.CompletedProcess(argv, 0, FIXTURE_CLAUDE_STDOUT, "")
 
     monkeypatch.setitem(account_broker.all_product_adapters, Product.CLAUDE, adapter)
-    monkeypatch.setattr(account_broker, "broker_state_path", lambda: tmp_path / "state.json")
     monkeypatch.setattr(
         dispatcher,
         "spawn_preflight_runner",