Improve service selection UI and help text

- Fix service icons to use background color when selected for better visibility against blue selection background
- Combine start/stop service help text entries into single "s/S: Start/Stop Service"
- Change help text keys to lowercase (r: Rebuild Host, q: Quit)
- Bump version to v0.1.34

CLAUDE.md

@@ -18,22 +18,24 @@ All system panel features successfully implemented:
 - ✅ **Tmpfs Monitoring**: Added /tmp usage to RAM section
 - ✅ **Agent Deployment**: NixOS collector working in production
 
-**Keyboard Navigation and Service Management - COMPLETED** ✅
+**Simplified Navigation and Service Management - COMPLETED** ✅
 
-All keyboard navigation and service selection features successfully implemented:
-- ✅ **Panel Navigation**: Shift+Tab cycles through visible panels only (System → Services → Backup)
-- ✅ **Service Selection**: Up/Down arrows navigate through parent services with visual cursor
-- ✅ **Focus Management**: Selection highlighting only visible when Services panel focused
-- ✅ **Status Preservation**: Service health colors maintained during selection (green/red icons)
-- ✅ **Smart Panel Switching**: Only cycles through panels with data (backup panel conditional)
-- ✅ **Scroll Support**: All panels support content scrolling with proper overflow indicators
+All navigation and service management features successfully implemented:
+- ✅ **Direct Service Control**: Up/Down (or j/k) arrows directly control service selection
+- ✅ **Always Visible Selection**: Service selection highlighting always visible (no panel focus needed)
+- ✅ **Complete Service Discovery**: All configured services visible regardless of state
+- ✅ **Transitional Visual Feedback**: Service operations show directional arrows (↑ ↓ ↻)
+- ✅ **Simplified Interface**: Removed panel switching complexity, uniform appearance
+- ✅ **Vi-style Navigation**: Added j/k keys for vim users alongside arrow keys
 
-**Current Status - October 27, 2025:**
-- All keyboard navigation features working correctly ✅
-- Service selection cursor implemented with focus-aware highlighting ✅
-- Panel scrolling fixed for System, Services, and Backup panels ✅
+**Current Status - October 28, 2025:**
+- All service discovery and display features working correctly ✅
+- Simplified navigation system implemented ✅
+- Service selection always visible with direct control ✅
+- Complete service visibility (all configured services show regardless of state) ✅
+- Transitional service icons working with proper color handling ✅
 - Build display working: "Build: 25.05.20251004.3bcc93c" ✅
-- Agent version display working: "Agent: v0.1.17" ✅
+- Agent version display working: "Agent: v0.1.33" ✅
 - Cross-host version comparison implemented ✅
 - Automated binary release system working ✅
 - SMART data consolidated into disk collector ✅
@@ -76,36 +78,35 @@ Storage:
 **Backup panel visibility fixed - only shows when meaningful data exists ✅**
 **SSH-based rebuild system fully implemented and working ✅**
 
-### Current Keyboard Navigation Implementation
+### Current Simplified Navigation Implementation
 
 **Navigation Controls:**
 - **Tab**: Switch between hosts (cmbox, srv01, srv02, steambox, etc.)
-- **Shift+Tab**: Cycle through visible panels (System → Services → Backup → System)
-- **Up/Down (System/Backup)**: Scroll through panel content
-- **Up/Down (Services)**: Move service selection cursor between parent services
+- **↑↓ or j/k**: Move service selection cursor (always works)
 - **q**: Quit dashboard
 
-**Panel-Specific Features:**
-- **System Panel**: Scrollable content with CPU, RAM, Storage details
-- **Services Panel**: Service selection cursor for parent services only (docker, nginx, postgresql, etc.)
-- **Backup Panel**: Scrollable repository list with proper overflow handling
+**Service Control:**
+- **s**: Start selected service
+- **S**: Stop selected service  
+- **R**: Rebuild current host (works from any context)
 
-**Visual Feedback:**
-- **Focused Panel**: Blue border and title highlighting
-- **Service Selection**: Blue background with preserved status icon colors (green ● for active, red ● for failed)
-- **Focus-Aware Selection**: Selection highlighting only visible when Services panel focused
-- **Dynamic Statusbar**: Context-aware shortcuts based on focused panel
+**Visual Features:**
+- **Service Selection**: Always visible blue background highlighting current service
+- **Status Icons**: Green ● (active), Yellow ◐ (inactive), Red ◯ (failed), ? (unknown)
+- **Transitional Icons**: Blue ↑ (starting), ↓ (stopping), ↻ (restarting) when not selected
+- **Transitional Icons**: Dark gray arrows when service is selected (for visibility)
+- **Uniform Interface**: All panels have consistent appearance (no focus borders)
 
-### Remote Command Execution - WORKING ✅
+### Service Discovery and Display - WORKING ✅
 
-**All Issues Resolved (as of 2025-10-24):**
-- ✅ **ZMQ Command Protocol**: Extended with ServiceControl and SystemRebuild variants
-- ✅ **Agent Handlers**: systemctl and nixos-rebuild execution with maintenance mode
-- ✅ **Dashboard Integration**: Keyboard shortcuts execute commands
-- ✅ **Service Control**: Fixed toggle logic - replaced with separate 's' (start) and 'S' (stop)
-- ✅ **System Rebuild**: Fixed permission issues and sandboxing problems
-- ✅ **Git Clone Approach**: Implemented for nixos-rebuild to avoid directory permissions
-- ✅ **Visual Feedback**: Directional arrows for service status (↑ starting, ↓ stopping, ↻ restarting)
+**All Issues Resolved (as of 2025-10-28):**
+- ✅ **Complete Service Discovery**: Uses `systemctl list-unit-files` + `list-units --all` for comprehensive service detection
+- ✅ **All Services Visible**: Shows all configured services regardless of current state (active/inactive)
+- ✅ **Proper Status Display**: Active services show green ●, inactive show yellow ◐, failed show red ◯
+- ✅ **Transitional Icons**: Visual feedback during service operations with proper color handling
+- ✅ **Simplified Navigation**: Removed panel complexity, direct service control always available
+- ✅ **Service Control**: Start (s) and Stop (S) commands work from anywhere
+- ✅ **System Rebuild**: SSH + tmux popup approach for reliable remote rebuilds
 
 ### Terminal Popup for Real-time Output - IMPLEMENTED ✅
 

Cargo.lock

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

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.22"
+version = "0.1.34"
 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/collectors/systemd.rs

@@ -136,8 +136,21 @@ impl SystemdCollector {
     /// Auto-discover interesting services to monitor (internal version that doesn't update state)
     fn discover_services_internal(&self) -> Result<(Vec<String>, std::collections::HashMap<String, ServiceStatusInfo>)> {
         debug!("Starting systemd service discovery with status caching");
-        // Get all services (includes inactive, running, failed - everything)
-        let units_output = Command::new("systemctl")
+        
+        // First: Get all service unit files (includes services that have never been started)
+        let unit_files_output = Command::new("systemctl")
+            .arg("list-unit-files")
+            .arg("--type=service")
+            .arg("--no-pager")
+            .arg("--plain")
+            .output()?;
+
+        if !unit_files_output.status.success() {
+            return Err(anyhow::anyhow!("systemctl list-unit-files command failed"));
+        }
+
+        // Second: Get runtime status of all units
+        let units_status_output = Command::new("systemctl")
             .arg("list-units")
             .arg("--type=service")
             .arg("--all")
@@ -145,22 +158,33 @@ impl SystemdCollector {
             .arg("--plain")
             .output()?;
 
-        if !units_output.status.success() {
-            return Err(anyhow::anyhow!("systemctl system command failed"));
+        if !units_status_output.status.success() {
+            return Err(anyhow::anyhow!("systemctl list-units command failed"));
         }
 
-        let units_str = String::from_utf8(units_output.stdout)?;
+        let unit_files_str = String::from_utf8(unit_files_output.stdout)?;
+        let units_status_str = String::from_utf8(units_status_output.stdout)?;
         let mut services = Vec::new();
 
         // Use configuration instead of hardcoded values
         let excluded_services = &self.config.excluded_services;
         let service_name_filters = &self.config.service_name_filters;
 
-        // Parse all services and cache their status information
+        // Parse all service unit files to get complete service list
         let mut all_service_names = std::collections::HashSet::new();
-        let mut status_cache = std::collections::HashMap::new();
         
-        for line in units_str.lines() {
+        for line in unit_files_str.lines() {
+            let fields: Vec<&str> = line.split_whitespace().collect();
+            if fields.len() >= 2 && fields[0].ends_with(".service") {
+                let service_name = fields[0].trim_end_matches(".service");
+                all_service_names.insert(service_name.to_string());
+                debug!("Found service unit file: {}", service_name);
+            }
+        }
+
+        // Parse runtime status for all units
+        let mut status_cache = std::collections::HashMap::new();
+        for line in units_status_str.lines() {
             let fields: Vec<&str> = line.split_whitespace().collect();
             if fields.len() >= 4 && fields[0].ends_with(".service") {
                 let service_name = fields[0].trim_end_matches(".service");
@@ -177,8 +201,19 @@ impl SystemdCollector {
                     sub_state: sub_state.clone(),
                 });
 
-                all_service_names.insert(service_name.to_string());
-                debug!("Parsed service: {} (load:{}, active:{}, sub:{})", service_name, load_state, active_state, sub_state);
+                debug!("Got runtime status for service: {} (load:{}, active:{}, sub:{})", service_name, load_state, active_state, sub_state);
+            }
+        }
+
+        // For services found in unit files but not in runtime status, set default inactive status
+        for service_name in &all_service_names {
+            if !status_cache.contains_key(service_name) {
+                status_cache.insert(service_name.to_string(), ServiceStatusInfo {
+                    load_state: "not-loaded".to_string(),
+                    active_state: "inactive".to_string(),
+                    sub_state: "dead".to_string(),
+                });
+                debug!("Service {} found in unit files but not runtime - marked as inactive", service_name);
             }
         }
 

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.22"
+version = "0.1.34"
 edition = "2021"
 
 [dependencies]

dashboard/src/app.rs

@@ -263,12 +263,7 @@ impl Dashboard {
                         cmd_output.output_line
                     );
 
-                    // Forward to TUI if not headless
-                    if let Some(ref mut tui_app) = self.tui_app {
-                        tui_app.add_terminal_output(&cmd_output.hostname, cmd_output.output_line);
-                        
-                        // Note: Popup stays open for manual review - close with ESC/Q
-                    }
+                    // Command output (terminal popup removed - output not displayed)
                 }
                 
                 last_metrics_check = Instant::now();
@@ -299,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.22"
+    "v0.1.33"
 }
 
 /// Check if running inside tmux session

dashboard/src/ui/mod.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use crossterm::event::{Event, KeyCode, KeyModifiers};
+use crossterm::event::{Event, KeyCode};
 use ratatui::{
     layout::{Constraint, Direction, Layout, Rect},
     style::Style,
@@ -7,7 +7,7 @@ use ratatui::{
     Frame,
 };
 use std::collections::HashMap;
-use std::time::{Duration, Instant};
+use std::time::Instant;
 use tracing::info;
 
 pub mod theme;
@@ -22,38 +22,21 @@ 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 },
 }
 
-/// Command execution status for visual feedback
-#[derive(Debug, Clone)]
-pub enum CommandStatus {
-    /// Command is executing
-    InProgress { command_type: CommandType, target: String, start_time: std::time::Instant },
-}
 
 /// Types of commands for status tracking
 #[derive(Debug, Clone)]
 pub enum CommandType {
-    ServiceRestart,
     ServiceStart,
     ServiceStop,
     BackupTrigger,
 }
 
 /// Panel types for focus management
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum PanelType {
-    System,
-    Services,
-    Backup,
-}
-
-impl PanelType {
-}
 
 /// Widget states for a specific host
 #[derive(Clone)]
@@ -70,8 +53,8 @@ pub struct HostWidgets {
     pub backup_scroll_offset: usize,
     /// Last update time for this host
     pub last_update: Option<Instant>,
-    /// Active command status for visual feedback
-    pub command_status: Option<CommandStatus>,
+    /// Pending service transitions for immediate visual feedback
+    pub pending_service_transitions: HashMap<String, (CommandType, String, Instant)>, // service_name -> (command_type, original_status, start_time)
 }
 
 impl HostWidgets {
@@ -84,55 +67,11 @@ impl HostWidgets {
             services_scroll_offset: 0,
             backup_scroll_offset: 0,
             last_update: None,
-            command_status: None,
+            pending_service_transitions: HashMap::new(),
         }
     }
 }
 
