4runr-os 2.9.46 → 2.9.48

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.46";
+    const PACKAGE_VERSION: &str = "2.9.48";
     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

@@ -2,7 +2,7 @@
 /// Wizard for setting up Gateway connection options
 
 use ratatui::prelude::*;
-use ratatui::widgets::{Block, Borders, Paragraph, Wrap, Clear, List, ListItem, ListState};
+use ratatui::widgets::{Block, Borders, Paragraph, Wrap, Clear, List, ListItem};
 use crate::app::{AppState, GatewayOption};
 
 // === 4RUNR BRAND COLORS (matching layout.rs) ===
@@ -18,8 +18,13 @@ 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: &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);
+    // Per-frame render ID so we can correlate all logs from the same draw
+    static mut RENDER_ID: u64 = 0;
+    let render_id = unsafe {
+        RENDER_ID += 1;
+        RENDER_ID
+    };
+    eprintln!("[SETUP-PORTAL] R#{} START selected_option={:?}", render_id, state.setup_portal.selected_option);
 
     static mut RENDER_COUNT: u64 = 0;
     unsafe {
@@ -133,7 +138,7 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
     
     render_header(f, chunks[0], state);
     render_description(f, chunks[1]);
-    render_content(f, chunks[2], state);
+    render_content(f, chunks[2], state, render_id);
     
     if has_error {
         render_error_box(f, chunks[3], state);
@@ -182,132 +187,79 @@ fn render_description(f: &mut Frame, area: Rect) {
     f.render_widget(text, inner);
 }
 
-fn render_content(f: &mut Frame, area: Rect, state: &mut AppState) {
-    // DEBUG: Log content area
+fn render_content(f: &mut Frame, area: Rect, state: &mut AppState, render_id: u64) {
     static mut LOG_COUNT: u64 = 0;
     unsafe {
         LOG_COUNT += 1;
         if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] render_content - area: x={}, y={}, w={}, h={}", 
-                area.x, area.y, area.width, area.height);
+            eprintln!("[SETUP-PORTAL] R#{} render_content area: {}x{}", render_id, area.width, area.height);
         }
     }
-    
-    // Split content into two columns: Options (left) and Details (right)
+
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([
-            Constraint::Percentage(40),  // Options list
-            Constraint::Percentage(60),  // Details panel
+            Constraint::Percentage(40),
+            Constraint::Percentage(60),
         ])
         .split(area);
-    
-    // DEBUG: Log content chunks
-    unsafe {
-        if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL]   Content chunks[0] (options): x={}, y={}, w={}, h={}", 
-                chunks[0].x, chunks[0].y, chunks[0].width, chunks[0].height);
-            eprintln!("[SETUP-PORTAL]   Content chunks[1] (details): x={}, y={}, w={}, h={}", 
-                chunks[1].x, chunks[1].y, chunks[1].width, chunks[1].height);
-        }
-    }
-    
-    render_options_list(f, chunks[0], state);
-    render_option_details(f, chunks[1], state);
+
+    render_options_list(f, chunks[0], state, render_id);
+    render_option_details(f, chunks[1], state, render_id);
 }
 
-fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState) {
-    // DEBUG: Log options list rendering
-    static mut LOG_COUNT: u64 = 0;
-    unsafe {
-        LOG_COUNT += 1;
-        if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] render_options_list - area: x={}, y={}, w={}, h={}", 
-                area.x, area.y, area.width, area.height);
-        }
-    }
-    
-    // CRITICAL: Fill entire area with background so every cell is overwritten.
-    // Without this, List only paints rows with items; leftover rows show previous frame (duplication).
+fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, render_id: u64) {
     let fill = Block::default().style(Style::default().bg(BG_PANEL));
     f.render_widget(fill, area);
-    
+
     let options = vec![
         ("Local Bundle", GatewayOption::LocalBundle),
         ("4Runr Server", GatewayOption::CloudServer),
         ("Custom URL", GatewayOption::CustomUrl),
     ];
-    
-    // Find selected index
+
+    let selected_option = &state.setup_portal.selected_option;
     let selected_index = options.iter()
-        .position(|(_, opt)| opt == &state.setup_portal.selected_option)
+        .position(|(_, opt)| opt == selected_option)
         .unwrap_or(0);
 
-    // 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);
+    eprintln!("[SETUP-PORTAL] R#{} LIST selected_index={} selected_option={:?}", render_id, selected_index, state.setup_portal.selected_option);
 
-    unsafe {
-        if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL]   Options count: {}", options.len());
-        }
-    }
-    
     let items: Vec<ListItem> = options
         .iter()
         .map(|(name, option)| {
-            let is_selected = &state.setup_portal.selected_option == option;
+            let is_selected = selected_option == option;
             let style = if is_selected {
                 Style::default().fg(CYBER_CYAN).bold()
             } else {
                 Style::default().fg(TEXT_MUTED)
             };
-            
             let icon = match option {
                 GatewayOption::LocalBundle => "[■]",
                 GatewayOption::CloudServer => "[≡]",
                 GatewayOption::CustomUrl => "[◆]",
             };
-            
             let prefix = if is_selected { "► " } else { "  " };
             let text = format!("{}{} {}", prefix, icon, name);
             ListItem::new(text).style(style)
         })
         .collect();
-    
-    // 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()
         .borders(Borders::ALL)
         .title(" Gateway Options ")
         .border_style(Style::default().fg(CYBER_CYAN))
         .style(Style::default().bg(BG_PANEL));
-    
-    let list = List::new(items)
-        .block(block)
-        .highlight_style(Style::default().fg(CYBER_CYAN).bold().bg(BG_PANEL));
-    
-    // CRITICAL: Pass the mutable reference to the persisted ListState
-    f.render_stateful_widget(list, area, &mut state.setup_portal.list_state);
+
+    // STATELESS: Render list without ListState so only our item styling (► + color) shows selection.
+    // This removes any second source of highlight that could drift from selected_option.
+    let list = List::new(items).block(block);
+    f.render_widget(list, area);
 }
 
-fn render_option_details(f: &mut Frame, area: Rect, state: &AppState) {
-    // DEBUG: Every frame - state used for details panel
-    eprintln!("[SETUP-PORTAL] DETAILS selected_option={:?}", state.setup_portal.selected_option);
+fn render_option_details(f: &mut Frame, area: Rect, state: &AppState, render_id: u64) {
+    eprintln!("[SETUP-PORTAL] R#{} DETAILS selected_option={:?}", render_id, 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={}",
-                area.x, area.y, area.width, area.height);
-        }
-    }
-    
     // CRITICAL: Fill entire area with background so every cell is overwritten.
     // Without this, Paragraph may not paint every cell; leftover shows previous option (corruption).
     let fill = Block::default().style(Style::default().bg(BG_PANEL));
@@ -397,19 +349,9 @@ fn render_option_details(f: &mut Frame, area: Rect, state: &AppState) {
             ]
         ),
     };
-    
-    // DEBUG: Log what content is being rendered
-    unsafe {
-        if LOG_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL]   Title: '{}'", title);
-            eprintln!("[SETUP-PORTAL]   Content lines: {}", content.len());
-            for (i, line) in content.iter().take(3).enumerate() {
-                let preview = format!("{:?}", line).chars().take(50).collect::<String>();
-                eprintln!("[SETUP-PORTAL]     content[{}]: {}", i, preview);
-            }
-        }
-    }
-    
+
+    eprintln!("[SETUP-PORTAL] R#{} DETAILS title='{}' lines={}", render_id, title.trim(), content.len());
+
     // Use Block to properly contain and clear the area
     let block = Block::default()
         .title(title)

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.46",
+  "version": "2.9.48",
   "type": "module",
-  "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",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.48: Setup Portal - stateless list (single source of truth), per-frame R# debug. v2.9.47: ListState sync. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",