diff --git a/codex-rs/app-server/src/config_manager.rs b/codex-rs/app-server/src/config_manager.rs
index d890000e42..812e843802 100644
--- a/codex-rs/app-server/src/config_manager.rs
+++ b/codex-rs/app-server/src/config_manager.rs
@@ -36,7 +36,6 @@ pub(crate) struct ConfigManager {
     cloud_config_bundle: Arc<RwLock<CloudConfigBundleLoader>>,
     arg0_paths: Arg0DispatchPaths,
     thread_config_loader: Arc<RwLock<Arc<dyn ThreadConfigLoader>>>,
-    pub(crate) psp: bool,
 }
 
 impl ConfigManager {
@@ -58,7 +57,6 @@ impl ConfigManager {
             cloud_config_bundle: Arc::new(RwLock::new(cloud_config_bundle)),
             arg0_paths,
             thread_config_loader: Arc::new(RwLock::new(thread_config_loader)),
-            psp: false,
         }
     }
 
@@ -190,7 +188,6 @@ impl ConfigManager {
             .cloud_config_bundle(CloudConfigBundleLoader::default())
             .build()
             .await?;
-        config.psp = self.psp;
         self.apply_runtime_feature_enablement(&mut config);
         self.apply_arg0_paths(&mut config);
         Ok(config)
@@ -251,8 +248,6 @@ impl ConfigManager {
                     .map(|(key, value)| (key, json_to_toml(value))),
             )
             .collect::<Vec<_>>();
-        typesafe_overrides.psp = Some(self.psp);
-
         let mut config = codex_core::config::ConfigBuilder::default()
             .codex_home(self.codex_home.clone())
             .cli_overrides(merged_cli_overrides)
diff --git a/codex-rs/app-server/src/config_manager_service_tests.rs b/codex-rs/app-server/src/config_manager_service_tests.rs
index 6ced2a703a..6fefac2c2c 100644
--- a/codex-rs/app-server/src/config_manager_service_tests.rs
+++ b/codex-rs/app-server/src/config_manager_service_tests.rs
@@ -1,5 +1,6 @@
 use super::*;
 use anyhow::Result;
+use axum::http::HeaderValue;
 use codex_app_server_protocol::AppConfig;
 use codex_app_server_protocol::AppToolApproval;
 use codex_app_server_protocol::AppsConfig;
@@ -8,6 +9,8 @@ use codex_app_server_protocol::ConfigLayerSource as ApiConfigLayerSource;
 use codex_config::CloudConfigBundleLoader;
 use codex_config::LoaderOverrides;
 use codex_config::test_support::CloudConfigBundleFixture;
+use codex_http_client::HttpClientFactory;
+use codex_http_client::OutboundProxyPolicy;
 use codex_utils_absolute_path::AbsolutePathBuf;
 use pretty_assertions::assert_eq;
 use tempfile::tempdir;
@@ -107,36 +110,42 @@ personality = true
 }
 
 #[tokio::test]
