refine sidebar workspace badges and agent summaries

- make workspace rows use a more consistent marker/name/state order
- simplify multi-pane state presentation in the sidebar
- switch agent summaries from plus-separated to comma-separated wording

2 files changed, 10 insertions, 13 deletions

diff --git a/src/ui.rs b/src/ui.rs
index c52794fc..a4d88b1b 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -255,24 +255,21 @@ fn render_sidebar(app: &AppState, frame: &mut Frame, area: Rect) {
         } else {
             Style::default().fg(Color::DarkGray)
         };
-        let mut line1 = vec![Span::styled(marker, text_style)];
+        let mut line1 = vec![
+            Span::styled(marker, text_style),
+            Span::styled(
+                ws.display_name(),
+                text_style.add_modifier(Modifier::BOLD),
+            ),
+            Span::styled("  ", dim_style),
+        ];
 
         if ws.layout.pane_count() == 1 {
             line1.push(Span::styled(
                 icon,
                 if selected { icon_style.bg(app.accent) } else { icon_style },
             ));
-            line1.push(Span::styled(" ", text_style));
-            line1.push(Span::styled(
-                ws.display_name(),
-                text_style.add_modifier(Modifier::BOLD),
-            ));
         } else {
-            line1.push(Span::styled(
-                ws.display_name(),
-                text_style.add_modifier(Modifier::BOLD),
-            ));
-            line1.push(Span::styled("  ", dim_style));
             for (pane_state, pane_seen) in ws.pane_states() {
                 let (pane_icon, pane_style) = state_icon_style(pane_state, pane_seen);
                 line1.push(Span::styled(
diff --git a/src/workspace.rs b/src/workspace.rs
index 9a584bd3..0e296639 100644
--- a/src/workspace.rs
+++ b/src/workspace.rs
@@ -154,9 +154,9 @@ impl Workspace {
         } else if names.len() == 1 {
             Some(names[0].to_string())
         } else if names.len() == 2 {
-            Some(format!("{} + {}", names[0], names[1]))
+            Some(format!("{}, {}", names[0], names[1]))
         } else {
-            Some(format!("{} + {} +{}", names[0], names[1], names.len() - 2))
+            Some(format!("{}, {} +{}", names[0], names[1], names.len() - 2))
         }
     }