Fix workspace changes status for untracked files

workspace-changes previously only reported tracked line diffs, so a workspace with only untracked files looked clean and the statusline segment was omitted. Count untracked files separately and render them as a compact ?N suffix while keeping line counts bounded to tracked diffs.

Also cover the async workspace-command AppEvent path so the statusline refresh contract is tested, not just the formatter.

Tests: just fmt; cargo test -p codex-tui branch_summary; cargo test -p codex-tui status_line_workspace_changes; just fix -p codex-tui

Author: LEON-gittech

codex-rs/tui/src/branch_summary.rs

@@ -38,6 +38,8 @@ pub(crate) struct GitWorkspaceDiffStats {
     pub(crate) additions: u64,
     /// Total deleted lines in the current workspace.
     pub(crate) deletions: u64,
+    /// Untracked files in the current workspace.
+    pub(crate) untracked_files: u64,
 }
 
 /// Combined git metadata cached by the status line for one working directory.
@@ -139,11 +141,10 @@ pub(crate) async fn status_line_git_summary(
     }
 }
 
-/// Counts tracked workspace line changes relative to `HEAD`.
+/// Counts workspace changes relative to `HEAD`.
 ///
-/// Untracked files are intentionally ignored for this compact status-line probe. Counting their
-/// lines requires full-file reads or expensive `--no-index` diffs, which is too heavy for a
-/// background UI refresh.
+/// Tracked changes are counted as line additions/deletions. Untracked files are counted as files,
+/// not lines, so the compact status-line probe stays bounded and avoids expensive full-file diffs.
 pub(crate) async fn workspace_diff_stats(
     runner: &dyn WorkspaceCommandExecutor,
     cwd: &Path,
@@ -163,9 +164,11 @@ pub(crate) async fn workspace_diff_stats(
     }
 
     let (additions, deletions) = parse_numstat_totals(&numstat.stdout);
+    let untracked_files = untracked_file_count(runner, cwd).await.unwrap_or(0);
     Some(GitWorkspaceDiffStats {
         additions,
         deletions,
+        untracked_files,
     })
 }
 
@@ -232,6 +235,26 @@ fn parse_numstat_totals(stdout: &str) -> (u64, u64) {
     })
 }
 
+async fn untracked_file_count(runner: &dyn WorkspaceCommandExecutor, cwd: &Path) -> Option<u64> {
+    let output = run_git_command(
+        runner,
+        cwd,
+        &["ls-files", "--others", "--exclude-standard", "-z"],
+    )
+    .await
+    .ok()?;
+    if !output.success() {
+        return None;
+    }
+
+    let count = output
+        .stdout
+        .split('\0')
+        .filter(|path| !path.is_empty())
+        .count();
+    Some(count as u64)
+}
+
 /// Returns git remotes in the order used for default-branch discovery.
 ///
 /// `origin` is prioritized because most repositories use it as the canonical upstream. Other
@@ -623,6 +646,11 @@ mod tests {
                 /*exit_code*/ 0,
                 "10\t2\tsrc/main.rs\n-\t-\tassets/logo.png\n3\t0\tREADME.md\n",
             ),
+            response(
+                &["git", "ls-files", "--others", "--exclude-standard", "-z"],
+                /*exit_code*/ 0,
+                "scratch.txt\0notes/todo.md\0",
+            ),
         ]);
 
         let stats = workspace_diff_stats(&runner, Path::new("/repo"))
@@ -634,6 +662,7 @@ mod tests {
             GitWorkspaceDiffStats {
                 additions: 13,
                 deletions: 2,
+                untracked_files: 2,
             }
         );
     }

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

