 Eric Traut
|
0d62edd2de
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 17:43:58 -07:00 |
|
|
Eric Traut
|
0f422dd875
|
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-18 17:43:41 -07:00 |
|
|
Eric Traut
|
0a2c9aa9d9
|
Simplify thread settings core helpers
|
2026-05-18 17:42:36 -07:00 |
|
|
Eric Traut
|
1d67ea0e0c
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 17:15:46 -07:00 |
|
|
Eric Traut
|
ed2534f1c1
|
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
|
2026-05-18 17:15:30 -07:00 |
|
|
Eric Traut
|
5dc813bd16
|
Fix thread settings op kind test
|
2026-05-18 17:15:15 -07:00 |
|
|
Eric Traut
|
38b56758f6
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 16:32:16 -07:00 |
|
|
Eric Traut
|
92d09dbb62
|
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
|
2026-05-18 16:32:07 -07:00 |
|
|
Eric Traut
|
a14199fbb6
|
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
|
2026-05-18 16:31:20 -07:00 |
|
|
Eric Traut
|
d6ae36fd8d
|
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context
|
2026-05-18 16:30:45 -07:00 |
|
|
Eric Traut
|
4939645c44
|
Simplify thread settings test overrides
|
2026-05-18 16:30:08 -07:00 |
|
|
Eric Traut
|
2836662ea4
|
Fix thread settings field rename
|
2026-05-18 16:17:01 -07:00 |
|
|
Eric Traut
|
0c4f2c572d
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 16:09:37 -07:00 |
|
|
Eric Traut
|
1484283d12
|
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
|
2026-05-18 16:09:25 -07:00 |
|
|
Eric Traut
|
b7d18d7606
|
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
# Conflicts:
# codex-rs/core/src/session/handlers.rs
|
2026-05-18 16:09:13 -07:00 |
|
|
Eric Traut
|
76447889f2
|
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context
|
2026-05-18 16:08:16 -07:00 |
|
|
Eric Traut
|
dea732b035
|
Merge branch 'etraut/next-turn-state-remove-user-input-with-context' into etraut/next-turn-state-input-op-consolidation
|
2026-05-18 16:07:57 -07:00 |
|
|
Eric Traut
|
d3052c6136
|
Merge branch 'etraut/next-turn-state-user-input-context' into etraut/next-turn-state-remove-user-input-with-context
|
2026-05-18 16:07:45 -07:00 |
|
|
Eric Traut
|
9ad7f64d9d
|
Clarify thread settings model updates
|
2026-05-18 16:06:51 -07:00 |
|
|
Eric Traut
|
ca60b05b21
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 15:58:08 -07:00 |
|
|
Eric Traut
|
fd4929c5b8
|
Rename app-server docs to thread settings
|
2026-05-18 15:58:04 -07:00 |
|
|
Eric Traut
|
deeca6475e
|
Rename TUI turn context wiring to thread settings
|
2026-05-18 15:54:29 -07:00 |
|
|
Eric Traut
|
7e6596fff3
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 15:46:26 -07:00 |
|
|
Eric Traut
|
e8e4502b64
|
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-18 15:46:18 -07:00 |
|
|
Eric Traut
|
de38d2a98b
|
Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core
# Conflicts:
# codex-rs/core/src/codex_thread.rs
# codex-rs/core/src/session/handlers.rs
# codex-rs/core/tests/suite/collaboration_instructions.rs
# codex-rs/core/tests/suite/compact.rs
# codex-rs/core/tests/suite/compact_remote.rs
# codex-rs/core/tests/suite/compact_resume_fork.rs
# codex-rs/core/tests/suite/model_overrides.rs
# codex-rs/core/tests/suite/model_switching.rs
# codex-rs/core/tests/suite/model_visible_layout.rs
# codex-rs/core/tests/suite/override_updates.rs
# codex-rs/core/tests/suite/permissions_messages.rs
# codex-rs/core/tests/suite/personality.rs
# codex-rs/core/tests/suite/prompt_caching.rs
# codex-rs/core/tests/suite/remote_models.rs
# codex-rs/core/tests/suite/resume.rs
# codex-rs/core/tests/suite/review.rs
# codex-rs/memories/write/src/startup_tests.rs
# codex-rs/protocol/src/protocol.rs
|
2026-05-18 15:36:21 -07:00 |
|
|
Eric Traut
|
a940c8db7b
|
Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context
# Conflicts:
# codex-rs/core/src/codex_thread.rs
# codex-rs/core/src/session/tests.rs
# codex-rs/protocol/src/protocol.rs
|
2026-05-18 15:29:58 -07:00 |
|
|
Eric Traut
|
50435559f4
|
Merge branch 'etraut/next-turn-state-remove-user-input-with-context' into etraut/next-turn-state-input-op-consolidation
|
2026-05-18 15:28:14 -07:00 |
|
|
Eric Traut
|
5946878f8e
|
Merge branch 'etraut/next-turn-state-user-input-context' into etraut/next-turn-state-remove-user-input-with-context
# 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-18 15:28:05 -07:00 |
|
|
Eric Traut
|
14284fe5a7
|
Rename input settings override terminology
|
2026-05-18 15:27:06 -07:00 |
|
|
Eric Traut
|
ec0e4958f7
|
Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui
|
2026-05-18 15:21:13 -07:00 |
|
|
Eric Traut
|
5015aa97bf
|
Merge branch 'etraut/next-turn-state-core' into etraut/next-turn-state-app-server
|
2026-05-18 15:21:02 -07:00 |
|
|
Eric Traut
|
0f483dd5d4
|
Use queued turn context op in tests
|
2026-05-18 15:20:43 -07:00 |
|
|
Eric Traut
|
ba3b410d9a
|
Fix TUI argument comments
|
2026-05-16 18:55:03 -07:00 |
|
|
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 |
|