Remove service restart functionality and make R always rebuild host

Simplified keyboard controls by removing service restart functionality:

- Removed 'r' key restart functionality from Services panel
- Made 'R' key always trigger system rebuild regardless of focused panel
- Updated context shortcuts to show 'R: Rebuild Host' globally
- Removed all ServiceRestart enum variants and associated code:
  - UiCommand::ServiceRestart
  - CommandType::ServiceRestart
  - ServiceAction::Restart
- Cleaned up pending transition logic to only handle Start/Stop commands

The 'R' key now consistently rebuilds the current host from any panel,
while 's' and 'S' continue to handle service start/stop in Services panel.

Cargo.lock

@@ -270,7 +270,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.24"
+version = "0.1.29"
 dependencies = [
  "anyhow",
  "chrono",
@@ -291,7 +291,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.24"
+version = "0.1.29"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -314,7 +314,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.24"
+version = "0.1.29"
 dependencies = [
  "chrono",
  "serde",

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.25"
+version = "0.1.30"
 edition = "2021"
 
 [dependencies]

agent/src/agent.rs

@@ -274,7 +274,6 @@ impl Agent {
         let action_str = match action {
             ServiceAction::Start => "start",
             ServiceAction::Stop => "stop", 
-            ServiceAction::Restart => "restart",
             ServiceAction::Status => "status",
         };
 
@@ -299,7 +298,7 @@ impl Agent {
         }
 
         // Force refresh metrics after service control to update service status
-        if matches!(action, ServiceAction::Start | ServiceAction::Stop | ServiceAction::Restart) {
+        if matches!(action, ServiceAction::Start | ServiceAction::Stop) {
             info!("Triggering immediate metric refresh after service control");
             if let Err(e) = self.collect_metrics_only().await {
                 error!("Failed to refresh metrics after service control: {}", e);

agent/src/communication/mod.rs

@@ -112,6 +112,5 @@ pub enum AgentCommand {
 pub enum ServiceAction {
     Start,
     Stop,
-    Restart,
     Status,
 }

dashboard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.25"
+version = "0.1.30"
 edition = "2021"
 
 [dependencies]

dashboard/src/app.rs

@@ -294,14 +294,6 @@ impl Dashboard {
     /// Execute a UI command by sending it to the appropriate agent
     async fn execute_ui_command(&self, command: UiCommand) -> Result<()> {
         match command {
-            UiCommand::ServiceRestart { hostname, service_name } => {
-                info!("Sending restart command for service {} on {}", service_name, hostname);
-                let agent_command = AgentCommand::ServiceControl {
-                    service_name,
-                    action: ServiceAction::Restart,
-                };
-                self.zmq_command_sender.send_command(&hostname, agent_command).await?;
-            }
             UiCommand::ServiceStart { hostname, service_name } => {
                 info!("Sending start command for service {} on {}", service_name, hostname);
                 let agent_command = AgentCommand::ServiceControl {

dashboard/src/communication/mod.rs

@@ -35,7 +35,6 @@ pub enum AgentCommand {
 pub enum ServiceAction {
     Start,
     Stop,
-    Restart,
     Status,
 }
 

dashboard/src/main.rs

@@ -14,7 +14,7 @@ use app::Dashboard;
 
 /// Get hardcoded version
 fn get_version() -> &'static str {
-    "v0.1.25"
+    "v0.1.30"
 }
 
 /// Check if running inside tmux session

dashboard/src/ui/mod.rs

@@ -22,7 +22,6 @@ use widgets::{BackupWidget, ServicesWidget, SystemWidget, Widget};
 /// Commands that can be triggered from the UI
 #[derive(Debug, Clone)]
 pub enum UiCommand {
-    ServiceRestart { hostname: String, service_name: String },
     ServiceStart { hostname: String, service_name: String },
     ServiceStop { hostname: String, service_name: String },
     TriggerBackup { hostname: String },
@@ -32,7 +31,6 @@ pub enum UiCommand {
 /// Types of commands for status tracking
 #[derive(Debug, Clone)]
 pub enum CommandType {
-    ServiceRestart,
     ServiceStart,
     ServiceStop,
     BackupTrigger,
@@ -65,7 +63,7 @@ pub struct HostWidgets {
     /// Last update time for this host
     pub last_update: Option<Instant>,
     /// Pending service transitions for immediate visual feedback
-    pub pending_service_transitions: HashMap<String, (CommandType, String)>, // service_name -> (command_type, original_status)
+    pub pending_service_transitions: HashMap<String, (CommandType, String, Instant)>, // service_name -> (command_type, original_status, start_time)
 }
 
 impl HostWidgets {
@@ -256,35 +254,20 @@ impl TuiApp {
                     self.navigate_host(1);
                 }
                 KeyCode::Char('r') => {
-                    match self.focused_panel {
-                        PanelType::System => {
-                            // Simple tmux popup with SSH rebuild using configured user and alias
-                            if let Some(hostname) = self.current_host.clone() {
-                                // Launch tmux popup with SSH using config values
-                                let ssh_command = format!(
-                                    "ssh -tt {}@{} 'bash -ic {}'",
-                                    self.config.ssh.rebuild_user,
-                                    hostname,
-                                    self.config.ssh.rebuild_alias
-                                );
-                                std::process::Command::new("tmux")
-                                    .arg("display-popup")
-                                    .arg(&ssh_command)
-                                    .spawn()
-                                    .ok(); // Ignore errors, tmux will handle them
-                            }
-                        }
-                        PanelType::Services => {
-                            // Service restart command
-                            if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
-                                if self.start_command(&hostname, CommandType::ServiceRestart, service_name.clone()) {
-                                    return Ok(Some(UiCommand::ServiceRestart { hostname, service_name }));
-                                }
-                            }
-                        }
-                        _ => {
-                            info!("Manual refresh requested");
-                        }
+                    // System rebuild command - works on any panel for current host
+                    if let Some(hostname) = self.current_host.clone() {
+                        // Launch tmux popup with SSH using config values
+                        let ssh_command = format!(
+                            "ssh -tt {}@{} 'bash -ic {}'",
+                            self.config.ssh.rebuild_user,
+                            hostname,
+                            self.config.ssh.rebuild_alias
+                        );
+                        std::process::Command::new("tmux")
+                            .arg("display-popup")
+                            .arg(&ssh_command)
+                            .spawn()
+                            .ok(); // Ignore errors, tmux will handle them
                     }
                 }
                 KeyCode::Char('s') => {
@@ -431,7 +414,6 @@ impl TuiApp {
         let should_execute = match (&command_type, current_status.as_deref()) {
             (CommandType::ServiceStart, Some("inactive") | Some("failed") | Some("dead")) => true,
             (CommandType::ServiceStop, Some("active")) => true,
-            (CommandType::ServiceRestart, Some("active") | Some("inactive") | Some("failed") | Some("dead")) => true,
             (CommandType::ServiceStart, Some("active")) => {
                 // Already running - don't execute
                 false
@@ -447,26 +429,25 @@ impl TuiApp {
             _ => true, // Default: allow other combinations
         };
         
-        if should_execute {
-            if let Some(host_widgets) = self.host_widgets.get_mut(hostname) {
-                // Store the pending transition for immediate visual feedback
-                host_widgets.pending_service_transitions.insert(
-                    target.clone(), 
-                    (command_type, current_status.unwrap_or_else(|| "unknown".to_string()))
-                );
-            }
+        // ALWAYS store the pending transition for immediate visual feedback, even if we don't execute
+        if let Some(host_widgets) = self.host_widgets.get_mut(hostname) {
+            host_widgets.pending_service_transitions.insert(
+                target.clone(), 
+                (command_type, current_status.unwrap_or_else(|| "unknown".to_string()), Instant::now())
+            );
         }
         
         should_execute
     }
 
-    /// Clear pending transitions when real status updates arrive
+    /// Clear pending transitions when real status updates arrive or timeout
     fn clear_completed_transitions(&mut self, hostname: &str, service_metrics: &[&Metric]) {
         if let Some(host_widgets) = self.host_widgets.get_mut(hostname) {
             let mut completed_services = Vec::new();
             
             // Check each pending transition to see if real status has changed
-            for (service_name, (command_type, original_status)) in &host_widgets.pending_service_transitions {
+            for (service_name, (command_type, original_status, _start_time)) in &host_widgets.pending_service_transitions {
+                
                 // Look for status metric for this service
                 for metric in service_metrics {
                     if metric.name == format!("service_{}_status", service_name) {
@@ -478,7 +459,6 @@ impl TuiApp {
                             let expected_change = match command_type {
                                 CommandType::ServiceStart => &new_status == "active",
                                 CommandType::ServiceStop => &new_status != "active",
-                                CommandType::ServiceRestart => true, // Any change indicates restart completed
                                 _ => false,
                             };
                             
@@ -755,19 +735,19 @@ impl TuiApp {
         // Scroll shortcuts (always available)
         shortcuts.push("↑↓: Scroll".to_string());
         
+        // Global rebuild shortcut (works on any panel)
+        shortcuts.push("R: Rebuild Host".to_string());
+        
         // Panel-specific shortcuts
         match self.focused_panel {
-            PanelType::System => {
-                shortcuts.push("R: Rebuild".to_string());
-            }
             PanelType::Services => {
                 shortcuts.push("S: Start".to_string());
                 shortcuts.push("Shift+S: Stop".to_string());
-                shortcuts.push("R: Restart".to_string());
             }
             PanelType::Backup => {
                 shortcuts.push("B: Trigger Backup".to_string());
             }
+            _ => {}
         }
         
         // Always show quit

dashboard/src/ui/widgets/services.rs

@@ -129,12 +129,11 @@ impl ServicesWidget {
     }
 
     /// Get status icon for service, considering pending transitions for visual feedback
-    fn get_service_icon_and_status(&self, service_name: &str, info: &ServiceInfo, pending_transitions: &HashMap<String, (CommandType, String)>) -> (String, String, ratatui::prelude::Color) {
+    fn get_service_icon_and_status(&self, service_name: &str, info: &ServiceInfo, pending_transitions: &HashMap<String, (CommandType, String, std::time::Instant)>) -> (String, String, ratatui::prelude::Color) {
         // Check if this service has a pending transition
-        if let Some((command_type, _original_status)) = pending_transitions.get(service_name) {
+        if let Some((command_type, _original_status, _start_time)) = pending_transitions.get(service_name) {
             // Show transitional icons for pending commands
             let (icon, status_text) = match command_type {
-                CommandType::ServiceRestart => ("↻", "restarting"),
                 CommandType::ServiceStart => ("↑", "starting"), 
                 CommandType::ServiceStop => ("↓", "stopping"),
                 _ => return (StatusIcons::get_icon(info.widget_status).to_string(), info.status.clone(), Theme::status_color(info.widget_status)), // Not a service command
@@ -162,7 +161,7 @@ impl ServicesWidget {
         name: &str,
         info: &ServiceInfo,
         is_last: bool,
-        pending_transitions: &HashMap<String, (CommandType, String)>,
+        pending_transitions: &HashMap<String, (CommandType, String, std::time::Instant)>,
     ) -> Vec<ratatui::text::Span<'static>> {
         // Truncate long sub-service names to fit layout (accounting for indentation)
         let short_name = if name.len() > 18 {
@@ -233,13 +232,14 @@ impl ServicesWidget {
     /// Get currently selected service name (for actions)
     pub fn get_selected_service(&self) -> Option<String> {
         // Build the same display list to find the selected service
-        let mut display_lines: Vec<(String, Status, bool, Option<(ServiceInfo, bool)>)> = Vec::new();
+        let mut display_lines: Vec<(String, Status, bool, Option<(ServiceInfo, bool)>, String)> = Vec::new();
         
         let mut parent_services: Vec<_> = self.parent_services.iter().collect();
         parent_services.sort_by(|(a, _), (b, _)| a.cmp(b));
 
         for (parent_name, parent_info) in parent_services {
-            display_lines.push((parent_name.clone(), parent_info.widget_status, false, None));
+            let parent_line = self.format_parent_service_line(parent_name, parent_info);
+            display_lines.push((parent_line, parent_info.widget_status, false, None, parent_name.clone()));
             
             if let Some(sub_list) = self.sub_services.get(parent_name) {
                 let mut sorted_subs = sub_list.clone();
@@ -247,17 +247,19 @@ impl ServicesWidget {
                 
                 for (i, (sub_name, sub_info)) in sorted_subs.iter().enumerate() {
                     let is_last_sub = i == sorted_subs.len() - 1;
+                    let full_sub_name = format!("{}_{}", parent_name, sub_name);
                     display_lines.push((
-                        format!("{}_{}", parent_name, sub_name), // Use parent_sub format for sub-services
+                        sub_name.clone(),
                         sub_info.widget_status,
                         true,
                         Some((sub_info.clone(), is_last_sub)),
+                        full_sub_name,
                     ));
                 }
             }
         }
         
-        display_lines.get(self.selected_index).map(|(name, _, _, _)| name.clone())
+        display_lines.get(self.selected_index).map(|(_, _, _, _, raw_name)| raw_name.clone())
     }
 
     /// Get total count of selectable services (parent services only, not sub-services)
@@ -440,7 +442,7 @@ impl Widget for ServicesWidget {
 impl ServicesWidget {
 
     /// Render with focus, scroll, and pending transitions for visual feedback
-    pub fn render_with_transitions(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, pending_transitions: &HashMap<String, (CommandType, String)>) {
+    pub fn render_with_transitions(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, pending_transitions: &HashMap<String, (CommandType, String, std::time::Instant)>) {
         let services_block = if is_focused {
             Components::focused_widget_block("services")
         } else {
@@ -474,9 +476,9 @@ impl ServicesWidget {
     }
 
     /// Render services list with pending transitions awareness
-    fn render_services_with_transitions(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, pending_transitions: &HashMap<String, (CommandType, String)>) {
-        // Build hierarchical service list for display (same as existing logic)
-        let mut display_lines: Vec<(String, Status, bool, Option<(ServiceInfo, bool)>)> = Vec::new();
+    fn render_services_with_transitions(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, pending_transitions: &HashMap<String, (CommandType, String, std::time::Instant)>) {
+        // Build hierarchical service list for display - include raw service name for pending transition lookups
+        let mut display_lines: Vec<(String, Status, bool, Option<(ServiceInfo, bool)>, String)> = Vec::new(); // Added raw service name
 
         // Sort parent services alphabetically for consistent order
         let mut parent_services: Vec<_> = self.parent_services.iter().collect();
@@ -485,7 +487,7 @@ impl ServicesWidget {
         for (parent_name, parent_info) in parent_services {
             // Add parent service line
             let parent_line = self.format_parent_service_line(parent_name, parent_info);
-            display_lines.push((parent_line, parent_info.widget_status, false, None)); // false = not sub-service
+            display_lines.push((parent_line, parent_info.widget_status, false, None, parent_name.clone())); // Include raw name
 
             // Add sub-services for this parent (if any)
             if let Some(sub_list) = self.sub_services.get(parent_name) {
@@ -495,12 +497,14 @@ impl ServicesWidget {
 
                 for (i, (sub_name, sub_info)) in sorted_subs.iter().enumerate() {
                     let is_last_sub = i == sorted_subs.len() - 1;
+                    let full_sub_name = format!("{}_{}", parent_name, sub_name);
                     // Store sub-service info for custom span rendering
                     display_lines.push((
                         sub_name.clone(),
                         sub_info.widget_status,
                         true,
                         Some((sub_info.clone(), is_last_sub)),
+                        full_sub_name, // Raw service name for pending transition lookup
                     )); // true = sub-service, with is_last info
                 }
             }
@@ -533,7 +537,7 @@ impl ServicesWidget {
                 .constraints(vec![Constraint::Length(1); lines_to_show])
                 .split(area);
 
-            for (i, (line_text, line_status, is_sub, sub_info)) in visible_lines.iter().enumerate()
+            for (i, (line_text, line_status, is_sub, sub_info, raw_service_name)) in visible_lines.iter().enumerate()
             {
                 let actual_index = effective_scroll + i; // Real index in the full list
                 
@@ -551,20 +555,28 @@ impl ServicesWidget {
                     let (service_info, is_last) = sub_info.as_ref().unwrap();
                     self.create_sub_service_spans_with_transitions(line_text, service_info, *is_last, pending_transitions)
                 } else {
-                    // Parent services - check if this parent service has a pending transition
-                    if pending_transitions.contains_key(line_text) {
+                    // Parent services - check if this parent service has a pending transition using RAW service name
+                    if pending_transitions.contains_key(raw_service_name) {
                         // Create spans with transitional status
-                        let (icon, status_text, status_color) = self.get_service_icon_and_status(line_text, &ServiceInfo { 
+                        let (icon, status_text, _) = self.get_service_icon_and_status(raw_service_name, &ServiceInfo { 
                             status: "".to_string(), 
                             memory_mb: None, 
                             disk_gb: None, 
                             latency_ms: None, 
                             widget_status: *line_status 
                         }, pending_transitions);
+                        
+                        // Use blue for transitional icons when not selected, background color when selected
+                        let icon_color = if is_selected && !*is_sub && is_focused {
+                            Theme::background() // Dark background color for visibility against blue selection
+                        } else {
+                            Theme::highlight() // Blue for normal case
+                        };
+                        
                         vec![
-                            ratatui::text::Span::styled(format!("{} ", icon), Style::default().fg(status_color)),
+                            ratatui::text::Span::styled(format!("{} ", icon), Style::default().fg(icon_color)),
                             ratatui::text::Span::styled(line_text.clone(), Style::default().fg(Theme::primary_text())),
-                            ratatui::text::Span::styled(format!(" {}", status_text), Style::default().fg(status_color)),
+                            ratatui::text::Span::styled(format!(" {}", status_text), Style::default().fg(icon_color)),
                         ]
                     } else {
                         StatusIcons::create_status_spans(*line_status, line_text)
@@ -573,8 +585,8 @@ impl ServicesWidget {
                 
                 // Apply selection highlighting to parent services only, preserving status icon color
                 // Only show selection when Services panel is focused
-                // IMPORTANT: Don't override transitional icons that show pending commands
-                if is_selected && !*is_sub && is_focused && !pending_transitions.contains_key(line_text) {
+                // Show selection highlighting even when transitional icons are present
+                if is_selected && !*is_sub && is_focused {
                     for (i, span) in spans.iter_mut().enumerate() {
                         if i == 0 {
                             // First span is the status icon - preserve its color

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.25"
+version = "0.1.30"
 edition = "2021"
 
 [dependencies]