Treat pending status as OK for title bar color aggregation

Apply same logic used for inactive status to pending status.
Pending services now contribute to OK count instead of being
ignored, preventing blue title bar during service transitions.

Cargo.lock

@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.87"
+version = "0.1.95"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.87"
+version = "0.1.95"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.87"
+version = "0.1.95"
 dependencies = [
  "chrono",
  "serde",

agent/Cargo.toml

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

dashboard/Cargo.toml

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

dashboard/src/config/mod.rs

@@ -55,8 +55,8 @@ pub struct SystemConfig {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SshConfig {
     pub rebuild_user: String,
-    pub rebuild_alias: String,
-    pub backup_alias: String,
+    pub rebuild_cmd: String,
+    pub service_manage_cmd: String,
 }
 
 /// Service log file configuration per host

dashboard/src/ui/mod.rs

@@ -220,12 +220,12 @@ impl TuiApp {
                         let connection_ip = self.get_connection_ip(&hostname);
                         // Create command that shows logo, rebuilds, and waits for user input
                         let logo_and_rebuild = format!(
-                            "echo 'Rebuilding system: {} ({})' && ssh -tt {}@{} \"bash -ic {}\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Rebuilding system: {} ({})' && ssh -tt {}@{} \"bash -ic '{}'\"",
                             hostname,
                             connection_ip,
                             self.config.ssh.rebuild_user,
                             connection_ip,
-                            self.config.ssh.rebuild_alias
+                            self.config.ssh.rebuild_cmd
                         );
                         
                         std::process::Command::new("tmux")
@@ -244,12 +244,12 @@ impl TuiApp {
                         let connection_ip = self.get_connection_ip(&hostname);
                         // Create command that shows logo, runs backup, and waits for user input
                         let logo_and_backup = format!(
-                            "echo 'Running backup: {} ({})' && ssh -tt {}@{} \"bash -ic {}\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Running backup: {} ({})' && ssh -tt {}@{} \"bash -ic '{}'\"",
                             hostname,
                             connection_ip,
                             self.config.ssh.rebuild_user,
                             connection_ip,
-                            self.config.ssh.backup_alias
+                            format!("{} start borgbackup", self.config.ssh.service_manage_cmd)
                         );
                         
                         std::process::Command::new("tmux")
@@ -267,14 +267,12 @@ impl TuiApp {
                     if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                         let connection_ip = self.get_connection_ip(&hostname);
                         let service_start_command = format!(
-                            "echo 'Starting service: {} on {}' && ssh -tt {}@{} \"sudo systemctl start {} & sudo journalctl -fu {} --since=\\\"1 second ago\\\" --no-pager & while ! systemctl is-active {} >/dev/null 2>&1; do sleep 0.5; done; sudo pkill -f 'journalctl -fu {}' 2>/dev/null || true\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Starting service: {} on {}' && ssh -tt {}@{} \"bash -ic '{} start {}'\"",
                             service_name,
                             hostname,
                             self.config.ssh.rebuild_user,
                             connection_ip,
-                            service_name,
-                            service_name,
-                            service_name,
+                            self.config.ssh.service_manage_cmd,
                             service_name
                         );
                         
@@ -293,14 +291,12 @@ impl TuiApp {
                     if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                         let connection_ip = self.get_connection_ip(&hostname);
                         let service_stop_command = format!(
-                            "echo 'Stopping service: {} on {}' && ssh -tt {}@{} \"sudo systemctl stop {} & sudo journalctl -fu {} --since=\\\"1 second ago\\\" --no-pager & sleep 1; while systemctl is-active {} >/dev/null 2>&1; do sleep 0.5; done; sleep 2; sudo pkill -f 'journalctl -fu {}' 2>/dev/null || true\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Stopping service: {} on {}' && ssh -tt {}@{} \"bash -ic '{} stop {}'\"",
                             service_name,
                             hostname,
                             self.config.ssh.rebuild_user,
                             connection_ip,
-                            service_name,
-                            service_name,
-                            service_name,
+                            self.config.ssh.service_manage_cmd,
                             service_name
                         );
                         
@@ -314,16 +310,15 @@ impl TuiApp {
                             .ok(); // Ignore errors, tmux will handle them
                     }
                 }
-                KeyCode::Char('J') => {
-                    // Show service logs via journalctl in tmux split window
+                KeyCode::Char('L') => {
+                    // Show service logs via service-manage script in tmux split window
                     if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                         let connection_ip = self.get_connection_ip(&hostname);
-                        let journalctl_command = format!(
-                            "echo 'Viewing logs for service: {} on {}' && ssh -tt {}@{} 'sudo journalctl -u {}.service -f --no-pager -n 50'",
-                            service_name,
-                            hostname,
+                        let logs_command = format!(
+                            "ssh -tt {}@{} '{} logs {}'",
                             self.config.ssh.rebuild_user,
                             connection_ip,
+                            self.config.ssh.service_manage_cmd,
                             service_name
                         );
                         
@@ -332,39 +327,11 @@ impl TuiApp {
                             .arg("-v")
                             .arg("-p")
                             .arg("30")
-                            .arg(&journalctl_command)
+                            .arg(&logs_command)
                             .spawn()
                             .ok(); // Ignore errors, tmux will handle them
                     }
                 }
-                KeyCode::Char('L') => {
-                    // Show custom service log file in tmux split window
-                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
-                        // Check if this service has a custom log file configured
-                        if let Some(host_logs) = self.config.service_logs.get(&hostname) {
-                            if let Some(log_config) = host_logs.iter().find(|config| config.service_name == service_name) {
-                                let connection_ip = self.get_connection_ip(&hostname);
-                                let tail_command = format!(
-                                    "echo 'Viewing custom logs for service: {} on {}' && ssh -tt {}@{} 'sudo tail -n 50 -f {}'",
-                                    service_name,
-                                    hostname,
-                                    self.config.ssh.rebuild_user,
-                                    connection_ip,
-                                    log_config.log_file_path
-                                );
-                                
-                                std::process::Command::new("tmux")
-                                    .arg("split-window")
-                                    .arg("-v")
-                                    .arg("-p")
-                                    .arg("30")
-                                    .arg(&tail_command)
-                                    .spawn()
-                                    .ok(); // Ignore errors, tmux will handle them
-                            }
-                        }
-                    }
-                }
                 KeyCode::Char('w') => {
                     // Wake on LAN for offline hosts
                     if let Some(hostname) = self.current_host.clone() {
@@ -397,7 +364,7 @@ impl TuiApp {
                     if let Some(hostname) = self.current_host.clone() {
                         let connection_ip = self.get_connection_ip(&hostname);
                         let ssh_command = format!(
-                            "echo 'Opening SSH terminal to: {}' && ssh -tt {}@{} && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Opening SSH terminal to: {}' && ssh -tt {}@{}",
                             hostname,
                             self.config.ssh.rebuild_user,
                             connection_ip
@@ -702,14 +669,13 @@ impl TuiApp {
         // Fallback to old aggregation logic with proper Pending handling
         let mut has_critical = false;
         let mut has_warning = false;
-        let mut has_pending = false;
         let mut ok_count = 0;
 
         for metric in &metrics {
             match metric.status {
                 Status::Critical => has_critical = true,
                 Status::Warning => has_warning = true,
-                Status::Pending => has_pending = true,
+                Status::Pending => ok_count += 1, // Treat pending as OK for aggregation
                 Status::Ok => ok_count += 1,
                 Status::Inactive => ok_count += 1, // Treat inactive as OK for aggregation
                 Status::Unknown => {}, // Ignore unknown for aggregation
@@ -717,13 +683,11 @@ impl TuiApp {
             }
         }
 
-        // Priority order: Critical > Warning > Pending > Ok > Unknown
+        // Priority order: Critical > Warning > Ok > Unknown (no Pending)
         if has_critical {
             Status::Critical
         } else if has_warning {
             Status::Warning
-        } else if has_pending {
-            Status::Pending
         } else if ok_count > 0 {
             Status::Ok
         } else {
@@ -751,9 +715,10 @@ impl TuiApp {
         shortcuts.push("Tab: Host".to_string());
         shortcuts.push("↑↓/jk: Select".to_string());
         shortcuts.push("r: Rebuild".to_string());
+        shortcuts.push("B: Backup".to_string());
         shortcuts.push("s/S: Start/Stop".to_string());
-        shortcuts.push("J: Logs".to_string());
-        shortcuts.push("L: Custom".to_string());
+        shortcuts.push("L: Logs".to_string());
+        shortcuts.push("t: Terminal".to_string());
         shortcuts.push("w: Wake".to_string());
         
         // Always show quit

dashboard/src/ui/widgets/services.rs

@@ -209,36 +209,13 @@ impl ServicesWidget {
     }
 
     /// Get currently selected service name (for actions)
+    /// Only returns parent service names since only parent services can be selected
     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)>, String)> = Vec::new();
-        
+        // Only parent services can be selected, so just get the parent service at selected_index
         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 {
-            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();
-                sorted_subs.sort_by(|(a, _), (b, _)| a.cmp(b));
-                
-                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((
-                        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(|(_, _, _, _, raw_name)| raw_name.clone())
+        parent_services.get(self.selected_index).map(|(name, _)| name.to_string())
     }
 
     /// Get total count of selectable services (parent services only, not sub-services)

shared/Cargo.toml

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