gstack/codex
Garry Tan 0f6227ecde
fix(codex): move diff scope into prompt instead of --base (Codex CLI 0.130+ argv conflict) (#1209)
Codex CLI ≥ 0.130.0 rejects passing a custom prompt and --base together
(mutually exclusive at argv level). Every /codex review, /review, and
/ship structured Codex review call ended with an argv error before the
model ran.

Fix: scope the diff in prompt text using
"Run git diff origin/<base>...HEAD 2>/dev/null || git diff <base>...HEAD"
instead of `--base <base>`. Preserves the filesystem boundary
instruction across all invocations and keeps Codex's review prompt
tuning.

Touches:
- codex/SKILL.md.tmpl + regenerated codex/SKILL.md
- scripts/resolvers/review.ts + regenerated review/SKILL.md, ship/SKILL.md
- test/gen-skill-docs.test.ts: new regression that fails if any of the
  five known files still contain the prompt+--base shape
- test/skill-validation.test.ts: corresponding negative + positive pin
  on the rendered SKILL.md files

Contributed by @jbetala7 via #1209. Closes #1479. Supersedes #1527
(@mvanhorn — same intent, different patch shape, CONFLICTING) and
#1449 (@Gujiassh — broader refactor, CONFLICTING). Credit retained
in CHANGELOG.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-18 21:06:22 -07:00
..
SKILL.md fix(codex): move diff scope into prompt instead of --base (Codex CLI 0.130+ argv conflict) (#1209) 2026-05-18 21:06:22 -07:00
SKILL.md.tmpl fix(codex): move diff scope into prompt instead of --base (Codex CLI 0.130+ argv conflict) (#1209) 2026-05-18 21:06:22 -07:00