Upstream merge: openai/codex@main into main #196
+228
−272
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, we change the tool description according to the sandbox policy and approval policy. This breaks the cache when the user hits `/approvals`. This PR does the following: - Always use the shell with escalation parameter: - removes `create_shell_tool_for_sandbox` and always uses unified tool via `create_shell_tool` - Reject the func call when the model uses escalation parameter when it cannot.
These are generally useful
…y-bucket) - Keep ours for protected core files: codex-rs/core/src/codex.rs, codex-rs/core/src/openai_tools.rs to preserve tool gating, UA/version, and fork-only handlers. - Adopt upstream test infra improvements (wiremock helpers) and minor exec derives. - Verified with scripts/upstream-merge/verify.sh and build-fast.sh: ok
Move to using test helper method everywhere.
…y-bucket (prefer-ours TUI/core handlers; prefer-theirs common/exec/file-search)\n- verify.sh: PASS (build-fast ok; api check ok; guards ok)\n- Preserved fork invariants: tool exposure gating, UA/version, public re-exports\n- Purge set unchanged; no conflicts encountered
…r TUI popup alignment and snapshots (prefer_ours)\n- Adopt upstream in common/exec/file-search where applicable\n- Purge reintroduced CLI images per policy\n\nBuild: ./build-fast.sh ok; verify.sh api_check ok
Hopefully fixes incorrectly showing ^J instead of Shift+Enter in the key hints occasionally.
…verify.sh green; build-fast ok
- Strategy: by-bucket; prefer ours for TUI/core tool wiring; prefer theirs for common/exec/file-search. - Resolved conflicts by keeping ours for codex-rs/tui/src/app.rs and codex-rs/tui/src/tui.rs per fork UX policy. - Purge check: no reintroduced .github/codex-cli-* images. - Guards: verify.sh passed; build-fast.sh OK; UA/version + tool parity preserved.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges openai/codex@main into main.