Fix status account display after auth changes

Author: Loongphy

codex-rs/tui/src/app.rs

@@ -676,12 +676,15 @@ impl AuthIdentity {
         if !self.has_chatgpt_account {
             return "API key".to_string();
         }
-        let email = self.email.as_deref().unwrap_or("unknown email");
-        let plan = self
-            .plan_type
-            .map(crate::status::plan_type_display_name)
-            .unwrap_or_else(|| "unknown plan".to_string());
-        format!("{email} ({plan})")
+        match (
+            self.email.as_deref(),
+            self.plan_type.map(crate::status::plan_type_display_name),
+        ) {
+            (Some(email), Some(plan)) => format!("{email} ({plan})"),
+            (Some(email), None) => email.to_string(),
+            (None, Some(plan)) => plan,
+            (None, None) => "ChatGPT".to_string(),
+        }
     }
 }
 

codex-rs/tui/src/app/app_server_events.rs

@@ -8,9 +8,7 @@ use crate::app_command::AppCommand;
 use crate::app_event::AppEvent;
 use crate::app_event::ConnectorsSnapshot;
 use crate::app_server_session::AppServerSession;
-use crate::app_server_session::status_account_display_from_auth_mode;
 use codex_app_server_client::AppServerEvent;
-use codex_app_server_protocol::AuthMode;
 use codex_app_server_protocol::ServerNotification;
 use codex_app_server_protocol::ServerRequest;
 
@@ -80,18 +78,8 @@ impl App {
                     .on_rate_limit_snapshot(Some(notification.rate_limits.clone()));
                 return;
             }
-            ServerNotification::AccountUpdated(notification) => {
-                self.chat_widget.update_account_state(
-                    status_account_display_from_auth_mode(
-                        notification.auth_mode,
-                        notification.plan_type,
-                    ),
-                    notification.plan_type,
-                    matches!(
-                        notification.auth_mode,
-                        Some(AuthMode::Chatgpt) | Some(AuthMode::ChatgptAuthTokens)
-                    ),
-                );
+            ServerNotification::AccountUpdated(_notification) => {
+                self.app_event_tx.send(AppEvent::AuthFileChanged);
                 return;
             }
             ServerNotification::ExternalAgentConfigImportCompleted(_) => {

codex-rs/tui/src/app_server_session.rs

@@ -17,6 +17,7 @@ use codex_app_server_client::AppServerRequestHandle;
 use codex_app_server_client::TypedRequestError;
 use codex_app_server_protocol::Account;
 use codex_app_server_protocol::AskForApproval;
+#[cfg(test)]
 use codex_app_server_protocol::AuthMode;
 use codex_app_server_protocol::ClientRequest;
 use codex_app_server_protocol::ConfigBatchWriteParams;
@@ -1153,6 +1154,7 @@ fn thread_realtime_start_params(
         .wrap_err("mapping TUI realtime start params to app-server params")
 }
 
+#[cfg(test)]
 pub(crate) fn status_account_display_from_auth_mode(
     auth_mode: Option<AuthMode>,
     plan_type: Option<codex_protocol::account::PlanType>,

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

@@ -393,9 +393,7 @@ fn status_header_account_label(
     }
 
     let (email, display_plan) = match account_display {
-        Some(StatusAccountDisplay::ChatGpt { email, plan }) => {
-            (email.as_deref().unwrap_or("unknown email"), plan.as_deref())
-        }
+        Some(StatusAccountDisplay::ChatGpt { email, plan }) => (email.as_deref(), plan.as_deref()),
         Some(StatusAccountDisplay::ApiKey) => return Some("API key".to_string()),
         None => return None,
     };
@@ -405,9 +403,11 @@ fn status_header_account_label(
         None => plan_type.map(crate::status::plan_type_display_name),
     };
 
-    match plan {
-        Some(plan) => Some(format!("{email}({plan})")),
-        None => Some(email.to_string()),
+    match (email, plan) {
+        (Some(email), Some(plan)) => Some(format!("{email}({plan})")),
+        (Some(email), None) => Some(email.to_string()),
+        (None, Some(plan)) => Some(plan),
+        (None, None) => None,
     }
 }