-async fn process_routing_does_not_enter_config_layers() -> Result<()> {
+async fn psp_feature_configures_first_party_routing() -> Result<()> {
     let tmp = tempdir()?;
-    let mut service = ConfigManager::new_for_tests(
+    let service = ConfigManager::new_for_tests(
         tmp.path().to_path_buf(),
         Vec::new(),
         LoaderOverrides::without_managed_config_for_tests(),
         CloudConfigBundleLoader::default(),
     );
-    service.psp = true;
 
     let config = service
         .load_with_overrides(
             Some(
-                [("features".to_string(), serde_json::json!({ "apps": true }))]
-                    .into_iter()
-                    .collect(),
+                [(
+                    "features".to_string(),
+                    serde_json::json!({ "apps": true, "psp": true }),
+                )]
+                .into_iter()
+                .collect(),
             ),
             Default::default(),
         )
         .await?;
 
-    assert!(config.psp);
-    assert!(config.http_client_factory().has_chatgpt_cookies());
-    assert!(
+    assert!(config.features.enabled(codex_features::Feature::Psp));
+    assert_eq!(
+        config.http_client_factory(),
+        HttpClientFactory::new(OutboundProxyPolicy::ReqwestDefault)
+            .with_chatgpt_cookies([HeaderValue::from_static("oai-chat-psp=true")])
+    );
+    assert_eq!(
         config
             .config_layer_stack
             .effective_config()
             .get("features")
-            .and_then(|features| features.get("psp"))
-            .is_none()
+            .and_then(|features| features.get("psp")),
+        Some(&toml::Value::Boolean(true))
     );
     Ok(())
 }
diff --git a/codex-rs/app-server/src/in_process.rs b/codex-rs/app-server/src/in_process.rs
index a37dd94a4c..2492eafeda 100644
--- a/codex-rs/app-server/src/in_process.rs
+++ b/codex-rs/app-server/src/in_process.rs
@@ -446,7 +446,7 @@ async fn start_uninitialized(args: InProcessStartArgs) -> IoResult<InProcessClie
         ));
 
         let processor_outgoing = Arc::clone(&outgoing_message_sender);
-        let mut config_manager = ConfigManager::new(
+        let config_manager = ConfigManager::new(
             args.config.codex_home.to_path_buf(),
             args.cli_overrides,
             args.loader_overrides,
@@ -455,7 +455,6 @@ async fn start_uninitialized(args: InProcessStartArgs) -> IoResult<InProcessClie
             args.arg0_paths.clone(),
             args.thread_config_loader,
         );
-        config_manager.psp = args.config.psp;
         let (processor_tx, mut processor_rx) = mpsc::channel::<ProcessorCommand>(channel_capacity);
         let mut processor_handle = tokio::spawn(async move {
             let processor = Arc::new(MessageProcessor::new(MessageProcessorArgs {
diff --git a/codex-rs/app-server/src/lib.rs b/codex-rs/app-server/src/lib.rs
index cdaf1ba240..7fef5cf838 100644
--- a/codex-rs/app-server/src/lib.rs
+++ b/codex-rs/app-server/src/lib.rs
@@ -438,7 +438,6 @@ pub struct AppServerRuntimeOptions {
     pub plugin_startup_tasks: PluginStartupTasks,
     pub remote_control_startup_mode: RemoteControlStartupMode,
     pub install_shutdown_signal_handler: bool,
-    pub psp: bool,
 }
 
 impl Default for AppServerRuntimeOptions {
@@ -448,7 +447,6 @@ impl Default for AppServerRuntimeOptions {
             plugin_startup_tasks: PluginStartupTasks::Start,
             remote_control_startup_mode: RemoteControlStartupMode::ResolvePersisted,
             install_shutdown_signal_handler: true,
-            psp: false,
         }
     }
 }
@@ -489,7 +487,7 @@ pub async fn run_main_with_transport_options(
         arg0_paths.codex_linux_sandbox_exe.clone(),
     )?;
     let ignore_user_config = loader_overrides.ignore_user_config;
-    let mut config_manager = ConfigManager::new(
+    let config_manager = ConfigManager::new(
         codex_home.to_path_buf(),
         cli_kv_overrides.clone(),
         loader_overrides,
@@ -498,7 +496,6 @@ pub async fn run_main_with_transport_options(
         arg0_paths.clone(),
         Arc::new(NoopThreadConfigLoader),
     );
-    config_manager.psp = runtime_options.psp;
     match config_manager
         .load_latest_config(/*fallback_cwd*/ None)
         .await
diff --git a/codex-rs/app-server/src/main.rs b/codex-rs/app-server/src/main.rs
index 67806d9327..4d5ab3f122 100644
--- a/codex-rs/app-server/src/main.rs
+++ b/codex-rs/app-server/src/main.rs
@@ -60,10 +60,6 @@ struct AppServerArgs {
     /// Enable remote control for this app-server process without changing persistence.
     #[arg(long = "remote-control", hide = true)]
     remote_control: bool,
-
-    /// Enable process-only PSP routing for first-party ChatGPT requests.
-    #[arg(long, hide = true)]
-    psp: bool,
 }
 
 fn main() -> anyhow::Result<()> {
@@ -79,7 +75,6 @@ fn main() -> anyhow::Result<()> {
             #[cfg(debug_assertions)]
             disable_plugin_startup_tasks_for_tests,
             remote_control,
-            psp,
         } = AppServerArgs::parse();
         let loader_overrides = if disable_managed_config_from_debug_env() {
             LoaderOverrides::without_managed_config_for_tests()
@@ -92,7 +87,6 @@ fn main() -> anyhow::Result<()> {
         let auth = auth.try_into_settings()?;
         let mut runtime_options = AppServerRuntimeOptions {
             code_mode_host_transport: code_mode_host.into(),
-            psp,
             ..Default::default()
         };
         #[cfg(debug_assertions)]
diff --git a/codex-rs/app-server/src/main_tests.rs b/codex-rs/app-server/src/main_tests.rs
index e5e6dc4ea1..9eb8d6fd53 100644
--- a/codex-rs/app-server/src/main_tests.rs
+++ b/codex-rs/app-server/src/main_tests.rs
@@ -46,7 +46,6 @@ fn app_server_accepts_process_scoped_code_mode_host() {
         "wss://example.test/code-mode",
         "--listen",
         "off",
-        "--psp",
     ])
     .expect("parse app-server args");
 
@@ -55,7 +54,6 @@ fn app_server_accepts_process_scoped_code_mode_host() {
         Some(Url::parse("wss://example.test/code-mode").expect("test endpoint should parse"))
     );
     assert_eq!(args.listen, AppServerTransport::Off);
-    assert!(args.psp);
     assert_eq!(args.config_overrides.raw_overrides, Vec::<String>::new());
 }
 
diff --git a/codex-rs/chatgpt/src/chatgpt_client.rs b/codex-rs/chatgpt/src/chatgpt_client.rs
index 944698315e..7beab01267 100644
--- a/codex-rs/chatgpt/src/chatgpt_client.rs
+++ b/codex-rs/chatgpt/src/chatgpt_client.rs
@@ -28,8 +28,7 @@ static PSP_CHATGPT_CLIENT: LazyLock<Mutex<Option<CachedChatGptClient>>> =
     LazyLock::new(|| Mutex::new(None));
 
 /// Reuse the default client while retaining its configured ChatGPT cookies.
-fn psp_chatgpt_client(config: &Config) -> HttpClient {
-    let factory = config.http_client_factory();
+fn psp_chatgpt_client(factory: HttpClientFactory) -> HttpClient {
     let residency = default_headers()
         .get(RESIDENCY_HEADER_NAME)
         .map(|value| value.as_bytes().to_vec());
@@ -87,8 +86,9 @@ pub(crate) async fn chatgpt_get_request_with_timeout<T: DeserializeOwned>(
         path.trim_start_matches('/')
     );
 
-    let client = if config.psp {
-        psp_chatgpt_client(config)
+    let http_client_factory = config.http_client_factory();
+    let client = if http_client_factory.has_chatgpt_cookies() {
+        psp_chatgpt_client(http_client_factory)
     } else {
         create_client()
     };
@@ -145,8 +145,9 @@ pub(crate) async fn chatgpt_post_request_with_timeout<
         config.chatgpt_base_url.trim_end_matches('/'),
         path.trim_start_matches('/')
     );
-    let client = if config.psp {
-        psp_chatgpt_client(config)
+    let http_client_factory = config.http_client_factory();
+    let client = if http_client_factory.has_chatgpt_cookies() {
+        psp_chatgpt_client(http_client_factory)
     } else {
         create_client()
     };
diff --git a/codex-rs/cli/src/main.rs b/codex-rs/cli/src/main.rs
index b22ff80b1e..6bd783f2b8 100644
--- a/codex-rs/cli/src/main.rs
+++ b/codex-rs/cli/src/main.rs
@@ -105,10 +105,6 @@ use codex_terminal_detection::TerminalName;
     override_usage = "codex [OPTIONS] [PROMPT]\n       codex [OPTIONS] <COMMAND> [ARGS]"
 )]
 struct MultitoolCli {
-    /// Enable process-only PSP routing for first-party ChatGPT requests.
-    #[arg(long, global = true, hide = true)]
-    psp: bool,
-
     #[clap(flatten)]
     pub config_overrides: CliConfigOverrides,
 
@@ -993,15 +989,12 @@ async fn cli_main(
     remote_control_disabled: bool,
 ) -> anyhow::Result<()> {
     let MultitoolCli {
-        psp,
         config_overrides: mut root_config_overrides,
         feature_toggles,
         remote,
         mut interactive,
         subcommand,
     } = MultitoolCli::parse();
-    interactive.psp = psp;
-
     // Fold --enable/--disable into config overrides so they flow to all subcommands.
     let toggle_overrides = feature_toggles.to_overrides()?;
     root_config_overrides.raw_overrides.extend(toggle_overrides);
@@ -1040,7 +1033,6 @@ async fn cli_main(
             exec_cli
                 .shared
                 .inherit_exec_root_options(&interactive.shared);
-            exec_cli.psp = psp;
             exec_cli.strict_config |= root_strict_config;
             prepend_config_flags(
                 &mut exec_cli.config_overrides,
@@ -1061,7 +1053,6 @@ async fn cli_main(
             exec_cli
                 .shared
                 .inherit_exec_root_options(&interactive.shared);
-            exec_cli.psp = psp;
             exec_cli.command = Some(ExecCommand::Review(review_args));
             exec_cli.strict_config = strict_config || root_strict_config;
             prepend_config_flags(
@@ -1171,7 +1162,6 @@ async fn cli_main(
                                 codex_app_server::RemoteControlStartupMode::ResolvePersisted
                             }
                         },
-                        psp,
                         ..Default::default()
                     };
                     codex_app_server::run_main_with_transport_options(
@@ -1274,7 +1264,6 @@ async fn cli_main(
                 remote_control_cli,
                 arg0_paths.clone(),
                 root_config_overrides,
-                psp,
             )
             .await?;
         }
@@ -2743,7 +2732,6 @@ mod tests {
     fn finalize_resume_from_args(args: &[&str]) -> TuiCli {
         let cli = MultitoolCli::try_parse_from(args).expect("parse");
         let MultitoolCli {
-            psp: _,
             mut interactive,
             config_overrides: mut root_overrides,
             subcommand,
@@ -2781,7 +2769,6 @@ mod tests {
     fn finalize_fork_from_args(args: &[&str]) -> TuiCli {
         let cli = MultitoolCli::try_parse_from(args).expect("parse");
         let MultitoolCli {
-            psp: _,
             mut interactive,
             config_overrides: mut root_overrides,
             subcommand,
@@ -2826,7 +2813,6 @@ mod tests {
     fn finalize_archive_from_args(args: &[&str]) -> (String, TuiCli, InteractiveRemoteOptions) {
         let cli = MultitoolCli::try_parse_from(args).expect("parse");
         let MultitoolCli {
-            psp: _,
             interactive,
             config_overrides: root_overrides,
             subcommand,
@@ -4055,19 +4041,6 @@ mod tests {
         assert!(err.to_string().contains("is empty"));
     }
 
-    #[test]
-    fn psp_is_a_global_runtime_argument() {
-        for args in [
-            ["codex", "--psp"].as_slice(),
-            ["codex", "app-server", "--psp"].as_slice(),
-            ["codex", "remote-control", "--psp"].as_slice(),
-        ] {
-            let cli = MultitoolCli::try_parse_from(args).expect("parse runtime PSP flag");
-            assert!(cli.psp);
-            assert!(cli.config_overrides.raw_overrides.is_empty());
-        }
-    }
-
     #[test]
     fn app_server_code_mode_host_url_parses_independently_of_listen_transport() {
         let app_server = app_server_from_args(
diff --git a/codex-rs/cli/src/remote_control_cmd.rs b/codex-rs/cli/src/remote_control_cmd.rs
index 919e01048e..bd0f16b82f 100644
--- a/codex-rs/cli/src/remote_control_cmd.rs
+++ b/codex-rs/cli/src/remote_control_cmd.rs
@@ -65,7 +65,6 @@ pub(crate) async fn run(
     command: RemoteControlCommand,
     arg0_paths: Arg0DispatchPaths,
     root_config_overrides: CliConfigOverrides,
-    psp: bool,
 ) -> anyhow::Result<()> {
     match command.subcommand {
         None => {
@@ -73,8 +72,7 @@ pub(crate) async fn run(
                 command.json,
                 "Starting app-server with remote control enabled...",
             )?;
-            run_foreground_remote_control(command.json, arg0_paths, root_config_overrides, psp)
-                .await?;
+            run_foreground_remote_control(command.json, arg0_paths, root_config_overrides).await?;
         }
         Some(RemoteControlSubcommand::Start) => {
             print_remote_control_progress(
@@ -113,7 +111,6 @@ async fn run_foreground_remote_control(
     json: bool,
     arg0_paths: Arg0DispatchPaths,
     root_config_overrides: CliConfigOverrides,
-    psp: bool,
 ) -> anyhow::Result<()> {
     let socket_dir = tempfile::Builder::new()
         .prefix("codex-rc-")
@@ -129,7 +126,6 @@ async fn run_foreground_remote_control(
     let runtime_options = AppServerRuntimeOptions {
         remote_control_startup_mode: codex_app_server::RemoteControlStartupMode::EnabledEphemeral,
         install_shutdown_signal_handler: false,
-        psp,
         ..Default::default()
     };
     let (stop_rx, stop_signal_task) = foreground_stop_signal();
diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json
index 0a543e8bb0..9d9816fce7 100644
--- a/codex-rs/core/config.schema.json
+++ b/codex-rs/core/config.schema.json
@@ -654,6 +654,9 @@
             "prevent_idle_sleep": {
               "type": "boolean"
             },
+            "psp": {
+              "type": "boolean"
+            },
             "realtime_conversation": {
               "type": "boolean"
             },
@@ -5290,6 +5293,9 @@
         "prevent_idle_sleep": {
           "type": "boolean"
         },
+        "psp": {
+          "type": "boolean"
+        },
         "realtime_conversation": {
           "type": "boolean"
         },
diff --git a/codex-rs/core/src/agent/role.rs b/codex-rs/core/src/agent/role.rs
index 1da0b68478..1f7044203c 100644
--- a/codex-rs/core/src/agent/role.rs
+++ b/codex-rs/core/src/agent/role.rs
@@ -285,7 +285,6 @@ mod reload {
                 .flatten(),
             model_provider: preserve_current_provider.then(|| config.model_provider_id.clone()),
             service_tier: preserve_current_service_tier.then(|| config.service_tier.clone()),
-            psp: Some(config.psp),
             codex_linux_sandbox_exe: config.codex_linux_sandbox_exe.clone(),
             main_execve_wrapper_exe: config.main_execve_wrapper_exe.clone(),
             ..Default::default()
diff --git a/codex-rs/core/src/agent/role_tests.rs b/codex-rs/core/src/agent/role_tests.rs
index 26d82fffe4..16e16bb56d 100644
--- a/codex-rs/core/src/agent/role_tests.rs
+++ b/codex-rs/core/src/agent/role_tests.rs
@@ -162,7 +162,6 @@ async fn apply_role_preserves_unspecified_keys() {
     .await;
     config.codex_linux_sandbox_exe = Some(PathBuf::from("/tmp/codex-linux-sandbox"));
     config.main_execve_wrapper_exe = Some(PathBuf::from("/tmp/codex-execve-wrapper"));
-    config.psp = true;
     let role_path = write_role_config(
         &home,
         "instructions-only.toml",
@@ -203,7 +202,6 @@ async fn apply_role_preserves_unspecified_keys() {
         config.main_execve_wrapper_exe,
         Some(PathBuf::from("/tmp/codex-execve-wrapper"))
     );
-    assert!(config.psp);
     assert_eq!(config.base_instructions, base_instructions);
     assert_eq!(config.base_instructions_provenance, provenance);
 }
diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs
index 7c94456a8d..0af212a9a3 100644
--- a/codex-rs/core/src/config/config_tests.rs
+++ b/codex-rs/core/src/config/config_tests.rs
@@ -5034,7 +5034,6 @@ async fn rebuild_preserving_session_layers_refreshes_requirements() -> std::io::
         refreshed_toml,
         ConfigOverrides {
             cwd: Some(codex_home.path().to_path_buf()),
-            psp: Some(true),
             ..Default::default()
         },
         codex_home.abs(),
@@ -5112,8 +5111,6 @@ async fn rebuild_preserving_session_layers_refreshes_requirements() -> std::io::
         .rebuild_preserving_session_layers(&refreshed_config)
         .await?;
 
-    assert!(config.psp);
-    assert!(config.http_client_factory().has_chatgpt_cookies());
     assert_eq!(
         config.mcp_servers.get(),
         &HashMap::from([
diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs
index 695bb1eae7..50fa08f45f 100644
--- a/codex-rs/core/src/config/mod.rs
+++ b/codex-rs/core/src/config/mod.rs
@@ -977,9 +977,6 @@ pub struct Config {
     /// Whether Codex-owned clients should respect host system proxy settings.
     pub respect_system_proxy: bool,
 
-    /// Process-only ChatGPT routing selection supplied when Codex is launched.
-    pub psp: bool,
-
     /// Optional product SKU forwarded to the host-owned apps MCP server.
     pub apps_mcp_product_sku: Option<String>,
 
@@ -1623,7 +1620,7 @@ impl Config {
             OutboundProxyPolicy::ReqwestDefault
         };
         let factory = HttpClientFactory::new(outbound_proxy_policy);
-        if self.psp {
+        if self.features.enabled(Feature::Psp) {
             factory.with_chatgpt_cookies([HeaderValue::from_static("oai-chat-psp=true")])
         } else {
             factory
@@ -1835,7 +1832,6 @@ impl Config {
             ConfigOverrides {
                 cwd: Some(self.cwd.to_path_buf()),
                 default_zsh_path,
-                psp: Some(refreshed_config.psp),
                 ..Default::default()
             },
             refreshed_config.codex_home.clone(),
@@ -2579,7 +2575,6 @@ pub struct ConfigOverrides {
     pub tools_web_search_request: Option<bool>,
     pub ephemeral: Option<bool>,
     pub bypass_hook_trust: Option<bool>,
-    pub psp: Option<bool>,
     /// Additional directories that should be treated as writable roots for this session.
     pub additional_writable_roots: Vec<PathBuf>,
     /// Explicit absolute runtime workspace roots for this session. When set,
@@ -3270,7 +3265,6 @@ impl Config {
             tools_web_search_request: override_tools_web_search_request,
             ephemeral,
             bypass_hook_trust,
-            psp,
             additional_writable_roots,
             workspace_roots: workspace_roots_override,
         } = overrides;
@@ -4192,7 +4186,6 @@ impl Config {
                 .chatgpt_base_url
                 .unwrap_or("https://chatgpt.com/backend-api/".to_string()),
             respect_system_proxy,
-            psp: psp.unwrap_or_default(),
             apps_mcp_product_sku: cfg.apps_mcp_product_sku.clone(),
             responses_api_metadata: cfg.responses_api_metadata.unwrap_or_default(),
             realtime_audio: cfg
diff --git a/codex-rs/exec/src/cli.rs b/codex-rs/exec/src/cli.rs
index 57fb54d1d6..1fc7bbc4be 100644
--- a/codex-rs/exec/src/cli.rs
+++ b/codex-rs/exec/src/cli.rs
@@ -12,10 +12,6 @@ use std::path::PathBuf;
     override_usage = "codex exec [OPTIONS] [PROMPT]\n       codex exec [OPTIONS] <COMMAND> [ARGS]"
 )]
 pub struct Cli {
-    /// Process-only PSP routing selected by the parent Codex CLI.
-    #[clap(skip)]
-    pub psp: bool,
-
     /// Action to perform. If omitted, runs a new non-interactive session.
     #[command(subcommand)]
     pub command: Option<Command>,
diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs
index bee8ef7008..5b4f3083ad 100644
--- a/codex-rs/exec/src/lib.rs
+++ b/codex-rs/exec/src/lib.rs
@@ -245,7 +245,6 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
     }
 
     let Cli {
-        psp,
         command,
         strict_config,
         shared,
@@ -423,7 +422,6 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
         tools_web_search_request: None,
         ephemeral: ephemeral.then_some(true),
         bypass_hook_trust: bypass_hook_trust.then_some(true),
-        psp: Some(psp),
         additional_writable_roots: add_dir,
     };
 
diff --git a/codex-rs/exec/src/main.rs b/codex-rs/exec/src/main.rs
index 383d87e16c..61eaecdd0a 100644
--- a/codex-rs/exec/src/main.rs
+++ b/codex-rs/exec/src/main.rs
@@ -18,9 +18,6 @@ use codex_utils_cli::CliConfigOverrides;
 
 #[derive(Parser, Debug)]
 struct TopCli {
-    #[arg(long, global = true, hide = true)]
-    psp: bool,
-
     #[clap(flatten)]
     config_overrides: CliConfigOverrides,
 
@@ -33,7 +30,6 @@ fn main() -> anyhow::Result<()> {
         let top_cli = TopCli::parse();
         // Merge root-level overrides into inner CLI struct so downstream logic remains unchanged.
         let mut inner = top_cli.inner;
-        inner.psp = top_cli.psp;
         inner
             .config_overrides
             .prepend_root_overrides(top_cli.config_overrides);
diff --git a/codex-rs/exec/src/main_tests.rs b/codex-rs/exec/src/main_tests.rs
index 6eb0c04df2..5c0a8a3bfc 100644
--- a/codex-rs/exec/src/main_tests.rs
+++ b/codex-rs/exec/src/main_tests.rs
@@ -7,7 +7,6 @@ fn top_cli_parses_resume_prompt_after_config_flag() {
     let cli = TopCli::parse_from([
         "codex-exec",
         "resume",
-        "--psp",
         "--strict-config",
         "--last",
         "--json",
@@ -19,7 +18,6 @@ fn top_cli_parses_resume_prompt_after_config_flag() {
         "--skip-git-repo-check",
         PROMPT,
     ]);
-    assert!(cli.psp);
     let mut inner = cli.inner;
     inner
         .config_overrides
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index d0f32c447f..0977e7d7f5 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -171,6 +171,8 @@ pub enum Feature {
     SpawnCsv,
     /// Enable apps.
     Apps,
+    /// Route first-party ChatGPT requests through PSP.
+    Psp,
     /// Enable MCP apps.
     EnableMcpApps,
     /// Enable MCP protocol version 2026-07-28 support.
@@ -1092,6 +1094,12 @@ pub const FEATURES: &[FeatureSpec] = &[
         stage: Stage::Stable,
         default_enabled: true,
     },
+    FeatureSpec {
+        id: Feature::Psp,
+        key: "psp",
+        stage: Stage::UnderDevelopment,
+        default_enabled: false,
+    },
     FeatureSpec {
         id: Feature::EnableMcpApps,
         key: "enable_mcp_apps",
diff --git a/codex-rs/thread-manager-sample/src/main.rs b/codex-rs/thread-manager-sample/src/main.rs
index 8c5ace272b..3a55d58e9f 100644
--- a/codex-rs/thread-manager-sample/src/main.rs
+++ b/codex-rs/thread-manager-sample/src/main.rs
@@ -187,7 +187,6 @@ fn new_config(model: Option<String>, arg0_paths: Arg0DispatchPaths) -> anyhow::R
         config_layer_stack: ConfigLayerStack::default(),
         startup_warnings: Vec::new(),
         bypass_hook_trust: false,
-        psp: false,
         model,
         service_tier: None,
         review_model: None,
diff --git a/codex-rs/tui/src/cli.rs b/codex-rs/tui/src/cli.rs
index 7e10e0b110..2273973bbf 100644
--- a/codex-rs/tui/src/cli.rs
+++ b/codex-rs/tui/src/cli.rs
@@ -8,10 +8,6 @@ use codex_utils_cli::SharedCliOptions;
 #[derive(Parser, Clone, Debug)]
 #[command(version)]
 pub struct Cli {
-    /// Process-only PSP routing selected by the parent Codex CLI.
-    #[clap(skip)]
-    pub psp: bool,
-
     /// Optional user prompt to start the session.
     #[arg(value_name = "PROMPT", value_hint = clap::ValueHint::Other)]
     pub prompt: Option<String>,
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
index c79e6add72..12a9bc4be2 100644
--- a/codex-rs/tui/src/lib.rs
+++ b/codex-rs/tui/src/lib.rs
@@ -943,7 +943,7 @@ pub async fn run_main(
         &cli_kv_overrides,
         &launch_loader_overrides,
         strict_config,
-        cli.bypass_hook_trust || cli.psp,
+        cli.bypass_hook_trust,
     );
     let default_daemon = if explicit_remote_endpoint.is_none() && reuse_implicit_local_daemon {
         maybe_probe_default_daemon_socket(&codex_home).await
@@ -1077,7 +1077,6 @@ pub async fn run_main(
         main_execve_wrapper_exe: arg0_paths.main_execve_wrapper_exe.clone(),
         show_raw_agent_reasoning: cli.oss.then_some(true),
         bypass_hook_trust: cli.bypass_hook_trust.then_some(true),
-        psp: Some(cli.psp),
         additional_writable_roots: additional_dirs,
         ..Default::default()
     };
diff --git a/codex-rs/tui/src/main.rs b/codex-rs/tui/src/main.rs
index 3092cc8c99..486dbe6499 100644
--- a/codex-rs/tui/src/main.rs
+++ b/codex-rs/tui/src/main.rs
@@ -40,9 +40,6 @@ fn format_exit_messages(exit_info: AppExitInfo, color_enabled: bool) -> Vec<Stri
 
 #[derive(Parser, Debug)]
 struct TopCli {
-    #[arg(long, hide = true)]
-    psp: bool,
-
     #[clap(flatten)]
     config_overrides: CliConfigOverrides,
 
@@ -54,7 +51,6 @@ fn main() -> anyhow::Result<()> {
     arg0_dispatch_or_else(|arg0_paths: Arg0DispatchPaths| async move {
         let top_cli = TopCli::parse();
         let mut inner = top_cli.inner;
-        inner.psp = top_cli.psp;
         inner
             .config_overrides
             .raw_overrides
diff --git a/codex-rs/tui/src/session_archive_commands.rs b/codex-rs/tui/src/session_archive_commands.rs
index e2c378f917..21b96f43b6 100644
--- a/codex-rs/tui/src/session_archive_commands.rs
+++ b/codex-rs/tui/src/session_archive_commands.rs
@@ -282,7 +282,7 @@ async fn start_app_server_for_archive_command(
         &cli_kv_overrides,
         &launch_loader_overrides,
         strict_config,
-        cli.bypass_hook_trust || cli.psp,
+        cli.bypass_hook_trust,
     );
     let default_daemon = if explicit_remote_endpoint.is_none() && reuse_implicit_local_daemon {
         super::maybe_probe_default_daemon_socket(codex_home.as_path()).await
@@ -373,7 +373,6 @@ async fn start_app_server_for_archive_command(
             main_execve_wrapper_exe: arg0_paths.main_execve_wrapper_exe.clone(),
             show_raw_agent_reasoning: cli.oss.then_some(true),
             bypass_hook_trust: cli.bypass_hook_trust.then_some(true),
-            psp: Some(cli.psp),
             ..Default::default()
         })
         .loader_overrides(loader_overrides.clone())