Fix data caching to prevent empty broadcasts

CRITICAL FIX: Collectors now update cached AgentData instead of
creating new empty data each cycle. This prevents the dashboard
from seeing flashing/disappearing data.

- Add cached_agent_data field to Agent struct
- Update cached data when collectors run
- Always broadcast the full cached data every 2s
- Only individual collectors respect their intervals
- Bump version to v0.1.230

Cargo.lock

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

agent/Cargo.toml

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

agent/src/agent.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use gethostname::gethostname;
-use std::time::Duration;
+use std::time::{Duration, Instant};
 use tokio::time::interval;
 use tracing::{debug, error, info};
 
@@ -19,13 +19,22 @@ use crate::collectors::{
 use crate::notifications::NotificationManager;
 use cm_dashboard_shared::AgentData;
 
+/// Wrapper for collectors with timing information
+struct TimedCollector {
+    collector: Box<dyn Collector>,
+    interval: Duration,
+    last_collection: Option<Instant>,
+    name: String,
+}
+
 pub struct Agent {
     hostname: String,
     config: AgentConfig,
     zmq_handler: ZmqHandler,
-    collectors: Vec<Box<dyn Collector>>,
+    collectors: Vec<TimedCollector>,
     notification_manager: NotificationManager,
     previous_status: Option<SystemStatus>,
+    cached_agent_data: AgentData,
 }
 
 /// Track system component status for change detection
@@ -55,36 +64,78 @@ impl Agent {
             config.zmq.publisher_port
         );
 
-        // Initialize collectors
+        // Initialize collectors with timing information
-        let mut collectors: Vec<Box<dyn Collector>> = Vec::new();
+        let mut collectors: Vec<TimedCollector> = Vec::new();
-        
+
         // Add enabled collectors
         if config.collectors.cpu.enabled {
-            collectors.push(Box::new(CpuCollector::new(config.collectors.cpu.clone())));
+            collectors.push(TimedCollector {
+                collector: Box::new(CpuCollector::new(config.collectors.cpu.clone())),
+                interval: Duration::from_secs(config.collectors.cpu.interval_seconds),
+                last_collection: None,
+                name: "CPU".to_string(),
+            });
+            info!("CPU collector initialized with {}s interval", config.collectors.cpu.interval_seconds);
         }
-        
+
         if config.collectors.memory.enabled {
-            collectors.push(Box::new(MemoryCollector::new(config.collectors.memory.clone())));
+            collectors.push(TimedCollector {
+                collector: Box::new(MemoryCollector::new(config.collectors.memory.clone())),
+                interval: Duration::from_secs(config.collectors.memory.interval_seconds),
+                last_collection: None,
+                name: "Memory".to_string(),
+            });
+            info!("Memory collector initialized with {}s interval", config.collectors.memory.interval_seconds);
         }
-        
+
         if config.collectors.disk.enabled {
-            collectors.push(Box::new(DiskCollector::new(config.collectors.disk.clone())));
+            collectors.push(TimedCollector {
+                collector: Box::new(DiskCollector::new(config.collectors.disk.clone())),
+                interval: Duration::from_secs(config.collectors.disk.interval_seconds),
+                last_collection: None,
+                name: "Disk".to_string(),
+            });
+            info!("Disk collector initialized with {}s interval", config.collectors.disk.interval_seconds);
         }
-        
+
         if config.collectors.systemd.enabled {
-            collectors.push(Box::new(SystemdCollector::new(config.collectors.systemd.clone())));
+            collectors.push(TimedCollector {
+                collector: Box::new(SystemdCollector::new(config.collectors.systemd.clone())),
+                interval: Duration::from_secs(config.collectors.systemd.interval_seconds),
+                last_collection: None,
+                name: "Systemd".to_string(),
+            });
+            info!("Systemd collector initialized with {}s interval", config.collectors.systemd.interval_seconds);
         }
-        
+
         if config.collectors.backup.enabled {
-            collectors.push(Box::new(BackupCollector::new()));
+            collectors.push(TimedCollector {
+                collector: Box::new(BackupCollector::new()),
+                interval: Duration::from_secs(config.collectors.backup.interval_seconds),
+                last_collection: None,
+                name: "Backup".to_string(),
+            });
+            info!("Backup collector initialized with {}s interval", config.collectors.backup.interval_seconds);
         }
 
         if config.collectors.network.enabled {
-            collectors.push(Box::new(NetworkCollector::new(config.collectors.network.clone())));
+            collectors.push(TimedCollector {
+                collector: Box::new(NetworkCollector::new(config.collectors.network.clone())),
+                interval: Duration::from_secs(config.collectors.network.interval_seconds),
+                last_collection: None,
+                name: "Network".to_string(),
+            });
+            info!("Network collector initialized with {}s interval", config.collectors.network.interval_seconds);
         }
 
         if config.collectors.nixos.enabled {
-            collectors.push(Box::new(NixOSCollector::new(config.collectors.nixos.clone())));
+            collectors.push(TimedCollector {
+                collector: Box::new(NixOSCollector::new(config.collectors.nixos.clone())),
+                interval: Duration::from_secs(config.collectors.nixos.interval_seconds),
+                last_collection: None,
+                name: "NixOS".to_string(),
+            });
+            info!("NixOS collector initialized with {}s interval", config.collectors.nixos.interval_seconds);
         }
 
         info!("Initialized {} collectors", collectors.len());
@@ -93,6 +144,9 @@ impl Agent {
         let notification_manager = NotificationManager::new(&config.notifications, &hostname)?;
         info!("Notification manager initialized");
 
+        // Initialize cached agent data
+        let cached_agent_data = AgentData::new(hostname.clone(), env!("CARGO_PKG_VERSION").to_string());
+
         Ok(Self {
             hostname,
             config,
@@ -100,6 +154,7 @@ impl Agent {
             collectors,
             notification_manager,
             previous_status: None,
+            cached_agent_data,
         })
     }
 
@@ -149,24 +204,47 @@ impl Agent {
     async fn collect_and_broadcast(&mut self) -> Result<()> {
         debug!("Starting structured data collection");
 
-        // Initialize empty AgentData
+        // Collect data from collectors whose intervals have elapsed
-        let mut agent_data = AgentData::new(self.hostname.clone(), env!("CARGO_PKG_VERSION").to_string());
+        // Update cached_agent_data with new data
+        let now = Instant::now();
+        for timed_collector in &mut self.collectors {
+            let should_collect = match timed_collector.last_collection {
+                None => true, // First collection
+                Some(last_time) => now.duration_since(last_time) >= timed_collector.interval,
+            };
 
-        // Collect data from all collectors
+            if should_collect {
-        for collector in &self.collectors {
+                if let Err(e) = timed_collector.collector.collect_structured(&mut self.cached_agent_data).await {
-            if let Err(e) = collector.collect_structured(&mut agent_data).await {
+                    error!("Collector {} failed: {}", timed_collector.name, e);
-                error!("Collector failed: {}", e);
+                    // Update last_collection time even on failure to prevent immediate retries
-                // Continue with other collectors even if one fails
+                    timed_collector.last_collection = Some(now);
+                } else {
+                    timed_collector.last_collection = Some(now);
+                    debug!(
+                        "Collected from {} ({}s interval)",
+                        timed_collector.name,
+                        timed_collector.interval.as_secs()
+                    );
+                }
             }
         }
 
+        // Update timestamp on cached data
+        self.cached_agent_data.timestamp = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+
+        // Clone for notification check (to avoid borrow issues)
+        let agent_data_snapshot = self.cached_agent_data.clone();
+
         // Check for status changes and send notifications
-        if let Err(e) = self.check_status_changes_and_notify(&agent_data).await {
+        if let Err(e) = self.check_status_changes_and_notify(&agent_data_snapshot).await {
             error!("Failed to check status changes: {}", e);
         }
 
-        // Broadcast the structured data via ZMQ
+        // Broadcast the cached structured data via ZMQ
-        if let Err(e) = self.zmq_handler.publish_agent_data(&agent_data).await {
+        if let Err(e) = self.zmq_handler.publish_agent_data(&agent_data_snapshot).await {
             error!("Failed to broadcast agent data: {}", e);
         } else {
             debug!("Successfully broadcast structured agent data");

dashboard/Cargo.toml

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

dashboard/src/ui/widgets/services.rs

@@ -22,10 +22,25 @@ struct ColumnVisibility {
 }
 
 impl ColumnVisibility {
+    /// Calculate actual width needed for all columns
+    const NAME_WIDTH: u16 = 23;
+    const STATUS_WIDTH: u16 = 10;
+    const RAM_WIDTH: u16 = 8;
+    const UPTIME_WIDTH: u16 = 8;
+    const RESTARTS_WIDTH: u16 = 5;
+    const COLUMN_SPACING: u16 = 1; // Space between columns
+
     /// Determine which columns to show based on available width
+    /// Priority order: Name > Status > RAM > Uptime > Restarts
     fn from_width(width: u16) -> Self {
-        if width >= 80 {
+        // Calculate cumulative widths for each configuration
-            // Full layout: Name (25) + Status (10) + RAM (8) + Uptime (8) + Restarts (5) = 56 chars
+        let minimal = Self::NAME_WIDTH + Self::COLUMN_SPACING + Self::STATUS_WIDTH; // 34
+        let with_ram = minimal + Self::COLUMN_SPACING + Self::RAM_WIDTH; // 43
+        let with_uptime = with_ram + Self::COLUMN_SPACING + Self::UPTIME_WIDTH; // 52
+        let full = with_uptime + Self::COLUMN_SPACING + Self::RESTARTS_WIDTH; // 58
+
+        if width >= full {
+            // Show all columns
             Self {
                 show_name: true,
                 show_status: true,
@@ -33,8 +48,8 @@ impl ColumnVisibility {
                 show_uptime: true,
                 show_restarts: true,
             }
-        } else if width >= 60 {
+        } else if width >= with_uptime {
-            // Hide restarts: Name (25) + Status (10) + RAM (8) + Uptime (8) = 51 chars
+            // Hide restarts
             Self {
                 show_name: true,
                 show_status: true,
@@ -42,8 +57,8 @@ impl ColumnVisibility {
                 show_uptime: true,
                 show_restarts: false,
             }
-        } else if width >= 45 {
+        } else if width >= with_ram {
-            // Hide uptime and restarts: Name (25) + Status (10) + RAM (8) = 43 chars
+            // Hide uptime and restarts
             Self {
                 show_name: true,
                 show_status: true,
@@ -52,7 +67,7 @@ impl ColumnVisibility {
                 show_restarts: false,
             }
         } else {
-            // Minimal: Name (25) + Status (10) = 35 chars
+            // Minimal: Name + Status only
             Self {
                 show_name: true,
                 show_status: true,
@@ -130,9 +145,11 @@ impl ServicesWidget {
 
     /// Format parent service line - returns text without icon for span formatting
     fn format_parent_service_line(&self, name: &str, info: &ServiceInfo, columns: ColumnVisibility) -> String {
-        // Truncate long service names to fit layout (account for icon space)
+        // Truncate long service names to fit layout
-        let short_name = if name.len() > 22 {
+        // NAME_WIDTH - 3 chars for "..." = max displayable chars
-            format!("{}...", &name[..19])
+        let max_name_len = (ColumnVisibility::NAME_WIDTH - 3) as usize;
+        let short_name = if name.len() > max_name_len {
+            format!("{}...", &name[..max_name_len.saturating_sub(3)])
         } else {
             name.to_string()
         };
@@ -185,19 +202,19 @@ impl ServicesWidget {
         // Build format string based on column visibility
         let mut parts = Vec::new();
         if columns.show_name {
-            parts.push(format!("{:<23}", short_name));
+            parts.push(format!("{:<width$}", short_name, width = ColumnVisibility::NAME_WIDTH as usize));
         }
         if columns.show_status {
-            parts.push(format!("{:<10}", status_str));
+            parts.push(format!("{:<width$}", status_str, width = ColumnVisibility::STATUS_WIDTH as usize));
         }
         if columns.show_ram {
-            parts.push(format!("{:<8}", memory_str));
+            parts.push(format!("{:<width$}", memory_str, width = ColumnVisibility::RAM_WIDTH as usize));
         }
         if columns.show_uptime {
-            parts.push(format!("{:<8}", uptime_str));
+            parts.push(format!("{:<width$}", uptime_str, width = ColumnVisibility::UPTIME_WIDTH as usize));
         }
         if columns.show_restarts {
-            parts.push(format!("{:<5}", restart_str));
+            parts.push(format!("{:<width$}", restart_str, width = ColumnVisibility::RESTARTS_WIDTH as usize));
         }
 
         parts.join(" ")
@@ -550,19 +567,19 @@ impl ServicesWidget {
         // Build header based on visible columns
         let mut header_parts = Vec::new();
         if columns.show_name {
-            header_parts.push(format!("{:<25}", "Service:"));
+            header_parts.push(format!("{:<width$}", "Service:", width = ColumnVisibility::NAME_WIDTH as usize));
         }
         if columns.show_status {
-            header_parts.push(format!("{:<10}", "Status:"));
+            header_parts.push(format!("{:<width$}", "Status:", width = ColumnVisibility::STATUS_WIDTH as usize));
         }
         if columns.show_ram {
-            header_parts.push(format!("{:<8}", "RAM:"));
+            header_parts.push(format!("{:<width$}", "RAM:", width = ColumnVisibility::RAM_WIDTH as usize));
         }
         if columns.show_uptime {
-            header_parts.push(format!("{:<8}", "Uptime:"));
+            header_parts.push(format!("{:<width$}", "Uptime:", width = ColumnVisibility::UPTIME_WIDTH as usize));
         }
         if columns.show_restarts {
-            header_parts.push(format!("{:<5}", "↻:"));
+            header_parts.push(format!("{:<width$}", "↻:", width = ColumnVisibility::RESTARTS_WIDTH as usize));
         }
         let header = header_parts.join(" ");
 

shared/Cargo.toml

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