Upstream merge: openai/codex@main into main - #196

Merged

zemaj merged 18 commits into

mainfrom

upstream-merge

Sep 22, 2025

Commits on Sep 19, 2025

Use a unified shell tell to not break cache (#3814)
aibrahim-oai
authored
a7fda70
Move responses mocking helpers to a shared lib (#3878)
pakrym-oai
authored
881c797
merge(upstream): incorporate openai/codex main into upstream-merge (by-bucket)
just-every-code
committed
e367827
docs(upstream-merge): add MERGE_PLAN.md and MERGE_REPORT.md for by-bucket sync
just-every-code
committed
0db45f3
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot]
committed
87df3dd
Use helpers instead of fixtures (#3888)
pakrym-oai
authored
9b18875
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code
committed
1f6a232
merge(upstream): merge upstream/main into upstream-merge\n\n- Mode: by-bucket (prefer-ours TUI/core handlers; prefer-theirs common/exec/file-search)\n- verify.sh: PASS (build-fast ok; api check ok;…
just-every-code
committed
dc3cbe1
fix alignment in slash command popup (#3937)
nornagon-openai
authored
ff389dc
merge(upstream): merge upstream/main into upstream-merge\n\n- Keep our TUI popup alignment and snapshots (prefer_ours)\n- Adopt upstream in common/exec/file-search where applicable\n- Purge reintro…
just-every-code
committed
2290b13
don't clear screen on startup (#3925)
nornagon-openai
authored
ad0c2b4
Cache keyboard enhancement detection before event streams (#3950)
nornagon-openai
authored
42d335d
Merge upstream/main into upstream-merge: keep ours for TUI (tui.rs); verify.sh green; build-fast ok
just-every-code
committed
9436d92
merge(upstream): merge openai/codex main into upstream-merge
just-every-code
committed
04d69c8

Navigation Menu

Uh oh!

Upstream merge: openai/codex@main into main - #196

Upstream merge: openai/codex@main into main#196
zemaj merged 18 commits into
mainfrom
upstream-merge

Commits on Sep 19, 2025

Use a unified shell tell to not break cache (#3814)

Move responses mocking helpers to a shared lib (#3878)

merge(upstream): incorporate openai/codex main into upstream-merge (by-bucket)

docs(upstream-merge): add MERGE_PLAN.md and MERGE_REPORT.md for by-bucket sync

chore(merge): enforce policy removals (images + cargo caches)

Use helpers instead of fixtures (#3888)

Merge remote-tracking branch 'origin/main' into upstream-merge

merge(upstream): merge upstream/main into upstream-merge\n\n- Mode: by-bucket (prefer-ours TUI/core handlers; prefer-theirs common/exec/file-search)\n- verify.sh: PASS (build-fast ok; api check ok;…

fix alignment in slash command popup (#3937)

merge(upstream): merge upstream/main into upstream-merge\n\n- Keep our TUI popup alignment and snapshots (prefer_ours)\n- Adopt upstream in common/exec/file-search where applicable\n- Purge reintro…

don't clear screen on startup (#3925)

Cache keyboard enhancement detection before event streams (#3950)

Merge upstream/main into upstream-merge: keep ours for TUI (tui.rs); verify.sh green; build-fast ok

merge(upstream): merge openai/codex main into upstream-merge

Commits on Sep 21, 2025

Forward Rate limits to the UI (#3965)

merge(upstream): adopt upstream/main into upstream-merge; preserve core/codex.rs and fork tool behaviors; include upstream RateLimits stream event; pass verify + build-fast

Tui: Rate limits (#3977)

Merge upstream/main into upstream-merge: keep our TUI, adopt upstream libs