From 19ce336a36fee87e48a2761187fce48a8ed9511a Mon Sep 17 00:00:00 2001
From: morgmart <98432065+morgmart@users.noreply.github.com>
Date: Wed, 15 Apr 2026 17:57:58 -0700
Subject: [PATCH] show individual untracked files in git changes widget (#8574)

Signed-off-by: morgmart <98432065+morgmart@users.noreply.github.com>
---
 ui/goose2/src-tauri/src/commands/git_changes.rs   | 5 ++++-
 ui/goose2/src/features/chat/ui/widgets/Widget.tsx | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/goose2/src-tauri/src/commands/git_changes.rs b/ui/goose2/src-tauri/src/commands/git_changes.rs
index 70b9e9b6..fa9598f7 100644
--- a/ui/goose2/src-tauri/src/commands/git_changes.rs
+++ b/ui/goose2/src-tauri/src/commands/git_changes.rs
@@ -20,7 +20,10 @@ pub fn get_changed_files(path: String) -> Result<Vec<ChangedFile>, String> {
         return Ok(Vec::new());
     }
 
-    let status_output = run_git_success(&repo_path, &["status", "--porcelain"])?;
+    let status_output = run_git_success(
+        &repo_path,
+        &["status", "--porcelain", "--untracked-files=all"],
+    )?;
     if status_output.trim().is_empty() {
         return Ok(Vec::new());
     }
diff --git a/ui/goose2/src/features/chat/ui/widgets/Widget.tsx b/ui/goose2/src/features/chat/ui/widgets/Widget.tsx
index d43c7df9..63c2edae 100644
--- a/ui/goose2/src/features/chat/ui/widgets/Widget.tsx
+++ b/ui/goose2/src/features/chat/ui/widgets/Widget.tsx
@@ -11,12 +11,12 @@ interface WidgetProps {
 export function Widget({ title, icon, action, flush, children }: WidgetProps) {
   return (
     <div className="overflow-hidden rounded-md border border-border">
-      <div className="flex h-8 items-center justify-between bg-background-alt px-3">
+      <div className="flex h-8 items-center justify-between gap-2 bg-background-alt px-3">
         <div className="flex min-w-0 items-center gap-2 text-xs font-medium text-foreground">
           {icon}
           {title}
         </div>
-        {action}
+        {action && <div className="shrink-0">{action}</div>}
       </div>
       {flush ? (
         children