Align the Claude Code plugin with GPT-5.6 runtime and prompting - #638
Align the Claude Code plugin with GPT-5.6 runtime and prompting#638eureka-pd wants to merge 3 commits into
Conversation
- port GPT-5.6 Sol/Terra/Luna model-catalog support from upstream PR openai#471 - support max/ultra efforts and model/effort selection in review flows - refresh stale shared brokers safely across plugin and Codex CLI upgrades - replace active GPT-5.4-specific prompt shaping with version-neutral codex-prompting guidance - keep gpt-5-4-prompting as a deprecated compatibility alias - update fork installation docs, changelog, and regression coverage Based-on: openai#471
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 866fdf8a09
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| return null; | ||
| } | ||
| } | ||
| teardownExistingBroker(cwd, existing, options.killProcess ?? terminateProcessTree); |
There was a problem hiding this comment.
Verify broker ownership before terminating the saved PID
When a broker crashes and leaves broker.json behind, its endpoint becomes unreachable but its PID can later be reused; this unconditionally passes that stale PID to terminateProcessTree. On Windows this kills the reused process tree, and on Unix it can terminate an unrelated process group when the reused PID is a group leader. Verify that the process still belongs to this broker, or avoid killing by PID when the endpoint cannot confirm broker identity.
Useful? React with 👍 / 👎.
| if (Number.isFinite(ownerPid) && isProcessAlive(ownerPid)) { | ||
| return false; |
There was a problem hiding this comment.
Recover stale locks when the owner PID has been reused
If a CLI process dies while holding this lock and the OS later assigns its PID to an unrelated long-lived process, isProcessAlive remains true and this branch ignores staleMs indefinitely. Every subsequent broker startup or reuse attempt then waits five seconds and fails until that unrelated process exits, effectively disabling the shared runtime for the workspace. Include process-start identity in the lock or allow sufficiently old locks to be recovered safely.
Useful? React with 👍 / 👎.
Summary
This PR aligns the Claude Code Codex plugin with the current GPT-5.6
Sol/Terra/Luna runtime and prompting model.
It:
maxandultrareasoning efforts where the selected model advertises themminimaleffort from the plugin-facing runtime and command surfacesparkalias togpt-5.6-lunagpt-5-4-promptingskill with version-neutralcodex-promptingguidance--modeland--effortconsistently for review and adversarial-review flowsdanger-full-accesssandboxContext
The runtime/model-catalog and broker-lifecycle portions of this change are
based on and extend #471 by @alexandrereyes.
That PR already addresses the underlying GPT-5.6 runtime and stale-broker
issues. This PR carries that work forward while also updating the
Claude-side model policy and prompting layer for the current GPT-5.6
generation.
In particular, it addresses the stale GPT-5.4 prompting path reported in
#485 and removes the remaining generation-specific assumptions from the
active rescue context.
The plugin now treats:
gpt-5.6-solas the highest-capability tiergpt-5.6-terraas the balanced tiergpt-5.6-lunaas the efficient/high-volume tierReasoning effort remains a separate inference-budget dimension and is
validated against the current Codex model catalog rather than a
generation-specific model matrix.
Model and effort handling
The companion exposes the following reasoning-effort values:
none,low,medium,high,xhigh,max,ultraminimalhas been removed from the plugin surface.Known OpenAI model/effort combinations are validated using
model/listfrom the app server. Older Codex versions that do not expose the model
catalog retain the existing compatibility fallback, and custom providers
or unknown future model names are not blocked by a plugin model allowlist.
The
sparkconvenience alias now resolves to:gpt-5.6-lunainstead of the previous GPT-5.3 Spark model.
Prompting
codex-rescueno longer loads a GPT-5.4-specific prompting skill.The new
codex-promptingskill is generation-neutral and uses a lean,outcome-first task contract:
The old
gpt-5-4-promptingskill and references are removed so they cannotbe injected into new rescue contexts.
Broker/runtime behavior
The shared app-server broker now records enough runtime identity to detect
plugin or Codex CLI upgrades.
Stale brokers are recycled when safe, while brokers with active work are
preserved so that:
Verification
Validated on Node.js 22 with the current Codex CLI:
npm cinpm run check-versionnpm test— 122/122 passingnpm run buildgit diff --checkmax/ultraspark→gpt-5.6-lunaminimalRelated
If maintainers prefer to land #471 independently, I am happy to split the
prompting/model-policy changes into a smaller follow-up PR on top of it.