Codex Infinity v1.3.16 - merge upstream + maintain custom features

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: lee101

codex-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codex-infinity/codex-infinity",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "license": "Apache-2.0",
   "description": "Codex Infinity - a smarter coding agent that can run forever",
   "bin": {

codex-rs/login/src/lib.rs

@@ -15,6 +15,7 @@ pub use server::ServerOptions;
 pub use server::ShutdownHandle;
 pub use server::run_login_server;
 
+pub use auth::ANTHROPIC_API_KEY_ENV_VAR;
 pub use auth::AuthConfig;
 pub use auth::AuthCredentialsStoreMode;
 pub use auth::AuthDotJson;
@@ -26,16 +27,15 @@ pub use auth::OPENAI_API_KEY_ENV_VAR;
 pub use auth::REFRESH_TOKEN_URL_OVERRIDE_ENV_VAR;
 pub use auth::RefreshTokenError;
 pub use auth::UnauthorizedRecovery;
+pub use auth::bootstrap_anthropic_api_key_from_claude_credentials;
 pub use auth::default_client;
 pub use auth::enforce_login_restrictions;
 pub use auth::load_auth_dot_json;
 pub use auth::login_with_api_key;
 pub use auth::logout;
-pub use auth::read_openai_api_key_from_env;
 pub use auth::read_anthropic_api_key_from_env;
 pub use auth::read_claude_code_credentials;
-pub use auth::bootstrap_anthropic_api_key_from_claude_credentials;
-pub use auth::ANTHROPIC_API_KEY_ENV_VAR;
+pub use auth::read_openai_api_key_from_env;
 pub use auth::save_auth;
 pub use codex_app_server_protocol::AuthMode;
 pub use token_data::TokenData;

codex-rs/mcp-server/src/ra1_tool.rs

@@ -1,9 +1,11 @@
 //! RA1 Art Generator tool - generates AI images via netwrck.com API.
 
-use rmcp::model::{CallToolResult, Tool};
-use schemars::r#gen::SchemaSettings;
+use rmcp::model::CallToolResult;
+use rmcp::model::Tool;
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use schemars::r#gen::SchemaSettings;
+use serde::Deserialize;
+use serde::Serialize;
 use serde_json::Map as JsonObject;
 use std::env;
 use std::sync::Arc;
@@ -94,7 +96,9 @@ pub async fn handle_ra1_art_generator(
     let api_key = match env::var(NETWRCK_API_KEY_ENV) {
         Ok(key) => key,
         Err(_) => {
-            return error_result(format!("{NETWRCK_API_KEY_ENV} environment variable not set"));
+            return error_result(format!(
+                "{NETWRCK_API_KEY_ENV} environment variable not set"
+            ));
         }
     };
 
@@ -106,9 +110,7 @@ pub async fn handle_ra1_art_generator(
             }
         },
         None => {
-            return error_result(
-                "Missing arguments; the `prompt` field is required.".to_string(),
-            );
+            return error_result("Missing arguments; the `prompt` field is required.".to_string());
         }
     };
 
@@ -159,9 +161,7 @@ pub async fn handle_ra1_art_generator(
             structured_content: None,
             meta: None,
         },
-        Err(e) => error_result(format!(
-            "Failed to parse API response: {e}\nRaw: {body}"
-        )),
+        Err(e) => error_result(format!("Failed to parse API response: {e}\nRaw: {body}")),
     }
 }
 

codex-rs/tui/src/app.rs

