codex: fix CI failure on PR #15150

Move the telemetry auth-mode conversion back into codex-core callsites to avoid an orphan impl in codex-login, and include the stale Cargo.lock cleanup from the core dependency removal.

Co-authored-by: Codex <noreply@openai.com>

Author: aibrahim-oai

codex-rs/Cargo.lock

@@ -7,6 +7,7 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicU64;
 
 use crate::AuthManager;
+use crate::AuthMode;
 use crate::CodexAuth;
 use crate::SandboxState;
 use crate::agent::AgentControl;
@@ -1577,7 +1578,10 @@ impl Session {
         }
 
         let auth = auth.as_ref();
-        let auth_mode = auth.map(CodexAuth::auth_mode).map(TelemetryAuthMode::from);
+        let auth_mode = auth.map(CodexAuth::auth_mode).map(|mode| match mode {
+            AuthMode::ApiKey => TelemetryAuthMode::ApiKey,
+            AuthMode::Chatgpt | AuthMode::ChatgptAuthTokens => TelemetryAuthMode::Chatgpt,
+        });
         let account_id = auth.and_then(CodexAuth::get_account_id);
         let account_email = auth.and_then(CodexAuth::get_account_email);
         let originator = crate::default_client::originator().value;

codex-rs/core/src/codex.rs

@@ -441,7 +441,12 @@ impl ModelsManager {
         );
         let transport = ReqwestTransport::new(build_reqwest_client());
         let request_telemetry: Arc<dyn RequestTelemetry> = Arc::new(ModelsRequestTelemetry {
-            auth_mode: auth_mode.map(|mode| TelemetryAuthMode::from(mode).to_string()),
+            auth_mode: auth_mode
+                .map(|mode| match mode {
+                    AuthMode::ApiKey => TelemetryAuthMode::ApiKey,
+                    AuthMode::Chatgpt | AuthMode::ChatgptAuthTokens => TelemetryAuthMode::Chatgpt,
+                })
+                .map(|mode| mode.to_string()),
             auth_header_attached: api_auth.auth_header_attached(),
             auth_header_name: api_auth.auth_header_name(),
             auth_env,

codex-rs/core/src/models_manager/manager.rs

@@ -54,17 +54,6 @@ impl From<AuthMode> for TelemetryAuthMode {
     }
 }
 
-impl From<crate::AuthMode> for TelemetryAuthMode {
-    fn from(mode: crate::AuthMode) -> Self {
-        match mode {
-            crate::AuthMode::ApiKey => TelemetryAuthMode::ApiKey,
-            crate::AuthMode::Chatgpt | crate::AuthMode::ChatgptAuthTokens => {
-                TelemetryAuthMode::Chatgpt
-            }
-        }
-    }
-}
-
 /// Authentication mechanism used by the current user.
 #[derive(Debug, Clone)]
 pub enum CodexAuth {