claude-dev-env 8.47.1 → 8.47.3

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/hooks/blocking/bash_pre_tool_use_dispatcher.py

@@ -207,17 +207,21 @@ def aggregate_bash_hook_results(
 
 
 def _emit_decision(decision: BashDispatcherDecision) -> None:
-    """Write one PreToolUse permission payload to stdout when an outcome exists."""
+    """Write one PreToolUse permission payload to stdout when an outcome exists.
+
+    A rewrite carries updatedInput with no permissionDecision, so the harness
+    applies the rewritten command and then runs its normal permission prompt.
+    """
     if not decision.decision:
         return
-    hook_specific: dict[str, object] = {
-        "hookEventName": HOOK_EVENT_NAME,
-        _PERMISSION_DECISION_KEY: decision.decision,
-    }
+    hook_specific: dict[str, object] = {"hookEventName": HOOK_EVENT_NAME}
+    is_rewrite = decision.decision == ALLOW_DECISION and decision.updated_input is not None
+    if is_rewrite:
+        hook_specific[_UPDATED_INPUT_KEY] = decision.updated_input
+    else:
+        hook_specific[_PERMISSION_DECISION_KEY] = decision.decision
     if decision.reasons:
         hook_specific[_PERMISSION_REASON_KEY] = REASON_JOIN_SEPARATOR.join(decision.reasons)
-    if decision.decision == ALLOW_DECISION and decision.updated_input is not None:
-        hook_specific[_UPDATED_INPUT_KEY] = decision.updated_input
     if decision.all_additional_context:
         hook_specific[_ADDITIONAL_CONTEXT_KEY] = CONTEXT_JOIN_SEPARATOR.join(
             decision.all_additional_context

package/hooks/blocking/test_bash_pre_tool_use_dispatcher.py

@@ -235,3 +235,19 @@ def test_emit_decision_re_emits_silent_deny_fields(
     assert hook_specific["additionalContext"] == "see docs/runbook.md"
     assert emitted_payload["systemMessage"] == "[gh-gate] blocked redirected gh pr create"
     assert emitted_payload["suppressOutput"] is True
+
+
+def test_emit_decision_sends_a_rewrite_through_the_permission_prompt(
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    """A rewritten command reaches the harness with updatedInput and no permissionDecision."""
+    rewrite = BashDispatcherDecision(
+        decision="allow",
+        updated_input={"command": "MSYS2_ARG_CONV_EXCL='*' git show HEAD:a.py"},
+    )
+    _emit_decision(rewrite)
+    hook_specific = json.loads(capsys.readouterr().out.strip())["hookSpecificOutput"]
+    assert "permissionDecision" not in hook_specific
+    assert hook_specific["updatedInput"] == {
+        "command": "MSYS2_ARG_CONV_EXCL='*' git show HEAD:a.py"
+    }

package/package.json

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

package/scripts/ci/install-playtest.mjs

@@ -54,7 +54,6 @@ export const PRE_TOOL_USE_EVENT_NAME = 'PreToolUse';
 export const SESSION_START_HOOK_SCRIPT_NAME = 'working_style_prompt.py';
 export const BASH_HOOK_SCRIPT_NAME = 'bash_pre_tool_use_dispatcher.py';
 export const BASH_MATCHER = 'Bash';
-export const ALLOW_DECISION = 'allow';
 
 export const SESSION_START_PAYLOAD = {
     hook_event_name: SESSION_START_EVENT_NAME,
@@ -238,8 +237,8 @@ function runBlockingStage(settingsPath, scratchHome, evidenceDirectory) {
     );
     const hookResult = runInstalledHook(command, scratchHome, BASH_HOOK_PAYLOAD);
     const envelope = readEnvelope(hookResult.stdout, PRE_TOOL_USE_EVENT_NAME);
-    if (envelope.permissionDecision !== ALLOW_DECISION) {
-        throw new Error(`The PreToolUse envelope decided ${envelope.permissionDecision}`);
+    if (envelope.permissionDecision !== undefined) {
+        throw new Error(`The PreToolUse envelope skipped the permission prompt with ${envelope.permissionDecision}`);
     }
     const rewrittenCommand = envelope.updatedInput?.command ?? '';
     if (!rewrittenCommand.includes(REWRITE_MARKER)) {

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: