Compare commits

...

4 Commits

Author SHA1 Message Date
jimmyfraiture
a019ce0f25 Typo name 2025-09-15 17:02:38 +01:00
jimmyfraiture
17cff22689 fix merge 2025-09-15 16:56:33 +01:00
jimmyfraiture
a88c772b14 Merge remote-tracking branch 'origin/main' into jif/fix-ui-update 2025-09-15 16:50:43 +01:00
jimmyfraiture
de36cc43d4 Fix update glitch 2025-09-15 16:45:03 +01:00
2 changed files with 6 additions and 9 deletions

View File

@@ -64,13 +64,11 @@ mod streaming;
mod text_formatting;
mod tui;
mod ui_consts;
mod updates;
mod user_approval_widget;
mod version;
mod wrapping;
#[cfg(not(debug_assertions))]
mod updates;
use crate::new_model_popup::ModelUpgradeDecision;
use crate::new_model_popup::run_model_upgrade_popup;
use crate::onboarding::TrustDirectorySelection;
@@ -275,10 +273,12 @@ async fn run_ratatui_app(
let mut tui = Tui::new(terminal);
let login_status = get_login_status(&config);
let show_login_screen = should_show_login_screen(login_status, &config);
// Show update banner in terminal history (instead of stderr) so it is visible
// within the TUI scrollback. Building spans keeps styling consistent.
#[cfg(not(debug_assertions))]
if let Some(latest_version) = updates::get_upgrade_version(&config) {
if !show_login_screen && let Some(latest_version) = updates::get_upgrade_version(&config) {
use ratatui::style::Stylize as _;
use ratatui::text::Line;
@@ -325,13 +325,12 @@ async fn run_ratatui_app(
session_log::maybe_init(&config);
let auth_manager = AuthManager::shared(config.codex_home.clone());
let login_status = get_login_status(&config);
let should_show_onboarding =
should_show_onboarding(login_status, &config, should_show_trust_screen);
if should_show_onboarding {
let directory_trust_decision = run_onboarding_app(
OnboardingScreenArgs {
show_login_screen: should_show_login_screen(login_status, &config),
show_login_screen,
show_trust_screen: should_show_trust_screen,
login_status,
auth_manager: auth_manager.clone(),

View File

@@ -1,5 +1,3 @@
#![cfg(any(not(debug_assertions), test))]
use chrono::DateTime;
use chrono::Duration;
use chrono::Utc;