Michael Bolin
d29ad70f17
Merge ff719f645b into sapling-pr-archive-bolinfest
2025-08-05 11:45:02 -07:00
Michael Bolin
ff719f645b
chore: remove unnecessary default_ prefix
2025-08-05 11:44:30 -07:00
Michael Bolin
bd24bc320e
fix: clean out some ASCII ( #1856 )
...
Similar to https://github.com/openai/codex/pull/1855 , this got through.
Fixed by running:
```
./scripts/asciicheck.py README.md
```
2025-08-05 11:44:04 -07:00
Michael Bolin
aa5147a86a
Merge 157a9d0c3e into sapling-pr-archive-bolinfest
2025-08-05 11:43:23 -07:00
Michael Bolin
157a9d0c3e
fix: clean out some ASCII
2025-08-05 11:43:07 -07:00
Michael Bolin
9edd12378e
Merge 1243bb03bf into sapling-pr-archive-bolinfest
2025-08-05 11:40:16 -07:00
Michael Bolin
1243bb03bf
chore: remove unnecessary default_ prefix
2025-08-05 11:39:53 -07:00
Michael Bolin
9f91b3da24
fix: correct spelling error that sneaked through ( #1855 )
...
I ended up force-pushing https://github.com/openai/codex/pull/1848
because CI jobs were not being triggered after updating the PR on
GitHub, so this spelling error sneaked through.
2025-08-05 11:39:30 -07:00
Michael Bolin
bc00177bcf
Merge 145df4556e into sapling-pr-archive-bolinfest
2025-08-05 11:38:26 -07:00
Michael Bolin
145df4556e
fix: correct spelling error that sneaked through
2025-08-05 11:38:10 -07:00
Michael Bolin
4582400739
merge commit for archive created by Sapling
2025-08-05 11:36:22 -07:00
Michael Bolin
d6cfe922f2
chore: remove unnecessary default_ prefix
2025-08-05 11:36:01 -07:00
easong-openai and Michael Bolin
9285350842
Introduce --oss flag to use gpt-oss models ( #1848 )
...
This adds support for easily running Codex backed by a local Ollama
instance running our new open source models. See
https://github.com/openai/gpt-oss for details.
If you pass in `--oss` you'll be prompted to install/launch ollama, and
it will automatically download the 20b model and attempt to use it.
We'll likely want to expand this with some options later to make the
experience smoother for users who can't run the 20b or want to run the
120b.
Co-authored-by: Michael Bolin <mbolin@openai.com >
2025-08-05 11:31:11 -07:00
Michael Bolin
5e19415a76
merge commit for archive created by Sapling
2025-08-05 11:20:26 -07:00
Michael Bolin
95abf99e71
feat: add a built-in model provider named "oss"
2025-08-05 11:19:49 -07:00
Michael Bolin
4220fce51d
merge commit for archive created by Sapling
2025-08-05 02:34:32 -07:00
Michael Bolin
8e08ab7f80
feat: add a built-in model provider named "oss"
2025-08-05 02:34:12 -07:00
Michael Bolin
f939d50980
merge commit for archive created by Sapling
2025-08-05 02:23:17 -07:00
Michael Bolin
bc427d6f71
feat: add a built-in model provider named "oss"
2025-08-05 02:22:55 -07:00
Michael Bolin
ee043a0029
Merge 505d6c22dc into sapling-pr-archive-bolinfest
2025-08-05 02:13:41 -07:00
Michael Bolin
505d6c22dc
feat: add a built-in model provider named "oss"
2025-08-05 02:13:25 -07:00
easong-openai and Ahmed Ibrahim
e0303dbac0
Rescue chat completion changes ( #1846 )
...
https://github.com/openai/codex/pull/1835 has some messed up history.
This adds support for streaming chat completions, which is useful for ollama. We should probably take a very skeptical eye to the code introduced in this PR.
---------
Co-authored-by: Ahmed Ibrahim <aibrahim@openai.com >
2025-08-05 08:56:13 +00:00
Dylan
d31e149cb1
[prompt] Update prompt.md ( #1839 )
...
## Summary
Additional clarifications to our prompt. Still very concise, but we'll
continue to add more here.
2025-08-05 00:43:23 -07:00
Michael Bolin
136b3ee5bf
chore: introduce ModelFamily abstraction ( #1838 )
...
To date, we have a number of hardcoded OpenAI model slug checks spread
throughout the codebase, which makes it hard to audit the various
special cases for each model. To mitigate this issue, this PR introduces
the idea of a `ModelFamily` that has fields to represent the existing
special cases, such as `supports_reasoning_summaries` and
`uses_local_shell_tool`.
There is a `find_family_for_model()` function that maps the raw model
slug to a `ModelFamily`. This function hardcodes all the knowledge about
the special attributes for each model. This PR then replaces the
hardcoded model name checks with checks against a `ModelFamily`.
Note `ModelFamily` is now available as `Config::model_family`. We should
ultimately remove `Config::model` in favor of
`Config::model_family::slug`.
2025-08-04 23:50:03 -07:00
Michael Bolin
bf0daf6ea1
merge commit for archive created by Sapling
2025-08-04 23:41:06 -07:00
Michael Bolin
41105009f0
chore: introduce ModelFamily abstraction
2025-08-04 23:41:00 -07:00
Michael Bolin
55fa107b35
merge commit for archive created by Sapling
2025-08-04 23:38:06 -07:00
Michael Bolin
8f90fb0725
chore: introduce ModelFamily abstraction
2025-08-04 23:37:11 -07:00
Michael Bolin
3086c5ee4e
merge commit for archive created by Sapling
2025-08-04 23:30:01 -07:00
Michael Bolin
a766a55c33
chore: introduce ModelFamily abstraction
2025-08-04 23:29:48 -07:00
Michael Bolin
1c898787e4
Merge d543562232 into sapling-pr-archive-bolinfest
2025-08-04 23:25:14 -07:00
Michael Bolin
d543562232
chore: introduce ModelFamily abstraction
2025-08-04 23:24:49 -07:00
Michael Bolin
fcdb1c4b4d
fix: disable reorderArrays in tamasfe.even-better-toml ( #1837 )
...
The existing setting kept destroying my `~/.codex/config.toml` for the
reasons mentioned in the comment.
2025-08-04 21:57:55 -07:00
Michael Bolin
152d43b44f
Merge dc623bd770 into sapling-pr-archive-bolinfest
2025-08-04 21:42:33 -07:00
Michael Bolin
dc623bd770
fix: disable reorderArrays in tamasfe.even-better-toml
2025-08-04 21:42:27 -07:00
Michael Bolin
ab2bb5b3e8
Merge bdcfb9ecf0 into sapling-pr-archive-bolinfest
2025-08-04 21:33:45 -07:00
Michael Bolin
bdcfb9ecf0
fix: disable reorderArrays in tamasfe.even-better-toml
2025-08-04 21:33:38 -07:00
easong-openai
906d449760
Stream model responses ( #1810 )
...
Stream models thoughts and responses instead of waiting for the whole
thing to come through. Very rough right now, but I'm making the risk call to push through.
2025-08-05 04:23:22 +00:00
Dylan
063083af15
[prompts] Better user_instructions handling ( #1836 )
...
## Summary
Our recent change in #1737 can sometimes lead to the model confusing
AGENTS.md context as part of the message. But a little prompting and
formatting can help fix this!
## Testing
- Ran locally with a few different prompts to verify the model
behaves well.
- Updated unit tests
2025-08-04 18:55:57 -07:00
pakrym-oai
f58401e203
Request the simplified auth flow ( #1834 )
2025-08-04 18:45:13 -07:00
pakrym-oai
84bcadb8d9
Restore API key and query param overrides ( #1826 )
...
Addresses https://github.com/openai/codex/issues/1796
2025-08-04 18:07:49 -07:00
Ahmed Ibrahim
e38ce39c51
Revert to 3f13ebce10 without rewriting history. Wrong merge
2025-08-04 17:03:24 -07:00
Ahmed Ibrahim
1a33de34b0
unify flag
2025-08-04 16:56:52 -07:00
Ahmed Ibrahim
bd171e5206
add raw reasoning
2025-08-04 16:49:42 -07:00
Michael Bolin
3f13ebce10
[codex] stop printing error message when --output-last-message is not specified ( #1828 )
...
Previously, `codex exec` was printing `Warning: no file to write last
message to` as a warning to stderr even though `--output-last-message`
was not specified, which is wrong. This fixes the code and changes
`handle_last_message()` so that it is only called when
`last_message_path` is `Some`.
2025-08-04 15:56:32 -07:00
Michael Bolin
d39a12ea30
merge commit for archive created by Sapling
2025-08-04 15:10:53 -07:00
Michael Bolin
be41458a49
[codex] stop printing error message when --output-last-message is not specified
2025-08-04 15:10:47 -07:00
Michael Bolin
aa80e28b6b
Merge 715fb37a04 into sapling-pr-archive-bolinfest
2025-08-04 15:06:51 -07:00
Michael Bolin
715fb37a04
[codex] stop printing error message when --output-last-message is not specified
2025-08-04 15:06:44 -07:00
dependabot[bot]
7279080edd
chore(deps): bump tokio from 1.46.1 to 1.47.1 in /codex-rs ( #1816 )
...
Bumps [tokio](https://github.com/tokio-rs/tokio ) from 1.46.1 to 1.47.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/tokio/releases ">tokio's
releases</a>.</em></p>
<blockquote>
<h2>Tokio v1.47.1</h2>
<h1>1.47.1 (August 1st, 2025)</h1>
<h3>Fixed</h3>
<ul>
<li>process: fix panic from spurious pidfd wakeup (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7494 ">#7494</a>)</li>
<li>sync: fix broken link of Python <code>asyncio.Event</code> in
<code>SetOnce</code> docs (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7485 ">#7485</a>)</li>
</ul>
<p><a
href="https://redirect.github.com/tokio-rs/tokio/issues/7485 ">#7485</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7485 ">tokio-rs/tokio#7485</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7494 ">#7494</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7494 ">tokio-rs/tokio#7494</a></p>
<h2>Tokio v1.47.0</h2>
<h1>1.47.0 (July 25th, 2025)</h1>
<p>This release adds <code>poll_proceed</code> and
<code>cooperative</code> to the <code>coop</code> module for
cooperative scheduling, adds <code>SetOnce</code> to the
<code>sync</code> module which provides
similar functionality to [<code>std::sync::OnceLock</code>], and adds a
new method
<code>sync::Notify::notified_owned()</code> which returns an
<code>OwnedNotified</code> without
a lifetime parameter.</p>
<h2>Added</h2>
<ul>
<li>coop: add <code>cooperative</code> and <code>poll_proceed</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7405 ">#7405</a>)</li>
<li>sync: add <code>SetOnce</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7418 ">#7418</a>)</li>
<li>sync: add <code>sync::Notify::notified_owned()</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7465 ">#7465</a>)</li>
</ul>
<h2>Changed</h2>
<ul>
<li>deps: upgrade windows-sys 0.52 → 0.59 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7117 ">#7117</a>)</li>
<li>deps: update to socket2 v0.6 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7443 ">#7443</a>)</li>
<li>sync: improve <code>AtomicWaker::wake</code> performance (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7450 ">#7450</a>)</li>
</ul>
<h2>Documented</h2>
<ul>
<li>metrics: fix listed feature requirements for some metrics (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7449 ">#7449</a>)</li>
<li>runtime: improve safety comments of <code>Readiness<'_></code>
(<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7415 ">#7415</a>)</li>
</ul>
<p><a
href="https://redirect.github.com/tokio-rs/tokio/issues/7405 ">#7405</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7405 ">tokio-rs/tokio#7405</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7415 ">#7415</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7415 ">tokio-rs/tokio#7415</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7418 ">#7418</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7418 ">tokio-rs/tokio#7418</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7449 ">#7449</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7449 ">tokio-rs/tokio#7449</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7450 ">#7450</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7450 ">tokio-rs/tokio#7450</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7465 ">#7465</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7465 ">tokio-rs/tokio#7465</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tokio-rs/tokio/commit/be8ee45b3fc2d107174e586141b1cb12c93e2ddf "><code>be8ee45</code></a>
chore: prepare Tokio v1.47.1 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7504 ">#7504</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/d9b19166cde30b8d4a65f31a94b5ee09d2dd7b8c "><code>d9b1916</code></a>
Merge 'tokio-1.43.2' into 'tokio-1.47.x' (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7503 ">#7503</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/db8edc620fb369f6cc92dd9dcfdd03b832c2b02f "><code>db8edc6</code></a>
chore: prepare Tokio v1.43.2 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7502 ">#7502</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/4730984d66e708b36efe84245cbf15bd483a886f "><code>4730984</code></a>
readme: add 1.47 as LTS release (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7497 ">#7497</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/1979615cbf1cc4b4d296814957394703827362d0 "><code>1979615</code></a>
process: fix panic from spurious pidfd wakeup (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7494 ">#7494</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/f669a609cf1eaa94d2bc135212f57ff913eca898 "><code>f669a60</code></a>
ci: add lockfile for LTS branch</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/ce41896f8dcbc6249df3279600f45f7a65915cf6 "><code>ce41896</code></a>
sync: fix broken link of Python <code>asyncio.Event</code> in
<code>SetOnce</code> docs (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7485 ">#7485</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/c8ab78a84fff284958dc84b77b5222fecd0f44b2 "><code>c8ab78a</code></a>
changelog: fix incorrect PR number for 1.47.0 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7484 ">#7484</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/3911cb8523f190142f61c64b66881c07c0d3e7be "><code>3911cb8</code></a>
chore: prepare Tokio v1.47.0 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7482 ">#7482</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/d545aa2601e3008ce49c8c0191b0f172ce577452 "><code>d545aa2</code></a>
sync: add <code>sync::Notify::notified_owned()</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7465 ">#7465</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/tokio-rs/tokio/compare/tokio-1.46.1...tokio-1.47.1 ">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-04 14:50:53 -07:00