diff --git a/codex-rs/app-server/src/request_processors/external_agent_config_processor.rs b/codex-rs/app-server/src/request_processors/external_agent_config_processor.rs
index 8490990af6..b09f067aac 100644
--- a/codex-rs/app-server/src/request_processors/external_agent_config_processor.rs
+++ b/codex-rs/app-server/src/request_processors/external_agent_config_processor.rs
@@ -309,7 +309,7 @@ impl ExternalAgentConfigRequestProcessor {
                 session_source: None,
                 thread_source: None,
                 code_mode_session_provider_selection:
-                    codex_code_mode::SessionProviderSelection::InProcess,
+                    codex_core::CodeModeSessionProviderSelection::InProcess,
                 dynamic_tools: Vec::new(),
                 persist_extended_history: false,
                 metrics_service_name: None,
diff --git a/codex-rs/app-server/src/request_processors/thread_processor.rs b/codex-rs/app-server/src/request_processors/thread_processor.rs
index 24e672e55f..548b2c032d 100644
--- a/codex-rs/app-server/src/request_processors/thread_processor.rs
+++ b/codex-rs/app-server/src/request_processors/thread_processor.rs
@@ -1106,7 +1106,7 @@ impl ThreadRequestProcessor {
                 session_source: None,
                 thread_source,
                 code_mode_session_provider_selection:
-                    codex_code_mode::SessionProviderSelection::InProcess,
+                    codex_core::CodeModeSessionProviderSelection::InProcess,
                 dynamic_tools: core_dynamic_tools,
                 persist_extended_history: false,
                 metrics_service_name: service_name,
diff --git a/codex-rs/core/src/lib.rs b/codex-rs/core/src/lib.rs
index 0dd72ed130..e8f57be2f9 100644
--- a/codex-rs/core/src/lib.rs
+++ b/codex-rs/core/src/lib.rs
@@ -101,6 +101,7 @@ pub mod test_support;
 mod unified_exec;
 pub mod windows_sandbox;
 pub use client::X_RESPONSESAPI_INCLUDE_TIMING_METRICS_HEADER;
+pub use codex_code_mode::SessionProviderSelection as CodeModeSessionProviderSelection;
 pub use codex_protocol::config_types::ModelProviderAuthInfo;
 mod event_mapping;
 pub mod review_format;
diff --git a/codex-rs/memories/write/src/runtime.rs b/codex-rs/memories/write/src/runtime.rs
index 1dc2ff9c0d..b8681c6815 100644
--- a/codex-rs/memories/write/src/runtime.rs
+++ b/codex-rs/memories/write/src/runtime.rs
@@ -248,7 +248,7 @@ impl MemoryStartupContext {
                 )),
                 thread_source: Some(ThreadSource::MemoryConsolidation),
                 code_mode_session_provider_selection:
-                    codex_code_mode::SessionProviderSelection::InProcess,
+                    codex_core::CodeModeSessionProviderSelection::InProcess,
                 dynamic_tools: Vec::new(),
                 persist_extended_history: false,
                 metrics_service_name: None,