Add workspace git stats to the TUI status line

Surface tracked workspace additions and deletions as a compact workspace-changes statusline item. The lookup uses the existing app-server workspace command runner and async AppEvent refresh path so remote workspaces and the TUI footer stay non-blocking.

The default status line now includes workspace-changes, but clean or unavailable repositories omit the segment so the footer stays compact.

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

Author: LEON-gittech

codex-rs/tui/src/app/event_dispatch.rs

@@ -1937,6 +1937,11 @@ impl App {
                 self.chat_widget.set_status_line_git_summary(cwd, summary);
                 self.refresh_status_line();
             }
+            AppEvent::StatusLineWorkspaceChangesUpdated { cwd, stats } => {
+                self.chat_widget
+                    .set_status_line_workspace_changes(cwd, stats);
+                self.refresh_status_line();
+            }
             AppEvent::StatusLineSetupCancelled => {
                 self.chat_widget.cancel_status_line_setup();
             }

codex-rs/tui/src/app_event.rs

@@ -881,6 +881,11 @@ pub(crate) enum AppEvent {
         cwd: PathBuf,
         summary: crate::chatwidget::StatusLineGitSummary,
     },
+    /// Async update of tracked workspace diff stats for status line rendering.
+    StatusLineWorkspaceChangesUpdated {
+        cwd: PathBuf,
+        stats: Option<crate::chatwidget::GitWorkspaceDiffStats>,
+    },
     /// Apply a user-confirmed status-line item ordering/selection.
     StatusLineSetup {
         items: Vec<StatusLineItem>,

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

@@ -11,7 +11,7 @@
 //!
 //! - Model information (name, reasoning level)
 //! - Directory paths (current dir, project root)
-//! - Git information (branch name)
+//! - Git information (branch name, workspace changes)
 //! - Context usage (remaining %, used %, window size)
 //! - Usage limits (5-hour, weekly)
 //! - Session info (thread title, ID, tokens used)
@@ -77,6 +77,14 @@ pub(crate) enum StatusLineItem {
     /// Committed branch diff stats relative to the default branch.
     BranchChanges,
 
+    /// Current tracked workspace diff stats relative to HEAD.
+    #[strum(
+        to_string = "workspace-changes",
+        serialize = "git-status",
+        serialize = "workspace-diff"
+    )]
+    WorkspaceChanges,
+
     /// Compact runtime run-state text.
     #[strum(to_string = "run-state", serialize = "status")]
     Status,
@@ -148,6 +156,9 @@ impl StatusLineItem {
             StatusLineItem::BranchChanges => {
                 "Committed branch changes against the default branch (omitted when unavailable)"
             }
+            StatusLineItem::WorkspaceChanges => {
+                "Tracked workspace changes against HEAD (omitted when clean or unavailable)"
+            }
             StatusLineItem::Status => "Compact session run-state text (Ready, Working, Thinking)",
             StatusLineItem::ContextRemaining => {
                 "Percentage of context window remaining (omitted when unknown)"
@@ -191,6 +202,7 @@ impl StatusLineItem {
             StatusLineItem::GitBranch => StatusSurfacePreviewItem::GitBranch,
             StatusLineItem::PullRequestNumber => StatusSurfacePreviewItem::PullRequestNumber,
             StatusLineItem::BranchChanges => StatusSurfacePreviewItem::BranchChanges,
+            StatusLineItem::WorkspaceChanges => StatusSurfacePreviewItem::WorkspaceChanges,
             StatusLineItem::Status => StatusSurfacePreviewItem::Status,
             StatusLineItem::ContextRemaining => StatusSurfacePreviewItem::ContextRemaining,
             StatusLineItem::ContextUsed => StatusSurfacePreviewItem::ContextUsed,
@@ -448,6 +460,18 @@ mod tests {
             "branch-changes".parse::<StatusLineItem>(),
             Ok(StatusLineItem::BranchChanges)
         );
+        assert_eq!(
+            "workspace-changes".parse::<StatusLineItem>(),
+            Ok(StatusLineItem::WorkspaceChanges)
+        );
+        assert_eq!(
+            "git-status".parse::<StatusLineItem>(),
+            Ok(StatusLineItem::WorkspaceChanges)
+        );
+        assert_eq!(
+            StatusLineItem::WorkspaceChanges.to_string(),
+            "workspace-changes"
+        );
     }
 
     #[test]

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

@@ -34,7 +34,8 @@ impl StatusLineAccent {
             StatusLineItem::CurrentDir | StatusLineItem::ProjectRoot => Self::Path,
             StatusLineItem::GitBranch
             | StatusLineItem::PullRequestNumber
-            | StatusLineItem::BranchChanges => Self::Branch,
+            | StatusLineItem::BranchChanges
+            | StatusLineItem::WorkspaceChanges => Self::Branch,
             StatusLineItem::Status => Self::State,
             StatusLineItem::ContextRemaining
             | StatusLineItem::ContextUsed

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

@@ -16,6 +16,7 @@ pub(crate) enum StatusSurfacePreviewItem {
     GitBranch,
     PullRequestNumber,
     BranchChanges,
+    WorkspaceChanges,
     ContextRemaining,
     ContextUsed,
     FiveHourLimit,
@@ -47,6 +48,7 @@ impl StatusSurfacePreviewItem {
             StatusSurfacePreviewItem::GitBranch => "feat/awesome-feature",
             StatusSurfacePreviewItem::PullRequestNumber => "PR #123",
             StatusSurfacePreviewItem::BranchChanges => "+12 -3",
+            StatusSurfacePreviewItem::WorkspaceChanges => "+830/-281",
             StatusSurfacePreviewItem::ContextRemaining => "Context 0% left",
             StatusSurfacePreviewItem::ContextUsed => "Context 0% used",
             StatusSurfacePreviewItem::FiveHourLimit => "5h 0%",
@@ -78,6 +80,7 @@ impl StatusSurfacePreviewItem {
             Self::GitBranch,
             Self::PullRequestNumber,
             Self::BranchChanges,
+            Self::WorkspaceChanges,
             Self::ContextRemaining,
             Self::ContextUsed,
             Self::FiveHourLimit,

codex-rs/tui/src/branch_summary.rs

@@ -31,6 +31,15 @@ pub(crate) struct GitBranchDiffStats {
     pub(crate) deletions: u64,
 }
 
+/// Additions and deletions in the current tracked workspace relative to `HEAD`.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(crate) struct GitWorkspaceDiffStats {
+    /// Total added lines in the current workspace.
+    pub(crate) additions: u64,
+    /// Total deleted lines in the current workspace.
+    pub(crate) deletions: u64,
+}
+
 /// Combined git metadata cached by the status line for one working directory.
 ///
 /// A summary may contain only one of the fields when the other probe fails. Renderers should treat
@@ -130,6 +139,36 @@ pub(crate) async fn status_line_git_summary(
     }
 }
 
+/// Counts tracked workspace line 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.
+pub(crate) async fn workspace_diff_stats(
+    runner: &dyn WorkspaceCommandExecutor,
+    cwd: &Path,
+) -> Option<GitWorkspaceDiffStats> {
+    let git_dir = run_git_command(runner, cwd, &["rev-parse", "--git-dir"])
+        .await
+        .ok()?;
+    if !git_dir.success() {
+        return None;
+    }
+
+    let numstat = run_git_command(runner, cwd, &["diff", "--numstat", "HEAD", "--"])
+        .await
+        .ok()?;
+    if !numstat.success() {
+        return None;
+    }
+
+    let (additions, deletions) = parse_numstat_totals(&numstat.stdout);
+    Some(GitWorkspaceDiffStats {
+        additions,
+        deletions,
+    })
+}
+
 /// Counts committed line changes between `HEAD` and the repository default branch.
 ///
 /// The comparison base is the merge base with a verified default-branch ref. Uncommitted working
@@ -170,23 +209,26 @@ async fn branch_diff_stats_to_default_branch(
         return None;
     }
 
-    let mut additions = 0_u64;
-    let mut deletions = 0_u64;
-    for line in numstat.stdout.lines() {
+    let (additions, deletions) = parse_numstat_totals(&numstat.stdout);
+
+    Some(GitBranchDiffStats {
+        additions,
+        deletions,
+    })
+}
+
+fn parse_numstat_totals(stdout: &str) -> (u64, u64) {
+    stdout.lines().fold((0_u64, 0_u64), |mut totals, line| {
         let mut columns = line.split('\t');
-        additions += columns
+        totals.0 += columns
             .next()
             .and_then(|value| value.parse().ok())
             .unwrap_or(0);
-        deletions += columns
+        totals.1 += columns
             .next()
             .and_then(|value| value.parse().ok())
             .unwrap_or(0);
-    }
-
-    Some(GitBranchDiffStats {
-        additions,
-        deletions,
+        totals
     })
 }
 
@@ -568,6 +610,49 @@ mod tests {
         assert!(runner.saw(&["git", "merge-base", "HEAD", "refs/remotes/origin/main"]));
     }
 
+    #[tokio::test]
+    async fn workspace_diff_stats_counts_tracked_changes_against_head() {
+        let runner = FakeRunner::new(vec![
+            response(
+                &["git", "rev-parse", "--git-dir"],
+                /*exit_code*/ 0,
+                ".git\n",
+            ),
+            response(
+                &["git", "diff", "--numstat", "HEAD", "--"],
+                /*exit_code*/ 0,
+                "10\t2\tsrc/main.rs\n-\t-\tassets/logo.png\n3\t0\tREADME.md\n",
+            ),
+        ]);
+
+        let stats = workspace_diff_stats(&runner, Path::new("/repo"))
+            .await
+            .expect("workspace diff stats");
+
+        assert_eq!(
+            stats,
+            GitWorkspaceDiffStats {
+                additions: 13,
+                deletions: 2,
+            }
+        );
+    }
+
+    #[tokio::test]
+    async fn workspace_diff_stats_omits_non_git_directories() {
+        let runner = FakeRunner::new(vec![response(
+            &["git", "rev-parse", "--git-dir"],
+            /*exit_code*/ 128,
+            "",
+        )]);
+
+        assert_eq!(
+            workspace_diff_stats(&runner, Path::new("/repo")).await,
+            None
+        );
+        assert!(!runner.saw(&["git", "diff", "--numstat", "HEAD", "--"]));
+    }
+
     #[tokio::test]
     async fn open_pull_request_uses_current_branch_view_first() {
         let runner = FakeRunner::new(vec![response(

codex-rs/tui/src/chatwidget.rs

@@ -363,6 +363,7 @@ use self::user_messages::PendingSteerCompareKey;
 use self::user_messages::UserMessageDisplay;
 mod warnings;
 use self::warnings::WarningDisplayState;
+pub(crate) use crate::branch_summary::GitWorkspaceDiffStats;
 pub(crate) use crate::branch_summary::StatusLineGitSummary;
 use crate::streaming::chunking::AdaptiveChunkingPolicy;
 use crate::streaming::commit_tick::CommitTickScope;
@@ -388,7 +389,8 @@ use unicode_segmentation::UnicodeSegmentation;
 const USER_SHELL_COMMAND_HELP_TITLE: &str = "Prefix a command with ! to run it locally";
 const USER_SHELL_COMMAND_HELP_HINT: &str = "Example: !ls";
 const DEFAULT_OPENAI_BASE_URL: &str = "https://api.openai.com/v1";
-const DEFAULT_STATUS_LINE_ITEMS: [&str; 2] = ["model-with-reasoning", "current-dir"];
+const DEFAULT_STATUS_LINE_ITEMS: [&str; 3] =
+    ["model-with-reasoning", "current-dir", "workspace-changes"];
 // Track information about an in-flight exec command.
 struct RunningCommand {
     command: Vec<String>,
@@ -1012,6 +1014,14 @@ pub(crate) struct ChatWidget {
     status_line_git_summary_pending: bool,
     // True once we've attempted a Git summary lookup for the current CWD.
     status_line_git_summary_lookup_complete: bool,
+    // Cached tracked workspace diff stats for the active status-line cwd.
+    status_line_workspace_changes: Option<GitWorkspaceDiffStats>,
+    // CWD used to resolve the cached workspace diff stats; change resets workspace state.
+    status_line_workspace_changes_cwd: Option<PathBuf>,
+    // True while an async workspace diff stats lookup is in flight.
+    status_line_workspace_changes_pending: bool,
+    // True once we've attempted a workspace diff stats lookup for the current CWD.
+    status_line_workspace_changes_lookup_complete: bool,
     // Current thread-goal status shown in the status line when plan mode is inactive.
     current_goal_status_indicator: Option<GoalStatusIndicator>,
     current_goal_status: Option<GoalStatusState>,
@@ -2018,6 +2028,22 @@ impl ChatWidget {
         self.refresh_status_surfaces();
     }
 
+    /// Stores async workspace diff stats for the current status-line cwd.
+    pub(crate) fn set_status_line_workspace_changes(
+        &mut self,
+        cwd: PathBuf,
+        stats: Option<GitWorkspaceDiffStats>,
+    ) {
+        if self.status_line_workspace_changes_cwd.as_ref() != Some(&cwd) {
+            self.status_line_workspace_changes_pending = false;
+            return;
+        }
+        self.status_line_workspace_changes = stats;
+        self.status_line_workspace_changes_pending = false;
+        self.status_line_workspace_changes_lookup_complete = true;
+        self.refresh_status_surfaces();
+    }
+
     fn collect_runtime_metrics_delta(&mut self) {
         if let Some(delta) = self.session_telemetry.runtime_metrics_summary() {
             self.apply_runtime_metrics_delta(delta);
@@ -2601,6 +2627,7 @@ impl ChatWidget {
             self.had_work_activity = false;
             self.request_status_line_branch_refresh();
             self.request_status_line_git_summary_refresh();
+            self.request_status_line_workspace_changes_refresh();
         }
         // Mark task stopped and request redraw now that all content is in history.
         self.pending_status_indicator_restore = false;
@@ -3114,6 +3141,7 @@ impl ChatWidget {
         self.pending_status_indicator_restore = false;
         self.request_status_line_branch_refresh();
         self.request_status_line_git_summary_refresh();
+        self.request_status_line_workspace_changes_refresh();
         self.maybe_show_pending_rate_limit_prompt();
     }
 
@@ -5202,6 +5230,10 @@ impl ChatWidget {
             status_line_git_summary_cwd: None,
             status_line_git_summary_pending: false,
             status_line_git_summary_lookup_complete: false,
+            status_line_workspace_changes: None,
+            status_line_workspace_changes_cwd: None,
+            status_line_workspace_changes_pending: false,
+            status_line_workspace_changes_lookup_complete: false,
             current_goal_status_indicator: None,
             current_goal_status: None,
             goal_status_active_turn_started_at: None,