claude-dev-env 8.47.0 → 8.47.2

package/.agents/skills/second-account-workers/SKILL.md

@@ -55,7 +55,8 @@ When the command exits 3 and the report has `"account": "wait"`, no account is
 eligible. Report the picker's reason and reset time. Do not fall back to the
 Agent tool. Claude can also return exit 3 after a worker starts. When the
 report account is `main`, `second`, or `extra_2` and later, report the child's
-exit code and result.
+exit code and result. Exit 124 with reason `timeout` means the worker ran past
+`--timeout-minutes`.
 
 Workers never commit, push, or call `gh`. The calling session reviews each
 worktree diff and owns every Git step.

package/package.json

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

package/scripts/claude_account_worker.py

@@ -27,6 +27,8 @@ 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,
 )
@@ -102,10 +104,11 @@ 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",
-        outcome.status,
-        exit_code=outcome.returncode,
+        TIMEOUT_ATTEMPT_STATUS if is_timed_out else outcome.status,
+        exit_code=TIMEOUT_EXIT_CODE if is_timed_out else outcome.returncode,
         duration_seconds=duration_seconds,
         stdout_text=outcome.stdout,
     )

package/scripts/dev_env_scripts_constants/claude_account_worker_constants.py

@@ -13,6 +13,10 @@ 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
@@ -100,6 +104,8 @@ __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_claude_account_worker.py

@@ -152,6 +152,20 @@ def test_should_preserve_served_failure_code(
     assert report["is_error"] is True
 
 
+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)
+
+    exit_code, report, _ = _run_worker(monkeypatch, tmp_path, timed_out)
+
+    assert exit_code == 124
+    assert report["exit_code"] == 124
+    assert report["reason"] == "timeout"
+    assert report["account"] == "extra_2"
+    assert report["is_error"] is True
+
+
 def test_should_write_report_for_unreadable_prompt(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:

package/scripts/tests/test_pr_verification_lock.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import subprocess
 import sys
+import threading
 import time
 from pathlib import Path
 from typing import cast
@@ -50,6 +51,7 @@ RESULT_WAIT_SECONDS = 5
 PROCESS_WAIT_SECONDS = 10
 POLL_INTERVAL_SECONDS = 0.01
 LEGACY_LOCK_CONTENT = "legacy owner metadata"
+DELAYED_OUTCOME_WRITE_SECONDS = 0.2
 BASE_PYTHON_EXECUTABLE = cast(str, getattr(sys, "_base_executable", sys.executable))
 
 
@@ -72,13 +74,20 @@ def _start_lock_contender(
     )
 
 
+def _read_reported_outcome(result_path: Path) -> str:
+    if not result_path.is_file():
+        return ""
+    return result_path.read_text(encoding="utf-8")
+
+
 def _wait_for_lock_outcomes(all_result_paths: list[Path]) -> list[str]:
     deadline = time.monotonic() + RESULT_WAIT_SECONDS
     while time.monotonic() < deadline:
-        if all(each_path.is_file() for each_path in all_result_paths):
-            return [
-                each_path.read_text(encoding="utf-8") for each_path in all_result_paths
-            ]
+        all_outcomes = [
+            _read_reported_outcome(each_path) for each_path in all_result_paths
+        ]
+        if all(all_outcomes):
+            return all_outcomes
         time.sleep(POLL_INTERVAL_SECONDS)
     raise AssertionError("lock contenders did not report within five seconds")
 
@@ -146,6 +155,22 @@ def test_process_lock_survives_contention_and_owner_termination(
             _terminate_owned_child(each_child_process)
 
 
+def test_wait_for_lock_outcomes_waits_for_written_content(tmp_path: Path) -> None:
+    result_path = tmp_path / "delayed.result"
+    result_path.touch()
+    delayed_writer = threading.Timer(
+        DELAYED_OUTCOME_WRITE_SECONDS,
+        result_path.write_text,
+        args=("acquired",),
+        kwargs={"encoding": "utf-8"},
+    )
+    delayed_writer.start()
+    try:
+        assert _wait_for_lock_outcomes([result_path]) == ["acquired"]
+    finally:
+        delayed_writer.join()
+
+
 def test_lock_io_error_is_presented_as_supervisor_lock_error(
     tmp_path: Path,
 ) -> None: