Skip to content

Upstream merge: openai/codex@main into main #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
just-every-code wants to merge 148 commits into from
Closed

Upstream merge: openai/codex@main into main #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
90965fb
chore: add `just test`, which runs `cargo nextest` (#3508)
bolinfest Sep 12, 2025
f805d17
MCP Documentation Changes Requests in Code Review (#3507)
charlie-openai Sep 12, 2025
ba6af23
Add spacing to timer duration formats (#3471)
aibrahim-oai Sep 12, 2025
5b04b40
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code Sep 12, 2025
92a7acd
merge(upstream): pull openai/codex main into upstream-merge
just-every-code Sep 12, 2025
aca9811
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 12, 2025
bba567c
bug: fix model save (#3525)
jif-oai Sep 12, 2025
82fd249
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code Sep 12, 2025
4ae6b97
standardize shell description (#3514)
dylan-hurd-oai Sep 12, 2025
868892f
merge(upstream): sync with openai/codex main (by-bucket)
just-every-code Sep 12, 2025
abdcb40
feat: change the behavior of SetDefaultModel RPC so None clears the v…
bolinfest Sep 12, 2025
4f7427a
merge(upstream): merge openai/codex@main into upstream-merge
just-every-code Sep 12, 2025
c6fd056
feat: reasoning effort as optional (#3527)
jif-oai Sep 12, 2025
7df1776
merge(upstream): sync with openai/codex main (by-bucket)
just-every-code Sep 12, 2025
d45b73d
fix(mcp-server/rollout/common): align with upstream API changes; remo…
just-every-code Sep 12, 2025
1a6a95f
Add spacing between dropdown headers and items (#3472)
aibrahim-oai Sep 12, 2025
d4848e5
Add spacing before composer footer hints (#3469)
aibrahim-oai Sep 12, 2025
6a3c7ce
merge(upstream): sync with openai/codex main into upstream-merge
just-every-code Sep 12, 2025
ea225df
feat: context compaction (#3446)
jif-oai Sep 12, 2025
a2e9cc5
Update interruption error message styling (#3470)
aibrahim-oai Sep 12, 2025
062c769
merge(upstream): sync openai/codex main; keep TUI/core; adopt compact
just-every-code Sep 12, 2025
5f6e95b
if a command parses as a patch, do not attempt to run it (#3382)
nornagon-openai Sep 12, 2025
e3c6903
Add Azure Responses API workaround (#3528)
pakrym-oai Sep 12, 2025
b8ccfe9
core: expand default sandbox (#3483)
nornagon-openai Sep 12, 2025
8408f3e
Fix NUX UI (#3534)
jif-oai Sep 12, 2025
8d56d2f
fix: NIT None reasoning effort (#3536)
jif-oai Sep 12, 2025
37facd2
merge(upstream): sync with openai/codex@main into upstream-merge
just-every-code Sep 12, 2025
1e6d3bc
merge(upstream): merge openai/codex@main into upstream-merge
just-every-code Sep 12, 2025
1cd74be
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 12, 2025
90a0fd3
Review Mode (Core) (#3401)
dedrisian-oai Sep 12, 2025
414b8be
Always request encrypted cot (#3539)
pakrym-oai Sep 12, 2025
3d4acba
Preserve IDs for more item types in azure (#3542)
pakrym-oai Sep 13, 2025
bb92168
merge(upstream): incorporate openai/codex@main into upstream-merge
just-every-code Sep 13, 2025
682aabe
chore(merge): add MERGE_PLAN.md for upstream sync plan
just-every-code Sep 13, 2025
21896e5
merge(upstream): sync with openai/codex@main (by-bucket)\n\n- Adopt c…
just-every-code Sep 13, 2025
2abbe38
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 13, 2025
19b4ed3
w
tibo-openai Sep 13, 2025
a77364b
chore: remove descriptions
tibo-openai Sep 13, 2025
14ab106
chore: rename
tibo-openai Sep 13, 2025
5839e62
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code Sep 13, 2025
be5233c
merge(upstream): merge upstream/main into upstream-merge
just-every-code Sep 13, 2025
f95a1ec
docs(upstream-merge): add MERGE_PLAN and MERGE_REPORT for upstream sync
just-every-code Sep 13, 2025
a97735f
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 13, 2025
bab172c
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 13, 2025
bac8a42
chore: default swiftfox models to experimental reasoning summaries (#…
tibo-openai Sep 13, 2025
01ec82a
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code Sep 14, 2025
94c3b21
Merge upstream/main: selective sync by-bucket; preserve fork invariants
just-every-code Sep 14, 2025
4891ee2
refactor transcript view to handle HistoryCells (#3538)
nornagon-openai Sep 14, 2025
ec9d659
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code Sep 14, 2025
c0e40f5
merge(upstream): selective by-bucket sync with upstream/main
just-every-code Sep 14, 2025
2ca13b1
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 14, 2025
bbea6bb
Handle resuming/forking after compact (#3533)
aibrahim-oai Sep 14, 2025
dbe4634
Merge remote-tracking branch 'origin/main' into upstream-merge
just-every-code Sep 14, 2025
5a6328e
merge(upstream): sync with openai/codex@main (by-bucket)
just-every-code Sep 14, 2025
ec7da76
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 14, 2025
e932722
Add spacing before queued status indicator messages (#3474)
aibrahim-oai Sep 14, 2025
9baae77
chore: update output_lines() to take a struct instead of a sequence o…
bolinfest Sep 14, 2025
d701eb3
Gate model upgrade prompt behind ChatGPT auth (#3586)
aibrahim-oai Sep 14, 2025
7773d97
merge(upstream): merge upstream/main into upstream-merge (by-bucket)
just-every-code Sep 14, 2025
fdc8d00
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 14, 2025
7e1543f
Align user history message prefix width (#3467)
aibrahim-oai Sep 14, 2025
f27be3f
merge(upstream): incorporate upstream/main into upstream-merge (by-bu…
just-every-code Sep 14, 2025
863d9c2
Include command output when sending timeout to model (#3576)
pakrym-oai Sep 14, 2025
a4fb34f
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 14, 2025
ffd28d9
merge(upstream): by-bucket sync with openai/codex main
just-every-code Sep 14, 2025
34c8f5e
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 14, 2025
916fdc2
Add per-model-family prompts (#3597)
pakrym-oai Sep 14, 2025
51f88fd
Fix swiftfox model selector (#3598)
pakrym-oai Sep 14, 2025
b2f6fc3
Fix flaky windows test (#3564)
dedrisian-oai Sep 14, 2025
99e1d33
feat: update model save (#3589)
jimmyfraiture2 Sep 14, 2025
ab04363
merge(upstream): sync with openai/codex main into upstream-merge
just-every-code Sep 14, 2025
a30e5e4
enable-resume (#3537)
aibrahim-oai Sep 14, 2025
7895bcf
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 14, 2025
9177bda
Only one branch for swiftfox (#3601)
pakrym-oai Sep 14, 2025
a674d6a
merge(upstream): sync upstream/main into upstream-merge with selectiv…
just-every-code Sep 15, 2025
e0678a5
chore(merge): add MERGE_REPORT and plan for this upstream sync
just-every-code Sep 15, 2025
e3038c6
chore(merge): write MERGE_PLAN (by-bucket) for upstream sync
just-every-code Sep 15, 2025
a76fcab
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 15, 2025
93026f2
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 15, 2025
2aa84b8
Fix EventMsg Optional (#3604)
dedrisian-oai Sep 15, 2025
76c37c5
feat: UI animation (#3590)
jimmyfraiture2 Sep 15, 2025
c47febf
Append full raw reasoning event text (#3605)
pakrym-oai Sep 15, 2025
ce984b2
Add session header to chat widget (#3592)
aibrahim-oai Sep 15, 2025
4dffa49
Skip frames files in codespell (#3606)
pakrym-oai Sep 15, 2025
5185d69
fix(core): flaky test `completed_commands_do_not_persist_sessions` (#…
fouad-openai Sep 15, 2025
1823906
fix(tui): update full-auto to default preset (#3608)
fouad-openai Sep 15, 2025
b667383
fix: model family and apply_patch consistency (#3603)
dylan-hurd-oai Sep 15, 2025
e5dd7f0
Fix get_auth_status response when using custom provider (#3581)
etraut-openai Sep 15, 2025
02159a4
Merge upstream/main: preserve TUI/tooling; adopt core updates (verify…
just-every-code Sep 15, 2025
2ad6a37
Don't show the model for apikey (#3607)
aibrahim-oai Sep 15, 2025
9d919db
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 15, 2025
900bb01
When logging in using ChatGPT, make sure to overwrite API key (#3611)
etraut-openai Sep 15, 2025
758ec16
merge(upstream): sync openai/codex main into upstream-merge (by-bucke…
just-every-code Sep 15, 2025
87f956d
chore(merge): add MERGE_PLAN and MERGE_REPORT artifacts under .github…
just-every-code Sep 15, 2025
328c668
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 15, 2025
6581da9
Show the header when resuming a conversation (#3615)
aibrahim-oai Sep 15, 2025
26f1246
Revert "refactor transcript view to handle HistoryCells" (#3614)
aibrahim-oai Sep 15, 2025
6f914be
merge(upstream): sync with openai/codex main on upstream-merge; prese…
just-every-code Sep 15, 2025
d7d9d96
feat: add reasoning level to header (#3622)
tibo-openai Sep 15, 2025
a797051
chore: update swiftfox_prompt.md (#3624)
tibo-openai Sep 15, 2025
6a8e743
initial mcp add interface (#3543)
easong-openai Sep 15, 2025
1be9dc9
Merge upstream/main into upstream-merge: by-bucket resolution; keep o…
just-every-code Sep 15, 2025
839b2ae
Change animation frames (#3627)
edward-bayes Sep 15, 2025
ea7530a
merge(upstream): sync upstream/main into upstream-merge
just-every-code Sep 15, 2025
50262a4
Show abort in the resume (#3629)
aibrahim-oai Sep 15, 2025
fd40d52
merge(upstream): sync with openai/codex main
just-every-code Sep 15, 2025
6039f8a
feat: tighten preset filter, tame storage load logs, enable rollout p…
tibo-openai Sep 15, 2025
2d52e3b
Fix codex resume so flags (cd, model, search, etc.) still work (#3625)
aibrahim-oai Sep 15, 2025
c98cd99
merge(upstream): by-bucket merge of upstream/main; keep TUI, adopt CL…
just-every-code Sep 15, 2025
b9af1d2
Login flow polish (#3632)
edward-bayes Sep 15, 2025
adc9e15
chore(deps): bump slab from 0.4.10 to 0.4.11 in /codex-rs (#3635)
dependabot[bot] Sep 15, 2025
fdf4a68
chore(deps): bump tracing-subscriber from 0.3.19 to 0.3.20 in /codex-…
dependabot[bot] Sep 15, 2025
1139464
merge(upstream): sync upstream/main into upstream-merge; keep forked …
just-every-code Sep 15, 2025
9baa5c3
feat: update splash (#3631)
ae-openai Sep 15, 2025
d555b68
fix: race condition unified exec (#3644)
jimmyfraiture2 Sep 15, 2025
6aafe37
chore: set `prerelease:true` for now (#3645)
bolinfest Sep 15, 2025
3e2028a
merge(upstream): sync with openai/codex@main; adopt exec exit status
just-every-code Sep 15, 2025
bd5d245
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 15, 2025
d60cbed
fix: add references (#3633)
tibo-openai Sep 15, 2025
f037b2f
chore: rename (#3648)
bolinfest Sep 15, 2025
934d728
feat: skip animations on small terminals (#3647)
tibo-openai Sep 15, 2025
3407cfe
merge(upstream): sync with openai/codex@main on upstream-merge
just-every-code Sep 15, 2025
b1c291e
Add file reference guidelines to gpt-5 prompt (#3651)
pakrym-oai Sep 15, 2025
4788ed9
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 15, 2025
cf63cbf
fix stray login url characters persisting in login (#3639)
easong-openai Sep 15, 2025
5c583fe
feat: tweak onboarding strings (#3650)
ae-openai Sep 15, 2025
e0b6578
chore(upstream-merge): add MERGE_PLAN with by-bucket strategy
just-every-code Sep 15, 2025
4764eb9
merge(upstream): merge upstream/main into upstream-merge; keep our TU…
just-every-code Sep 15, 2025
c679282
docs(upstream-merge): add MERGE_REPORT summarizing decisions and vali…
just-every-code Sep 15, 2025
0b65153
chore(merge): enforce policy removals (images + cargo caches)
github-actions[bot] Sep 15, 2025
0de1541
fix: change MIN_ANIMATION_HEIGHT so show_animation is calculated corr…
bolinfest Sep 15, 2025
0560079
notifications on approvals and turn end (#3329)
nornagon-openai Sep 15, 2025
97e02b8
Merge upstream/main: by-bucket sync; preserve TUI/core gating; adopt …
just-every-code Sep 15, 2025
2df7f7e
chore: restore prerelease logic in rust-release.yml (#3659)
bolinfest Sep 15, 2025
add6395
merge(upstream): by-bucket sync with openai/codex@main
just-every-code Sep 15, 2025
232fc74
merge(upstream): incorporate upstream/main into upstream-merge
just-every-code Sep 15, 2025
39ed8a7
chore(deps): bump serde_json from 1.0.143 to 1.0.145 in /codex-rs (#3…
dependabot[bot] Sep 15, 2025
ca8bd09
chore: simplify dep so serde=1 in Cargo.toml (#3664)
bolinfest Sep 15, 2025
5fcacad
Merge upstream/main into upstream-merge: adopt upstream for common/ex…
just-every-code Sep 15, 2025
8802755
chore(deps): bump serde from 1.0.219 to 1.0.223 in /codex-rs (#3618)
dependabot[bot] Sep 15, 2025
62cdb11
merge(upstream): sync with openai/codex main into upstream-merge
just-every-code Sep 15, 2025
404c126
chore(deps): bump wildmatch from 2.4.0 to 2.5.0 in /codex-rs (#3619)
dependabot[bot] Sep 15, 2025
c24710d
merge(upstream): bucketed merge of upstream/main into upstream-merge\…
just-every-code Sep 15, 2025
45bccd3
fix permissions alignment
easong-openai Sep 16, 2025
d3ea9a2
merge(upstream): bucketed merge of upstream/main into upstream-merge
just-every-code Sep 16, 2025
9e8c9e8
chore(merge): auto-rebrand user-visible strings ('Codex'→'Code') in T…
github-actions[bot] Sep 16, 2025
a8026d3
fix: read-only escalations (#3673)
dylan-hurd-oai Sep 16, 2025
ce8c3ec
merge(upstream): sync with openai/codex@main (by-bucket)\n\n- Adopt u…
just-every-code Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion codex-cli/.pack/package/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@just-every/code",
"version": "0.2.148",
"license": "Apache-2.0",
"description": "Lightweight coding agent that runs in your terminal - fork of OpenAI Codex",
"description": "Lightweight coding agent that runs in your terminal - fork of OpenAI Code",
"bin": {
"coder": "bin/coder.js"
},
Expand Down
2 changes: 1 addition & 1 deletion codex-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@just-every/code",
"version": "0.2.148",
"license": "Apache-2.0",
"description": "Lightweight coding agent that runs in your terminal - fork of OpenAI Codex",
"description": "Lightweight coding agent that runs in your terminal - fork of OpenAI Code",
"bin": {
"coder": "bin/coder.js"
},
Expand Down
Loading