Switch saved accounts from tray menus

apps/desktop-tauri/src-tauri/src/commands/claude_accounts.rs

@@ -17,6 +17,8 @@ pub fn claude_accounts_list() -> Result<Vec<ClaudeAccount>, String> {
 
 fn changed(app: &tauri::AppHandle) {
     let _emit = app.emit("claude-accounts-updated", ());
+    let handle = app.clone();
+    let _dispatch = app.run_on_main_thread(move || crate::tray_bridge::rebuild_tray_menu(&handle));
 }
 
 #[tauri::command]

apps/desktop-tauri/src-tauri/src/commands/codex_accounts.rs

@@ -411,6 +411,8 @@ fn refresh_persisted_accounts(app: tauri::AppHandle) -> Result<(), String> {
 
 fn accounts_changed(app: &tauri::AppHandle) {
     events::emit_codex_accounts_updated(app);
+    let handle = app.clone();
+    let _ = app.run_on_main_thread(move || crate::tray_bridge::rebuild_tray_menu(&handle));
 }
 
 fn into_user_message(error: CodexAccountManagerError) -> String {

apps/desktop-tauri/src-tauri/src/main.rs

@@ -15,6 +15,7 @@ mod shortcut_bridge;
 mod state;
 mod surface;
 mod surface_target;
+mod tray_accounts;
 mod tray_bridge;
 mod tray_menu;
 mod tray_visibility;

apps/desktop-tauri/src-tauri/src/tray_accounts.rs

@@ -0,0 +1,373 @@
+//! Account-specific native tray menu construction and dispatch.
+//!
+//! Keep provider/account workflows out of the generic tray shell so adding a
+//! new account action does not grow `tray_bridge.rs` into another controller.
+
+use codexbar::codex_accounts::CodexAccount;
+use codexbar::locale::{self, LocaleKey};
+use codexbar::settings::{Language, Settings};
+use tauri::AppHandle;
+
+use crate::tray_menu::TrayMenuEntry;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) enum AccountMenuAction {
+    AddCodexAccount,
+    AddClaudeAccount,
+    SaveClaudeAccount,
+    CancelClaudeLogin,
+    SwitchClaudeAccount(String),
+    SwitchCodexAccount(String),
+}
+
+pub(crate) fn prepend_account_menus(spec: &mut Vec<TrayMenuEntry>, settings: &Settings) {
+    let accounts = crate::commands::load_codex_accounts().unwrap_or_default();
+    let active =
+        codexbar::codex_accounts::CodexAccountManager::new().discover_ambient_account(&accounts);
+    spec.insert(
+        0,
+        codex_accounts_menu(
+            &accounts,
+            active.as_ref(),
+            settings.ui_language,
+            settings.hide_personal_info,
+        ),
+    );
+
+    let claude_accounts = crate::commands::claude_accounts_list().unwrap_or_default();
+    spec.insert(
+        1,
+        claude_accounts_menu(
+            &claude_accounts,
+            settings.ui_language,
+            settings.hide_personal_info,
+        ),
+    );
+}
+
+pub(crate) fn resolve_action(id: &str) -> Option<AccountMenuAction> {
+    match id {
+        "add_codex_account" => Some(AccountMenuAction::AddCodexAccount),
+        "add_claude_account" => Some(AccountMenuAction::AddClaudeAccount),
+        "save_claude_account" => Some(AccountMenuAction::SaveClaudeAccount),
+        "cancel_claude_login" => Some(AccountMenuAction::CancelClaudeLogin),
+        _ if id.starts_with("switch_claude_account:") => {
+            let id = id.strip_prefix("switch_claude_account:")?;
+            (!id.is_empty()).then(|| AccountMenuAction::SwitchClaudeAccount(id.to_string()))
+        }
+        _ if id.starts_with("switch_codex_account:") => {
+            let id = id.strip_prefix("switch_codex_account:")?;
+            uuid::Uuid::parse_str(id).ok()?;
+            Some(AccountMenuAction::SwitchCodexAccount(id.to_string()))
+        }
+        _ => None,
+    }
+}
+
+pub(crate) fn handle_action(app: &AppHandle, action: AccountMenuAction) {
+    match action {
+        AccountMenuAction::AddCodexAccount => {
+            let handle = app.clone();
+            tauri::async_runtime::spawn(async move {
+                match crate::commands::codex_account_add(handle.clone()).await {
+                    Ok(_) => show_codex_message(&handle, "Codex account added."),
+                    Err(error) => show_codex_message(&handle, &error),
+                }
+            });
+        }
+        AccountMenuAction::SwitchCodexAccount(id) => {
+            let handle = app.clone();
+            tauri::async_runtime::spawn(async move {
+                match crate::commands::codex_account_switch(handle.clone(), id).await {
+                    Ok(result) => {
+                        use tauri_plugin_dialog::{DialogExt, MessageDialogButtons};
+                        if result.desktop_session_restore_path.is_some() {
+                            let dialog_handle = handle.clone();
+                            let restart = tauri::async_runtime::spawn_blocking(move || {
+                                dialog_handle
+                                    .dialog()
+                                    .message("Account switched. Restart Codex Desktop to use it? This stops running desktop tasks.")
+                                    .title("Codex Accounts")
+                                    .buttons(MessageDialogButtons::OkCancelCustom(
+                                        "Restart".into(),
+                                        "Later".into(),
+                                    ))
+                                    .blocking_show()
+                            })
+                            .await
+                            .unwrap_or(false);
+                            if restart {
+                                let restart_result =
+                                    crate::commands::codex_account_restart_desktop(
+                                        handle.clone(),
+                                        result.switch_id.to_string(),
+                                    )
+                                    .await;
+                                if let Err(error) = restart_result {
+                                    show_codex_message(&handle, &error);
+                                }
+                            }
+                        } else {
+                            show_codex_message(&handle, "Codex account switched.");
+                        }
+                    }
+                    Err(error) => show_codex_message(&handle, &error),
+                }
+            });
+        }
+        AccountMenuAction::CancelClaudeLogin => crate::commands::claude_account_cancel_login(),
+        action @ (AccountMenuAction::AddClaudeAccount
+        | AccountMenuAction::SaveClaudeAccount
+        | AccountMenuAction::SwitchClaudeAccount(_)) => {
+            let handle = app.clone();
+            tauri::async_runtime::spawn(async move {
+                use tauri_plugin_dialog::DialogExt;
+                let (result, message) = match action {
+                    AccountMenuAction::AddClaudeAccount => (
+                        crate::commands::claude_account_add(handle.clone()).await,
+                        "Claude Code account added. Select it to switch.",
+                    ),
+                    AccountMenuAction::SaveClaudeAccount => (
+                        crate::commands::claude_account_save_current(handle.clone()).await,
+                        "Current Claude Code account saved.",
+                    ),
+                    AccountMenuAction::SwitchClaudeAccount(id) => (
+                        crate::commands::claude_account_switch(handle.clone(), id).await,
+                        "Claude Code account switched. Reopen the Claude Code CLI to use it.",
+                    ),
+                    _ => unreachable!(),
+                };
+                handle
+                    .dialog()
+                    .message(result.err().unwrap_or_else(|| message.to_string()))
+                    .title("Claude Code accounts")
+                    .show(|_| {});
+            });
+        }
+    }
+}
+
+fn show_codex_message(app: &AppHandle, message: &str) {
+    use tauri_plugin_dialog::DialogExt;
+    app.dialog()
+        .message(message)
+        .title("Codex Accounts")
+        .show(|_| {});
+}
+
+fn codex_accounts_menu(
+    accounts: &[CodexAccount],
+    active: Option<&CodexAccount>,
+    lang: Language,
+    hide_personal_info: bool,
+) -> TrayMenuEntry {
+    let text = |key| locale::get_text(lang, key);
+    let mut children: Vec<_> = accounts
+        .iter()
+        .map(|account| {
+            let is_active = active.is_some_and(|current| current.matches(account));
+            let mut entry = TrayMenuEntry::check_item(
+                format!("switch_codex_account:{}", account.id),
+                if hide_personal_info
+                    && account
+                        .nickname
+                        .as_deref()
+                        .is_none_or(|n| n.trim().is_empty())
+                {
+                    codexbar::core::PersonalInfoRedactor::partial_redact_email(
+                        account.email_hint.as_deref(),
+                        true,
+                    )
+                } else {
+                    account.display_name()
+                },
+                is_active,
+            );
+            entry.disabled = is_active;
+            entry
+        })
+        .collect();
+    if children.is_empty() {
+        children.push(TrayMenuEntry::status_row(
+            "codex_accounts_empty",
+            text(LocaleKey::CodexAccountsEmpty),
+        ));
+    }
+    children.push(TrayMenuEntry::separator());
+    children.push(TrayMenuEntry::item(
+        "add_codex_account",
+        text(LocaleKey::CodexAccountsAddButton),
+    ));
+    TrayMenuEntry::submenu(
+        "codex_accounts",
+        text(LocaleKey::CodexAccountsTitle),
+        children,
+    )
+}
+
+fn claude_accounts_menu(
+    accounts: &[codexbar::providers::claude::accounts::ClaudeAccount],
+    lang: Language,
+    hide_personal_info: bool,
+) -> TrayMenuEntry {
+    let text = |key| locale::get_text(lang, key);
+    let mut children: Vec<_> = accounts
+        .iter()
+        .map(|account| {
+            let label = if hide_personal_info {
+                codexbar::core::PersonalInfoRedactor::partial_redact_email(
+                    Some(&account.email),
+                    true,
+                )
+            } else {
+                account.organization.as_ref().map_or_else(
+                    || account.email.clone(),
+                    |org| format!("{} ({org})", account.email),
+                )
+            };
+            let mut entry = TrayMenuEntry::check_item(
+                format!("switch_claude_account:{}", account.id),
+                label,
+                account.is_active,
+            );
+            entry.disabled = account.is_active || !account.is_saved;
+            entry
+        })
+        .collect();
+    if children.is_empty() {
+        children.push(TrayMenuEntry::status_row(
+            "claude_accounts_empty",
+            text(LocaleKey::ClaudeAccountsEmpty),
+        ));
+    }
+    children.push(TrayMenuEntry::separator());
+    children.push(TrayMenuEntry::item(
+        "add_claude_account",
+        text(LocaleKey::CodexAccountsAddButton),
+    ));
+    children.push(TrayMenuEntry::item(
+        "save_claude_account",
+        text(LocaleKey::ClaudeAccountsSaveCurrent),
+    ));
+    children.push(TrayMenuEntry::item(
+        "cancel_claude_login",
+        text(LocaleKey::ClaudeAccountsCancelLogin),
+    ));
+    TrayMenuEntry::submenu(
+        "claude_accounts",
+        text(LocaleKey::ClaudeAccountsTitle),
+        children,
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn menu_contains(menu: &[TrayMenuEntry], id: &str) -> bool {
+        menu.iter().any(|entry| {
+            entry.id.as_deref() == Some(id)
+                || (!entry.children.is_empty() && menu_contains(&entry.children, id))
+        })
+    }
+
+    #[test]
+    fn account_action_ids_are_typed_and_validated() {
+        assert_eq!(
+            resolve_action("add_claude_account"),
+            Some(AccountMenuAction::AddClaudeAccount)
+        );
+        assert_eq!(
+            resolve_action("save_claude_account"),
+            Some(AccountMenuAction::SaveClaudeAccount)
+        );
+        assert_eq!(
+            resolve_action("cancel_claude_login"),
+            Some(AccountMenuAction::CancelClaudeLogin)
+        );
+        assert_eq!(
+            resolve_action("switch_claude_account:a:org"),
+            Some(AccountMenuAction::SwitchClaudeAccount("a:org".into()))
+        );
+        assert!(resolve_action("switch_claude_account:").is_none());
+        assert!(resolve_action("switch_codex_account:not-a-uuid").is_none());
+    }
+
+    #[test]
+    fn codex_accounts_can_be_switched_or_added_from_tray() {
+        use codexbar::codex_accounts::{CodexAccountSource, utc_now};
+        let make = |name: &str| {
+            CodexAccount::new(
+                uuid::Uuid::new_v4(),
+                Some(name.into()),
+                None,
+                None,
+                Some(name.into()),
+                std::path::PathBuf::from(name),
+                CodexAccountSource::ManagedByApp,
+                utc_now(),
+                utc_now(),
+                None,
+            )
+        };
+        let first = make("Personal");
+        let second = make("Work");
+        let menu = codex_accounts_menu(
+            &[first.clone(), second.clone()],
+            Some(&first),
+            Language::English,
+            false,
+        );
+        assert_eq!(menu.children[0].checked, Some(true));
+        assert!(menu.children[0].disabled);
+        assert_eq!(
+            menu.children[1].id.as_deref(),
+            Some(format!("switch_codex_account:{}", second.id).as_str())
+        );
+        assert_eq!(menu.children[1].checked, Some(false));
+        assert!(!menu.children[1].disabled);
+        assert!(menu_contains(&menu.children, "add_codex_account"));
+        let empty = codex_accounts_menu(&[], None, Language::English, false);
+        assert!(menu_contains(&empty.children, "add_codex_account"));
+        let mut email_account = second;
+        email_account.nickname = None;
+        email_account.email_hint = Some("private@example.com".into());
+        let private = codex_accounts_menu(&[email_account.clone()], None, Language::English, true);
+        assert!(!private.children[0].label.contains("private@example.com"));
+        let visible = codex_accounts_menu(&[email_account], None, Language::English, false);
+        assert_eq!(visible.children[0].label, "private@example.com");
+    }
+
+    #[test]
+    fn claude_menu_checks_current_account_and_routes_saved_accounts() {
+        use codexbar::providers::claude::accounts::ClaudeAccount;
+        let current = ClaudeAccount {
+            id: "a:org".into(),
+            email: "a@example.com".into(),
+            organization: None,
+            plan: None,
+            is_active: true,
+            is_saved: false,
+        };
+        let saved = ClaudeAccount {
+            id: "b:org".into(),
+            is_active: false,
+            is_saved: true,
+            ..current.clone()
+        };
+        let menu = claude_accounts_menu(&[current, saved], Language::English, false);
+        assert_eq!(menu.id.as_deref(), Some("claude_accounts"));
+        assert_eq!(menu.children[0].checked, Some(true));
+        assert!(menu.children[0].disabled);
+        assert_eq!(
+            menu.children[1].id.as_deref(),
+            Some("switch_claude_account:b:org")
+        );
+        assert!(!menu.children[1].disabled);
+        assert!(menu_contains(&menu.children, "add_claude_account"));
+        assert!(menu_contains(
+            &claude_accounts_menu(&[], Language::English, false).children,
+            "add_claude_account"
+        ));
+    }
+}