claude-dev-env 8.44.6 → 8.45.0

package/docs/account-broker.md

@@ -14,7 +14,7 @@ python scripts/account_broker.py check --product codex
 python scripts/account_broker.py run --product claude --report report.json -- claude --output-format json -p "prompt"
 ```
 
-`accounts` prints the roster without reading meters. `choose` prints `decision`, `accounts`, and `state_path`. Each decision contains `action`, `account`, `home`, `reason`, `tier`, and `resets_at`. A wait decision has no account or home and includes the soonest reset in UTC. A failed meter read excludes the account for that choice. `--spent` saves an exclusion until the supplied Unix reset, the account's soonest known meter reset, or one hour when neither is available. Meter reads younger than 60 seconds are reused.
+`accounts` prints the roster without reading meters. `choose` prints `decision`, `accounts`, and `state_path`. Each decision contains `action`, `account`, `home`, `reason`, `tier`, and `resets_at`. A wait decision has no account or home and includes the soonest reset in UTC. A failed meter read excludes the account for that choice. `--spent` saves an exclusion until the supplied Unix reset, the account's soonest known meter reset, or one hour when neither is available. A `--spent` name absent from the roster is saved until the supplied Unix reset, or for one hour when no reset is given. While any such mark is still in the future, `choose` waits until the soonest mark and exits 3, and with no Codex roster `--spent default` waits until that mark passes. Meter reads younger than 60 seconds are reused.
 
 `check` prints nothing and exits 3 while every account is below its floor. `run` sets only `CLAUDE_CONFIG_DIR` or `CODEX_HOME` for each attempt. It replays the same stdin bytes when a usage limit or start failure leads to another account. It writes the command's stdout to stdout and diagnostics to stderr. A resumed Claude session uses the account bound to its session when that account has room.
 

package/package.json

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

package/scripts/account_broker.py

@@ -127,7 +127,6 @@ def readings_payload(all_readings: Sequence[Reading]) -> list[dict[str, object]]
     ]
 
 
-
 def _spent_for_readings(all_readings: Sequence[Reading], all_state: dict[str, object], now: datetime) -> tuple[frozenset[Account], dict[Account, datetime]]:
     marks = all_state["spent"]
     spent = {}
@@ -147,6 +146,23 @@ def _mark_spent(all_state: dict[str, object], reading: Reading, now: datetime, r
     return until
 
 
+def _outside_roster_resets(product: Product, all_readings: Sequence[Reading], all_state: Mapping[str, object], now: datetime) -> tuple[datetime, ...]:
+    marks = all_state.get("spent") if isinstance(all_state.get("spent"), dict) else {}
+    all_roster_names = {each_reading.account.name for each_reading in all_readings}
+    prefix = f"{product.value}:"
+    placeholder_suffix = f":{Path()}"
+    return tuple(datetime.fromtimestamp(float(each_raw), timezone.utc) for each_key, each_raw in marks.items() if isinstance(each_key, str) and each_key.startswith(prefix) and each_key.endswith(placeholder_suffix) and each_key[len(prefix):-len(placeholder_suffix)] not in all_roster_names and isinstance(each_raw, (int, float)) and each_raw > now.timestamp())
+
+
+def _with_outside_spent_marks(decision: Decision, all_outside_resets: Sequence[datetime]) -> Decision:
+    if not all_outside_resets:
+        return decision
+    soonest = min(all_outside_resets) if decision.resets_at is None else min(decision.resets_at, *all_outside_resets)
+    if decision.action == "wait" and decision.resets_at == soonest:
+        return decision
+    return Decision("wait", None, soonest, f"no account has room; next reset at {_time_text(soonest)}", "wait")
+
+
 def _write_report(path: Path, report: Report) -> None:
     payload = {
         "product": report.product.value,
@@ -268,12 +284,8 @@ def _execute(
 ) -> tuple[JobOutcome, Report]:
     context = _prepare_run(product, all_argv, now, timeout_seconds, stdin_text, cwd, encoding, errors)
     while True:
-        decision = choose_from_readings(
-            product, context.all_readings, now=now,
-            all_spent_accounts=frozenset(context.all_spent_accounts),
-            preferred_command=context.preferred_command, adapter=context.active,
-            all_spent_resets=context.all_spent_resets
-        )
+        picked = choose_from_readings(product, context.all_readings, now=now, all_spent_accounts=frozenset(context.all_spent_accounts), preferred_command=context.preferred_command, adapter=context.active, all_spent_resets=context.all_spent_resets)
+        decision = _with_outside_spent_marks(picked, _outside_roster_resets(product, context.all_readings, context.all_state, now))
         context.report.events.append({"type": "pick", "decision": decision_payload(decision)})
         if decision.account is None:
             return _wait_outcome(context, decision), context.report
@@ -309,21 +321,20 @@ def _parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _parse_spent_mark(all_accounts_by_name: Mapping[str, Reading], mark: str) -> tuple[Reading, datetime | None]:
+def _parse_spent_mark(all_accounts_by_name: Mapping[str, Reading], mark: str, product: Product) -> tuple[Reading, datetime | None]:
     name, separator, reset_text = mark.partition(":")
-    if name not in all_accounts_by_name:
-        raise BrokerConfigurationError(f"unknown account {name}")
     try:
         reset = datetime.fromtimestamp(float(reset_text), timezone.utc) if separator else None
-    except ValueError as error:
+    except (ValueError, OSError, OverflowError) as error:
         raise BrokerConfigurationError(f"invalid reset for account {name}") from error
-    return all_accounts_by_name[name], reset
+    reading = all_accounts_by_name.get(name)
+    return reading if reading is not None else Reading(Account(product, name, Path(), False), None), reset
 
 
-def _save_spent_arguments(all_marks: Sequence[str], all_readings: Sequence[Reading], all_state: dict[str, object], now: datetime) -> None:
+def _save_spent_arguments(all_marks: Sequence[str], all_readings: Sequence[Reading], all_state: dict[str, object], now: datetime, product: Product) -> None:
     all_accounts_by_name = {each_reading.account.name: each_reading for each_reading in all_readings}
     for each_mark in all_marks:
-        reading, reset = _parse_spent_mark(all_accounts_by_name, each_mark)
+        reading, reset = _parse_spent_mark(all_accounts_by_name, each_mark, product)
         _mark_spent(all_state, reading, now, reset)
 
 
@@ -352,9 +363,10 @@ def _choose_cli(product: Product, parsed: argparse.Namespace) -> int:
     all_state = _load_state(broker_state_path())
     all_readings = read_accounts(product, all_state=all_state, now=now)
     if parsed.action == "choose" and parsed.spent:
-        _save_spent_arguments(parsed.spent, all_readings, all_state, now)
+        _save_spent_arguments(parsed.spent, all_readings, all_state, now, product)
     spent, resets = _spent_for_readings(all_readings, all_state, now)
     decision = choose_from_readings(product, all_readings, now=now, all_spent_accounts=spent, all_spent_resets=resets)
+    decision = _with_outside_spent_marks(decision, _outside_roster_resets(product, all_readings, all_state, now))
     if parsed.action == "choose":
         print(json.dumps({"decision": decision_payload(decision), "accounts": readings_payload(all_readings), "state_path": str(broker_state_path())}))
     return WAIT_EXIT_CODE if decision.action == "wait" else 0

package/scripts/dev_env_scripts_constants/test_account_broker_constants.py

@@ -0,0 +1,49 @@
+"""Floors and outcome shape for the account broker."""
+
+from __future__ import annotations
+
+import dataclasses
+
+import pytest
+
+from dev_env_scripts_constants.account_broker_constants import (
+    ALL_CLAUDE_FLOORS,
+    ALL_CODEX_FLOORS,
+    JobOutcome,
+)
+from dev_env_scripts_constants.claude_account_constants import (
+    MAIN_SESSION_USED_CEILING_PERCENT,
+    MAIN_SPEND_WINDOW,
+    MAIN_WEEKLY_USED_CEILING_PERCENT,
+    SECOND_SESSION_USED_CEILING_PERCENT,
+    SECOND_WEEKLY_USED_CEILING_PERCENT,
+)
+from dev_env_scripts_constants.codex_account_constants import (
+    LUNA_TIER_SHORT_WINDOW_MINIMUM_PERCENT_LEFT,
+    LUNA_TIER_STOP_PERCENT_LEFT,
+    NORMAL_TIER_MINIMUM_PERCENT_LEFT,
+)
+
+
+def test_should_keep_claude_floors_tied_to_the_account_ceilings() -> None:
+    assert ALL_CLAUDE_FLOORS == {
+        "main_weekly_used_ceiling": MAIN_WEEKLY_USED_CEILING_PERCENT,
+        "main_session_used_ceiling": MAIN_SESSION_USED_CEILING_PERCENT,
+        "main_spend_window": MAIN_SPEND_WINDOW,
+        "extra_weekly_used_ceiling": SECOND_WEEKLY_USED_CEILING_PERCENT,
+        "extra_session_used_ceiling": SECOND_SESSION_USED_CEILING_PERCENT,
+    }
+
+
+def test_should_keep_codex_floors_tied_to_the_tier_limits() -> None:
+    assert ALL_CODEX_FLOORS == {
+        "normal_minimum_left": NORMAL_TIER_MINIMUM_PERCENT_LEFT,
+        "luna_stop_left": LUNA_TIER_STOP_PERCENT_LEFT,
+        "luna_short_minimum_left": LUNA_TIER_SHORT_WINDOW_MINIMUM_PERCENT_LEFT,
+    }
+
+
+def test_should_freeze_job_outcome() -> None:
+    outcome = JobOutcome(0, "", "", None, (), "served", None, None)
+    with pytest.raises(dataclasses.FrozenInstanceError):
+        outcome.status = "wait"

package/scripts/test_account_broker.py

@@ -24,6 +24,21 @@ from dev_env_scripts_constants.account_broker_constants import WAIT_EXIT_CODE
 NOW = datetime(2026, 10, 3, tzinfo=timezone.utc)
 
 
+class _FrozenClock(datetime):
+    instant = NOW
+
+    @classmethod
+    def now(cls, tz: timezone | None = None) -> datetime:
+        if tz is None:
+            return cls.instant.replace(tzinfo=None)
+        return cls.instant.astimezone(tz)
+
+
+def _freeze_clock(monkeypatch: pytest.MonkeyPatch, instant: datetime) -> None:
+    _FrozenClock.instant = instant
+    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")
@@ -525,6 +540,112 @@ def test_should_raise_configuration_error_for_broken_list(
         account_broker.load_claude_accounts()
 
 
+def test_should_wait_when_a_spent_mark_names_an_account_outside_the_roster(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    account = _account("first")
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CODEX, _adapter((account,), {"first": _meters(80, 80)}))
+    _freeze_clock(monkeypatch, NOW)
+    sooner = NOW + timedelta(hours=2)
+    later = NOW + timedelta(hours=5)
+
+    code = account_broker.main((
+        "choose", "--product", "codex",
+        "--spent", f"visitor:{int(sooner.timestamp())}",
+        "--spent", f"guest:{int(later.timestamp())}",
+    ))
+
+    decision = json.loads(capsys.readouterr().out)["decision"]
+    assert code == WAIT_EXIT_CODE
+    assert decision["action"] == "wait"
+    assert decision["account"] is None
+    assert decision["resets_at"] == sooner.isoformat()
+
+
+def test_should_wait_for_spent_default_home_until_the_mark_passes(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
+    home = tmp_path / "default-home"
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CODEX, _adapter((), {}))
+    monkeypatch.setenv("CODEX_HOME", str(home))
+    _freeze_clock(monkeypatch, NOW)
+    reset = NOW + timedelta(hours=2)
+
+    waiting = account_broker.main(("choose", "--product", "codex", "--spent", f"default:{int(reset.timestamp())}"))
+    waiting_decision = json.loads(capsys.readouterr().out)["decision"]
+    assert waiting == WAIT_EXIT_CODE
+    assert waiting_decision["action"] == "wait"
+    assert waiting_decision["resets_at"] == reset.isoformat()
+
+    _FrozenClock.instant = reset + timedelta(seconds=1)
+    running = account_broker.main(("choose", "--product", "codex"))
+    running_decision = json.loads(capsys.readouterr().out)["decision"]
+    assert running == 0
+    assert running_decision["action"] == "run"
+    assert running_decision["account"] == "default"
+    assert running_decision["home"] == str(home.resolve())
+
+
+def test_should_keep_a_spent_mark_without_a_reset_for_one_hour(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    account = _account("first")
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CODEX, _adapter((account,), {"first": _meters(80, 80)}))
+    _freeze_clock(monkeypatch, NOW)
+
+    code = account_broker.main(("choose", "--product", "codex", "--spent", "guest"))
+
+    decision = json.loads(capsys.readouterr().out)["decision"]
+    assert code == WAIT_EXIT_CODE
+    assert decision["action"] == "wait"
+    assert decision["resets_at"] == (NOW + timedelta(hours=1)).isoformat()
+
+
+def test_should_reject_an_invalid_spent_reset(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    account = _account("first")
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CODEX, _adapter((account,), {"first": _meters(80, 80)}))
+
+    code = account_broker.main(("choose", "--product", "codex", "--spent", "guest:tomorrow"))
+
+    assert code == 2
+    assert "invalid reset" in capsys.readouterr().err
+
+
+@pytest.mark.parametrize("reset_text", ["inf", "1e20", "-1e20"])
+def test_should_reject_a_spent_reset_outside_the_platform_range(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str], reset_text: str
+) -> None:
+    account = _account("first")
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CODEX, _adapter((account,), {"first": _meters(80, 80)}))
+
+    code = account_broker.main(("choose", "--product", "codex", "--spent", f"guest:{reset_text}"))
+
+    assert code == 2
+    assert "invalid reset" in capsys.readouterr().err
+
+
+def test_should_run_past_a_spent_mark_left_by_an_account_removed_from_the_roster(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    account = _account("first")
+    monkeypatch.setitem(account_broker.all_product_adapters, Product.CODEX, _adapter((account,), {"first": _meters(80, 80)}))
+    _freeze_clock(monkeypatch, NOW)
+    retired_key = account_broker._state_key(_account("retired"))
+    account_broker._save_state(
+        account_broker.broker_state_path(),
+        {"meters": {}, "spent": {retired_key: (NOW + timedelta(days=6)).timestamp()}, "affinity": {}},
+    )
+
+    code = account_broker.main(("choose", "--product", "codex"))
+
+    decision = json.loads(capsys.readouterr().out)["decision"]
+    assert code == 0
+    assert decision["action"] == "run"
+    assert decision["account"] == "first"
+
+
 def test_should_run_job_through_override(
     monkeypatch: pytest.MonkeyPatch
 ) -> None: