Always show branch name in sidebar

Richard Feldman created 3 weeks ago

Change summary

crates/sidebar/src/sidebar.rs              |  9 ++++++++-
crates/ui/src/components/ai/thread_item.rs | 20 +++++++++++---------
2 files changed, 19 insertions(+), 10 deletions(-)

Detailed changes

crates/sidebar/src/sidebar.rs

@@ -567,6 +567,13 @@ impl Sidebar {
             if should_load_threads {
                 let mut seen_session_ids: HashSet<acp::SessionId> = HashSet::new();
 
+                // Get the current branch name from the workspace's root repository.
+                let workspace_branch_name: Option<SharedString> =
+                    root_repository_snapshots(workspace, cx)
+                        .first()
+                        .and_then(|snapshot| snapshot.branch.as_ref())
+                        .map(|branch| SharedString::from(branch.name().to_string()));
+
                 // Read threads from SidebarDb for this workspace's path list.
                 if let Some(rows) = threads_by_paths.get(&path_list) {
                     for row in rows {
@@ -602,7 +609,7 @@ impl Sidebar {
                             is_background: false,
                             is_title_generating: false,
                             highlight_positions: Vec::new(),
-                            worktree_name: None,
+                            worktree_name: workspace_branch_name.clone(),
                             worktree_path: None,
                             worktree_highlight_positions: Vec::new(),
                             diff_stats: DiffStats::default(),

crates/ui/src/components/ai/thread_item.rs

@@ -346,15 +346,17 @@ impl RenderOnce for ThreadItem {
                         .min_w_0()
                         .gap_1p5()
                         .child(icon_container()) // Icon Spacing
-                        .when(worktree_path.is_some(), |this| {
-                            this.child(
-                                div().child(
-                                    Icon::new(IconName::GitBranch)
-                                        .size(IconSize::XSmall)
-                                        .color(Color::Muted),
-                                ),
-                            )
-                        })
+                        .child(
+                            div().child(
+                                Icon::new(if worktree_path.is_some() {
+                                    IconName::GitBranch
+                                } else {
+                                    IconName::GitBranchAlt
+                                })
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                            ),
+                        )
                         .child(worktree_label)
                         .when(has_diff_stats || has_timestamp, |this| {
                             this.child(dot_separator())