claude-dev-env 8.44.6 → 8.45.1

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.1",
     "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/claude_account_worker_process.py

@@ -1,4 +1,4 @@
-"""Run a headless Claude worker through the account broker."""
+"""Time one broker job for the headless Claude worker."""
 
 from __future__ import annotations
 

package/scripts/claude_account_worker_report.py

@@ -57,6 +57,7 @@ def wait_report(account: str, reason: str, wait_reset_at: datetime | None) -> Wo
     Args:
         account: The chosen account slot.
         reason: Why the broker returned a wait decision.
+        wait_reset_at: The soonest account reset, or None when unknown.
 
     Returns:
         A report carrying the wait exit code and no payload.
@@ -111,7 +112,7 @@ def pre_launch_failure_report(
 
     Args:
         account: The chosen account slot.
-        reason: Why the picker chose that account.
+        reason: Why the worker stopped before launch.
         exit_code: The failure's exit code.
 
     Returns:

package/scripts/dev_env_scripts_constants/claude_account_worker_constants.py

@@ -11,10 +11,6 @@ DEFAULT_TIMEOUT_MINUTES: int = 60
 
 MINIMUM_TIMEOUT_MINUTES: int = 1
 
-TIMEOUT_EXIT_CODE: int = 124
-
-MISSING_BINARY_EXIT_CODE: int = 127
-
 LAUNCH_FAILURE_EXIT_CODE: int = 1
 
 CONFIGURATION_FAILURE_EXIT_CODE: int = 2
@@ -23,18 +19,12 @@ WAIT_DURATION_SECONDS: float = 0.0
 
 STDOUT_TAIL_CHARACTER_LIMIT: int = 4000
 
-DRAIN_GRACE_TIMEOUT_SECONDS: int = 10
-
-DRAIN_ATTEMPT_LIMIT: int = 2
-
 DURATION_DECIMAL_PLACES: int = 3
 
 REPORT_INDENT: int = 2
 
 UTF8_ENCODING: str = "utf-8"
 
-UTF8_DECODE_ERRORS: str = "replace"
-
 CLI_DESCRIPTION: str = "Run one Claude worker through the account broker."
 
 PROMPT_FILE_FLAG: str = "--prompt-file"
@@ -85,8 +75,6 @@ __all__ = [
     "CWD_FLAG",
     "DEFAULT_PERMISSION_MODE",
     "DEFAULT_TIMEOUT_MINUTES",
-    "DRAIN_ATTEMPT_LIMIT",
-    "DRAIN_GRACE_TIMEOUT_SECONDS",
     "DURATION_DECIMAL_PLACES",
     "INVALID_TIMEOUT_MESSAGE",
     "JSON_ACCOUNT_KEY",
@@ -94,7 +82,6 @@ __all__ = [
     "JSON_REASON_KEY",
     "JSON_RESULT_KEY",
     "LAUNCH_FAILURE_EXIT_CODE",
-    "MISSING_BINARY_EXIT_CODE",
     "MINIMUM_TIMEOUT_MINUTES",
     "MODEL_FLAG",
     "OUTPUT_FORMAT_FLAG",
@@ -113,9 +100,7 @@ __all__ = [
     "SINGLE_PROMPT_FLAG",
     "STDOUT_TAIL_CHARACTER_LIMIT",
     "SUMMARY_LINE_TEMPLATE",
-    "TIMEOUT_EXIT_CODE",
     "TIMEOUT_MINUTES_FLAG",
-    "UTF8_DECODE_ERRORS",
     "UTF8_ENCODING",
     "WAIT_DURATION_SECONDS",
     "WAIT_EXIT_CODE",

package/scripts/dev_env_scripts_constants/claude_chain_constants.py

@@ -1,93 +1,7 @@
-"""Named constants for the claude fallback-chain runner, and the helper that
-picks which text-codec kwargs a chain subprocess wrapper forwards.
-
-Per the project's configuration conventions, every scalar and structural
-constant the runner needs lives here rather than inline in the module.
-"""
+"""Named constants the account broker and the code review CLI share for Claude runs."""
 
 from __future__ import annotations
 
-from collections.abc import Mapping
-
-UTF8_ENCODING: str = "utf-8"
-"""Encoding used to read the chain configuration file."""
-
-CODEC_ERROR_STRATEGY: str = "replace"
-"""Codec error handler that maps any unencodable or undecodable value to a marker."""
-
-CRLF_NEWLINE: str = "\r\n"
-"""Windows-style newline sequence normalized away when decoding spool captures."""
-
-CARRIAGE_RETURN: str = "\r"
-"""Bare carriage return normalized to LF when decoding spool captures."""
-
-LINE_FEED: str = "\n"
-"""Unix-style newline retained after universal-newline normalization."""
-
-SUBPROCESS_ENCODING_KEYWORD: str = "encoding"
-"""Keyword name for text encoding when forwarding chain subprocess runner kwargs."""
-
-SUBPROCESS_ERRORS_KEYWORD: str = "errors"
-"""Keyword name for text decode error policy when forwarding chain subprocess runner kwargs."""
-
-ALL_SUBPROCESS_TEXT_CODEC_KEYWORDS: tuple[str, ...] = (
-    SUBPROCESS_ENCODING_KEYWORD,
-    SUBPROCESS_ERRORS_KEYWORD,
-)
-"""Keyword names to forward from the chain runner for text-mode subprocess capture."""
-
-
-def collect_forwarded_text_codec(
-    all_keywords: Mapping[str, object],
-) -> dict[str, object]:
-    """Return only the text-codec kwargs present in ``all_keywords``.
-
-    ::
-
-        collect_forwarded_text_codec({"encoding": "utf-8", "timeout": 30})
-        # -> {"encoding": "utf-8"}
-
-        collect_forwarded_text_codec({"timeout": 30})
-        # -> {}
-
-    Args:
-        all_keywords: Keyword arguments received by a chain subprocess wrapper.
-
-    Returns:
-        Mapping of codec keyword names to their values, limited to keys listed
-        in ``ALL_SUBPROCESS_TEXT_CODEC_KEYWORDS`` that are present in the input.
-    """
-    return {
-        each_key: all_keywords[each_key]
-        for each_key in ALL_SUBPROCESS_TEXT_CODEC_KEYWORDS
-        if each_key in all_keywords
-    }
-
-
-CLAUDE_HOME_SUBDIRECTORY: str = ".claude"
-"""Per-user directory under the home directory that holds the chain config."""
-
-CONFIG_FILENAME: str = "claude-chain.json"
-"""Real chain-configuration filename read from the user's home directory."""
-
-CHAIN_USAGE_MODULE_NAME: str = "claude_chain_usage"
-"""Import name of the weekly-usage report module loaded lazily by the runner."""
-
-EXAMPLE_CONFIG_FILENAME: str = "claude-chain.example.json"
-"""Committed template filename referenced in the config-error guidance."""
-
-CONFIG_CHAIN_KEY: str = "chain"
-"""Top-level key whose value is the ordered list of chain entries."""
-
-CONFIG_COMMAND_KEY: str = "command"
-"""Chain-entry key naming the binary to spawn."""
-
-CONFIG_EXTRA_ARGS_KEY: str = "extra_args"
-"""Chain-entry key holding per-account arguments appended to each invocation."""
-
-CONFIG_CREDENTIALS_PATH_KEY: str = "credentials_path"
-"""Optional chain-entry key naming that account's OAuth credentials file path."""
-
 ALL_USAGE_LIMIT_SIGNATURES: tuple[str, ...] = (
     "hit your session limit",
     "usage limit reached",
@@ -96,208 +10,5 @@ ALL_USAGE_LIMIT_SIGNATURES: tuple[str, ...] = (
 )
 """Case-insensitive substrings that mark a non-zero exit as a usage-limit refusal."""
 
-ATTEMPT_STATUS_SERVED: str = "served"
-"""Status recorded when a binary exits zero and serves the call."""
-
-ATTEMPT_STATUS_USAGE_LIMITED: str = "usage_limited"
-"""Status recorded when a binary fails with a usage-limit signature."""
-
-ATTEMPT_STATUS_EXECUTABLE_NOT_FOUND: str = "executable_not_found"
-"""Status recorded when a binary is not installed."""
-
-ATTEMPT_STATUS_NONZERO_EXIT: str = "nonzero_exit"
-"""Status recorded when a binary fails without a usage-limit signature."""
-
-ATTEMPT_STATUS_TIMEOUT: str = "timeout"
-"""Status recorded when a binary exceeds the invocation timeout."""
-
-DEFAULT_TIMEOUT_SECONDS: int = 300
-"""Timeout applied to each binary invocation when the caller names none."""
-
-NO_COMPLETED_PROCESS_RETURN_CODE: int = 1
-"""Return code carried on the result when no binary produced a completed process."""
-
-CHAIN_EXHAUSTED_EXIT_CODE: int = 2
-"""CLI exit code when no binary in the chain served the call."""
-
 CHAIN_CONFIG_ERROR_EXIT_CODE: int = 3
 """CLI exit code when the chain configuration is missing or invalid."""
-
-CLI_TIMEOUT_FLAG: str = "--timeout-seconds"
-"""CLI flag that overrides the per-invocation timeout in seconds."""
-
-CLI_ROUTING_MODE_FLAG: str = "--routing-mode"
-"""CLI flag that selects usage-ranked or ordered-account chain routing."""
-
-CLI_ARGUMENTS_SEPARATOR: str = "--"
-"""CLI token separating runner flags from the passthrough claude arguments."""
-
-ROUTING_MODE_USAGE_RANKED: str = "usage_ranked"
-"""Default routing: probe weekly remaining and try highest remaining first."""
-
-ROUTING_MODE_ORDERED_ACCOUNT: str = "ordered_account"
-"""Explicit routing: walk chain entries in config order; usage-limit-only fallover."""
-
-DEFAULT_ROUTING_MODE: str = ROUTING_MODE_USAGE_RANKED
-"""Routing mode applied when the caller does not name one."""
-
-ALL_ROUTING_MODES: frozenset[str] = frozenset(
-    {
-        ROUTING_MODE_USAGE_RANKED,
-        ROUTING_MODE_ORDERED_ACCOUNT,
-    }
-)
-"""Accepted values for the routing-mode parameter and CLI flag."""
-
-TERMINAL_STATUS_SERVED: str = "served"
-"""Outcome status when a binary served the call (zero or non-usage nonzero)."""
-
-TERMINAL_STATUS_ADVISOR_BLOCKED: str = "advisor_blocked"
-"""Outcome status when ordered-account mode stops on a non-usage failure."""
-
-TERMINAL_STATUS_CHAIN_EXHAUSTED: str = "chain_exhausted"
-"""Outcome status when every chain entry was usage-limited or missing."""
-
-TERMINAL_STATUS_TIMEOUT: str = "timeout"
-"""Outcome status when a usage-ranked walk stops on TimeoutExpired mid-walk."""
-
-SESSION_ID_JSON_KEY: str = "session_id"
-"""JSON key read from Claude ``--output-format json`` events for resume."""
-
-CHAIN_ADVISOR_BLOCKED_EXIT_CODE: int = 4
-"""CLI exit code when ordered-account mode stops with advisor_blocked."""
-
-CONFIG_NOT_OBJECT_REASON: str = "the top-level value is not a JSON object"
-"""Reason detail when the config root is not an object."""
-
-CONFIG_CHAIN_NOT_LIST_REASON: str = "the 'chain' key is missing or not a list"
-"""Reason detail when the chain key is absent or the wrong type."""
-
-CONFIG_CHAIN_EMPTY_REASON: str = "the 'chain' list is empty"
-"""Reason detail when the chain contains no entries."""
-
-CONFIG_ENTRY_NOT_OBJECT_REASON: str = "a chain entry is not a JSON object"
-"""Reason detail when a chain entry is not an object."""
-
-CONFIG_ENTRY_COMMAND_MISSING_REASON: str = "a chain entry has no string 'command'"
-"""Reason detail when a chain entry lacks a usable command."""
-
-CONFIG_ENTRY_EXTRA_ARGS_INVALID_REASON: str = (
-    "a chain entry's 'extra_args' is not a list of strings"
-)
-"""Reason detail when a chain entry's extra_args value is the wrong shape."""
-
-CONFIG_ENTRY_CREDENTIALS_PATH_INVALID_REASON: str = (
-    "a chain entry's 'credentials_path' is not a non-empty string"
-)
-"""Reason detail when a chain entry's credentials_path value is the wrong shape."""
-
-CONFIG_MISSING_MESSAGE_TEMPLATE: str = (
-    "Claude chain config not found at {config_path}. Copy {example_filename} to "
-    "{config_path} and list your account binaries. Try order comes from weekly "
-    "remaining; config order is the tiebreak."
-)
-"""Guidance shown when the config file is absent."""
-
-CONFIG_UNREADABLE_MESSAGE_TEMPLATE: str = (
-    "Cannot read claude chain config at {config_path}: {error}. "
-    "See {example_filename} for the expected shape."
-)
-"""Guidance shown when the config file cannot be read."""
-
-CONFIG_MALFORMED_MESSAGE_TEMPLATE: str = (
-    "Malformed JSON in claude chain config at {config_path}: {error}. "
-    "See {example_filename} for the expected shape."
-)
-"""Guidance shown when the config file is not valid JSON."""
-
-CONFIG_INVALID_SHAPE_MESSAGE_TEMPLATE: str = (
-    "Invalid claude chain config at {config_path}: {reason}. "
-    "See {example_filename} for the expected shape."
-)
-"""Guidance shown when the config JSON does not match the expected shape."""
-
-CHAIN_EXHAUSTED_MESSAGE_TEMPLATE: str = (
-    "No claude binary in the chain served the call. Attempts: {attempt_summary}"
-)
-"""CLI stderr message when the walk ends without a serving binary."""
-
-ATTEMPT_SUMMARY_ENTRY_TEMPLATE: str = "{command}={status}"
-"""Per-attempt fragment used to build the exhausted-chain summary."""
-
-ATTEMPT_SUMMARY_JOIN_SEPARATOR: str = ", "
-"""Separator joining per-attempt fragments in the exhausted-chain summary."""
-
-AFFINITY_STATE_SCHEMA_VERSION: int = 1
-"""Version field written into the session-to-binary affinity state document."""
-
-AFFINITY_STATE_FILENAME: str = "claude-chain-affinity.json"
-"""Default affinity state file name under the Claude home directory."""
-
-AFFINITY_MAXIMUM_ENTRIES: int = 64
-"""Hard cap on retained session-to-binary affinity rows (oldest drop first)."""
-
-AFFINITY_KEY_SCHEMA_VERSION: str = "schema_version"
-"""JSON key for the affinity document schema version."""
-
-AFFINITY_KEY_ALL_BINDINGS: str = "all_bindings"
-"""JSON key for the ordered list of session-to-command bindings."""
-
-AFFINITY_KEY_SESSION_ID: str = "session_id"
-"""JSON key for a bound Claude session id."""
-
-AFFINITY_KEY_COMMAND: str = "command"
-"""JSON key for the chain binary command bound to a session id."""
-
-AFFINITY_TEMP_SUFFIX: str = ".tmp"
-"""Suffix for the temporary file used during atomic affinity replacement."""
-
-AFFINITY_BINDING_NOT_OBJECT_REASON: str = "a binding entry is not an object"
-"""Reason when an affinity binding entry is not a JSON object."""
-
-AFFINITY_BINDING_SESSION_ID_MISSING_REASON: str = (
-    "binding missing non-empty session_id"
-)
-"""Reason when an affinity binding lacks a usable session_id."""
-
-AFFINITY_BINDING_COMMAND_MISSING_REASON: str = "binding missing non-empty command"
-"""Reason when an affinity binding lacks a usable command."""
-
-AFFINITY_UNSUPPORTED_SCHEMA_VERSION_REASON_TEMPLATE: str = (
-    "unsupported schema_version {schema_version!r}"
-)
-"""Reason when the affinity document schema version is not supported."""
-
-AFFINITY_BINDINGS_MISSING_OR_NOT_LIST_REASON: str = (
-    "all_bindings is missing or not a list"
-)
-"""Reason when all_bindings is absent or the wrong type."""
-
-AFFINITY_TOP_LEVEL_NOT_OBJECT_REASON: str = "top-level value is not a JSON object"
-"""Reason when the affinity document root is not an object."""
-
-AFFINITY_SESSION_ID_AND_COMMAND_REQUIRED_MESSAGE: str = (
-    "session_id and command must be non-empty"
-)
-"""ValueError message when record_affinity_binding receives empty ids."""
-
-AFFINITY_MAXIMUM_ENTRIES_MINIMUM_MESSAGE: str = "maximum_entries must be at least 1"
-"""ValueError message when maximum_entries is below one."""
-
-AFFINITY_CORRUPT_MESSAGE_TEMPLATE: str = (
-    "Affinity state at {state_path} is corrupt or unreadable: {error}. "
-    "Delete or repair the file before retrying."
-)
-"""Actionable diagnostic when affinity state cannot be loaded."""
-
-AFFINITY_WRITE_FAILED_MESSAGE_TEMPLATE: str = (
-    "Failed to write affinity state at {state_path}: {error}. "
-    "Check directory permissions and free space."
-)
-"""Actionable diagnostic when atomic affinity replacement fails."""
-
-AFFINITY_JSON_INDENT_SPACES: int = 2
-"""Indent width for the written affinity state JSON document."""
-
-RESUME_SESSION_FLAG: str = "--resume"
-"""Claude CLI flag that continues a prior session by id."""

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: