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

..

snapshots

[codex] Remove unused legacy shell tools (#22246)

2026-05-13 16:43:25 +00:00

abort_tasks.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

agent_jobs.rs

…

agent_websocket.rs

2- Use string service tiers in session protocol (#20971)

2026-05-06 18:00:21 +03:00

agents_md.rs

Fix remote environment test fixtures (#22572)

2026-05-14 12:40:01 -07:00

apply_patch_cli.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

approvals.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

cli_stream.rs

Remove CODEX_RS_SSE_FIXTURE test hook (#22413)

2026-05-13 03:08:01 +00:00

client_websockets.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

client.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

code_mode.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

codex_delegate.rs

chore(features) rm Feature::ApplyPatchFreeform (#22711)

2026-05-14 16:15:56 -07:00

collaboration_instructions.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

compact_remote_parity.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

compact_remote.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

compact_resume_fork.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

compact.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

deprecation_notice.rs

[codex] Remove experimental instructions file config (#22724)

2026-05-14 18:04:26 -07:00

exec_policy.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

exec.rs

core tests: migrate more turns to permission profiles (#20013)

2026-04-28 17:05:53 -07:00

fork_thread.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

hierarchical_agents.rs

Fix remote environment test fixtures (#22572)

2026-05-14 12:40:01 -07:00

hooks_mcp.rs

Support explicit MCP OAuth client IDs (#22575)

2026-05-14 11:52:43 -07:00

hooks.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

image_rollout.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

items.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

json_result.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

live_cli.rs

tests: isolate codex home for live cli (#22563)

2026-05-14 12:59:56 -07:00

mcp_turn_metadata.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

mod.rs

Run compact hooks for remote compaction v2 (#22828)

2026-05-15 15:26:21 +02:00

model_overrides.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

model_switching.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

model_visible_layout.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

models_cache_ttl.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

models_etag_responses.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

openai_file_mcp.rs

Add user_input_requested_during_turn to MCP turn metadata (#22237)

2026-05-15 01:26:50 +00:00

otel.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

override_updates.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

pending_input.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

permissions_messages.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

personality_migration.rs

Preserve image detail in app-server inputs (#20693)

2026-05-15 15:04:04 -07:00

personality.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

plugins.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

prompt_caching.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

prompt_debug_tests.rs

Revert state DB injection and agent graph store (#21481)

2026-05-06 22:48:29 -07:00

quota_exceeded.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

realtime_conversation.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

remote_env.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

remote_models.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

request_compression.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

request_permissions_tool.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

request_permissions.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

request_plugin_install.rs

[tool_suggest] More prompt polishes. (#20566)

2026-05-02 04:22:12 +00:00

request_user_input.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

responses_api_proxy_headers.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

resume_warning.rs

Preserve image detail in app-server inputs (#20693)

2026-05-15 15:04:04 -07:00

resume.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

review.rs

Merge branch 'etraut/next-turn-state-remove-override-context' into etraut/next-turn-state-core

2026-05-18 15:36:21 -07:00

rmcp_client.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

rollout_list_find.rs

Unify thread metadata updates above store (#22236)

2026-05-13 00:28:15 +00:00

safety_check_downgrade.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

search_tool.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

shell_command.rs

chore(features) rm Feature::ApplyPatchFreeform (#22711)

2026-05-14 16:15:56 -07:00

shell_serialization.rs

chore(features) rm Feature::ApplyPatchFreeform (#22711)

2026-05-14 16:15:56 -07:00

shell_snapshot.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

skill_approval.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

skills.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

spawn_agent_description.rs

multiagent: trim model-visible description, cap to 5 models (#23069)

2026-05-16 13:43:30 -07:00

sqlite_state.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

stream_error_allows_next_turn.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

stream_no_completed.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

subagent_notifications.rs

feat: add session_id (#20437)

2026-05-06 10:48:37 +02:00

tool_harness.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

tool_parallelism.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

tools.rs

chore(features) rm Feature::ApplyPatchFreeform (#22711)

2026-05-14 16:15:56 -07:00

truncation.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

turn_state.rs

…

unified_exec.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

unstable_features_warning.rs

Revert state DB injection and agent graph store (#21481)

2026-05-06 22:48:29 -07:00

user_notification.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

user_shell_cmd.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

view_image.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

web_search.rs

…

websocket_fallback.rs

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

2026-05-18 15:29:58 -07:00

window_headers.rs

Rename input settings override terminology

2026-05-18 15:27:06 -07:00

windows_sandbox.rs

feat(sandbox): add Windows deny-read parity (#18202)

2026-05-11 23:04:28 -07:00