codex: cancel stale device-code login attempts (#16827)

Author: etraut-openai

codex-rs/tui/src/onboarding/auth.rs

@@ -105,6 +105,20 @@ fn onboarding_request_id() -> codex_app_server_protocol::RequestId {
     codex_app_server_protocol::RequestId::String(Uuid::new_v4().to_string())
 }
 
+pub(super) async fn cancel_login_attempt(
+    request_handle: &AppServerRequestHandle,
+    login_id: String,
+) {
+    let _ = request_handle
+        .request_typed::<codex_app_server_protocol::CancelLoginAccountResponse>(
+            ClientRequest::CancelLoginAccount {
+                request_id: onboarding_request_id(),
+                params: CancelLoginAccountParams { login_id },
+            },
+        )
+        .await;
+}
+
 #[derive(Clone, Default)]
 pub(crate) struct ApiKeyInputState {
     value: String,
@@ -245,28 +259,14 @@ impl AuthModeWidget {
                 let request_handle = self.app_server_request_handle.clone();
                 let login_id = state.login_id.clone();
                 tokio::spawn(async move {
-                    let _ = request_handle
-                        .request_typed::<codex_app_server_protocol::CancelLoginAccountResponse>(
-                            ClientRequest::CancelLoginAccount {
-                                request_id: onboarding_request_id(),
-                                params: CancelLoginAccountParams { login_id },
-                            },
-                        )
-                        .await;
+                    cancel_login_attempt(&request_handle, login_id).await;
                 });
             }
             SignInState::ChatGptDeviceCode(state) => {
                 if let Some(login_id) = state.login_id().map(str::to_owned) {
                     let request_handle = self.app_server_request_handle.clone();
                     tokio::spawn(async move {
-                        let _ = request_handle
-                            .request_typed::<codex_app_server_protocol::CancelLoginAccountResponse>(
-                                ClientRequest::CancelLoginAccount {
-                                    request_id: onboarding_request_id(),
-                                    params: CancelLoginAccountParams { login_id },
-                                },
-                            )
-                            .await;
+                        cancel_login_attempt(&request_handle, login_id).await;
                     });
                 }
             }

codex-rs/tui/src/onboarding/auth/headless_chatgpt_login.rs

@@ -15,6 +15,7 @@ use crate::shimmer::shimmer_spans;
 use super::AuthModeWidget;
 use super::ContinueWithDeviceCodeState;
 use super::SignInState;
+use super::cancel_login_attempt;
 use super::mark_url_hyperlink;
 use super::onboarding_request_id;
 
@@ -47,13 +48,15 @@ pub(super) fn start_headless_chatgpt_login(widget: &mut AuthModeWidget) {
                     &request_id,
                     ContinueWithDeviceCodeState::ready(
                         request_id.clone(),
-                        login_id,
+                        login_id.clone(),
                         verification_url,
                         user_code,
                     ),
                 );
                 if updated {
                     *error.write().unwrap() = None;
+                } else {
+                    cancel_login_attempt(&request_handle, login_id).await;
                 }
             }
             Ok(other) => {