-/// Terminal popup for streaming command output
-#[derive(Clone)]
-pub struct TerminalPopup {
-    /// Is the popup currently visible
-    pub visible: bool,
-    /// Command being executed
-    pub _command_type: CommandType,
-    /// Target hostname
-    pub hostname: String,
-    /// Target service/operation name
-    pub target: String,
-    /// Output lines collected so far
-    pub output_lines: Vec<String>,
-    /// Scroll offset for the output
-    pub scroll_offset: usize,
-    /// Start time of the operation
-    pub start_time: Instant,
-}
-
-impl TerminalPopup {
-    pub fn _new(command_type: CommandType, hostname: String, target: String) -> Self {
-        Self {
-            visible: true,
-            _command_type: command_type,
-            hostname,
-            target,
-            output_lines: Vec::new(),
-            scroll_offset: 0,
-            start_time: Instant::now(),
-        }
-    }
-
-    pub fn add_output_line(&mut self, line: String) {
-        self.output_lines.push(line);
-        // Auto-scroll to bottom when new content arrives
-        if self.output_lines.len() > 20 {
-            self.scroll_offset = self.output_lines.len().saturating_sub(20);
-        }
-    }
-
-    pub fn close(&mut self) {
-        self.visible = false;
-    }
-}
 
 /// Main TUI application
 pub struct TuiApp {
@@ -144,14 +83,10 @@ pub struct TuiApp {
     available_hosts: Vec<String>,
     /// Host index for navigation
     host_index: usize,
-    /// Currently focused panel
-    focused_panel: PanelType,
     /// Should quit application
     should_quit: bool,
     /// Track if user manually navigated away from localhost
     user_navigated_away: bool,
-    /// Terminal popup for streaming command output
-    terminal_popup: Option<TerminalPopup>,
     /// Dashboard configuration
     config: DashboardConfig,
 }
@@ -163,10 +98,8 @@ impl TuiApp {
             current_host: None,
             available_hosts: Vec::new(),
             host_index: 0,
-            focused_panel: PanelType::System, // Start with System panel focused
             should_quit: false,
             user_navigated_away: false,
-            terminal_popup: None,
             config,
         }
     }