@@ -653,8 +653,15 @@ impl ChatWidget {
                 .status_line_workspace_changes
                 .as_ref()
                 .and_then(|stats| {
-                    (stats.additions != 0 || stats.deletions != 0)
-                        .then(|| format!("+{}/-{}", stats.additions, stats.deletions))
+                    if stats.additions == 0 && stats.deletions == 0 && stats.untracked_files == 0 {
+                        return None;
+                    }
+
+                    let mut value = format!("+{}/-{}", stats.additions, stats.deletions);
+                    if stats.untracked_files > 0 {
+                        value.push_str(&format!(" ?{}", stats.untracked_files));
+                    }
+                    Some(value)
                 }),
             StatusLineItem::Status => Some(self.run_state_status_text()),
             StatusLineItem::UsedTokens => {

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

@@ -289,6 +289,7 @@ async fn status_line_workspace_changes_render_dirty_tracked_stats() {
     chat.status_line_workspace_changes = Some(crate::branch_summary::GitWorkspaceDiffStats {
         additions: 830,
         deletions: 281,
+        untracked_files: 0,
     });
 
     assert_eq!(
@@ -303,6 +304,7 @@ async fn status_line_workspace_changes_omits_clean_workspaces() {
     chat.status_line_workspace_changes = Some(crate::branch_summary::GitWorkspaceDiffStats {
         additions: 0,
         deletions: 0,
+        untracked_files: 0,
     });
 
     assert_eq!(
@@ -311,6 +313,69 @@ async fn status_line_workspace_changes_omits_clean_workspaces() {
     );
 }
 
+#[tokio::test]
+async fn status_line_workspace_changes_render_untracked_file_count() {
+    let (mut chat, _rx, _ops) = make_chatwidget_manual(/*model_override*/ None).await;
+    chat.status_line_workspace_changes = Some(crate::branch_summary::GitWorkspaceDiffStats {
+        additions: 0,
+        deletions: 0,
+        untracked_files: 3,
+    });
+
+    assert_eq!(
+        chat.status_line_value_for_item(crate::bottom_pane::StatusLineItem::WorkspaceChanges),
+        Some("+0/-0 ?3".to_string())
+    );
+}
+
+#[tokio::test]
+async fn status_line_workspace_changes_async_event_renders_untracked_stats() {
+    let (mut chat, mut rx, _ops) = make_chatwidget_manual(/*model_override*/ None).await;
+    chat.config.tui_status_line = Some(vec!["workspace-changes".to_string()]);
+    let expected_cwd = chat.config.cwd.to_path_buf();
+    install_scripted_workspace_command_runner(
+        &mut chat,
+        vec![
+            workspace_response(
+                &["git", "rev-parse", "--git-dir"],
+                /*exit_code*/ 0,
+                ".git\n",
+            ),
+            workspace_response(
+                &["git", "diff", "--numstat", "HEAD", "--"],
+                /*exit_code*/ 0,
+                "2\t1\tsrc/lib.rs\n",
+            ),
+            workspace_response(
+                &["git", "ls-files", "--others", "--exclude-standard", "-z"],
+                /*exit_code*/ 0,
+                "scratch.txt\0",
+            ),
+        ],
+    );
+    chat.status_line_workspace_changes_cwd = None;
+    chat.status_line_workspace_changes_lookup_complete = false;
+
+    chat.refresh_status_line();
+    assert_eq!(status_line_text(&chat), None);
+
+    let event = tokio::time::timeout(std::time::Duration::from_secs(2), rx.recv())
+        .await
+        .expect("workspace changes event")
+        .expect("workspace changes event");
+    let crate::app_event::AppEvent::StatusLineWorkspaceChangesUpdated { cwd, stats } = event else {
+        panic!("expected workspace changes event, got {event:?}");
+    };
+    assert_eq!(cwd, expected_cwd);
+    chat.set_status_line_workspace_changes(cwd, stats);
+
+    assert_eq!(
+        chat.status_line_workspace_changes_cwd.as_deref(),
+        Some(expected_cwd.as_path())
+    );
+    assert_eq!(status_line_text(&chat), Some("+2/-1 ?1".to_string()));
+}
+
 #[tokio::test]
 async fn raw_output_status_line_value_only_shows_when_enabled() {
     let (mut chat, _rx, _ops) = make_chatwidget_manual(/*model_override*/ None).await;
@@ -1627,6 +1692,62 @@ fn install_noop_workspace_command_runner(chat: &mut ChatWidget) {
     chat.workspace_command_runner = Some(std::sync::Arc::new(NoopWorkspaceCommandRunner));
 }
 
+fn install_scripted_workspace_command_runner(
+    chat: &mut ChatWidget,
+    responses: Vec<WorkspaceCommandResponse>,
+) {
+    chat.workspace_command_runner = Some(std::sync::Arc::new(ScriptedWorkspaceCommandRunner {
+        responses: std::sync::Mutex::new(responses.into()),
+    }));
+}
+
+fn workspace_response(argv: &[&str], exit_code: i32, stdout: &str) -> WorkspaceCommandResponse {
+    WorkspaceCommandResponse {
+        argv: argv.iter().map(|arg| (*arg).to_string()).collect(),
+        output: crate::workspace_command::WorkspaceCommandOutput {
+            exit_code,
+            stdout: stdout.to_string(),
+            stderr: String::new(),
+        },
+    }
+}
+
+struct WorkspaceCommandResponse {
+    argv: Vec<String>,
+    output: crate::workspace_command::WorkspaceCommandOutput,
+}
+
+struct ScriptedWorkspaceCommandRunner {
+    responses: std::sync::Mutex<std::collections::VecDeque<WorkspaceCommandResponse>>,
+}
+
+impl crate::workspace_command::WorkspaceCommandExecutor for ScriptedWorkspaceCommandRunner {
+    fn run(
+        &self,
+        command: crate::workspace_command::WorkspaceCommand,
+    ) -> std::pin::Pin<
+        Box<
+            dyn std::future::Future<
+                    Output = Result<
+                        crate::workspace_command::WorkspaceCommandOutput,
+                        crate::workspace_command::WorkspaceCommandError,
+                    >,
+                > + Send
+                + '_,
+        >,
+    > {
+        Box::pin(async move {
+            let mut responses = self.responses.lock().expect("responses lock");
+            let index = responses
+                .iter()
+                .position(|response| response.argv == command.argv)
+                .unwrap_or_else(|| panic!("missing fake response for {:?}", command.argv));
+            let response = responses.remove(index).expect("fake response");
+            Ok(response.output)
+        })
+    }
+}
+
 struct NoopWorkspaceCommandRunner;
 
 impl crate::workspace_command::WorkspaceCommandExecutor for NoopWorkspaceCommandRunner {