openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-11 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fork popup rebase drift on main

Browse Source
This commit is contained in:
Rakan El Khalil
2026-03-21 23:09:00 -07:00
parent ffc441bb5d
commit c17c8433f8
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codex-rs/tui/src/app/fork_session_overlay.rs
View File

@@ -1039,6 +1039,9 @@ mod tests {
config,
active_profile: None,
cli_kv_overrides: Vec::new(),
arg0_paths: codex_arg0::Arg0DispatchPaths::default(),
loader_overrides: codex_core::config_loader::LoaderOverrides::default(),
cloud_requirements: codex_core::config_loader::CloudRequirementsLoader::default(),
harness_overrides: ConfigOverrides::default(),
runtime_approval_policy_override: None,
runtime_sandbox_policy_override: None,
@@ -1051,6 +1054,7 @@ mod tests {
enhanced_keys_supported: false,
commit_anim_running: Arc::new(AtomicBool::new(false)),
status_line_invalid_items_warned: Arc::new(AtomicBool::new(false)),
terminal_title_invalid_items_warned: Arc::new(AtomicBool::new(false)),
backtrack: BacktrackState::default(),
backtrack_render_pending: false,
feedback: codex_feedback::CodexFeedback::new(),

5
codex-rs/tui/src/app/fork_session_overlay_vt100_tests.rs
View File

@@ -67,6 +67,9 @@ async fn make_test_app() -> App {
config,
active_profile: None,
cli_kv_overrides: Vec::new(),
arg0_paths: codex_arg0::Arg0DispatchPaths::default(),
loader_overrides: codex_core::config_loader::LoaderOverrides::default(),
cloud_requirements: codex_core::config_loader::CloudRequirementsLoader::default(),
harness_overrides: ConfigOverrides::default(),
runtime_approval_policy_override: None,
runtime_sandbox_policy_override: None,
@@ -79,6 +82,7 @@ async fn make_test_app() -> App {
enhanced_keys_supported: false,
commit_anim_running: Arc::new(AtomicBool::new(false)),
status_line_invalid_items_warned: Arc::new(AtomicBool::new(false)),
terminal_title_invalid_items_warned: Arc::new(AtomicBool::new(false)),
backtrack: BacktrackState::default(),
backtrack_render_pending: false,
feedback: codex_feedback::CodexFeedback::new(),
@@ -110,6 +114,7 @@ fn configure_chat_widget(app: &mut App) {
model_provider_id: "test-provider".to_string(),
service_tier: None,
approval_policy: AskForApproval::Never,
approvals_reviewer: codex_core::config::types::ApprovalsReviewer::User,
sandbox_policy: SandboxPolicy::new_read_only_policy(),
cwd: PathBuf::from("/tmp/worktree"),
reasoning_effort: Some(ReasoningEffortConfig::XHigh),