4runr-os 2.4.3 → 2.5.0

package/mk3-tui/src/app.rs

@@ -29,35 +29,6 @@ pub enum AppMode {
     Main,
 }
 
-#[derive(Debug, Clone)]
-pub struct AgentListState {
-    pub agents: Vec<AgentInfo>,
-    pub selected_index: usize,
-    pub detail_view: Option<usize>,  // None = list view, Some(index) = detail popup
-}
-
-impl Default for AgentListState {
-    fn default() -> Self {
-        Self {
-            agents: Vec::new(),
-            selected_index: 0,
-            detail_view: None,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct AgentInfo {
-    pub name: String,
-    pub description: Option<String>,
-    pub model: String,
-    pub provider: String,
-    pub system_prompt: Option<String>,
-    pub temperature: Option<f32>,
-    pub max_tokens: Option<u32>,
-    pub tools: Vec<String>,
-}
-
 #[derive(Debug, Clone)]
 pub struct AppState {
     // Navigation state (NEW - replaces simple mode)
@@ -190,6 +161,35 @@ impl Default for AppState {
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct AgentListState {
+    pub agents: Vec<AgentInfo>,
+    pub selected_index: usize,
+    pub detail_view: Option<usize>,  // None = list view, Some(index) = detail popup
+}
+
+impl Default for AgentListState {
+    fn default() -> Self {
+        Self {
+            agents: Vec::new(),
+            selected_index: 0,
+            detail_view: None,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct AgentInfo {
+    pub name: String,
+    pub description: Option<String>,
+    pub model: String,
+    pub provider: String,
+    pub system_prompt: Option<String>,
+    pub temperature: Option<f32>,
+    pub max_tokens: Option<u32>,
+    pub tools: Vec<String>,
+}
+
 pub struct App {
     pub(crate) state: AppState,
     render_scheduler: RenderScheduler,
@@ -1112,69 +1112,6 @@ impl App {
         Ok(false)
     }
     
-    // ============================================================
-    // AGENT LIST INPUT HANDLING (Step 4)
-    // ============================================================
-    
-    /// Handle input when Agent List screen is active
-    fn handle_agent_list_input(&mut self, key: KeyEvent) -> anyhow::Result<bool> {
-        use crossterm::event::KeyModifiers;
-        
-        // Ctrl+C/Q to exit
-        if key.modifiers.contains(KeyModifiers::CONTROL) {
-            match key.code {
-                KeyCode::Char('c') | KeyCode::Char('q') => return Ok(true),
-                _ => return Ok(false),
-            }
-        }
-        
-        match key.code {
-            // Navigation
-            KeyCode::Up => {
-                if self.state.agent_list.selected_index > 0 {
-                    self.state.agent_list.selected_index -= 1;
-                }
-                self.request_render("agent_list_up");
-            }
-            KeyCode::Down => {
-                let max = self.state.agent_list.agents.len().saturating_sub(1);
-                if self.state.agent_list.selected_index < max {
-                    self.state.agent_list.selected_index += 1;
-                }
-                self.request_render("agent_list_down");
-            }
-            
-            // View details / Close detail view
-            KeyCode::Enter => {
-                if self.state.agent_list.detail_view.is_some() {
-                    // Close detail view
-                    self.state.agent_list.detail_view = None;
-                } else {
-                    // Open detail view for selected agent
-                    self.state.agent_list.detail_view = Some(self.state.agent_list.selected_index);
-                }
-                self.request_render("agent_list_toggle_detail");
-            }
-            
-            // Close
-            KeyCode::Esc => {
-                if self.state.agent_list.detail_view.is_some() {
-                    // Close detail popup first
-                    self.state.agent_list.detail_view = None;
-                    self.request_render("agent_list_close_detail");
-                } else {
-                    // Close agent list
-                    self.pop_overlay();
-                    self.request_render("agent_list_close");
-                }
-            }
-            
-            _ => {}
-        }
-        
-        Ok(false)
-    }
-    
     // ============================================================
     // SETTINGS INPUT HANDLING (Step 4.8)
     // ============================================================
@@ -1246,5 +1183,64 @@ impl App {
         
         Ok(false)
     }
+    
+    /// Handle input when Agent List screen is active
+    fn handle_agent_list_input(&mut self, key: KeyEvent) -> anyhow::Result<bool> {
+        use crossterm::event::KeyModifiers;
+        
+        // Ctrl+C/Q to exit
+        if key.modifiers.contains(KeyModifiers::CONTROL) {
+            match key.code {
+                KeyCode::Char('c') | KeyCode::Char('q') => return Ok(true),
+                _ => return Ok(false),
+            }
+        }
+        
+        match key.code {
+            // Navigation
+            KeyCode::Up => {
+                if self.state.agent_list.selected_index > 0 {
+                    self.state.agent_list.selected_index -= 1;
+                }
+                self.request_render("agent_list_up");
+            }
+            KeyCode::Down => {
+                let max = self.state.agent_list.agents.len().saturating_sub(1);
+                if self.state.agent_list.selected_index < max {
+                    self.state.agent_list.selected_index += 1;
+                }
+                self.request_render("agent_list_down");
+            }
+            
+            // View details / Close detail view
+            KeyCode::Enter => {
+                if self.state.agent_list.detail_view.is_some() {
+                    // Close detail view
+                    self.state.agent_list.detail_view = None;
+                } else {
+                    // Open detail view for selected agent
+                    self.state.agent_list.detail_view = Some(self.state.agent_list.selected_index);
+                }
+                self.request_render("agent_list_toggle_detail");
+            }
+            
+            // Close
+            KeyCode::Esc => {
+                if self.state.agent_list.detail_view.is_some() {
+                    // Close detail popup first
+                    self.state.agent_list.detail_view = None;
+                    self.request_render("agent_list_close_detail");
+                } else {
+                    // Close agent list
+                    self.pop_overlay();
+                    self.request_render("agent_list_close");
+                }
+            }
+            
+            _ => {}
+        }
+        
+        Ok(false)
+    }
 }
 

package/mk3-tui/src/main.rs

@@ -15,7 +15,6 @@ mod websocket;
 
 use app::App;
 use io::IoHandler;
-use screens::Screen;
 use websocket::{WebSocketClient, WsClientMessage};
 
 fn main() -> Result<()> {
@@ -142,17 +141,7 @@ fn main() -> Result<()> {
                                     // Handle agent.list response
                                     else if let Some(agents_data) = obj.get("agents") {
                                         if let Some(agents_array) = agents_data.as_array() {
-                                            // Update capabilities with real agent names
-                                            app.state.capabilities = agents_array.iter()
-                                                .filter_map(|agent| {
-                                                    agent.as_object()
-                                                        .and_then(|a| a.get("name"))
-                                                        .and_then(|n| n.as_str())
-                                                        .map(|s| s.to_string())
-                                                })
-                                                .collect();
-                                            
-                                            // Parse agents into AgentInfo structs for Agent List viewer
+                                            // Parse agents into AgentInfo structs
                                             use crate::app::AgentInfo;
                                             let agents: Vec<AgentInfo> = agents_array.iter()
                                                 .filter_map(|agent| {
@@ -175,44 +164,37 @@ fn main() -> Result<()> {
                                                 })
                                                 .collect();
                                             
+                                            // Update capabilities with agent names
+                                            app.state.capabilities = agents.iter()
+                                                .map(|a| a.name.clone())
+                                                .collect();
+                                            
                                             // Update cache with agent data
                                             if let Some(cache) = &mut app.state.cache {
                                                 use crate::storage::cache::AgentData;
                                                 use std::time::{SystemTime, UNIX_EPOCH};
                                                 
-                                                let cache_agents: Vec<AgentData> = agents_array.iter()
-                                                    .filter_map(|agent| {
-                                                        let obj = agent.as_object()?;
-                                                        Some(AgentData {
-                                                            name: obj.get("name")?.as_str()?.to_string(),
-                                                            description: obj.get("description").and_then(|d| d.as_str()).map(|s| s.to_string()),
-                                                            model: obj.get("model").and_then(|m| m.as_str()).unwrap_or("unknown").to_string(),
-                                                            provider: obj.get("provider").and_then(|p| p.as_str()).unwrap_or("unknown").to_string(),
-                                                            created_at: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
-                                                        })
+                                                let cache_agents: Vec<AgentData> = agents.iter()
+                                                    .map(|agent| AgentData {
+                                                        name: agent.name.clone(),
+                                                        description: agent.description.clone(),
+                                                        model: agent.model.clone(),
+                                                        provider: agent.provider.clone(),
+                                                        created_at: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
                                                     })
                                                     .collect();
                                                 
                                                 let _ = cache.update_agents(cache_agents);
                                             }
                                             
-                                            // Update agent list state
+                                            // Update agent list state and open AgentList overlay
                                             app.state.agent_list.agents = agents;
                                             app.state.agent_list.selected_index = 0;
                                             app.state.agent_list.detail_view = None;
                                             
-                                            // Open AgentList overlay
+                                            use crate::screens::Screen;
                                             app.push_overlay(Screen::AgentList);
                                             app.request_render("agent_list_opened");
-                                            
-                                            // Only log if agents were actually loaded
-                                            if agents_array.len() > 0 {
-                                                app.add_log(format!(
-                                                    "✓ [{}] Loaded {} agents",
-                                                    short_id,
-                                                    agents_array.len()
-                                                ));
-                                            }
                                         }
                                     } else {
                                         app.add_log(format!("✓ [{}] Success", short_id));

package/mk3-tui/src/screens/mod.rs

@@ -1,225 +1,225 @@
-/// Screen types and navigation system
-/// 
-/// This module defines the screen/mode system for the TUI.
-/// Screens can be:
-/// - Base screens (Boot, Main) - always visible
-/// - Overlay screens (Agent Builder, Run Manager, Settings) - full-screen modals
-/// - Popup screens (Confirmations, Alerts) - small overlays
-
-use serde::{Deserialize, Serialize};
-
-/// Screen enum - represents all possible screens in the TUI
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Screen {
-    // Base screens
-    Boot,
-    Main,
-    
-    // Overlay screens (full-screen modals)
-    AgentBuilder,
-    RunManager,
-    Settings,
-    AgentList,
-    
-    // Popup screens (small overlays)
-    Confirmation { message: String, action: String },
-    Alert { message: String },
-    Help,
-}
-
-impl Screen {
-    /// Returns true if this screen is an overlay (covers base screen)
-    pub fn is_overlay(&self) -> bool {
-        matches!(
-            self,
-            Screen::AgentBuilder | Screen::RunManager | Screen::Settings | Screen::AgentList
-        )
-    }
-    
-    /// Returns true if this screen is a popup (small overlay)
-    pub fn is_popup(&self) -> bool {
-        matches!(
-            self,
-            Screen::Confirmation { .. } | Screen::Alert { .. } | Screen::Help
-        )
-    }
-    
-    /// Returns true if this screen is a base screen
-    pub fn is_base(&self) -> bool {
-        matches!(self, Screen::Boot | Screen::Main)
-    }
-    
-    /// Returns the screen name for display
-    pub fn name(&self) -> &str {
-        match self {
-            Screen::Boot => "Boot",
-            Screen::Main => "Main",
-            Screen::AgentBuilder => "Agent Builder",
-            Screen::RunManager => "Run Manager",
-            Screen::Settings => "Settings",
-            Screen::AgentList => "Agent List",
-            Screen::Confirmation { .. } => "Confirmation",
-            Screen::Alert { .. } => "Alert",
-            Screen::Help => "Help",
-        }
-    }
-}
-
-/// Navigation state - manages screen stack and transitions
-#[derive(Debug, Clone)]
-pub struct NavigationState {
-    /// Current base screen (Boot or Main)
-    pub base_screen: Screen,
-    
-    /// Overlay stack (full-screen modals)
-    /// Last item is the currently visible overlay
-    pub overlay_stack: Vec<Screen>,
-    
-    /// Popup stack (small overlays on top of everything)
-    /// Last item is the currently visible popup
-    pub popup_stack: Vec<Screen>,
-}
-
-impl Default for NavigationState {
-    fn default() -> Self {
-        Self {
-            base_screen: Screen::Boot,
-            overlay_stack: Vec::new(),
-            popup_stack: Vec::new(),
-        }
-    }
-}
-
-impl NavigationState {
-    /// Create a new navigation state starting at Boot
-    pub fn new() -> Self {
-        Self::default()
-    }
-    
-    /// Get the currently visible screen (topmost in hierarchy)
-    pub fn current_screen(&self) -> &Screen {
-        // Priority: Popup > Overlay > Base
-        if let Some(popup) = self.popup_stack.last() {
-            popup
-        } else if let Some(overlay) = self.overlay_stack.last() {
-            overlay
-        } else {
-            &self.base_screen
-        }
-    }
-    
-    /// Navigate to a base screen (Boot or Main)
-    pub fn navigate_to_base(&mut self, screen: Screen) {
-        if screen.is_base() {
-            self.base_screen = screen;
-            // Clear overlays and popups when changing base screen
-            self.overlay_stack.clear();
-            self.popup_stack.clear();
-        }
-    }
-    
-    /// Push an overlay screen (Agent Builder, Run Manager, Settings)
-    pub fn push_overlay(&mut self, screen: Screen) {
-        if screen.is_overlay() {
-            self.overlay_stack.push(screen);
-        }
-    }
-    
-    /// Pop the current overlay and return to previous screen
-    pub fn pop_overlay(&mut self) -> Option<Screen> {
-        self.overlay_stack.pop()
-    }
-    
-    /// Push a popup screen (Confirmation, Alert, Help)
-    pub fn push_popup(&mut self, screen: Screen) {
-        if screen.is_popup() {
-            self.popup_stack.push(screen);
-        }
-    }
-    
-    /// Pop the current popup
-    pub fn pop_popup(&mut self) -> Option<Screen> {
-        self.popup_stack.pop()
-    }
-    
-    /// Close all overlays and popups (return to base screen)
-    pub fn close_all(&mut self) {
-        self.overlay_stack.clear();
-        self.popup_stack.clear();
-    }
-    
-    /// Check if we're currently on the base screen (no overlays/popups)
-    pub fn is_on_base(&self) -> bool {
-        self.overlay_stack.is_empty() && self.popup_stack.is_empty()
-    }
-    
-    /// Check if we have any overlays open
-    pub fn has_overlay(&self) -> bool {
-        !self.overlay_stack.is_empty()
-    }
-    
-    /// Check if we have any popups open
-    pub fn has_popup(&self) -> bool {
-        !self.popup_stack.is_empty()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    
-    #[test]
-    fn test_screen_classification() {
-        assert!(Screen::Boot.is_base());
-        assert!(Screen::Main.is_base());
-        assert!(Screen::AgentBuilder.is_overlay());
-        assert!(Screen::RunManager.is_overlay());
-        assert!(Screen::Settings.is_overlay());
-        assert!(Screen::Help.is_popup());
-    }
-    
-    #[test]
-    fn test_navigation_state() {
-        let mut nav = NavigationState::new();
-        
-        // Start at Boot
-        assert_eq!(nav.current_screen(), &Screen::Boot);
-        assert!(nav.is_on_base());
-        
-        // Navigate to Main
-        nav.navigate_to_base(Screen::Main);
-        assert_eq!(nav.current_screen(), &Screen::Main);
-        
-        // Push overlay
-        nav.push_overlay(Screen::AgentBuilder);
-        assert_eq!(nav.current_screen(), &Screen::AgentBuilder);
-        assert!(nav.has_overlay());
-        assert!(!nav.is_on_base());
-        
-        // Push popup
-        nav.push_popup(Screen::Help);
-        assert_eq!(nav.current_screen(), &Screen::Help);
-        assert!(nav.has_popup());
-        
-        // Pop popup
-        nav.pop_popup();
-        assert_eq!(nav.current_screen(), &Screen::AgentBuilder);
-        
-        // Pop overlay
-        nav.pop_overlay();
-        assert_eq!(nav.current_screen(), &Screen::Main);
-        assert!(nav.is_on_base());
-    }
-    
-    #[test]
-    fn test_close_all() {
-        let mut nav = NavigationState::new();
-        nav.navigate_to_base(Screen::Main);
-        nav.push_overlay(Screen::AgentBuilder);
-        nav.push_popup(Screen::Help);
-        
-        nav.close_all();
-        assert!(nav.is_on_base());
-        assert_eq!(nav.current_screen(), &Screen::Main);
-    }
-}
+/// Screen types and navigation system
+/// 
+/// This module defines the screen/mode system for the TUI.
+/// Screens can be:
+/// - Base screens (Boot, Main) - always visible
+/// - Overlay screens (Agent Builder, Run Manager, Settings) - full-screen modals
+/// - Popup screens (Confirmations, Alerts) - small overlays
+
+use serde::{Deserialize, Serialize};
+
+/// Screen enum - represents all possible screens in the TUI
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Screen {
+    // Base screens
+    Boot,
+    Main,
+    
+    // Overlay screens (full-screen modals)
+    AgentBuilder,
+    RunManager,
+    Settings,
+    AgentList,
+    
+    // Popup screens (small overlays)
+    Confirmation { message: String, action: String },
+    Alert { message: String },
+    Help,
+}
+
+impl Screen {
+    /// Returns true if this screen is an overlay (covers base screen)
+    pub fn is_overlay(&self) -> bool {
+        matches!(
+            self,
+            Screen::AgentBuilder | Screen::RunManager | Screen::Settings | Screen::AgentList
+        )
+    }
+    
+    /// Returns true if this screen is a popup (small overlay)
+    pub fn is_popup(&self) -> bool {
+        matches!(
+            self,
+            Screen::Confirmation { .. } | Screen::Alert { .. } | Screen::Help
+        )
+    }
+    
+    /// Returns true if this screen is a base screen
+    pub fn is_base(&self) -> bool {
+        matches!(self, Screen::Boot | Screen::Main)
+    }
+    
+    /// Returns the screen name for display
+    pub fn name(&self) -> &str {
+        match self {
+            Screen::Boot => "Boot",
+            Screen::Main => "Main",
+            Screen::AgentBuilder => "Agent Builder",
+            Screen::RunManager => "Run Manager",
+            Screen::Settings => "Settings",
+            Screen::AgentList => "Agent List",
+            Screen::Confirmation { .. } => "Confirmation",
+            Screen::Alert { .. } => "Alert",
+            Screen::Help => "Help",
+        }
+    }
+}
+
+/// Navigation state - manages screen stack and transitions
+#[derive(Debug, Clone)]
+pub struct NavigationState {
+    /// Current base screen (Boot or Main)
+    pub base_screen: Screen,
+    
+    /// Overlay stack (full-screen modals)
+    /// Last item is the currently visible overlay
+    pub overlay_stack: Vec<Screen>,
+    
+    /// Popup stack (small overlays on top of everything)
+    /// Last item is the currently visible popup
+    pub popup_stack: Vec<Screen>,
+}
+
+impl Default for NavigationState {
+    fn default() -> Self {
+        Self {
+            base_screen: Screen::Boot,
+            overlay_stack: Vec::new(),
+            popup_stack: Vec::new(),
+        }
+    }
+}
+
+impl NavigationState {
+    /// Create a new navigation state starting at Boot
+    pub fn new() -> Self {
+        Self::default()
+    }
+    
+    /// Get the currently visible screen (topmost in hierarchy)
+    pub fn current_screen(&self) -> &Screen {
+        // Priority: Popup > Overlay > Base
+        if let Some(popup) = self.popup_stack.last() {
+            popup
+        } else if let Some(overlay) = self.overlay_stack.last() {
+            overlay
+        } else {
+            &self.base_screen
+        }
+    }
+    
+    /// Navigate to a base screen (Boot or Main)
+    pub fn navigate_to_base(&mut self, screen: Screen) {
+        if screen.is_base() {
+            self.base_screen = screen;
+            // Clear overlays and popups when changing base screen
+            self.overlay_stack.clear();
+            self.popup_stack.clear();
+        }
+    }
+    
+    /// Push an overlay screen (Agent Builder, Run Manager, Settings)
+    pub fn push_overlay(&mut self, screen: Screen) {
+        if screen.is_overlay() {
+            self.overlay_stack.push(screen);
+        }
+    }
+    
+    /// Pop the current overlay and return to previous screen
+    pub fn pop_overlay(&mut self) -> Option<Screen> {
+        self.overlay_stack.pop()
+    }
+    
+    /// Push a popup screen (Confirmation, Alert, Help)
+    pub fn push_popup(&mut self, screen: Screen) {
+        if screen.is_popup() {
+            self.popup_stack.push(screen);
+        }
+    }
+    
+    /// Pop the current popup
+    pub fn pop_popup(&mut self) -> Option<Screen> {
+        self.popup_stack.pop()
+    }
+    
+    /// Close all overlays and popups (return to base screen)
+    pub fn close_all(&mut self) {
+        self.overlay_stack.clear();
+        self.popup_stack.clear();
+    }
+    
+    /// Check if we're currently on the base screen (no overlays/popups)
+    pub fn is_on_base(&self) -> bool {
+        self.overlay_stack.is_empty() && self.popup_stack.is_empty()
+    }
+    
+    /// Check if we have any overlays open
+    pub fn has_overlay(&self) -> bool {
+        !self.overlay_stack.is_empty()
+    }
+    
+    /// Check if we have any popups open
+    pub fn has_popup(&self) -> bool {
+        !self.popup_stack.is_empty()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    
+    #[test]
+    fn test_screen_classification() {
+        assert!(Screen::Boot.is_base());
+        assert!(Screen::Main.is_base());
+        assert!(Screen::AgentBuilder.is_overlay());
+        assert!(Screen::RunManager.is_overlay());
+        assert!(Screen::Settings.is_overlay());
+        assert!(Screen::Help.is_popup());
+    }
+    
+    #[test]
+    fn test_navigation_state() {
+        let mut nav = NavigationState::new();
+        
+        // Start at Boot
+        assert_eq!(nav.current_screen(), &Screen::Boot);
+        assert!(nav.is_on_base());
+        
+        // Navigate to Main
+        nav.navigate_to_base(Screen::Main);
+        assert_eq!(nav.current_screen(), &Screen::Main);
+        
+        // Push overlay
+        nav.push_overlay(Screen::AgentBuilder);
+        assert_eq!(nav.current_screen(), &Screen::AgentBuilder);
+        assert!(nav.has_overlay());
+        assert!(!nav.is_on_base());
+        
+        // Push popup
+        nav.push_popup(Screen::Help);
+        assert_eq!(nav.current_screen(), &Screen::Help);
+        assert!(nav.has_popup());
+        
+        // Pop popup
+        nav.pop_popup();
+        assert_eq!(nav.current_screen(), &Screen::AgentBuilder);
+        
+        // Pop overlay
+        nav.pop_overlay();
+        assert_eq!(nav.current_screen(), &Screen::Main);
+        assert!(nav.is_on_base());
+    }
+    
+    #[test]
+    fn test_close_all() {
+        let mut nav = NavigationState::new();
+        nav.navigate_to_base(Screen::Main);
+        nav.push_overlay(Screen::AgentBuilder);
+        nav.push_popup(Screen::Help);
+        
+        nav.close_all();
+        assert!(nav.is_on_base());
+        assert_eq!(nav.current_screen(), &Screen::Main);
+    }
+}

package/mk3-tui/src/storage/mod.rs

@@ -3,4 +3,4 @@
 
 pub mod cache;
 
-pub use cache::Cache;
+pub use cache::{Cache, CacheData};

package/mk3-tui/src/ui/agent_builder.rs

@@ -108,7 +108,7 @@ struct CostEstimate {
     is_free: bool,
 }
 
-fn calculate_cost(provider: &str, model: &str, _max_tokens: u32) -> CostEstimate {
+fn calculate_cost(provider: &str, model: &str, max_tokens: u32) -> CostEstimate {
     let pricing = get_model_pricing(provider, model);
     let is_free = pricing.input_cost == 0.0 && pricing.output_cost == 0.0;
     

package/mk3-tui/src/ui/agent_list.rs

@@ -19,12 +19,10 @@ pub fn render(f: &mut Frame, state: &AppState) {
     let area = f.size();
     
     if state.agent_list.detail_view.is_some() {
-        // Render list view first (as base)
-        render_list_view(f, area, state);
-        // Then render detail popup on top
+        // Render detail popup
         render_detail_popup(f, area, state);
     } else {
-        // Render list view only
+        // Render list view
         render_list_view(f, area, state);
     }
 }
@@ -59,57 +57,63 @@ fn render_list_view(f: &mut Frame, area: Rect, state: &AppState) {
         .border_style(Style::default().fg(TEXT_MUTED))
         .style(Style::default().bg(BG_PANEL));
     
-    f.render_widget(content_block.clone(), chunks[1]);
+    f.render_widget(content_block, chunks[1]);
     
     let table_area = content_block.inner(chunks[1]);
     
-    // Create table rows
-    let rows: Vec<Row> = state.agent_list.agents.iter().enumerate().map(|(i, agent)| {
-        let is_selected = i == state.agent_list.selected_index;
-        let style = if is_selected {
-            Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)
-        } else {
-            Style::default().fg(TEXT_PRIMARY)
-        };
-        
-        let name = if is_selected {
-            format!("▶ {}", agent.name)
-        } else {
-            format!("  {}", agent.name)
-        };
+    if state.agent_list.agents.is_empty() {
+        // Show "No agents" message
+        f.render_widget(
+            Paragraph::new("No agents available.\n\nUse Agent Builder to create new agents.")
+                .style(Style::default().fg(TEXT_DIM))
+                .alignment(Alignment::Center),
+            table_area
+        );
+    } else {
+        // Create table rows
+        let rows: Vec<Row> = state.agent_list.agents.iter().enumerate().map(|(i, agent)| {
+            let is_selected = i == state.agent_list.selected_index;
+            let style = if is_selected {
+                Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)
+            } else {
+                Style::default().fg(TEXT_PRIMARY)
+            };
+            
+            let name = if is_selected {
+                format!("▶ {}", agent.name)
+            } else {
+                format!("  {}", agent.name)
+            };
+            
+            let desc = agent.description.as_deref().unwrap_or("No description").chars().take(30).collect::<String>();
+            let model = agent.model.chars().take(15).collect::<String>();
+            let provider = agent.provider.chars().take(10).collect::<String>();
+            
+            Row::new(vec![
+                Cell::from(name).style(style),
+                Cell::from(desc).style(style),
+                Cell::from(model).style(style),
+                Cell::from(provider).style(style),
+            ])
+        }).collect();
         
-        let desc = agent.description.as_deref().unwrap_or("No description")
-            .chars().take(30).collect::<String>();
-        let model = agent.model.chars().take(15).collect::<String>();
-        let provider = agent.provider.chars().take(10).collect::<String>();
+        let table = Table::new(rows, [
+                Constraint::Percentage(25),
+                Constraint::Percentage(35),
+                Constraint::Percentage(20),
+                Constraint::Percentage(20),
+            ])
+            .header(Row::new(vec![
+                Cell::from("Name").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
+                Cell::from("Description").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
+                Cell::from("Model").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
+                Cell::from("Provider").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
+            ]))
+            .column_spacing(1)
+            .style(Style::default().fg(TEXT_PRIMARY));
         
-        Row::new(vec![
-            Cell::from(name).style(style),
-            Cell::from(desc).style(style),
-            Cell::from(model).style(style),
-            Cell::from(provider).style(style),
-        ])
-    }).collect();
-    
-    let table = Table::new(
-        rows,
-        [
-            Constraint::Percentage(25),
-            Constraint::Percentage(35),
-            Constraint::Percentage(20),
-            Constraint::Percentage(20),
-        ]
-    )
-        .header(Row::new(vec![
-            Cell::from("Name").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
-            Cell::from("Description").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
-            Cell::from("Model").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
-            Cell::from("Provider").style(Style::default().fg(CYBER_CYAN).add_modifier(Modifier::BOLD)),
-        ]))
-        .column_spacing(1)
-        .style(Style::default().fg(TEXT_PRIMARY));
-    
-    f.render_widget(table, table_area);
+        f.render_widget(table, table_area);
+    }
     
     // === FOOTER ===
     let footer_text = Line::from(vec![
@@ -124,12 +128,17 @@ fn render_list_view(f: &mut Frame, area: Rect, state: &AppState) {
     f.render_widget(
         Paragraph::new(footer_text)
             .alignment(Alignment::Center)
-            .style(Style::default().bg(BG_PANEL)),
+            .style(Style::default().bg(BG_PANEL))
+            .block(Block::default().borders(Borders::ALL).border_style(Style::default().fg(TEXT_MUTED))),
         chunks[2]
     );
 }
 
 fn render_detail_popup(f: &mut Frame, area: Rect, state: &AppState) {
+    // First render list view (dimmed)
+    render_list_view(f, area, state);
+    
+    // Then render detail popup on top
     let detail_index = state.agent_list.detail_view.unwrap();
     if let Some(agent) = state.agent_list.agents.get(detail_index) {
         render_agent_detail(f, area, agent);
@@ -137,6 +146,8 @@ fn render_detail_popup(f: &mut Frame, area: Rect, state: &AppState) {
 }
 
 fn render_agent_detail(f: &mut Frame, area: Rect, agent: &AgentInfo) {
+    use ratatui::layout::{Constraint, Direction, Layout};
+    
     // Calculate popup size (70% width, 80% height, centered)
     let popup_width = (area.width * 70 / 100).max(50);
     let popup_height = (area.height * 80 / 100).max(15);
@@ -151,9 +162,16 @@ fn render_agent_detail(f: &mut Frame, area: Rect, agent: &AgentInfo) {
     };
     
     // Render dimmed overlay
-    let overlay = Block::default()
-        .style(Style::default().bg(Color::Black).fg(Color::Black));
-    f.render_widget(overlay, area);
+    for y in area.y..area.y + area.height {
+        for x in area.x..area.x + area.width {
+            if x < popup_x || x >= popup_x + popup_width || y < popup_y || y >= popup_y + popup_height {
+                f.render_widget(
+                    Block::default().style(Style::default().bg(Color::Black)),
+                    Rect { x, y, width: 1, height: 1 }
+                );
+            }
+        }
+    }
     
     // Render detail popup
     let detail_block = Block::default()
@@ -163,7 +181,7 @@ fn render_agent_detail(f: &mut Frame, area: Rect, agent: &AgentInfo) {
         .border_style(Style::default().fg(CYBER_CYAN))
         .style(Style::default().bg(BG_PANEL));
     
-    f.render_widget(detail_block.clone(), popup_area);
+    f.render_widget(detail_block, popup_area);
     
     let inner = detail_block.inner(popup_area);
     

package/mk3-tui/src/ui/help.rs

@@ -115,7 +115,7 @@ fn render_command_list(f: &mut Frame, area: Rect) {
     let chunks = Layout::default()
         .direction(Direction::Vertical)
         .constraints([
-            Constraint::Length(8),  // Navigation Commands
+            Constraint::Length(7),  // Navigation Commands
             Constraint::Length(7),  // Local Commands
             Constraint::Min(0),     // WebSocket Commands
         ])
@@ -130,28 +130,16 @@ fn render_command_list(f: &mut Frame, area: Rect) {
         .style(Style::default().bg(BG_PANEL));
     
     let nav_items = vec![
-        ListItem::new(Line::from(vec![
-            Span::styled("build", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("runs", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("config", Style::default().fg(NEON_GREEN)),
-            Span::styled(", ", Style::default().fg(TEXT_DIM)),
-            Span::styled("settings", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("ESC", Style::default().fg(NEON_GREEN)),
-        ])),
+        ListItem::new("build").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("runs").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("config, settings").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("ESC").style(Style::default().fg(NEON_GREEN)),
     ];
     
-    f.render_widget(nav_block.clone(), chunks[0]);
-    f.render_widget(
-        List::new(nav_items)
-            .style(Style::default().fg(TEXT_PRIMARY)),
-        nav_block.inner(chunks[0])
-    );
+    let nav_list = List::new(nav_items);
+    
+    f.render_widget(nav_block, chunks[0]);
+    f.render_widget(nav_list, nav_block.inner(chunks[0]));
     
     // Local Commands section
     let local_block = Block::default()
@@ -162,28 +150,16 @@ fn render_command_list(f: &mut Frame, area: Rect) {
         .style(Style::default().bg(BG_PANEL));
     
     let local_items = vec![
-        ListItem::new(Line::from(vec![
-            Span::styled("quit", Style::default().fg(NEON_GREEN)),
-            Span::styled(", ", Style::default().fg(TEXT_DIM)),
-            Span::styled("exit", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("clear", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("help", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled(":perf", Style::default().fg(NEON_GREEN)),
-        ])),
+        ListItem::new("quit, exit").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("clear").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("help").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new(":perf").style(Style::default().fg(NEON_GREEN)),
     ];
     
-    f.render_widget(local_block.clone(), chunks[1]);
-    f.render_widget(
-        List::new(local_items)
-            .style(Style::default().fg(TEXT_PRIMARY)),
-        local_block.inner(chunks[1])
-    );
+    let local_list = List::new(local_items);
+    
+    f.render_widget(local_block, chunks[1]);
+    f.render_widget(local_list, local_block.inner(chunks[1]));
     
     // WebSocket Commands section
     let ws_block = Block::default()
@@ -194,35 +170,19 @@ fn render_command_list(f: &mut Frame, area: Rect) {
         .style(Style::default().bg(BG_PANEL));
     
     let ws_items = vec![
-        ListItem::new(Line::from(vec![
-            Span::styled("agent.list", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("agent.get", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("agent.create", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("agent.delete", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("system.status", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("run.list", Style::default().fg(NEON_GREEN)),
-        ])),
-        ListItem::new(Line::from(vec![
-            Span::styled("tool.list", Style::default().fg(NEON_GREEN)),
-        ])),
+        ListItem::new("agent.list").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("agent.get").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("agent.create").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("agent.delete").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("system.status").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("run.list").style(Style::default().fg(NEON_GREEN)),
+        ListItem::new("tool.list").style(Style::default().fg(NEON_GREEN)),
     ];
     
-    f.render_widget(ws_block.clone(), chunks[2]);
-    f.render_widget(
-        List::new(ws_items)
-            .style(Style::default().fg(TEXT_PRIMARY)),
-        ws_block.inner(chunks[2])
-    );
+    let ws_list = List::new(ws_items);
+    
+    f.render_widget(ws_block, chunks[2]);
+    f.render_widget(ws_list, ws_block.inner(chunks[2]));
 }
 
 fn render_command_details(f: &mut Frame, area: Rect) {
@@ -247,46 +207,42 @@ fn render_command_details(f: &mut Frame, area: Rect) {
     let desc_text = vec![
         Line::from(vec![
             Span::styled("build", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Open Agent Builder (6-step wizard)", Style::default().fg(TEXT_PRIMARY)),
+            Span::styled(" - ", Style::default().fg(TEXT_MUTED)),
+            Span::styled("Open Agent Builder (6-step wizard)", Style::default().fg(TEXT_PRIMARY)),
         ]),
         Line::from(""),
         Line::from(vec![
             Span::styled("runs", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Open Run Manager (list, filter, sort)", Style::default().fg(TEXT_PRIMARY)),
+            Span::styled(" - ", Style::default().fg(TEXT_MUTED)),
+            Span::styled("Open Run Manager (list, filter, sort)", Style::default().fg(TEXT_PRIMARY)),
         ]),
         Line::from(""),
         Line::from(vec![
             Span::styled("config, settings", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Open Settings (mode, AI provider)", Style::default().fg(TEXT_PRIMARY)),
+            Span::styled(" - ", Style::default().fg(TEXT_MUTED)),
+            Span::styled("Open Settings (mode, AI provider)", Style::default().fg(TEXT_PRIMARY)),
         ]),
         Line::from(""),
         Line::from(vec![
             Span::styled("ESC", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Close overlay/popup or clear input", Style::default().fg(TEXT_PRIMARY)),
+            Span::styled(" - ", Style::default().fg(TEXT_MUTED)),
+            Span::styled("Close overlay/popup or clear input", Style::default().fg(TEXT_PRIMARY)),
         ]),
         Line::from(""),
         Line::from(vec![
             Span::styled("quit, exit", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Exit application", Style::default().fg(TEXT_PRIMARY)),
+            Span::styled(" - ", Style::default().fg(TEXT_MUTED)),
+            Span::styled("Exit application", Style::default().fg(TEXT_PRIMARY)),
         ]),
         Line::from(""),
         Line::from(vec![
             Span::styled("clear", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Clear operations log", Style::default().fg(TEXT_PRIMARY)),
-        ]),
-        Line::from(""),
-        Line::from(vec![
-            Span::styled("help", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Show this help", Style::default().fg(TEXT_PRIMARY)),
-        ]),
-        Line::from(""),
-        Line::from(vec![
-            Span::styled(":perf", Style::default().fg(NEON_GREEN).add_modifier(Modifier::BOLD)),
-            Span::styled(" - Show performance stats", Style::default().fg(TEXT_PRIMARY)),
+            Span::styled(" - ", Style::default().fg(TEXT_MUTED)),
+            Span::styled("Clear operations log", Style::default().fg(TEXT_PRIMARY)),
         ]),
     ];
     
-    f.render_widget(desc_block.clone(), chunks[0]);
+    f.render_widget(desc_block, chunks[0]);
     f.render_widget(
         Paragraph::new(desc_text)
             .wrap(Wrap { trim: false }),
@@ -308,11 +264,11 @@ fn render_command_details(f: &mut Frame, area: Rect) {
         Line::from(vec![
             Span::raw("  "),
             Span::styled("Enter", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Next  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Next  |  "),
             Span::styled("Backspace", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Prev  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Prev  |  "),
             Span::styled("ESC", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Cancel", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Cancel"),
         ]),
         Line::from(""),
         Line::from(vec![
@@ -321,13 +277,13 @@ fn render_command_details(f: &mut Frame, area: Rect) {
         Line::from(vec![
             Span::raw("  "),
             Span::styled("↑/↓", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Navigate  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Navigate  |  "),
             Span::styled("F", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Filter  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Filter  |  "),
             Span::styled("S", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Sort  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Sort  |  "),
             Span::styled("R", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Refresh", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Refresh"),
         ]),
         Line::from(""),
         Line::from(vec![
@@ -336,15 +292,15 @@ fn render_command_details(f: &mut Frame, area: Rect) {
         Line::from(vec![
             Span::raw("  "),
             Span::styled("↑/↓", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Navigate  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Navigate  |  "),
             Span::styled("Space", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Toggle  |  ", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Toggle  |  "),
             Span::styled("Enter", Style::default().fg(NEON_GREEN)),
-            Span::styled(" = Save", Style::default().fg(TEXT_DIM)),
+            Span::raw(" = Save"),
         ]),
     ];
     
-    f.render_widget(controls_block.clone(), chunks[1]);
+    f.render_widget(controls_block, chunks[1]);
     f.render_widget(
         Paragraph::new(controls_text)
             .wrap(Wrap { trim: false }),

package/mk3-tui/src/ui/layout.rs

@@ -120,7 +120,7 @@ fn render_header(f: &mut Frame, area: Rect, state: &AppState) {
     
     // Line 1: Brand + version + uptime - Bug 3 fix: Use "4Runr." with dot (matches brand logo)
     // Use npm package version (2.3.5) - matches package.json
-    const PACKAGE_VERSION: &str = "2.4.3";
+    const PACKAGE_VERSION: &str = "2.5.0";
     let brand_line = Line::from(vec![
         Span::styled("4Runr.", Style::default().fg(BRAND_PURPLE).add_modifier(Modifier::BOLD)),
         Span::styled(" AI AGENT OS", Style::default().fg(BRAND_VIOLET)),
@@ -422,6 +422,7 @@ fn mem_color(value: f64) -> Color {
     else if value > 0.6 { Color::Rgb(255, 191, 0) }
     else { CYBER_CYAN }
 }
+
 fn render_center_column(f: &mut Frame, area: Rect, state: &AppState) {
     let panel_area = Rect {
         x: area.x + 1,

package/mk3-tui/src/ui/mod.rs

@@ -7,3 +7,8 @@ pub mod run_manager;
 pub mod safe_viewport;
 pub mod settings;
 
+// Re-export screen states
+pub use agent_builder::AgentBuilderState;
+pub use run_manager::RunManagerState;
+pub use settings::SettingsState;
+

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "type": "module",
-  "private": false,
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.3.5: Fixed boot screen logo rendering (restored original working version), fully functional Agent Builder with input handling and TUI styling. Built with Rust + Ratatui. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.5.0: NEW professional help popup interface, NEW Agent List viewer with detail popup for agent.list command. Enhanced UX with clean navigation and organized displays. Built with Rust + Ratatui. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",