openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-13 11:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into nux

Browse Source
This commit is contained in:
Ahmed Ibrahim
2025-08-19 17:05:46 -07:00
committed by GitHub
parent ee761180ea bc298e47ca
commit bc6368cff9
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codex-rs/tui/src/app.rs
View File

@@ -663,7 +663,13 @@ fn is_free_plan(login_status: &LoginStatus) -> bool {
}
}
fn should_show_login_screen(login_status: &LoginStatus, config: &Config) -> bool {
fn should_show_login_screen(login_status: LoginStatus, config: &Config) -> bool {
// Only show the login screen for providers that actually require OpenAI auth
// (OpenAI or equivalents). For OSS/other providers, skip login entirely.
if !config.model_provider.requires_openai_auth {
return false;
}
match login_status {
LoginStatus::NotAuthenticated => true,
LoginStatus::Auth(auth) => {

2
codex-rs/tui/src/chatwidget/tests.rs
View File

@@ -695,7 +695,7 @@ fn apply_patch_request_shows_diff_summary() {
// Per-file summary line should include the file path and counts
assert!(
blob.contains("README.md (+2 -0)"),
blob.contains("README.md"),
"missing per-file diff summary: {blob:?}"
);
}

25
codex-rs/tui/src/diff_render.rs
View File

@@ -130,17 +130,20 @@ pub(crate) fn create_diff_summary(
for (idx, f) in files.iter().enumerate() {
let mut spans: Vec<RtSpan<'static>> = Vec::new();
spans.push(RtSpan::raw(f.display_path.clone()));
spans.push(RtSpan::raw(" ("));
spans.push(RtSpan::styled(
format!("+{}", f.added),
Style::default().fg(Color::Green),
));
spans.push(RtSpan::raw(" "));
spans.push(RtSpan::styled(
format!("-{}", f.removed),
Style::default().fg(Color::Red),
));
spans.push(RtSpan::raw(")"));
// Show per-file +/- counts only when there are multiple files
if file_count > 1 {
spans.push(RtSpan::raw(" ("));
spans.push(RtSpan::styled(
format!("+{}", f.added),
Style::default().fg(Color::Green),
));
spans.push(RtSpan::raw(" "));
spans.push(RtSpan::styled(
format!("-{}", f.removed),
Style::default().fg(Color::Red),
));
spans.push(RtSpan::raw(")"));
}
let mut line = RtLine::from(spans);
let prefix = if idx == 0 { " └ " } else { " " };

2
codex-rs/tui/src/snapshots/codex_tui__diff_render__tests__add_details.snap
View File

@@ -3,7 +3,7 @@ source: tui/src/diff_render.rs
expression: terminal.backend()
---
"proposed patch to 1 file (+2 -0) "
" └ README.md (+2 -0) "
" └ README.md "
" 1 +first line "
" 2 +second line "
" "

2
codex-rs/tui/src/snapshots/codex_tui__diff_render__tests__update_details_with_rename.snap
View File

@@ -4,7 +4,7 @@ assertion_line: 380
expression: terminal.backend()
---
"proposed patch to 1 file (+1 -1) "
" └ src/lib.rs → src/lib_new.rs (+1 -1) "
" └ src/lib.rs → src/lib_new.rs "
" 1 line one "
" 2 -line two "
" 2 +line two changed "