@@ -2856,7 +2856,7 @@ impl App {
                         .await?
                         {
                             crate::ResolveCwdOutcome::Continue(Some(cwd)) => cwd,
-                            crate::ResolveCwdOutcome::Continue(None) => current_cwd.clone(),
+                            crate::ResolveCwdOutcome::Continue(None) => current_cwd.clone().to_path_buf(),
                             crate::ResolveCwdOutcome::Exit => {
                                 return Ok(AppRunControl::Exit(ExitReason::UserRequested));
                             }
@@ -3033,7 +3033,7 @@ impl App {
                         .await?
                         {
                             crate::ResolveCwdOutcome::Continue(Some(cwd)) => cwd,
-                            crate::ResolveCwdOutcome::Continue(None) => current_cwd.clone(),
+                            crate::ResolveCwdOutcome::Continue(None) => current_cwd.clone().to_path_buf(),
                             crate::ResolveCwdOutcome::Exit => {
                                 return Ok(AppRunControl::Exit(ExitReason::UserRequested));
                             }
@@ -3076,7 +3076,7 @@ impl App {
                                 self.shutdown_current_thread().await;
                                 self.config = fork_config;
                                 tui.set_notification_method(self.config.tui_notification_method);
-                                self.file_search.update_search_dir(self.config.cwd.clone());
+                                self.file_search.update_search_dir(self.config.cwd.clone().to_path_buf());
                                 let init = self.chatwidget_init_for_forked_or_resumed_thread(
                                     tui,
                                     self.config.clone(),

codex-rs/tui/src/bottom_pane/feedback_view.rs

@@ -29,8 +29,7 @@ use super::popup_consts::standard_popup_hint_line;
 use super::textarea::TextArea;
 use super::textarea::TextAreaState;
 
-const BASE_CLI_BUG_ISSUE_URL: &str =
-    "https://github.com/lee101/codex-infinity/issues/new";
+const BASE_CLI_BUG_ISSUE_URL: &str = "https://github.com/lee101/codex-infinity/issues/new";
 /// Internal routing link for employee feedback follow-ups. This must not be shown to external users.
 const CODEX_FEEDBACK_INTERNAL_URL: &str = "http://go/codex-feedback-internal";
 

codex-rs/tui/src/chatwidget.rs

@@ -324,8 +324,6 @@ use self::realtime::RealtimeConversationUiState;
 use self::realtime::RenderedUserMessageEvent;
 mod status_surfaces;
 use self::status_surfaces::CachedProjectRootName;
-#[cfg(test)]
-use self::status_surfaces::TERMINAL_TITLE_SPINNER_INTERVAL;
 use self::status_surfaces::TerminalTitleStatusKind;
 use crate::mention_codec::LinkedMention;
 use crate::mention_codec::encode_history_mentions;
@@ -875,8 +873,6 @@ pub(crate) struct ChatWidget {
     // Original terminal-title config captured when opening the setup UI so live preview can be
     // rolled back on cancel.
     terminal_title_setup_original_items: Option<Option<Vec<String>>>,
-    // Baseline instant used to animate spinner-prefixed title statuses.
-    terminal_title_animation_origin: Instant,
     // Cached project root display name for the current cwd; avoids walking parent directories on
     // frequent title/status refreshes.
     status_line_project_root_name_cache: Option<CachedProjectRootName>,
@@ -4019,7 +4015,6 @@ impl ChatWidget {
             terminal_title_invalid_items_warned,
             last_terminal_title: None,
             terminal_title_setup_original_items: None,
-            terminal_title_animation_origin: Instant::now(),
             status_line_project_root_name_cache: None,
             status_line_branch: None,
             status_line_branch_cwd: None,
@@ -4230,7 +4225,6 @@ impl ChatWidget {
             terminal_title_invalid_items_warned,
             last_terminal_title: None,
             terminal_title_setup_original_items: None,
-            terminal_title_animation_origin: Instant::now(),
             status_line_project_root_name_cache: None,
             status_line_branch: None,
             status_line_branch_cwd: None,
@@ -4433,7 +4427,6 @@ impl ChatWidget {
             terminal_title_invalid_items_warned,
             last_terminal_title: None,
             terminal_title_setup_original_items: None,
-            terminal_title_animation_origin: Instant::now(),
             status_line_project_root_name_cache: None,
             status_line_branch: None,
             status_line_branch_cwd: None,

codex-rs/tui/src/chatwidget/status_surfaces.rs

@@ -6,9 +6,6 @@
 use super::*;
 
 pub(super) const DEFAULT_TERMINAL_TITLE_ITEMS: [&str; 2] = ["spinner", "project"];
-pub(super) const TERMINAL_TITLE_SPINNER_FRAMES: [&str; 10] =
-    ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-pub(super) const TERMINAL_TITLE_SPINNER_INTERVAL: Duration = Duration::from_millis(100);
 
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 /// Compact runtime states that can be rendered into the terminal title.
@@ -200,10 +197,7 @@ impl ChatWidget {
         let should_animate_spinner =
             self.should_animate_terminal_title_spinner_with_selections(selections);
         if self.last_terminal_title == title {
-            if should_animate_spinner {
-                self.frame_requester
-                    .schedule_frame_in(TERMINAL_TITLE_SPINNER_INTERVAL);
-            }
+            let _ = should_animate_spinner;
             return;
         }
         match title {
@@ -226,11 +220,6 @@ impl ChatWidget {
                 }
             }
         }
-
-        if should_animate_spinner {
-            self.frame_requester
-                .schedule_frame_in(TERMINAL_TITLE_SPINNER_INTERVAL);
-        }
     }
 
     /// Recomputes both status surfaces from one shared config snapshot.
@@ -585,53 +574,19 @@ impl ChatWidget {
         }
     }
 
-    pub(super) fn terminal_title_spinner_text_at(&self, now: Instant) -> Option<String> {
-        if !self.config.animations {
-            return None;
-        }
-
-        if !self.terminal_title_has_active_progress() {
-            return None;
-        }
-
-        Some(self.terminal_title_spinner_frame_at(now).to_string())
-    }
-
-    fn terminal_title_spinner_frame_at(&self, now: Instant) -> &'static str {
-        let elapsed = now.saturating_duration_since(self.terminal_title_animation_origin);
-        let frame_index =
-            (elapsed.as_millis() / TERMINAL_TITLE_SPINNER_INTERVAL.as_millis()) as usize;
-        TERMINAL_TITLE_SPINNER_FRAMES[frame_index % TERMINAL_TITLE_SPINNER_FRAMES.len()]
-    }
-
-    fn terminal_title_uses_spinner(&self) -> bool {
-        self.config
-            .tui_terminal_title
-            .as_ref()
-            .is_none_or(|items| items.iter().any(|item| item == "spinner"))
-    }
-
-    fn terminal_title_has_active_progress(&self) -> bool {
-        self.mcp_startup_status.is_some()
-            || self.bottom_pane.is_task_running()
-            || self.terminal_title_status_kind == TerminalTitleStatusKind::Undoing
+    pub(super) fn terminal_title_spinner_text_at(&self, _now: Instant) -> Option<String> {
+        None
     }
 
     pub(super) fn should_animate_terminal_title_spinner(&self) -> bool {
-        self.config.animations
-            && self.terminal_title_uses_spinner()
-            && self.terminal_title_has_active_progress()
+        false
     }
 
     fn should_animate_terminal_title_spinner_with_selections(
         &self,
-        selections: &StatusSurfaceSelections,
+        _selections: &StatusSurfaceSelections,
     ) -> bool {
-        self.config.animations
-            && selections
-                .terminal_title_items
-                .contains(&TerminalTitleItem::Spinner)
-            && self.terminal_title_has_active_progress()
+        false
     }
 
     /// Formats the last `update_plan` progress snapshot for terminal-title display.

codex-rs/tui/src/chatwidget/tests.rs

@@ -2086,7 +2086,6 @@ async fn make_chatwidget_manual(
         terminal_title_invalid_items_warned: Arc::new(AtomicBool::new(false)),
         last_terminal_title: None,
         terminal_title_setup_original_items: None,
-        terminal_title_animation_origin: Instant::now(),
         status_line_project_root_name_cache: None,
         status_line_branch: None,
         status_line_branch_cwd: None,
@@ -6682,14 +6681,13 @@ async fn undo_completed_clears_terminal_title_undo_state() {
     let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
     chat.config.animations = true;
     chat.config.tui_terminal_title = Some(vec!["spinner".to_string(), "status".to_string()]);
-    chat.terminal_title_animation_origin = Instant::now() + Duration::from_secs(1);
 
     chat.handle_codex_event(Event {
         id: "turn-undo".to_string(),
         msg: EventMsg::UndoStarted(UndoStartedEvent { message: None }),
     });
 
-    assert_eq!(chat.last_terminal_title, Some("⠋ Undoing".to_string()));
+    assert_eq!(chat.last_terminal_title, Some("Undoing".to_string()));
 
     chat.handle_codex_event(Event {
         id: "turn-undo".to_string(),
@@ -6711,14 +6709,13 @@ async fn undo_started_refreshes_default_spinner_project_title() {
         .last_terminal_title
         .clone()
         .expect("default title should include a project name");
-    chat.terminal_title_animation_origin = Instant::now() + Duration::from_secs(1);
 
     chat.handle_codex_event(Event {
         id: "turn-undo".to_string(),
         msg: EventMsg::UndoStarted(UndoStartedEvent { message: None }),
     });
 
-    assert_eq!(chat.last_terminal_title, Some(format!("⠋ {project}")));
+    assert_eq!(chat.last_terminal_title, Some(project));
 }
 
 /// The commit picker shows only commit subjects (no timestamps).
@@ -11619,7 +11616,7 @@ async fn terminal_title_can_render_app_name_item() {
 }
 
 #[tokio::test]
-async fn default_terminal_title_refreshes_when_spinner_state_changes() {
+async fn default_terminal_title_refreshes_when_task_state_changes() {
     let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
     chat.config.animations = true;
 
@@ -11658,34 +11655,22 @@ async fn default_terminal_title_refreshes_when_spinner_state_changes() {
     chat.last_terminal_title = Some(project.clone());
     chat.bottom_pane.set_task_running(true);
     chat.terminal_title_status_kind = TerminalTitleStatusKind::Thinking;
-    chat.terminal_title_animation_origin = Instant::now() + Duration::from_secs(1);
-
     chat.refresh_terminal_title();
 
-    assert_eq!(chat.last_terminal_title, Some(format!("⠋ {project}")));
+    assert_eq!(chat.last_terminal_title, Some(project));
 }
 
 #[tokio::test]
-async fn terminal_title_spinner_item_renders_when_animations_enabled() {
+async fn terminal_title_spinner_item_renders_nothing() {
     let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
     chat.bottom_pane.set_task_running(true);
     chat.terminal_title_status_kind = TerminalTitleStatusKind::Working;
-    chat.terminal_title_animation_origin = Instant::now();
 
-    assert_eq!(
-        chat.terminal_title_spinner_text_at(chat.terminal_title_animation_origin),
-        Some("⠋".to_string())
-    );
-    assert_eq!(
-        chat.terminal_title_spinner_text_at(
-            chat.terminal_title_animation_origin + TERMINAL_TITLE_SPINNER_INTERVAL,
-        ),
-        Some("⠙".to_string())
-    );
+    assert_eq!(chat.terminal_title_spinner_text_at(Instant::now()), None);
 }
 
 #[tokio::test]
-async fn terminal_title_uses_spaces_around_spinner_item() {
+async fn terminal_title_omits_spinner_item_spacing_when_spinner_is_disabled() {
     let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
     chat.config.animations = true;
     chat.config.tui_terminal_title = Some(vec![
@@ -11697,49 +11682,45 @@ async fn terminal_title_uses_spaces_around_spinner_item() {
     chat.thread_name = Some("Investigate flaky test".to_string());
     chat.bottom_pane.set_task_running(true);
     chat.terminal_title_status_kind = TerminalTitleStatusKind::Working;
-    chat.terminal_title_animation_origin = Instant::now() + Duration::from_secs(1);
 
     chat.refresh_terminal_title();
 
     let title = chat
         .last_terminal_title
         .clone()
         .expect("expected terminal title");
-    assert!(title.contains(" ⠋ Working | "));
-    assert!(!title.contains("| ⠋"));
-    assert!(!title.contains("⠋ |"));
+    assert!(title.contains(" Working | Investigate flaky test"));
+    assert!(!title.contains("⠋"));
 }
 
 #[tokio::test]
-async fn terminal_title_shows_spinner_and_undoing_without_task_running() {
+async fn terminal_title_shows_undoing_without_spinner_when_task_is_not_running() {
     let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
     chat.config.animations = true;
     chat.config.tui_terminal_title = Some(vec!["spinner".to_string(), "status".to_string()]);
     chat.terminal_title_status_kind = TerminalTitleStatusKind::Undoing;
-    chat.terminal_title_animation_origin = Instant::now() + Duration::from_secs(1);
 
     assert!(!chat.bottom_pane.is_task_running());
 
     chat.refresh_terminal_title();
 
-    assert_eq!(chat.last_terminal_title, Some("⠋ Undoing".to_string()));
+    assert_eq!(chat.last_terminal_title, Some("Undoing".to_string()));
 }
 
 #[tokio::test]
-async fn terminal_title_reschedules_spinner_when_title_text_is_unchanged() {
+async fn terminal_title_does_not_reschedule_spinner_when_title_text_is_unchanged() {
     let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
     let (frame_requester, mut frame_schedule_rx) = FrameRequester::test_observable();
     chat.frame_requester = frame_requester;
     chat.config.animations = true;
     chat.config.tui_terminal_title = Some(vec!["spinner".to_string()]);
     chat.bottom_pane.set_task_running(true);
     chat.terminal_title_status_kind = TerminalTitleStatusKind::Working;
-    chat.terminal_title_animation_origin = Instant::now() + Duration::from_secs(1);
-    chat.last_terminal_title = Some("⠋".to_string());
+    chat.last_terminal_title = Some(String::new());
 
     chat.refresh_terminal_title();
 
-    assert!(frame_schedule_rx.try_recv().is_ok());
+    assert!(frame_schedule_rx.try_recv().is_err());
 }
 
 #[tokio::test]