4runr-os 2.9.44 → 2.9.46

package/mk3-tui/src/app.rs

@@ -343,6 +343,7 @@ pub struct SetupPortalState {
     pub detecting: bool,
     pub detection_result: Option<DetectionResult>,
     pub error: Option<String>,
+    pub list_state: ratatui::widgets::ListState,  // CRITICAL: Must persist across frames
 }
 
 #[derive(Debug, Clone)]
@@ -366,11 +367,14 @@ pub struct CloudStatus {
 
 impl Default for SetupPortalState {
     fn default() -> Self {
+        let mut list_state = ratatui::widgets::ListState::default();
+        list_state.select(Some(0));  // Start with first option selected
         Self {
             selected_option: GatewayOption::LocalBundle,
             detecting: false,
             detection_result: None,
             error: None,
+            list_state,
         }
     }
 }
@@ -378,6 +382,7 @@ impl Default for SetupPortalState {
 impl SetupPortalState {
     pub fn cycle_option(&mut self, direction: i8) {
         use GatewayOption::*;
+        let prev = self.selected_option.clone();
         self.selected_option = match (&self.selected_option, direction) {
             // Forward cycling (Down key, Scroll Down)
             (LocalBundle, 1) => CloudServer,
@@ -389,6 +394,17 @@ impl SetupPortalState {
             (CustomUrl, -1) => CloudServer,
             _ => self.selected_option.clone(),
         };
+        
+        // CRITICAL: Update the persisted ListState index
+        let new_index = match self.selected_option {
+            LocalBundle => 0,
+            CloudServer => 1,
+            CustomUrl => 2,
+        };
+        self.list_state.select(Some(new_index));
+        
+        eprintln!("[SETUP-PORTAL] cycle_option direction={} prev={:?} -> new={:?} list_index={}", 
+            direction, prev, self.selected_option, new_index);
     }
     
     pub fn reset(&mut self) {
@@ -915,7 +931,7 @@ impl App {
         }
     }
 
-    pub fn render(&self, f: &mut Frame) {
+    pub fn render(&mut self, f: &mut Frame) {
         // Use new navigation system - render based on current screen
         let current = self.state.navigation.current_screen();
         
@@ -968,7 +984,7 @@ impl App {
                 // Render Setup Portal as standalone screen (not overlay)
                 // This eliminates double-rendering and improves performance
                 use crate::ui::setup_portal;
-                setup_portal::render(f, &self.state);
+                setup_portal::render(f, &mut self.state);
             }
             Screen::Confirmation { message, action } => {
                 // TODO: Implement confirmation popup
@@ -1799,12 +1815,13 @@ impl App {
     // SETUP PORTAL INPUT HANDLING
     // ============================================================
     
-    fn handle_setup_portal_input(&mut self, key: KeyEvent, ws_client: Option<&WebSocketClient>) -> anyhow::Result<bool> {
+    fn handle_setup_portal_input(&mut self, key: KeyEvent, _ws_client: Option<&WebSocketClient>) -> anyhow::Result<bool> {
+        eprintln!("[SETUP-PORTAL] INPUT key={:?} (selected_option={:?})", key.code, self.state.setup_portal.selected_option);
         // Guard: Don't process if already detecting
         if self.state.setup_portal.detecting {
             return Ok(false);
         }
-        
+
         match key.code {
             // ESC - Cancel and close portal
             KeyCode::Esc => {
@@ -1824,11 +1841,13 @@ impl App {
             
             // Up/Down - Navigate options (immediate render for responsiveness)
             KeyCode::Up => {
+                eprintln!("[SETUP-PORTAL] KEY Up -> cycle_option(-1)");
                 self.state.setup_portal.cycle_option(-1);
                 self.request_immediate_render("setup_nav_up");
             }
             
             KeyCode::Down => {
+                eprintln!("[SETUP-PORTAL] KEY Down -> cycle_option(1)");
                 self.state.setup_portal.cycle_option(1);
                 self.request_immediate_render("setup_nav_down");
             }

package/mk3-tui/src/main.rs

@@ -632,12 +632,12 @@ fn main() -> Result<()> {
                         if !app.state.setup_portal.detecting {
                             match mouse.kind {
                                 MouseEventKind::ScrollUp => {
-                                    // Navigate up (cycle backward)
+                                    eprintln!("[SETUP-PORTAL] MOUSE ScrollUp -> cycle_option(-1)");
                                     app.state.setup_portal.cycle_option(-1);
                                     app.request_immediate_render("setup_portal_scroll_up");
                                 }
                                 MouseEventKind::ScrollDown => {
-                                    // Navigate down (cycle forward)
+                                    eprintln!("[SETUP-PORTAL] MOUSE ScrollDown -> cycle_option(1)");
                                     app.state.setup_portal.cycle_option(1);
                                     app.request_immediate_render("setup_portal_scroll_down");
                                 }

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

@@ -144,7 +144,7 @@ fn render_header(f: &mut Frame, area: Rect, state: &AppState) {
     
     // Line 1: Brand + version + mode + uptime - Bug 3 fix: Use "4Runr." with dot (matches brand logo)
     // Use npm package version (2.9.24) - matches package.json
-    const PACKAGE_VERSION: &str = "2.9.44";
+    const PACKAGE_VERSION: &str = "2.9.46";
     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)),

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

@@ -17,19 +17,20 @@ const BG_PANEL: Color = Color::Rgb(18, 18, 25);
 const ERROR_RED: Color = Color::Rgb(255, 69, 69);
 
 /// Render the Setup Portal screen - Full-screen standalone portal
-pub fn render(f: &mut Frame, state: &AppState) {
-    // DEBUG: Track render calls
+pub fn render(f: &mut Frame, state: &mut AppState) {
+    // DEBUG: Every frame log the selection state used for this draw (no throttle)
+    eprintln!("[SETUP-PORTAL] FRAME selected_option={:?}", state.setup_portal.selected_option);
+
     static mut RENDER_COUNT: u64 = 0;
     unsafe {
         RENDER_COUNT += 1;
-        if RENDER_COUNT % 10 == 1 {  // Log every 10th render to avoid spam
+        if RENDER_COUNT % 10 == 1 {
             eprintln!("[SETUP-PORTAL] Render #{}", RENDER_COUNT);
         }
     }
-    
+
     let area = f.size();
-    
-    // DEBUG: Log terminal size
+
     unsafe {
         if RENDER_COUNT % 10 == 1 {
             eprintln!("[SETUP-PORTAL] Terminal size: {}x{}", area.width, area.height);
@@ -181,7 +182,7 @@ fn render_description(f: &mut Frame, area: Rect) {
     f.render_widget(text, inner);
 }
 
-fn render_content(f: &mut Frame, area: Rect, state: &AppState) {
+fn render_content(f: &mut Frame, area: Rect, state: &mut AppState) {
     // DEBUG: Log content area
     static mut LOG_COUNT: u64 = 0;
     unsafe {
@@ -215,7 +216,7 @@ fn render_content(f: &mut Frame, area: Rect, state: &AppState) {
     render_option_details(f, chunks[1], state);
 }
 
-fn render_options_list(f: &mut Frame, area: Rect, state: &AppState) {
+fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState) {
     // DEBUG: Log options list rendering
     static mut LOG_COUNT: u64 = 0;
     unsafe {
@@ -241,12 +242,12 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &AppState) {
     let selected_index = options.iter()
         .position(|(_, opt)| opt == &state.setup_portal.selected_option)
         .unwrap_or(0);
-    
-    // DEBUG: Log selected index
+
+    // DEBUG: Every frame - exact state used for list (so we can match what's drawn)
+    eprintln!("[SETUP-PORTAL] LIST selected_index={} selected_option={:?}", selected_index, state.setup_portal.selected_option);
+
     unsafe {
         if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL]   Selected index: {}, option: {:?}", 
-                selected_index, state.setup_portal.selected_option);
             eprintln!("[SETUP-PORTAL]   Options count: {}", options.len());
         }
     }
@@ -273,9 +274,11 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &AppState) {
         })
         .collect();
     
-    // Create ListState with selected index
-    let mut list_state = ListState::default();
-    list_state.select(Some(selected_index));
+    // CRITICAL: Use the PERSISTED ListState from app state (not a new one each frame)
+    // This is required for Ratatui's stateful widget to maintain selection across frames
+    let list_state_selected = state.setup_portal.list_state.selected();
+    eprintln!("[SETUP-PORTAL] LIST About to render: list_state.selected()={:?} selected_index={} selected_option={:?}", 
+        list_state_selected, selected_index, state.setup_portal.selected_option);
     
     // Use Block to properly contain and clear the area
     let block = Block::default()
@@ -288,18 +291,20 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &AppState) {
         .block(block)
         .highlight_style(Style::default().fg(CYBER_CYAN).bold().bg(BG_PANEL));
     
-    f.render_stateful_widget(list, area, &mut list_state);
+    // CRITICAL: Pass the mutable reference to the persisted ListState
+    f.render_stateful_widget(list, area, &mut state.setup_portal.list_state);
 }
 
 fn render_option_details(f: &mut Frame, area: Rect, state: &AppState) {
-    // DEBUG: Log details rendering
+    // DEBUG: Every frame - state used for details panel
+    eprintln!("[SETUP-PORTAL] DETAILS selected_option={:?}", state.setup_portal.selected_option);
+
     static mut LOG_COUNT: u64 = 0;
     unsafe {
         LOG_COUNT += 1;
         if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] render_option_details - area: x={}, y={}, w={}, h={}", 
+            eprintln!("[SETUP-PORTAL] render_option_details - area: x={}, y={}, w={}, h={}",
                 area.x, area.y, area.width, area.height);
-            eprintln!("[SETUP-PORTAL]   Selected option: {:?}", state.setup_portal.selected_option);
         }
     }
     

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.44",
+  "version": "2.9.46",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.44: Setup Portal navigation fix - fill background before List/details to fix duplication and character corruption. v2.9.43: Release prep. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.46: Setup Portal navigation fix - persisted ListState so selection matches visual. v2.9.45: Debug logging. v2.9.44: Fill-background fix. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",