Eric Traut
f2c2f9bbc6
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 18:34:22 -07:00
Eric Traut
9bb0e0f578
Simplify turn context update tests
2026-05-16 18:34:08 -07:00
Eric Traut
ee48c5a7aa
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 18:25:45 -07:00
Eric Traut
2f1591db16
Fix argument comment lint
2026-05-16 18:25:23 -07:00
Eric Traut
3c7e8d4361
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 18:13:00 -07:00
Eric Traut
aea47290fd
Wait before resolving turn start context
2026-05-16 18:12:46 -07:00
Eric Traut
55f62066bd
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 18:06:10 -07:00
Eric Traut
eb533c3616
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
2026-05-16 18:06:00 -07:00
Eric Traut
98c38ee9bf
Simplify turn context handler
2026-05-16 18:05:35 -07:00
Eric Traut
89f0804d2e
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 17:59:11 -07:00
Eric Traut
bb41cb44cf
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
2026-05-16 17:58:43 -07:00
Eric Traut
529c16f268
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
2026-05-16 17:58:11 -07:00
Eric Traut
5b41df2613
Simplify turn context update cleanup
2026-05-16 17:57:42 -07:00
Eric Traut
d5d3bb7348
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 17:43:47 -07:00
Eric Traut
28f6e90082
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
...
# Conflicts:
# codex-rs/app-server/src/request_processors/turn_processor.rs
2026-05-16 17:43:32 -07:00
Eric Traut
91e427f9f4
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
2026-05-16 17:42:54 -07:00
Eric Traut
5aeec5fa05
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context
2026-05-16 17:42:40 -07:00
Eric Traut
db6e9bfaa9
Merge branch 'etraut/next-turn-state-remove-user-input-with-context' into etraut/next-turn-state-input-op-consolidation
2026-05-16 17:42:27 -07:00
Eric Traut
cd69441b5b
Simplify turn start context overrides
2026-05-16 17:42:10 -07:00
Eric Traut
a5f2e7f68f
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context
2026-05-16 17:39:28 -07:00
Eric Traut
9d5a0e2b5d
Trim redundant turn context defaults
2026-05-16 17:39:09 -07:00
Eric Traut
af71859c77
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 17:27:50 -07:00
Eric Traut
d2b614b545
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
2026-05-16 17:27:34 -07:00
Eric Traut
b2445a9bcc
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
2026-05-16 17:27:17 -07:00
Eric Traut
532a6d07bb
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context
2026-05-16 17:27:02 -07:00
Eric Traut
8f6825e572
Merge branch 'etraut/next-turn-state-remove-user-input-with-context' into etraut/next-turn-state-input-op-consolidation
2026-05-16 17:26:53 -07:00
Eric Traut
73ad0c2463
Merge branch 'etraut/next-turn-state-user-input-context' into etraut/next-turn-state-remove-user-input-with-context
...
# Conflicts:
# codex-rs/core/src/session/handlers.rs
2026-05-16 17:26:44 -07:00
Eric Traut
c6fe81d803
Simplify turn context update handling
2026-05-16 17:23:39 -07:00
Eric Traut
f5943e0fd9
Merge remote-tracking branch 'origin/main' into etraut/next-turn-state-user-input-context
2026-05-16 17:21:08 -07:00
Eric Traut
19b95abd18
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 17:07:39 -07:00
Eric Traut
579abe122b
Fix turn context update ordering
2026-05-16 17:07:08 -07:00
Eric Traut
afdf699cc0
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 16:00:56 -07:00
Eric Traut
9af52a593b
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
2026-05-16 16:00:50 -07:00
Eric Traut
a31c4cd218
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
...
# Conflicts:
# codex-rs/core/src/codex_thread.rs
2026-05-16 16:00:41 -07:00
Eric Traut
5b47db287d
Fix OverrideTurnContext removal split
2026-05-16 16:00:11 -07:00
Eric Traut
fd0125a122
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 15:49:31 -07:00
Eric Traut
f3703798ee
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
2026-05-16 15:49:24 -07:00
Eric Traut
9393c2647b
Add queued core turn context op
2026-05-16 15:49:05 -07:00
Eric Traut
875b846721
Remove core OverrideTurnContext op
2026-05-16 15:47:40 -07:00
Eric Traut
0c291736bf
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 14:44:18 -07:00
Eric Traut
e3bb6dad55
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
2026-05-16 14:43:58 -07:00
Eric Traut
b2fa7ac1d0
Document direct turn context override ordering
2026-05-16 14:43:36 -07:00
Eric Traut
0445b290fe
[1 of 4] tui: route primary settings writes through app server ( #22913 )
...
## Why
The TUI can run against a remote app server, but several high-traffic
settings still persisted by editing the local config file. That sends
remote sessions' preference writes to the wrong machine and lets local
disk state drift from the app-server-owned config.
This is **[1 of 4]** in a stacked series that moves TUI-owned config
mutations onto app-server APIs.
## What changed
- Added a small TUI helper for typed app-server config writes.
- Routed primary interactive preference writes through
`config/batchWrite`.
- Preserved existing profile scoping for settings that already support
`profiles.<profile>.*` overrides.
## Config keys affected
- `model`
- `model_reasoning_effort`
- `personality`
- `service_tier`
- `plan_mode_reasoning_effort`
- `approvals_reviewer`
- `notice.fast_default_opt_out`
- Profile-scoped equivalents under `profiles.<profile>.*`
## Suggested manual validation
- Connect the TUI to a remote app server, change `model` and
`model_reasoning_effort`, reconnect, and confirm the remote config
retained both values while the local `config.toml` did not change.
- Change `personality`, `plan_mode_reasoning_effort`, and the explicit
auto-review selection, then reconnect and confirm those choices persist
through the app server.
- Clear the service tier back to default and confirm `service_tier` is
cleared while `notice.fast_default_opt_out = true` is persisted
remotely.
- Repeat one setting change with an active profile and confirm the write
lands under `profiles.<profile>.*`.
## Stack
1. [#22913 ](https://github.com/openai/codex/pull/22913 ) `[1 of 4]`
primary settings writes
2. [#22914 ](https://github.com/openai/codex/pull/22914 ) `[2 of 4]` app
and skill enablement
3. [#22915 ](https://github.com/openai/codex/pull/22915 ) `[3 of 4]`
feature and memory toggles
4. [#22916 ](https://github.com/openai/codex/pull/22916 ) `[4 of 4]`
startup and onboarding bookkeeping
2026-05-16 14:27:02 -07:00
Eric Traut
a5b5369d44
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 14:22:14 -07:00
Eric Traut
49bcf51b7f
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
...
# Conflicts:
# codex-rs/app-server/src/request_processors/turn_processor.rs
2026-05-16 14:22:05 -07:00
Eric Traut
1320847a37
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-core
2026-05-16 14:21:21 -07:00
Eric Traut
1c10a91853
Merge branch 'etraut/next-turn-state-remove-user-input-with-context' into etraut/next-turn-state-input-op-consolidation
...
# Conflicts:
# codex-rs/app-server/src/request_processors/turn_processor.rs
# codex-rs/core/src/session/handlers.rs
# codex-rs/protocol/src/protocol.rs
2026-05-16 14:21:06 -07:00
Eric Traut
cb528adace
Remove UserInputWithTurnContext op
2026-05-16 14:20:00 -07:00
Eric Traut
3b1b54ace7
Add turn context to UserInput
2026-05-16 14:16:20 -07:00
Eric Traut
d8c50437f3
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
2026-05-16 13:51:47 -07:00
