claude-dev-env 8.54.7 → 8.54.8

package/package.json

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

package/scripts/account_broker.py

@@ -48,6 +48,7 @@ from dev_env_scripts_constants.account_broker_constants import (
     ALL_PARENT_CLAUDE_SESSION_VARIABLES,
     COMMAND_MISSING_EXIT_CODE,
     REPORT_INDENT_SPACES,
+    TIMEOUT_EXIT_CODE,
     WAIT_EXIT_CODE,
     utc_time_text as _time_text,
 )
@@ -287,13 +288,16 @@ def _attempt_once(context: _RunContext, decision: Decision) -> JobOutcome | None
     account = decision.account
     try:
         completion = _invoke(context, account)
-    except (OSError, subprocess.TimeoutExpired) as error:
-        status = "timeout" if isinstance(error, subprocess.TimeoutExpired) else "start_failed"
-        _record_spent_attempt(context, account, status, COMMAND_MISSING_EXIT_CODE)
+    except subprocess.TimeoutExpired as error:
+        _record_spent_attempt(context, account, "timeout", TIMEOUT_EXIT_CODE)
+        context.report.final_decision = decision
+        return JobOutcome(TIMEOUT_EXIT_CODE, "", str(error), account.name, tuple(context.all_attempts), "timeout", None, None)
+    except OSError as error:
+        _record_spent_attempt(context, account, "start_failed", COMMAND_MISSING_EXIT_CODE)
         context.start_failure_text = str(error)
-        if isinstance(error, subprocess.TimeoutExpired) or not context.all_readings:
+        if not context.all_readings:
             context.report.final_decision = decision
-            final_status = "advisor_blocked" if context.product is Product.CLAUDE else status
+            final_status = "advisor_blocked" if context.product is Product.CLAUDE else "start_failed"
             return JobOutcome(COMMAND_MISSING_EXIT_CODE, "", str(error), account.name, tuple(context.all_attempts), final_status, None, None)
         return None
     combined = f"{completion.stdout}{completion.stderr}".casefold()

package/scripts/claude_account_worker.py

@@ -27,8 +27,6 @@ from dev_env_scripts_constants.claude_account_worker_constants import (
     PROMPT_FILE_FLAG,
     REPORT_FILE_FLAG,
     SINGLE_PROMPT_FLAG,
-    TIMEOUT_ATTEMPT_STATUS,
-    TIMEOUT_EXIT_CODE,
     TIMEOUT_MINUTES_FLAG,
     UTF8_ENCODING,
 )
@@ -104,11 +102,10 @@ def run_worker(
     if outcome.status in {"wait", "exhausted"}:
         report = wait_report("wait", _wait_reason(outcome), outcome.wait_reset_at)
         return finalize_report(report_file, report)
-    is_timed_out = bool(outcome.attempts) and outcome.attempts[-1][1] == TIMEOUT_ATTEMPT_STATUS
     report = make_report(
         outcome.account_name or "none",
-        TIMEOUT_ATTEMPT_STATUS if is_timed_out else outcome.status,
-        exit_code=TIMEOUT_EXIT_CODE if is_timed_out else outcome.returncode,
+        outcome.status,
+        exit_code=outcome.returncode,
         duration_seconds=duration_seconds,
         stdout_text=outcome.stdout,
     )

package/scripts/dev_env_scripts_constants/account_broker_constants.py

@@ -50,6 +50,7 @@ ALL_CODEX_FLOORS = {
 
 WAIT_EXIT_CODE = 3
 COMMAND_MISSING_EXIT_CODE = 127
+TIMEOUT_EXIT_CODE = 124
 REPORT_INDENT_SPACES = 2
 BROKER_STATE_DIRECTORY_NAME = "account-broker"
 BROKER_STATE_FILE_NAME = "state.json"

package/scripts/dev_env_scripts_constants/claude_account_worker_constants.py

@@ -13,10 +13,6 @@ MINIMUM_TIMEOUT_MINUTES: int = 1
 
 LAUNCH_FAILURE_EXIT_CODE: int = 1
 
-TIMEOUT_EXIT_CODE: int = 124
-
-TIMEOUT_ATTEMPT_STATUS: str = "timeout"
-
 CONFIGURATION_FAILURE_EXIT_CODE: int = 2
 
 WAIT_DURATION_SECONDS: float = 0.0
@@ -104,8 +100,6 @@ __all__ = [
     "SINGLE_PROMPT_FLAG",
     "STDOUT_TAIL_CHARACTER_LIMIT",
     "SUMMARY_LINE_TEMPLATE",
-    "TIMEOUT_ATTEMPT_STATUS",
-    "TIMEOUT_EXIT_CODE",
     "TIMEOUT_MINUTES_FLAG",
     "UTF8_ENCODING",
     "WAIT_DURATION_SECONDS",

package/scripts/test_account_broker.py

@@ -687,6 +687,7 @@ def test_should_stop_after_timeout_without_running_job_again(
     assert invoked_homes == ["first"]
     assert outcome.attempts == (("first", "timeout"),)
     assert outcome.status == "timeout"
+    assert outcome.returncode == 124
     assert outcome.account_name == "first"
     assert report.final_decision.account.name == "first"
     assert account_broker.main(("choose", "--product", "codex")) == 0
@@ -696,12 +697,12 @@ def test_should_stop_after_timeout_without_running_job_again(
 @pytest.mark.parametrize(
     ("product", "roster_names", "start_error", "expected_code"),
     (
-        (Product.CLAUDE, ("first",), subprocess.TimeoutExpired("job", 1), 4),
-        (Product.CODEX, ("first",), subprocess.TimeoutExpired("job", 1), 127),
+        (Product.CLAUDE, ("first",), subprocess.TimeoutExpired("job", 1), 124),
+        (Product.CODEX, ("first",), subprocess.TimeoutExpired("job", 1), 124),
         (Product.CODEX, (), OSError("missing command"), 127),
     ),
 )
-def test_should_exit_four_only_for_a_blocked_claude_job(
+def test_should_exit_with_job_failure_code(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: Path,
     product: Product,

package/scripts/test_claude_account_worker.py

@@ -165,7 +165,7 @@ def test_should_preserve_served_failure_code(
 def test_should_exit_124_with_timeout_reason_when_the_broker_attempt_timed_out(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:
-    timed_out = JobOutcome(127, "", "timed out", "extra_2", (("extra_2", "timeout"),), "advisor_blocked", None, None)
+    timed_out = JobOutcome(124, "", "timed out", "extra_2", (("extra_2", "timeout"),), "timeout", None, None)
 
     exit_code, report, _ = _run_worker(monkeypatch, tmp_path, timed_out)