Skip to content

fix(agents): make the codex timeout wrapper zsh-safe #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anderson-spider wants to merge 1 commit into from
Closed

fix(agents): make the codex timeout wrapper zsh-safe #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions agents/codex-implementer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,28 @@ a refusal, whatever caused it.
2. Invoke codex non-interactively, sandboxed to the workspace, at the effort the spec named:

```bash
# Portable timeout: macOS has no `timeout` unless coreutils is installed
T=$(command -v gtimeout || command -v timeout || true)
# Portable timeout: macOS has no `timeout` unless coreutils is installed.
# Probe by RUNNING each candidate — a `command -v` hit is not proof it execs
# (stale shell hash cache, dangling symlink from a relinked coreutils).
T=""
for c in gtimeout timeout; do
command -v "$c" >/dev/null 2>&1 && "$c" 1 true >/dev/null 2>&1 && { T="$c"; break; }
done
[ -z "$T" ] && echo "WARN: no timeout binary — codex runs uncapped (brew install coreutils to cap)"

EFFORT="<value from the spec's REASONING line, or empty>"

${T:+$T 600} codex exec \
# Build the timeout prefix as positional parameters. `${T:+$T 600}` relies on bash
# word-splitting an unquoted expansion; zsh does not split, so the prefix reaches
# execve as ONE argv word and every run dies with "no such file or directory".
# Claude Code's Bash tool runs zsh on macOS. `"$@"` expands to zero words when no
# positional parameters are set — in bash and zsh alike — so the uncapped fallback
# needs no special-casing.
if [ -n "$T" ]; then set -- "$T" 600; else set --; fi

"$@" codex exec \
--model gpt-5.6-luna \
${EFFORT:+-c model_reasoning_effort=$EFFORT} \
${EFFORT:+-c} ${EFFORT:+model_reasoning_effort=$EFFORT} \
--sandbox workspace-write \
--skip-git-repo-check \
--cd "$(pwd)" \
Expand All @@ -92,10 +105,10 @@ Flag discipline (non-negotiable):
| Flag | Why |
|---|---|
| `--sandbox workspace-write` | Codex writes code, scoped to the working tree. Never `danger-full-access`. |
| `-c model_reasoning_effort=$EFFORT` | Only when the spec named one. The architect chose it for this task; the lane passes it through unchanged. |
| `${EFFORT:+-c} ${EFFORT:+model_reasoning_effort=$EFFORT}` | Only when the spec named one. Split across two expansions so each yields exactly one argv word or vanishes — `${EFFORT:+-c model_reasoning_effort=$EFFORT}` is a single word under zsh. The architect chose it for this task; the lane passes it through unchanged. |
| `--skip-git-repo-check` + `--cd "$(pwd)"` | Deterministic working root; works outside git repos. |
| `- < spec file` | Prompt via stdin. No quoting hazards, no truncated specs. |
| `${T:+$T 600}` | Ten-minute wall clock when `timeout`/`gtimeout` exists (macOS needs `brew install coreutils`); runs uncapped otherwise. On timeout, report `STATUS: timeout` with whatever landed. |
| `"$@"` (timeout prefix, 600s) | Ten-minute wall clock when `timeout`/`gtimeout` exists (macOS needs `brew install coreutils`); runs uncapped otherwise. On timeout, report `STATUS: timeout` with whatever landed. |

`--model gpt-5.6-luna` selects the Luna capability tier — if the caller's spec names a different codex model, use that instead; the slug is a documented default, not a constant.

Expand Down
25 changes: 19 additions & 6 deletions agents/sol-implementer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,28 @@ a refusal, whatever caused it.
2. Invoke codex non-interactively, sandboxed to the workspace, at the effort the spec named:

```bash
# Portable timeout: macOS has no `timeout` unless coreutils is installed
T=$(command -v gtimeout || command -v timeout || true)
# Portable timeout: macOS has no `timeout` unless coreutils is installed.
# Probe by RUNNING each candidate — a `command -v` hit is not proof it execs
# (stale shell hash cache, dangling symlink from a relinked coreutils).
T=""
for c in gtimeout timeout; do
command -v "$c" >/dev/null 2>&1 && "$c" 1 true >/dev/null 2>&1 && { T="$c"; break; }
done
[ -z "$T" ] && echo "WARN: no timeout binary — codex runs uncapped (brew install coreutils to cap)"

EFFORT="<value from the spec's REASONING line, or empty>"

${T:+$T 1800} codex exec \
# Build the timeout prefix as positional parameters. `${T:+$T 1800}` relies on bash
# word-splitting an unquoted expansion; zsh does not split, so the prefix reaches
# execve as ONE argv word and every run dies with "no such file or directory".
# Claude Code's Bash tool runs zsh on macOS. `"$@"` expands to zero words when no
# positional parameters are set — in bash and zsh alike — so the uncapped fallback
# needs no special-casing.
if [ -n "$T" ]; then set -- "$T" 1800; else set --; fi

"$@" codex exec \
--model gpt-5.6-sol \
${EFFORT:+-c model_reasoning_effort=$EFFORT} \
${EFFORT:+-c} ${EFFORT:+model_reasoning_effort=$EFFORT} \
--sandbox workspace-write \
--skip-git-repo-check \
--cd "$(pwd)" \
Expand All @@ -92,10 +105,10 @@ Flag discipline (non-negotiable):
| Flag | Why |
|---|---|
| `--sandbox workspace-write` | Codex writes code, scoped to the working tree. Never `danger-full-access`. |
| `-c model_reasoning_effort=$EFFORT` | Only when the spec named one. The architect chose it for this task; the lane passes it through unchanged. |
| `${EFFORT:+-c} ${EFFORT:+model_reasoning_effort=$EFFORT}` | Only when the spec named one. Split across two expansions so each yields exactly one argv word or vanishes — `${EFFORT:+-c model_reasoning_effort=$EFFORT}` is a single word under zsh. The architect chose it for this task; the lane passes it through unchanged. |
| `--skip-git-repo-check` + `--cd "$(pwd)"` | Deterministic working root; works outside git repos. |
| `- < spec file` | Prompt via stdin. No quoting hazards, no truncated specs. |
| `${T:+$T 1800}` | Thirty-minute wall clock when `timeout`/`gtimeout` exists (macOS needs `brew install coreutils`); runs uncapped otherwise. High efforts on Sol are slow by design. On timeout, report `STATUS: timeout` with whatever landed. |
| `"$@"` (timeout prefix, 1800s) | Thirty-minute wall clock when `timeout`/`gtimeout` exists (macOS needs `brew install coreutils`); runs uncapped otherwise. High efforts on Sol are slow by design. On timeout, report `STATUS: timeout` with whatever landed. |

`--model gpt-5.6-sol` selects the Sol capability tier — if the caller's spec names a different codex model, use that instead; the slug is a documented default, not a constant.

Expand Down