4runr-os 2.9.50 → 2.9.52

package/mk3-tui/src/app.rs

@@ -344,8 +344,6 @@ pub struct SetupPortalState {
     pub detection_result: Option<DetectionResult>,
     pub error: Option<String>,
     pub list_state: ratatui::widgets::ListState,
-    /// Last option we drew; clear terminal only when this differs from selected_option (reduces flicker).
-    pub last_rendered_option: Option<GatewayOption>,
 }
 
 #[derive(Debug, Clone)]
@@ -377,7 +375,6 @@ impl Default for SetupPortalState {
             detection_result: None,
             error: None,
             list_state,
-            last_rendered_option: None,
         }
     }
 }
@@ -385,7 +382,6 @@ 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,
@@ -405,9 +401,6 @@ impl SetupPortalState {
             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) {
@@ -1819,7 +1812,6 @@ impl App {
     // ============================================================
     
     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);
@@ -1844,13 +1836,11 @@ 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

@@ -591,23 +591,13 @@ fn main() -> Result<()> {
             let current_screen = app.state.navigation.current_screen().clone();
             let is_portal_active = matches!(current_screen, crate::screens::Screen::ConnectionPortal | crate::screens::Screen::SetupPortal);
             
-            // Clear on screen switch, or on Setup Portal only when selection just changed
-            // (avoids flicker from clearing every frame while still fixing list/details mismatch)
+            // Clear only on screen switch (no clear on Setup Portal nav = no flicker)
             let is_switching = match (&previous_screen, &current_screen) {
                 (Some(prev), current) => prev != current,
                 (None, _) => true,
             };
 
-            let setup_selection_changed = match &current_screen {
-                crate::screens::Screen::SetupPortal => {
-                    let last = app.state.setup_portal.last_rendered_option.as_ref();
-                    let current = &app.state.setup_portal.selected_option;
-                    last != Some(current)
-                }
-                _ => false,
-            };
-
-            if is_switching || setup_selection_changed {
+            if is_switching {
                 terminal.clear()?;
             }
             
@@ -640,12 +630,10 @@ fn main() -> Result<()> {
                         if !app.state.setup_portal.detecting {
                             match mouse.kind {
                                 MouseEventKind::ScrollUp => {
-                                    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 => {
-                                    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.50";
+    const PACKAGE_VERSION: &str = "2.9.52";
     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

@@ -18,40 +18,22 @@ 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) {
-    // Per-frame render ID so we can correlate all logs from the same draw
+    // Per-frame render ID (used for passing to content/details; debug logs removed to avoid terminal spam)
     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 {
-        RENDER_COUNT += 1;
-        if RENDER_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] Render #{}", RENDER_COUNT);
-        }
-    }
 
     let area = f.size();
 
-    unsafe {
-        if RENDER_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] Terminal size: {}x{}", area.width, area.height);
-        }
-    }
-    
     // CRITICAL: Validate terminal size before rendering
     // This prevents character corruption when terminal size is wrong on initial render
     if area.width == 0 || area.height == 0 {
-        eprintln!("[SETUP-PORTAL] ⚠️ Terminal size invalid: {}x{} - skipping render", area.width, area.height);
         return;
     }
-    
-    // Ensure minimum size for portal (85x25)
+
     if area.width < 85 || area.height < 25 {
-        eprintln!("[SETUP-PORTAL] ⚠️ Terminal too small: {}x{} (required: 85x25)", area.width, area.height);
         render_too_small(f, area);
         return;
     }
@@ -76,15 +58,7 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
         width: portal_width,
         height: portal_height,
     };
-    
-    // DEBUG: Log portal area calculations
-    unsafe {
-        if RENDER_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] Portal area: x={}, y={}, w={}, h={}", 
-                portal_area.x, portal_area.y, portal_area.width, portal_area.height);
-        }
-    }
-    
+
     // Split portal into sections
     use ratatui::layout::{Constraint, Direction, Layout};
     
@@ -111,31 +85,7 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
         .direction(Direction::Vertical)
         .constraints(constraints)
         .split(portal_area);
-    
-    // DEBUG: Log layout chunks and selected option
-    unsafe {
-        if RENDER_COUNT % 10 == 1 {
-            eprintln!("[SETUP-PORTAL] Selected option: {:?}", state.setup_portal.selected_option);
-            eprintln!("[SETUP-PORTAL] Has error: {}", has_error);
-            eprintln!("[SETUP-PORTAL] Chunks count: {}", chunks.len());
-            for (i, chunk) in chunks.iter().enumerate() {
-                eprintln!("[SETUP-PORTAL]   chunks[{}]: x={}, y={}, w={}, h={}", 
-                    i, chunk.x, chunk.y, chunk.width, chunk.height);
-            }
-            // Check for overlaps
-            for i in 0..chunks.len() {
-                for j in (i+1)..chunks.len() {
-                    let a = &chunks[i];
-                    let b = &chunks[j];
-                    if a.x < b.x + b.width && a.x + a.width > b.x &&
-                       a.y < b.y + b.height && a.y + a.height > b.y {
-                        eprintln!("[SETUP-PORTAL] ⚠️ OVERLAP: chunks[{}] overlaps chunks[{}]!", i, j);
-                    }
-                }
-            }
-        }
-    }
-    
+
     render_header(f, chunks[0], state);
     render_description(f, chunks[1]);
     render_content(f, chunks[2], state, render_id);
