Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Restore the account email in `/status` after account updates (#50199)

Eric Traut3f97f2b3bd89
diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs
index 683c548e23..9085fbb163 100644
--- a/codex-rs/tui/src/app.rs
+++ b/codex-rs/tui/src/app.rs
@@ -194,6 +194,7 @@ use tokio::task::JoinHandle;
use tokio_util::sync::CancellationToken;
use toml::Value as TomlValue;
use uuid::Uuid;
+mod account_status;
mod agent_message_consolidation;
mod agent_navigation;
mod agent_picker;
@@ -654,6 +655,7 @@ pub(crate) struct App {
/// Keeps that boundary armed while a startup approval waits for the typing-idle timer.
startup_pending_protected_request: bool,
/// Invalidates in-flight full rate-limit reads when a newer rolling hard stop arrives.
+ account_email_request_id: Option<uuid::Uuid>,
rate_limit_hard_stop_generation: u64,
rate_limit_refresh_state: rate_limit_refresh::RateLimitRefreshState,
pending_mcp_login_start: Option<PendingMcpLoginStart>,
diff --git a/codex-rs/tui/src/app/account_status.rs b/codex-rs/tui/src/app/account_status.rs
new file mode 100644
index 0000000000..4cccb0c9f2
--- /dev/null
+++ b/codex-rs/tui/src/app/account_status.rs
@@ -0,0 +1,44 @@
+//! Refreshes the email omitted by account-update notifications without blocking terminal input.
+//! Results carry a request ID so account changes and reconnects reject obsolete identities.
+
+use super::App;
+use crate::app_event::AppEvent;
+use crate::app_server_session::AppServerSession;
+use codex_app_server_protocol::Account;
+use codex_app_server_protocol::ClientRequest;
+use codex_app_server_protocol::GetAccountParams;
+use codex_app_server_protocol::GetAccountResponse;
+use codex_app_server_protocol::RequestId;
+use std::time::Duration;
+use uuid::Uuid;
+
+impl App {
+ pub(super) fn refresh_account_email(&mut self, app_server: &AppServerSession) {
+ let request_id = Uuid::new_v4();
+ self.account_email_request_id = Some(request_id);
+ let request_handle = app_server.request_handle();
+ let app_event_tx = self.app_event_tx.clone();
+ tokio::spawn(async move {
+ let result = tokio::time::timeout(
+ Duration::from_secs(/*secs*/ 30),
+ request_handle.request_typed::<GetAccountResponse>(ClientRequest::GetAccount {
+ request_id: RequestId::String(format!("account-status-{request_id}")),
+ params: GetAccountParams {
+ refresh_token: false,
+ },
+ }),
+ )
+ .await;
+ match result {
+ Ok(Ok(response)) => {
+ if let Some(Account::Chatgpt { email, .. }) = response.account {
+ app_event_tx.send(AppEvent::AccountEmailLoaded { request_id, email });
+ }
+ }
+ Ok(Err(_)) | Err(_) => {
+ tracing::warn!("failed to read account identity after account update");
+ }
+ }
+ });
+ }
+}
diff --git a/codex-rs/tui/src/app/app_server_events.rs b/codex-rs/tui/src/app/app_server_events.rs
index 81a9963cbd..75a02aff48 100644
--- a/codex-rs/tui/src/app/app_server_events.rs
+++ b/codex-rs/tui/src/app/app_server_events.rs
@@ -349,18 +349,22 @@ impl App {
| AuthMode::PersonalAccessToken
)
);
+ let account_display = status_account_display_from_auth_mode(
+ notification.auth_mode,
+ notification.plan_type,
+ );
+ let has_chatgpt_account = notification
+ .auth_mode
+ .is_some_and(AuthMode::has_chatgpt_account);
+ self.account_email_request_id = None;
self.chat_widget.update_account_state(
- status_account_display_from_auth_mode(
- notification.auth_mode,
- notification.plan_type,
- ),
+ account_display,
notification.plan_type,
- notification
- .auth_mode
- .is_some_and(AuthMode::has_chatgpt_account),
+ has_chatgpt_account,
has_codex_backend_auth,
);
if self.chat_widget.has_chatgpt_account() {
+ self.refresh_account_email(app_server_client);
crate::security_setup::prefetch(
&self.config,
app_server_client,
diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs
index 258ce3d4f8..d4cd4d533a 100644
--- a/codex-rs/tui/src/app/event_dispatch.rs
+++ b/codex-rs/tui/src/app/event_dispatch.rs
@@ -1267,6 +1267,12 @@ impl App {
elicitation_target: None,
});
}
+ AppEvent::AccountEmailLoaded { request_id, email } => {
+ if self.account_email_request_id == Some(request_id) {
+ self.account_email_request_id = None;
+ self.chat_widget.on_account_email_loaded(email);
+ }
+ }
AppEvent::SecuritySetupLoaded { request_id, identity, notice } => {
tracing::debug!(current = request_id == self.chat_widget.security_setup_request_id, "handling security setup notice");
if request_id == self.chat_widget.security_setup_request_id {
diff --git a/codex-rs/tui/src/app/reconnect.rs b/codex-rs/tui/src/app/reconnect.rs
index a48479bcd2..25872123b0 100644
--- a/codex-rs/tui/src/app/reconnect.rs
+++ b/codex-rs/tui/src/app/reconnect.rs
@@ -195,6 +195,7 @@ impl App {
}
self.retire_background_voice();
self.reconnect.offline = true;
+ self.account_email_request_id = None;
// Cached blank sessions are usable only while this connection owns a subscription.
self.agents_overview.blank_sessions.clear();
self.reconnect.failed = false;
diff --git a/codex-rs/tui/src/app/startup.rs b/codex-rs/tui/src/app/startup.rs
index 213c98a106..8525909fa4 100644
--- a/codex-rs/tui/src/app/startup.rs
+++ b/codex-rs/tui/src/app/startup.rs
@@ -933,6 +933,7 @@ See the Codex keymap documentation for supported actions and examples."
pending_managed_worktree_attach: None,
startup_protected_input_boundary: true,
startup_pending_protected_request: false,
+ account_email_request_id: None,
rate_limit_hard_stop_generation: 0,
rate_limit_refresh_state: Default::default(),
pending_mcp_login_start: None,
diff --git a/codex-rs/tui/src/app/test_support.rs b/codex-rs/tui/src/app/test_support.rs
index 5e6dcf7be5..8b5901c606 100644
--- a/codex-rs/tui/src/app/test_support.rs
+++ b/codex-rs/tui/src/app/test_support.rs
@@ -112,6 +112,7 @@ pub(crate) async fn make_test_app() -> App {
pending_managed_worktree_attach: None,
startup_protected_input_boundary: false,
startup_pending_protected_request: false,
+ account_email_request_id: None,
rate_limit_hard_stop_generation: 0,
rate_limit_refresh_state: Default::default(),
pending_mcp_login_start: None,
diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs
index cc3e5dc8c4..68504517d0 100644
--- a/codex-rs/tui/src/app/tests.rs
+++ b/codex-rs/tui/src/app/tests.rs
@@ -6151,6 +6151,7 @@ async fn make_test_app() -> Box<App> {
pending_managed_worktree_attach: None,
startup_protected_input_boundary: false,
startup_pending_protected_request: false,
+ account_email_request_id: None,
rate_limit_hard_stop_generation: 0,
rate_limit_refresh_state: Default::default(),
pending_mcp_login_start: None,
@@ -6270,6 +6271,7 @@ pub(super) async fn make_test_app_with_channels() -> (
pending_managed_worktree_attach: None,
startup_protected_input_boundary: false,
startup_pending_protected_request: false,
+ account_email_request_id: None,
rate_limit_hard_stop_generation: 0,
rate_limit_refresh_state: Default::default(),
pending_mcp_login_start: None,
diff --git a/codex-rs/tui/src/app/tests/security_setup_tests.rs b/codex-rs/tui/src/app/tests/security_setup_tests.rs
index b2e8bf8f1d..cbd167dfcf 100644
--- a/codex-rs/tui/src/app/tests/security_setup_tests.rs
+++ b/codex-rs/tui/src/app/tests/security_setup_tests.rs
@@ -3,6 +3,7 @@ use super::disconnect::serve_reconnect_requests;
use super::*;
use crate::app_server_session::ThreadParamsMode;
use crate::security_setup::Identity;
+use crate::status::StatusAccountDisplay;
use app_test_support::ChatGptAuthFixture;
use app_test_support::write_chatgpt_auth;
use codex_app_server_client::AppServerEvent;
@@ -27,6 +28,7 @@ async fn security_setup_fetch_with_default_features_uses_authenticated_codex_end
write_chatgpt_auth(
&app.config.codex_home,
ChatGptAuthFixture::new("test-token")
+ .email("[email protected]")
.account_id("account")
.chatgpt_user_id("user"),
AuthCredentialsStoreMode::File,
@@ -141,9 +143,14 @@ async fn security_setup_fetch_with_default_features_uses_authenticated_codex_end
);
app.replace_chat_widget(ChatWidget::new_with_app_event(init));
let event = tokio::time::timeout(Duration::from_secs(5), async {
+ let mut security_notice = None;
+ let mut email_loaded = false;
loop {
let event = events.recv().await.unwrap();
- if let AppEvent::SecuritySetupLoaded {
+ if matches!(event, AppEvent::AccountEmailLoaded { .. }) {
+ app.handle_event(&mut tui, &mut server, event).await?;
+ email_loaded = true;
+ } else if let AppEvent::SecuritySetupLoaded {
request_id: actual,
identity: actual_identity,
..
@@ -151,11 +158,30 @@ async fn security_setup_fetch_with_default_features_uses_authenticated_codex_end
{
assert_eq!(*actual, request_id);
assert_eq!(actual_identity, &identity);
- break event;
+ security_notice = Some(event);
+ }
+ if email_loaded && let Some(event) = security_notice.take() {
+ break Result::<AppEvent>::Ok(event);
}
}
})
+ .await??;
+ app.handle_event(
+ &mut tui,
+ &mut server,
+ AppEvent::AccountEmailLoaded {
+ request_id: uuid::Uuid::new_v4(),
+ email: Some("[email protected]".into()),
+ },
+ )
.await?;
+ assert_eq!(
+ app.chat_widget.status_account_display(),
+ Some(&StatusAccountDisplay::ChatGpt {
+ email: Some("[email protected]".into()),
+ plan: None,
+ })
+ );
app.handle_event(&mut tui, &mut server, event).await?;
assert!(!render_bottom_popup(&app.chat_widget, /*width*/ 70).contains("Set up security"));
}
diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs
index 3185d8a4c0..480cb4cc69 100644
--- a/codex-rs/tui/src/app_event.rs
+++ b/codex-rs/tui/src/app_event.rs
@@ -279,6 +279,10 @@ pub(crate) struct AgentsOverviewThreadRefresh {
#[allow(clippy::large_enum_variant)]
#[derive(Debug, IntoStaticStr)]
pub(crate) enum AppEvent {
+ AccountEmailLoaded {
+ request_id: uuid::Uuid,
+ email: Option<String>,
+ },
SecuritySetupLoaded {
request_id: uuid::Uuid,
identity: crate::security_setup::Identity,
diff --git a/codex-rs/tui/src/chatwidget/settings.rs b/codex-rs/tui/src/chatwidget/settings.rs
index 399b3f8bed..5280aaac46 100644
--- a/codex-rs/tui/src/chatwidget/settings.rs
+++ b/codex-rs/tui/src/chatwidget/settings.rs
@@ -198,6 +198,13 @@ impl ChatWidget {
self.model_catalog.clone()
}
+ pub(crate) fn on_account_email_loaded(&mut self, current_email: Option<String>) {
+ if let Some(StatusAccountDisplay::ChatGpt { email, .. }) = &mut self.status_account_display
+ {
+ *email = current_email;
+ }
+ }
+
pub(crate) fn current_plan_type(&self) -> Option<PlanType> {
self.plan_type
}
diff --git a/codex-rs/tui/src/status/snapshots/codex_tui__status__tests__status_snapshot_includes_credits_and_limits.snap b/codex-rs/tui/src/status/snapshots/codex_tui__status__tests__status_snapshot_includes_credits_and_limits.snap
index b2836f4618..6783811c53 100644
--- a/codex-rs/tui/src/status/snapshots/codex_tui__status__tests__status_snapshot_includes_credits_and_limits.snap
+++ b/codex-rs/tui/src/status/snapshots/codex_tui__status__tests__status_snapshot_includes_credits_and_limits.snap
@@ -13,8 +13,8 @@ expression: sanitized
Directory: [[workspace]]
Permissions: Custom (workspace with network access, Ask for approval)
Agents.md: <none>
+ Account: [email protected] (Pro 200)
- Token usage: 2K total (1.4K input + 600 output)
Context window: 100% left (2.2K used / 272K)
5h limit: [███████████░░░░░░░░░] 55% left (resets 09:25)
Weekly limit: [██████████████░░░░░░] 70% left (resets 09:55)
diff --git a/codex-rs/tui/src/status/tests.rs b/codex-rs/tui/src/status/tests.rs
index 029ef13695..4c2765b6aa 100644
--- a/codex-rs/tui/src/status/tests.rs
+++ b/codex-rs/tui/src/status/tests.rs
@@ -1913,7 +1913,10 @@ async fn status_snapshot_includes_credits_and_limits() {
config.model = Some("gpt-5.1-codex".to_string());
set_workspace_cwd(&mut config, test_path_buf("/workspace/tests").abs());
- let account_display = test_status_account_display();
+ let account_display = Some(StatusAccountDisplay::ChatGpt {
+ email: Some("[email protected]".into()),
+ plan: Some("Pro 200".into()),
+ });
let usage = TokenUsage {
input_tokens: 1_500,
cached_input_tokens: 100,