@@ -180,8 +113,6 @@ impl TuiApp {
 
     /// Update widgets with metrics from store (only for current host)
     pub fn update_metrics(&mut self, metric_store: &MetricStore) {
-        // Check for command timeouts first
-        self.check_command_timeouts();
         
         // Check for rebuild completion by agent hash change
         
@@ -215,6 +146,9 @@ impl TuiApp {
                     .copied()
                     .collect();
 
+                // Clear completed transitions first
+                self.clear_completed_transitions(&hostname, &service_metrics);
+
                 // Now get host widgets and update them
                 let host_widgets = self.get_or_create_host_widgets(&hostname);
 
@@ -256,9 +190,9 @@ impl TuiApp {
         // Sort hosts alphabetically
         let mut sorted_hosts = hosts.clone();
         
-        // Keep hosts that have ongoing commands even if they're offline
+        // Keep hosts that have pending transitions even if they're offline
         for (hostname, host_widgets) in &self.host_widgets {
-            if let Some(CommandStatus::InProgress { .. }) = &host_widgets.command_status {
+            if !host_widgets.pending_service_transitions.is_empty() {
                 if !sorted_hosts.contains(hostname) {
                     sorted_hosts.push(hostname.clone());
                 }
@@ -297,38 +231,6 @@ impl TuiApp {
     /// Handle keyboard input
     pub fn handle_input(&mut self, event: Event) -> Result<Option<UiCommand>> {
         if let Event::Key(key) = event {
-            // If terminal popup is visible, handle popup-specific keys first
-            if let Some(ref mut popup) = self.terminal_popup {
-                if popup.visible {
-                    match key.code {
-                        KeyCode::Esc => {
-                            popup.close();
-                            self.terminal_popup = None;
-                            return Ok(None);
-                        }
-                        KeyCode::Up => {
-                            popup.scroll_offset = popup.scroll_offset.saturating_sub(1);
-                            return Ok(None);
-                        }
-                        KeyCode::Down => {
-                            let max_scroll = if popup.output_lines.len() > 20 {
-                                popup.output_lines.len() - 20
-                            } else {
-                                0
-                            };
-                            popup.scroll_offset = (popup.scroll_offset + 1).min(max_scroll);
-                            return Ok(None);
-                        }
-                        KeyCode::Char('q') => {
-                            popup.close();
-                            self.terminal_popup = None;
-                            return Ok(None);
-                        }
-                        _ => return Ok(None), // Consume all other keys when popup is open
-                    }
-                }
-            }
-
             match key.code {
                 KeyCode::Char('q') => {
                     self.should_quit = true;
@@ -340,83 +242,66 @@ 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()) {
-                                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') => {
-                    if self.focused_panel == PanelType::Services {
-                        // Service start command
-                        if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
-                            self.start_command(&hostname, CommandType::ServiceStart, service_name.clone());
+                    // Service start command
+                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
+                        if self.start_command(&hostname, CommandType::ServiceStart, service_name.clone()) {
                             return Ok(Some(UiCommand::ServiceStart { hostname, service_name }));
                         }
                     }
                 }
                 KeyCode::Char('S') => {
-                    if self.focused_panel == PanelType::Services {
-                        // Service stop command
-                        if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
-                            self.start_command(&hostname, CommandType::ServiceStop, service_name.clone());
+                    // Service stop command
+                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
+                        if self.start_command(&hostname, CommandType::ServiceStop, service_name.clone()) {
                             return Ok(Some(UiCommand::ServiceStop { hostname, service_name }));
                         }
                     }
                 }
                 KeyCode::Char('b') => {
-                    if self.focused_panel == PanelType::Backup {
-                        // Trigger backup
-                        if let Some(hostname) = self.current_host.clone() {
-                            self.start_command(&hostname, CommandType::BackupTrigger, hostname.clone());
-                            return Ok(Some(UiCommand::TriggerBackup { hostname }));
-                        }
+                    // Trigger backup
+                    if let Some(hostname) = self.current_host.clone() {
+                        self.start_command(&hostname, CommandType::BackupTrigger, hostname.clone());
+                        return Ok(Some(UiCommand::TriggerBackup { hostname }));
                     }
                 }
                 KeyCode::Tab => {
-                    if key.modifiers.contains(KeyModifiers::SHIFT) {
-                        // Shift+Tab cycles through panels
-                        self.next_panel();
-                    } else {
-                        // Tab cycles to next host
-                        self.navigate_host(1);
+                    // Tab cycles to next host
+                    self.navigate_host(1);
+                }
+                KeyCode::Up | KeyCode::Char('k') => {
+                    // Move service selection up
+                    if let Some(hostname) = self.current_host.clone() {
+                        let host_widgets = self.get_or_create_host_widgets(&hostname);
+                        host_widgets.services_widget.select_previous();
                     }
                 }
-                KeyCode::BackTab => {
-                    // BackTab (Shift+Tab on some terminals) also cycles panels
-                    self.next_panel();
-                }
-                KeyCode::Up => {
-                    // Scroll up in focused panel
-                    self.scroll_focused_panel(-1);
-                }
-                KeyCode::Down => {
-                    // Scroll down in focused panel
-                    self.scroll_focused_panel(1);
+                KeyCode::Down | KeyCode::Char('j') => {
+                    // Move service selection down
+                    if let Some(hostname) = self.current_host.clone() {
+                        let total_services = {
+                            let host_widgets = self.get_or_create_host_widgets(&hostname);
+                            host_widgets.services_widget.get_total_services_count()
+                        };
+                        let host_widgets = self.get_or_create_host_widgets(&hostname);
+                        host_widgets.services_widget.select_next(total_services);
+                    }
                 }
                 _ => {}
             }
@@ -457,25 +342,6 @@ impl TuiApp {
     }
 
 
-    /// Switch to next panel (Shift+Tab) - only cycles through visible panels
-    pub fn next_panel(&mut self) {
-        let visible_panels = self.get_visible_panels();
-        if visible_panels.len() <= 1 {
-            return; // Can't switch if only one or no panels visible
-        }
-        
-        // Find current panel index in visible panels
-        if let Some(current_index) = visible_panels.iter().position(|&p| p == self.focused_panel) {
-            // Move to next visible panel
-            let next_index = (current_index + 1) % visible_panels.len();
-            self.focused_panel = visible_panels[next_index];
-        } else {
-            // Current panel not visible, switch to first visible panel
-            self.focused_panel = visible_panels[0];
-        }
-        
-        info!("Switched to panel: {:?}", self.focused_panel);
-    }
 
 
 
@@ -495,124 +361,89 @@ impl TuiApp {
         self.should_quit
     }
 
-    /// Start command execution and track status for visual feedback
-    pub fn start_command(&mut self, hostname: &str, command_type: CommandType, target: String) {
-        if let Some(host_widgets) = self.host_widgets.get_mut(hostname) {
-            host_widgets.command_status = Some(CommandStatus::InProgress {
-                command_type,
-                target,
-                start_time: Instant::now(),
-            });
+    /// Get current service status for state-aware command validation
+    fn get_current_service_status(&self, hostname: &str, service_name: &str) -> Option<String> {
+        if let Some(host_widgets) = self.host_widgets.get(hostname) {
+            return host_widgets.services_widget.get_service_status(service_name);
         }
+        None
     }
 
-    /// Mark command as completed successfully
-    pub fn _complete_command(&mut self, hostname: &str) {
-        if let Some(host_widgets) = self.host_widgets.get_mut(hostname) {
-            // Simply clear the command status when completed
-            host_widgets.command_status = None;
-        }
-    }
-
-
-    /// Check for command timeouts and automatically clear them
-    pub fn check_command_timeouts(&mut self) {
-        let now = Instant::now();
-        let mut hosts_to_clear = Vec::new();
+    /// Start command execution with immediate visual feedback 
+    pub fn start_command(&mut self, hostname: &str, command_type: CommandType, target: String) -> bool {
+        // Get current service status to validate command
+        let current_status = self.get_current_service_status(hostname, &target);
         
-        for (hostname, host_widgets) in &self.host_widgets {
-            if let Some(CommandStatus::InProgress { command_type: _, start_time, .. }) = &host_widgets.command_status {
-                let timeout_duration = Duration::from_secs(30); // 30 seconds for service commands
-                
-                if now.duration_since(*start_time) > timeout_duration {
-                    hosts_to_clear.push(hostname.clone());
-                }
-            }
+        // Validate if command makes sense for current state
+        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::ServiceStart, Some("active")) => {
+                // Already running - don't execute
+                false
+            },
+            (CommandType::ServiceStop, Some("inactive") | Some("failed") | Some("dead")) => {
+                // Already stopped - don't execute  
+                false
+            },
+            (_, None) => {
+                // Unknown service state - allow command to proceed
+                true
+            },
+            _ => true, // Default: allow other combinations
+        };
+        
+        // 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())
+            );
         }
         
-        // Clear timed out commands
-        for hostname in hosts_to_clear {
-            if let Some(host_widgets) = self.host_widgets.get_mut(&hostname) {
-                host_widgets.command_status = None;
-            }
-        }
+        should_execute
     }
 
-    /// Add output line to terminal popup
-    pub fn add_terminal_output(&mut self, hostname: &str, line: String) {
-        if let Some(ref mut popup) = self.terminal_popup {
-            if popup.hostname == hostname && popup.visible {
-                popup.add_output_line(line);
-            }
-        }
-    }
-
-    /// Close terminal popup for a specific hostname
-    pub fn _close_terminal_popup(&mut self, hostname: &str) {
-        if let Some(ref mut popup) = self.terminal_popup {
-            if popup.hostname == hostname {
-                popup.close();
-                self.terminal_popup = None;
-            }
-        }
-    }
-
-
-    /// Scroll the focused panel up or down
-    pub fn scroll_focused_panel(&mut self, direction: i32) {
-        if let Some(hostname) = self.current_host.clone() {
-            let focused_panel = self.focused_panel; // Get the value before borrowing
-            let host_widgets = self.get_or_create_host_widgets(&hostname);
+    /// 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();
             
-            match focused_panel {
-                PanelType::System => {
-                    if direction > 0 {
-                        host_widgets.system_scroll_offset = host_widgets.system_scroll_offset.saturating_add(1);
-                    } else {
-                        host_widgets.system_scroll_offset = host_widgets.system_scroll_offset.saturating_sub(1);
-                    }
-                    info!("System panel scroll offset: {}", host_widgets.system_scroll_offset);
-                }
-                PanelType::Services => {
-                    // For services panel, Up/Down moves selection cursor, not scroll
-                    let total_services = host_widgets.services_widget.get_total_services_count();
-                    
-                    if direction > 0 {
-                        host_widgets.services_widget.select_next(total_services);
-                        info!("Services selection moved down");
-                    } else {
-                        host_widgets.services_widget.select_previous();
-                        info!("Services selection moved up");
+            // Check each pending transition to see if real status has changed
+            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) {
+                        let new_status = metric.value.as_string();
+                        
+                        // Check if status has changed from original (command completed)
+                        if &new_status != original_status {
+                            // Verify it changed in the expected direction
+                            let expected_change = match command_type {
+                                CommandType::ServiceStart => &new_status == "active",
+                                CommandType::ServiceStop => &new_status != "active",
+                                _ => false,
+                            };
+                            
+                            if expected_change {
+                                completed_services.push(service_name.clone());
+                            }
+                        }
+                        break;
                     }
                 }
-                PanelType::Backup => {
-                    if direction > 0 {
-                        host_widgets.backup_scroll_offset = host_widgets.backup_scroll_offset.saturating_add(1);
-                    } else {
-                        host_widgets.backup_scroll_offset = host_widgets.backup_scroll_offset.saturating_sub(1);
-                    }
-                    info!("Backup panel scroll offset: {}", host_widgets.backup_scroll_offset);
-                }
+            }
+            
+            // Remove completed transitions
+            for service_name in completed_services {
+                host_widgets.pending_service_transitions.remove(&service_name);
             }
         }
     }
 
 
-    /// Get list of currently visible panels
-    fn get_visible_panels(&self) -> Vec<PanelType> {
-        let mut visible_panels = vec![PanelType::System, PanelType::Services];
-        
-        // Check if backup panel should be shown
-        if let Some(hostname) = &self.current_host {
-            if let Some(host_widgets) = self.host_widgets.get(hostname) {
-                if host_widgets.backup_widget.has_data() {
-                    visible_panels.push(PanelType::Backup);
-                }
-            }
-        }
-        
-        visible_panels
-    }
+
 
     /// Render the dashboard (real btop-style multi-panel layout)
     pub fn render(&mut self, frame: &mut Frame, metric_store: &MetricStore) {
@@ -681,26 +512,20 @@ impl TuiApp {
 
         // Render services widget for current host
         if let Some(hostname) = self.current_host.clone() {
-            let is_focused = self.focused_panel == PanelType::Services;
-            let (scroll_offset, command_status) = {
+            let is_focused = true; // Always show service selection
+            let (scroll_offset, pending_transitions) = {
                 let host_widgets = self.get_or_create_host_widgets(&hostname);
-                (host_widgets.services_scroll_offset, host_widgets.command_status.clone())
+                (host_widgets.services_scroll_offset, host_widgets.pending_service_transitions.clone())
             };
             let host_widgets = self.get_or_create_host_widgets(&hostname);
             host_widgets
                 .services_widget
-                .render_with_command_status(frame, content_chunks[1], is_focused, scroll_offset, command_status.as_ref()); // Services takes full right side
+                .render_with_transitions(frame, content_chunks[1], is_focused, scroll_offset, &pending_transitions); // Services takes full right side
         }
 
         // Render statusbar at the bottom
         self.render_statusbar(frame, main_chunks[2]); // main_chunks[2] is the statusbar area
 
-        // Render terminal popup on top of everything else
-        if let Some(ref popup) = self.terminal_popup {
-            if popup.visible {
-                self.render_terminal_popup(frame, size, popup);
-            }
-        }
     }
 
     /// Render btop-style minimal title with host status colors
@@ -816,38 +641,18 @@ impl TuiApp {
         
         // Global shortcuts
         shortcuts.push("Tab: Switch Host".to_string());
-        shortcuts.push("Shift+Tab: Switch Panel".to_string());
-        
-        // Scroll shortcuts (always available)
-        shortcuts.push("↑↓: Scroll".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());
-            }
-        }
+        shortcuts.push("↑↓/jk: Select Service".to_string());
+        shortcuts.push("r: Rebuild Host".to_string());
+        shortcuts.push("s/S: Start/Stop Service".to_string());
         
         // Always show quit
-        shortcuts.push("Q: Quit".to_string());
+        shortcuts.push("q: Quit".to_string());
         
         shortcuts
     }
 
     fn render_system_panel(&mut self, frame: &mut Frame, area: Rect, _metric_store: &MetricStore) {
-        let system_block = if self.focused_panel == PanelType::System {
-            Components::focused_widget_block("system")
-        } else {
-            Components::widget_block("system")
-        };
+        let system_block = Components::widget_block("system");
         let inner_area = system_block.inner(area);
         frame.render_widget(system_block, area);
         // Get current host widgets, create if none exist
@@ -862,11 +667,7 @@ impl TuiApp {
     }
 
     fn render_backup_panel(&mut self, frame: &mut Frame, area: Rect) {
-        let backup_block = if self.focused_panel == PanelType::Backup {
-            Components::focused_widget_block("backup")
-        } else {
-            Components::widget_block("backup")
-        };
+        let backup_block = Components::widget_block("backup");
         let inner_area = backup_block.inner(area);
         frame.render_widget(backup_block, area);
 
@@ -881,112 +682,5 @@ impl TuiApp {
         }
     }
 
-    /// Render terminal popup with streaming output
-    fn render_terminal_popup(&self, frame: &mut Frame, area: Rect, popup: &TerminalPopup) {
-        use ratatui::{
-            style::{Color, Style},
-            text::{Line, Span},
-            widgets::{Block, Borders, Clear, Paragraph, Wrap},
-        };
-
-        // Calculate popup size (80% of screen, centered)
-        let popup_width = area.width * 80 / 100;
-        let popup_height = area.height * 80 / 100;
-        let popup_x = (area.width - popup_width) / 2;
-        let popup_y = (area.height - popup_height) / 2;
-        
-        let popup_area = Rect {
-            x: popup_x,
-            y: popup_y,
-            width: popup_width,
-            height: popup_height,
-        };
-
-        // Clear background
-        frame.render_widget(Clear, popup_area);
-
-        // Create terminal-style block
-        let title = format!(" {} → {} ({:.1}s) ", 
-            popup.hostname, 
-            popup.target,
-            popup.start_time.elapsed().as_secs_f32()
-        );
-        
-        let block = Block::default()
-            .title(title)
-            .borders(Borders::ALL)
-            .border_style(Style::default().fg(Color::Cyan))
-            .style(Style::default().bg(Color::Black));
-
-        let inner_area = block.inner(popup_area);
-        frame.render_widget(block, popup_area);
-
-        // Render output content
-        let available_height = inner_area.height as usize;
-        let total_lines = popup.output_lines.len();
-        
-        // Calculate which lines to show based on scroll offset
-        let start_line = popup.scroll_offset;
-        let end_line = (start_line + available_height).min(total_lines);
-        
-        let visible_lines: Vec<Line> = popup.output_lines[start_line..end_line]
-            .iter()
-            .map(|line| {
-                // Style output lines with terminal colors
-                if line.contains("error") || line.contains("Error") || line.contains("failed") {
-                    Line::from(Span::styled(line.clone(), Style::default().fg(Color::Red)))
-                } else if line.contains("warning") || line.contains("Warning") {
-                    Line::from(Span::styled(line.clone(), Style::default().fg(Color::Yellow)))
-                } else if line.contains("building") || line.contains("Building") {
-                    Line::from(Span::styled(line.clone(), Style::default().fg(Color::Blue)))
-                } else if line.contains("✓") || line.contains("success") || line.contains("completed") {
-                    Line::from(Span::styled(line.clone(), Style::default().fg(Color::Green)))
-                } else {
-                    Line::from(Span::styled(line.clone(), Style::default().fg(Color::White)))
-                }
-            })
-            .collect();
-
-        let content = Paragraph::new(visible_lines)
-            .wrap(Wrap { trim: false })
-            .style(Style::default().bg(Color::Black));
-
-        frame.render_widget(content, inner_area);
-
-        // Render scroll indicator if needed
-        if total_lines > available_height {
-            let scroll_info = format!(" {}% ", 
-                if total_lines > 0 { 
-                    (end_line * 100) / total_lines 
-                } else { 
-                    100 
-                }
-            );
-            
-            let scroll_area = Rect {
-                x: popup_area.x + popup_area.width - scroll_info.len() as u16 - 1,
-                y: popup_area.y + popup_area.height - 1,
-                width: scroll_info.len() as u16,
-                height: 1,
-            };
-            
-            let scroll_widget = Paragraph::new(scroll_info)
-                .style(Style::default().fg(Color::Cyan).bg(Color::Black));
-            frame.render_widget(scroll_widget, scroll_area);
-        }
-
-        // Instructions at bottom
-        let instructions = " ESC/Q: Close • ↑↓: Scroll ";
-        let instructions_area = Rect {
-            x: popup_area.x + 1,
-            y: popup_area.y + popup_area.height - 1,
-            width: instructions.len() as u16,
-            height: 1,
-        };
-        
-        let instructions_widget = Paragraph::new(instructions)
-            .style(Style::default().fg(Color::Gray).bg(Color::Black));
-        frame.render_widget(instructions_widget, instructions_area);
-    }
 
 }

dashboard/src/ui/theme.rs

@@ -289,18 +289,6 @@ impl Components {
             )
     }
 
-    /// Widget block with focus indicator (blue border)
-    pub fn focused_widget_block(title: &str) -> Block<'_> {
-        Block::default()
-            .title(title)
-            .borders(Borders::ALL)
-            .style(Style::default().fg(Theme::highlight()).bg(Theme::background())) // Blue border for focus
-            .title_style(
-                Style::default()
-                    .fg(Theme::highlight()) // Blue title for focus
-                    .bg(Theme::background()),
-            )
-    }
 }
 
 impl Typography {

dashboard/src/ui/widgets/services.rs

@@ -9,7 +9,7 @@ use tracing::debug;
 
 use super::Widget;
 use crate::ui::theme::{Components, StatusIcons, Theme, Typography};
-use crate::ui::{CommandStatus, CommandType};
+use crate::ui::CommandType;
 use ratatui::style::Style;
 
 /// Services widget displaying hierarchical systemd service statuses
@@ -128,25 +128,17 @@ impl ServicesWidget {
         )
     }
 
-    /// Get status icon for service, considering command status for visual feedback
-    fn get_service_icon_and_status(&self, service_name: &str, info: &ServiceInfo, command_status: Option<&CommandStatus>) -> (String, String, ratatui::prelude::Color) {
-        // Check if this service is currently being operated on
-        if let Some(status) = command_status {
-            match status {
-                CommandStatus::InProgress { command_type, target, .. } => {
-                    if target == service_name {
-                        // Only show special icons for service commands
-                        if let Some((icon, status_text)) = match command_type {
-                            CommandType::ServiceRestart => Some(("↻", "restarting")),
-                            CommandType::ServiceStart => Some(("↑", "starting")), 
-                            CommandType::ServiceStop => Some(("↓", "stopping")),
-                            _ => None, // Don't handle non-service commands here
-                        } {
-                            return (icon.to_string(), status_text.to_string(), Theme::highlight());
-                        }
-                    }
-                }
-            }
+    /// 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, std::time::Instant)>) -> (String, String, ratatui::prelude::Color) {
+        // Check if this service has a pending transition
+        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::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
+            };
+            return (icon.to_string(), status_text.to_string(), Theme::highlight());
         }
         
         // Normal status display
@@ -163,13 +155,13 @@ impl ServicesWidget {
     }
 
 
-    /// Create spans for sub-service with icon next to name, considering command status
-    fn create_sub_service_spans_with_status(
+    /// Create spans for sub-service with icon next to name, considering pending transitions
+    fn create_sub_service_spans_with_transitions(
         &self,
         name: &str,
         info: &ServiceInfo,
         is_last: bool,
-        command_status: Option<&CommandStatus>,
+        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 {
@@ -178,11 +170,11 @@ impl ServicesWidget {
             name.to_string()
         };
 
-        // Get status icon and text, considering command status
-        let (icon, mut status_str, status_color) = self.get_service_icon_and_status(name, info, command_status);
+        // Get status icon and text, considering pending transitions
+        let (icon, mut status_str, status_color) = self.get_service_icon_and_status(name, info, pending_transitions);
 
-        // For sub-services, prefer latency if available (unless command is in progress)
-        if command_status.is_none() {
+        // For sub-services, prefer latency if available (unless transition is pending)
+        if !pending_transitions.contains_key(name) {
             if let Some(latency) = info.latency_ms {
                 status_str = if latency < 0.0 {
                     "timeout".to_string()
@@ -240,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();
@@ -254,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)
@@ -273,6 +268,26 @@ impl ServicesWidget {
         self.parent_services.len()
     }
 
+    /// Get current status of a specific service by name
+    pub fn get_service_status(&self, service_name: &str) -> Option<String> {
+        // Check if it's a parent service
+        if let Some(parent_info) = self.parent_services.get(service_name) {
+            return Some(parent_info.status.clone());
+        }
+        
+        // Check sub-services (format: parent_sub)
+        for (parent_name, sub_list) in &self.sub_services {
+            for (sub_name, sub_info) in sub_list {
+                let full_sub_name = format!("{}_{}", parent_name, sub_name);
+                if full_sub_name == service_name {
+                    return Some(sub_info.status.clone());
+                }
+            }
+        }
+        
+        None
+    }
+
     /// Calculate which parent service index corresponds to a display line index
     fn calculate_parent_service_index(&self, display_line_index: &usize) -> usize {
         // Build the same display list to map line index to parent service index
@@ -426,13 +441,9 @@ impl Widget for ServicesWidget {
 
 impl ServicesWidget {
 
-    /// Render with focus, scroll, and command status for visual feedback
-    pub fn render_with_command_status(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, command_status: Option<&CommandStatus>) {
-        let services_block = if is_focused {
-            Components::focused_widget_block("services")
-        } else {
-            Components::widget_block("services")
-        };
+    /// 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, std::time::Instant)>) {
+        let services_block = Components::widget_block("services");
         let inner_area = services_block.inner(area);
         frame.render_widget(services_block, area);
 
@@ -456,14 +467,14 @@ impl ServicesWidget {
             return;
         }
 
-        // Use the existing render logic but with command status
-        self.render_services_with_status(frame, content_chunks[1], is_focused, scroll_offset, command_status);
+        // Use the existing render logic but with pending transitions
+        self.render_services_with_transitions(frame, content_chunks[1], is_focused, scroll_offset, pending_transitions);
     }
 
-    /// Render services list with command status awareness
-    fn render_services_with_status(&mut self, frame: &mut Frame, area: Rect, is_focused: bool, scroll_offset: usize, command_status: Option<&CommandStatus>) {
-        // Build hierarchical service list for display (same as existing logic)
-        let mut display_lines: Vec<(String, Status, bool, Option<(ServiceInfo, bool)>)> = Vec::new();
+    /// 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, 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();
@@ -472,7 +483,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) {
@@ -482,12 +493,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
                 }
             }
@@ -520,7 +533,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
                 
@@ -534,46 +547,48 @@ impl ServicesWidget {
                 };
                 
                 let mut spans = if *is_sub && sub_info.is_some() {
-                    // Use custom sub-service span creation WITH command status
+                    // Use custom sub-service span creation WITH pending transitions
                     let (service_info, is_last) = sub_info.as_ref().unwrap();
-                    self.create_sub_service_spans_with_status(line_text, service_info, *is_last, command_status)
+                    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 command in progress
-                    let service_spans = if let Some(status) = command_status {
-                        match status {
-                            CommandStatus::InProgress { target, .. } => {
-                                if target == line_text {
-                                    // Create spans with progress status
-                                    let (icon, status_text, status_color) = self.get_service_icon_and_status(line_text, &ServiceInfo { 
-                                        status: "".to_string(), 
-                                        memory_mb: None, 
-                                        disk_gb: None, 
-                                        latency_ms: None, 
-                                        widget_status: *line_status 
-                                    }, command_status);
-                                    vec![
-                                        ratatui::text::Span::styled(format!("{} ", icon), Style::default().fg(status_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)),
-                                    ]
-                                } else {
-                                    StatusIcons::create_status_spans(*line_status, 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, _) = 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(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(icon_color)),
+                        ]
                     } else {
                         StatusIcons::create_status_spans(*line_status, line_text)
-                    };
-                    service_spans
+                    }
                 };
                 
-                // Apply selection highlighting to parent services only, preserving status icon color
+                // Apply selection highlighting to parent services only, making icons background color when selected
                 // Only show selection when Services panel is focused
+                // 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
-                            span.style = span.style.bg(Theme::highlight());
+                            // First span is the status icon - use background color for visibility against blue selection
+                            span.style = span.style
+                                .bg(Theme::highlight())
+                                .fg(Theme::background());
                         } else {
                             // Other spans (text) get full selection highlighting
                             span.style = span.style

shared/Cargo.toml

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