@@ -146,9 +96,6 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
     } else {
         render_actions(f, chunks[3], state);
     }
-
-    // So main loop only clears terminal when selection actually changed (reduces flicker).
-    state.setup_portal.last_rendered_option = Some(state.setup_portal.selected_option.clone());
 }
 
 fn render_header(f: &mut Frame, area: Rect, state: &AppState) {
@@ -191,14 +138,6 @@ fn render_description(f: &mut Frame, area: Rect) {
 }
 
 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] R#{} render_content area: {}x{}", render_id, area.width, area.height);
-        }
-    }
-
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([
@@ -211,10 +150,7 @@ fn render_content(f: &mut Frame, area: Rect, state: &mut AppState, render_id: u6
     render_option_details(f, chunks[1], state, render_id);
 }
 
-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);
-
+fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, _render_id: u64) {
     let options = vec![
         ("Local Bundle", GatewayOption::LocalBundle),
         ("4Runr Server", GatewayOption::CloudServer),
@@ -222,12 +158,10 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, render_i
     ];
 
     let selected_option = &state.setup_portal.selected_option;
-    let selected_index = options.iter()
+    let _selected_index = options.iter()
         .position(|(_, opt)| opt == selected_option)
         .unwrap_or(0);
 
-    eprintln!("[SETUP-PORTAL] R#{} LIST selected_index={} selected_option={:?}", render_id, selected_index, state.setup_portal.selected_option);
-
     let items: Vec<ListItem> = options
         .iter()
         .map(|(name, option)| {
@@ -248,26 +182,26 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, render_i
         })
         .collect();
 
+    // CRITICAL: Render block first, then fill inner, then list to ensure full paint
     let block = Block::default()
         .borders(Borders::ALL)
         .title(" Gateway Options ")
         .border_style(Style::default().fg(CYBER_CYAN))
         .style(Style::default().bg(BG_PANEL));
 
-    // 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);
-}
+    let inner = block.inner(area);
+    f.render_widget(block, area);
+    
+    // Fill inner area
+    let fill = Block::default().style(Style::default().bg(BG_PANEL));
+    f.render_widget(fill, inner);
 
-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);
+    // STATELESS: Render list without ListState so only our item styling (► + color) shows selection
+    let list = List::new(items).style(Style::default().bg(BG_PANEL));
+    f.render_widget(list, inner);
+}
 
-    // 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));
-    f.render_widget(fill, area);
-    
+fn render_option_details(f: &mut Frame, area: Rect, state: &AppState, _render_id: u64) {
     let selected_option = &state.setup_portal.selected_option;
     let detection_result = &state.setup_portal.detection_result;
     
@@ -353,31 +287,33 @@ fn render_option_details(f: &mut Frame, area: Rect, state: &AppState, render_id:
         ),
     };
 
-    eprintln!("[SETUP-PORTAL] R#{} DETAILS title='{}' lines={}", render_id, title.trim(), content.len());
-
-    // Use Block to properly contain and clear the area
+    // CRITICAL: Render Block first (clears its area), then Paragraph separately to force full paint
     let block = Block::default()
         .title(title)
         .borders(Borders::ALL)
         .border_style(Style::default().fg(TEXT_DIM))
         .style(Style::default().bg(BG_PANEL));
     
-    // CRITICAL: Use the standard Ratatui pattern - Paragraph with .block()
-    // This is more reliable than rendering Block and Paragraph separately
+    let inner = block.inner(area);
+    f.render_widget(block, area);
+    
+    // Fill the inner area with background explicitly
+    let fill = Block::default().style(Style::default().bg(BG_PANEL));
+    f.render_widget(fill, inner);
+    
+    // Now render paragraph (content only, no block)
     let paragraph = Paragraph::new(content)
-        .block(block)
         .wrap(Wrap { trim: true })
-        .style(Style::default().bg(BG_PANEL));  // Ensure background fills the block
+        .style(Style::default().bg(BG_PANEL));
     
     // Validate area before rendering
     let terminal_size = f.size();
-    if area.width == 0 || area.height == 0 || 
-       area.x >= terminal_size.width || area.y >= terminal_size.height {
-        eprintln!("[SETUP-PORTAL]   ⚠️ ERROR: Invalid area, skipping render");
+    if inner.width == 0 || inner.height == 0 || 
+       inner.x >= terminal_size.width || inner.y >= terminal_size.height {
         return;
     }
     
-    f.render_widget(paragraph, area);
+    f.render_widget(paragraph, inner);
 }
 
 fn render_error_box(f: &mut Frame, area: Rect, state: &AppState) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.50",
+  "version": "2.9.52",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.50: Setup Portal - clear only when selection changes (fixes flicker, keeps list/details in sync). v2.9.49: Per-frame clear. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.52: Setup Portal - block+fill+widget render (no flicker, no corruption). v2.9.51: No clear on nav, removed debug logs. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",