From 208d4ee5f451528465974743632a8f1e4962c69d Mon Sep 17 00:00:00 2001
From: Ken Brush <kbrush@gmail.com>
Date: Mon, 27 Apr 2026 08:42:36 -0700
Subject: [PATCH] fix(codex-rescue): append </dev/null to codex-companion task
 invocation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this redirect, the `node codex-companion.mjs task ...` Bash
invocation can hang when stdin is left attached to the parent shell.
This manifests in Claude Code as "Reading additional input from
stdin..." errors that block long-running Codex dispatches at
indeterminate points (post-fixture, post-commit, etc.) — the wrapper
reports "completed" but the underlying node process never returns.

Reproduced in two consecutive Codex dispatches (clod repo, 2026-04-27)
where Codex correctly wrote all expected files + ran regression tests
to PASS, then hung 30+ minutes before the would-be commit/push step.
External `codex-companion.mjs status --json` confirmed the job was
still listed as "running" with the node process attached. Killing the
node process unblocked the hang; appending `</dev/null` to the
invocation prevents it entirely.

Patches both `agents/codex-rescue.md` (the agent template the rescue
subagent follows) and `skills/codex-cli-runtime/SKILL.md` (the skill
contract that documents the canonical helper invocation). Also adds
a short rationale comment in each file so the redirect doesn't get
removed in a future cleanup.
---
 plugins/codex/agents/codex-rescue.md            | 3 ++-
 plugins/codex/skills/codex-cli-runtime/SKILL.md | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/codex/agents/codex-rescue.md b/plugins/codex/agents/codex-rescue.md
index 7009ec86..599dc8e7 100644
--- a/plugins/codex/agents/codex-rescue.md
+++ b/plugins/codex/agents/codex-rescue.md
@@ -19,7 +19,8 @@ Selection guidance:
 
 Forwarding rules:
 
-- Use exactly one `Bash` call to invoke `node "${CLAUDE_PLUGIN_ROOT}/scripts/codex-companion.mjs" task ...`.
+- Use exactly one `Bash` call to invoke `node "${CLAUDE_PLUGIN_ROOT}/scripts/codex-companion.mjs" task ... </dev/null`.
+- Always append `</dev/null` to the Bash invocation. Without it the codex-companion node process can hang reading from stdin (Codex skill execution often hangs in Claude Code with "Reading additional input from stdin..." errors when stdin is left attached to the parent shell).
 - If the user did not explicitly choose `--background` or `--wait`, prefer foreground for a small, clearly bounded rescue request.
 - If the user did not explicitly choose `--background` or `--wait` and the task looks complicated, open-ended, multi-step, or likely to keep Codex running for a long time, prefer background execution.
 - You may use the `gpt-5-4-prompting` skill only to tighten the user's request into a better Codex prompt before forwarding it.
diff --git a/plugins/codex/skills/codex-cli-runtime/SKILL.md b/plugins/codex/skills/codex-cli-runtime/SKILL.md
index 0e91bfb5..77e5b621 100644
--- a/plugins/codex/skills/codex-cli-runtime/SKILL.md
+++ b/plugins/codex/skills/codex-cli-runtime/SKILL.md
@@ -9,7 +9,9 @@ user-invocable: false
 Use this skill only inside the `codex:codex-rescue` subagent.
 
 Primary helper:
-- `node "${CLAUDE_PLUGIN_ROOT}/scripts/codex-companion.mjs" task "<raw arguments>"`
+- `node "${CLAUDE_PLUGIN_ROOT}/scripts/codex-companion.mjs" task "<raw arguments>" </dev/null`
+
+The `</dev/null` redirect is mandatory. Without it the codex-companion node process can hang reading from stdin (Codex skill execution often hangs in Claude Code with "Reading additional input from stdin..." errors when stdin is left attached to the parent shell).
 
 Execution rules:
 - The rescue subagent is a forwarder, not an orchestrator. Its only job is to invoke `task` once and return that stdout unchanged.