codex: fix CI failure on PR #15561

codex-rs/Cargo.lock

@@ -2240,6 +2240,7 @@ dependencies = [
  "codex-keyring-store",
  "codex-protocol",
  "codex-terminal-detection",
+ "codex-utils-home-dir",
  "core_test_support",
  "keyring",
  "once_cell",

codex-rs/login/Cargo.toml

@@ -17,6 +17,7 @@ codex-config = { workspace = true }
 codex-keyring-store = { workspace = true }
 codex-protocol = { workspace = true }
 codex-terminal-detection = { workspace = true }
+codex-utils-home-dir = { workspace = true }
 once_cell = { workspace = true }
 os_info = { workspace = true }
 rand = { workspace = true }

codex-rs/login/src/dotenv_api_key.rs

@@ -3,7 +3,7 @@ use std::io;
 use std::io::ErrorKind;
 use std::path::Path;
 
-use codex_core::auth::OPENAI_API_KEY_ENV_VAR;
+use crate::auth::OPENAI_API_KEY_ENV_VAR;
 
 pub fn validate_dotenv_target(path: &Path) -> io::Result<()> {
     ensure_parent_dir(path)?;

codex-rs/login/src/lib.rs

@@ -36,7 +36,6 @@ pub use auth::logout;
 pub use auth::read_openai_api_key_from_env;
 pub use auth::save_auth;
 pub use codex_app_server_protocol::AuthMode;
-pub use token_data::TokenData;
 pub use dotenv_api_key::upsert_dotenv_api_key;
 pub use dotenv_api_key::validate_dotenv_target;
 pub use onboard_oauth_helper::ApiProvisionOptions;
@@ -45,3 +44,4 @@ pub use onboard_oauth_helper::PendingApiProvisioning;
 pub use onboard_oauth_helper::ProvisionedApiKey;
 pub use onboard_oauth_helper::run_from_env as run_onboard_oauth_helper_from_env;
 pub use onboard_oauth_helper::start_api_provisioning;
+pub use token_data::TokenData;

codex-rs/login/src/onboard_oauth_helper.rs

@@ -18,8 +18,7 @@ use std::time::Duration;
 use base64::Engine;
 use codex_app_server_protocol::AuthMode;
 use codex_client::build_reqwest_client_with_custom_ca;
-use codex_core::auth::AuthDotJson;
-use codex_core::config::find_codex_home;
+use codex_utils_home_dir::find_codex_home;
 use rand::RngCore;
 use reqwest::Client;
 use reqwest::Method;
@@ -33,6 +32,8 @@ use tiny_http::Server;
 use tiny_http::StatusCode;
 use url::Url;
 
+use crate::auth::AuthDotJson;
+
 const AUTH_ISSUER: &str = "https://auth.openai.com";
 const PLATFORM_HYDRA_CLIENT_ID: &str = "app_2SKx67EdpoN0G6j64rFvigXD";
 const PLATFORM_AUDIENCE: &str = "https://api.openai.com/v1";

codex-rs/tui/src/chatwidget/status_surfaces.rs

@@ -325,7 +325,7 @@ impl ChatWidget {
         })
     }
 
-    fn status_line_cwd(&self) -> &Path {
+    pub(super) fn status_line_cwd(&self) -> &Path {
         self.current_cwd
             .as_deref()
             .unwrap_or(self.config.cwd.as_path())