Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Avoid nested read locking when rendering browser sign-in (#47861)

jif3e9d1d29370e
diff --git a/codex-rs/tui/src/onboarding/auth.rs b/codex-rs/tui/src/onboarding/auth.rs
index c78840b6a2..9ad829140a 100644
--- a/codex-rs/tui/src/onboarding/auth.rs
+++ b/codex-rs/tui/src/onboarding/auth.rs
@@ -553,7 +553,12 @@ impl AuthModeWidget {
.render(area, buf);
}
- fn render_continue_in_browser(&self, area: Rect, buf: &mut Buffer) {
+ fn render_continue_in_browser(
+ &self,
+ area: Rect,
+ buf: &mut Buffer,
+ state: &ContinueInBrowserState,
+ ) {
let mut spans = vec![" ".into()];
if self.animations_enabled && !self.animations_suppressed.get() {
// Schedule a follow-up frame to keep the shimmer animation going.
@@ -568,10 +573,7 @@ impl AuthModeWidget {
}
let mut lines = vec![spans.into(), "".into()];
- let sign_in_state = self.sign_in_state.read().unwrap();
- let auth_url = if let SignInState::ChatGptContinueInBrowser(state) = &*sign_in_state
- && !state.auth_url.is_empty()
- {
+ let auth_url = if !state.auth_url.is_empty() {
lines.push(" If the link doesn't open automatically, open the following link to authenticate:".into());
lines.push("".into());
lines.push(Line::from(vec![
@@ -1053,8 +1055,8 @@ impl WidgetRef for AuthModeWidget {
SignInState::PickMode => {
self.render_pick_mode(area, buf);
}
- SignInState::ChatGptContinueInBrowser(_) => {
- self.render_continue_in_browser(area, buf);
+ SignInState::ChatGptContinueInBrowser(state) => {
+ self.render_continue_in_browser(area, buf, state);
}
SignInState::ChatGptDeviceCode(state) => {
headless_chatgpt_login::render_device_code_login(self, area, buf, state);
@@ -1366,7 +1368,7 @@ mod tests {
let height = 30;
let area = Rect::new(0, 0, width, height);
let mut buf = Buffer::empty(area);
- widget.render_continue_in_browser(area, &mut buf);
+ widget.render_ref(area, &mut buf);
let found = collect_osc8_chars(&buf, area, PRODUCTION_LENGTH_AUTH_URL);
assert_eq!(
@@ -1381,7 +1383,7 @@ mod tests {
terminal.set_viewport_area(area);
terminal
- .draw(|frame| widget.render_continue_in_browser(area, frame.buffer_mut()))
+ .draw(|frame| widget.render_ref(area, frame.buffer_mut()))
.expect("draw");
let contents = terminal.backend().to_string();