[Edo771977]

Three upstream PRs. Each one lands as its own merge commit with upstream authorship kept, so any of them can be reverted on its own.

What changes

openai/codex-plugin-cc#809: a turn whose turn/start response has no turn id now completes
captureTurn held every notification in its buffer until it had a turn id. If the turn/start response carried none, every later notification stayed buffered, turn/completed included, and the run never finished. Notifications are now buffered only until the start request settles.

• Conflict in tests/fake-codex-fixture.mjs, where the fork's crash-mid-turn and turn-never-completes branches sit. Upstream's missing-turn-id branch was added as a separate block that returns early, placed before them, so the fork's branches are untouched.
• The two new tests in tests/missing-turn-id.test.mjs fail if the old condition (!state.turnId) is put back.

openai/codex-plugin-cc#811: -h in the bump-version help
scripts/bump-version.mjs --help now lists the -h alias the script already accepted. Merged without conflicts.

openai/codex-plugin-cc#808: tests only

• The fork's parser already split inline values at the first = (since 3d6c7d9). lib/args.mjs keeps the fork's version, and upstream's change to it is dropped in the merge.
• tests/args.test.mjs conflicted add/add because both sides created it. Upstream's 9 tests are appended after the fork's.
• One test is adapted. Upstream expects --debug=false=extra to read as true. The fork rejects any boolean value other than true/false, so the test now expects the error.
• Putting the old split("=", 2) back into the parser fails 4 of the imported tests.

README (imports table) and CHANGELOG are updated.

Verification

• node --test tests/*.test.mjs: 396/396 on two full runs.
• npx tsc -p tsconfig.app-server.json: clean. npm run build was not used because its prebuild step runs codex app-server generate-ts, and codex is not installed here.
• npm run check-version: all version metadata matches 1.0.6. The version is left at the upstream number on purpose.

Not in this PR

• openai/codex-plugin-cc#814 (stops the app-server's child processes when the broker shuts down): needs adapting rather than merging. It conflicts in 5 files and adds its own idle timeout, which duplicates the fork's. No decision yet.
• openai/codex-plugin-cc#806 (take the approval policy from the user's Codex config): not recommended. The fork answers every server approval request with "unsupported", so a user whose config sets untrusted or on-request would have their commands refused.

🤖 Generated with Claude Code

https://claude.ai/code/session_01UXfvnjSC72HsM6EEPVt2Tg

---

Generated by Claude Code