4runr-os 2.9.39 → 2.9.41

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.39";
+    const PACKAGE_VERSION: &str = "2.9.41";
     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,18 +18,34 @@ 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
+    static mut RENDER_COUNT: u64 = 0;
+    unsafe {
+        RENDER_COUNT += 1;
+        if RENDER_COUNT % 10 == 1 {  // Log every 10th render to avoid spam
+            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);
+        }
+    }
+    
     // 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 {
-        // Terminal not ready - skip render
+        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 {
-        // Render "too small" message
+        eprintln!("[SETUP-PORTAL] ⚠️ Terminal too small: {}x{} (required: 85x25)", area.width, area.height);
         render_too_small(f, area);
         return;
     }
@@ -55,6 +71,14 @@ pub fn render(f: &mut Frame, state: &AppState) {
         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};
     
@@ -82,6 +106,30 @@ pub fn render(f: &mut Frame, state: &AppState) {
         .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);
@@ -134,6 +182,16 @@ fn render_description(f: &mut Frame, area: Rect) {
 }
 
 fn render_content(f: &mut Frame, area: Rect, state: &AppState) {
+    // DEBUG: Log content area
+    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);
+        }
+    }
+    
     // Split content into two columns: Options (left) and Details (right)
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
@@ -143,11 +201,34 @@ fn render_content(f: &mut Frame, area: Rect, state: &AppState) {
         ])
         .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);
 }
 
 fn render_options_list(f: &mut Frame, area: Rect, state: &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: Clear the list area first to prevent duplication
+    f.render_widget(Clear, area);
+    
     let options = vec![
         ("Local Bundle", GatewayOption::LocalBundle),
         ("4Runr Server", GatewayOption::CloudServer),
@@ -159,6 +240,15 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &AppState) {
         .position(|(_, opt)| opt == &state.setup_portal.selected_option)
         .unwrap_or(0);
     
+    // DEBUG: Log selected index
+    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());
+        }
+    }
+    
     let items: Vec<ListItem> = options
         .iter()
         .map(|(name, option)| {
@@ -200,6 +290,20 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &AppState) {
 }
 
 fn render_option_details(f: &mut Frame, area: Rect, state: &AppState) {
+    // DEBUG: Log details rendering
+    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);
+            eprintln!("[SETUP-PORTAL]   Selected option: {:?}", state.setup_portal.selected_option);
+        }
+    }
+    
+    // CRITICAL: Clear the details area first to prevent content overlap/corruption
+    f.render_widget(Clear, area);
+    
     let selected_option = &state.setup_portal.selected_option;
     let detection_result = &state.setup_portal.detection_result;
     
@@ -285,6 +389,18 @@ 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);
+            }
+        }
+    }
+    
     // Use Block to properly contain and clear the area
     let block = Block::default()
         .title(title)
@@ -292,11 +408,58 @@ fn render_option_details(f: &mut Frame, area: Rect, state: &AppState) {
         .border_style(Style::default().fg(TEXT_DIM))
         .style(Style::default().bg(BG_PANEL));
     
+    // CRITICAL: Render block first to clear and establish boundaries
+    let inner = block.inner(area);
+    
+    // CRITICAL: Validate inner area to prevent index out of bounds panic
+    // Ratatui panics if area coordinates exceed terminal buffer
+    let terminal_size = f.size();
+    let safe_inner = Rect {
+        x: inner.x.min(terminal_size.width.saturating_sub(1)),
+        y: inner.y.min(terminal_size.height.saturating_sub(1)),
+        width: inner.width.min(terminal_size.width.saturating_sub(inner.x)),
+        height: inner.height.min(terminal_size.height.saturating_sub(inner.y)),
+    };
+    
+    // DEBUG: Log block inner area
+    unsafe {
+        if LOG_COUNT % 10 == 1 {
+            eprintln!("[SETUP-PORTAL]   Block outer: x={}, y={}, w={}, h={}", 
+                area.x, area.y, area.width, area.height);
+            eprintln!("[SETUP-PORTAL]   Block inner (original): x={}, y={}, w={}, h={}", 
+                inner.x, inner.y, inner.width, inner.height);
+            eprintln!("[SETUP-PORTAL]   Terminal size: {}x{}", terminal_size.width, terminal_size.height);
+            eprintln!("[SETUP-PORTAL]   Block inner (safe): x={}, y={}, w={}, h={}", 
+                safe_inner.x, safe_inner.y, safe_inner.width, safe_inner.height);
+            
+            // Warn if we had to clamp
+            if inner.x != safe_inner.x || inner.y != safe_inner.y || 
+               inner.width != safe_inner.width || inner.height != safe_inner.height {
+                eprintln!("[SETUP-PORTAL]   ⚠️ WARNING: Inner area was clamped to fit terminal bounds!");
+            }
+        }
+    }
+    
+    // Validate area before rendering block
+    if area.width == 0 || area.height == 0 || 
+       area.x >= terminal_size.width || area.y >= terminal_size.height {
+        eprintln!("[SETUP-PORTAL]   ⚠️ ERROR: Invalid block area, skipping render");
+        return;
+    }
+    
+    f.render_widget(block, area);
+    
+    // Validate safe_inner before rendering paragraph
+    if safe_inner.width == 0 || safe_inner.height == 0 {
+        eprintln!("[SETUP-PORTAL]   ⚠️ ERROR: Invalid inner area (zero size), skipping paragraph render");
+        return;
+    }
+    
+    // Then render paragraph content only within the safe inner area
     let paragraph = Paragraph::new(content)
-        .block(block)
         .wrap(Wrap { trim: true });
     
-    f.render_widget(paragraph, area);
+    f.render_widget(paragraph, safe_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.39",
+  "version": "2.9.41",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.39: Fixed Setup Portal initial render bug - added Event::Resize handler and terminal size validation to prevent character corruption on first open. v2.9.38: Fixed Setup Portal character corruption. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.41: Fixed Setup Portal index out of bounds panic - added bounds validation and clamping for safe area rendering. Added comprehensive debug logging for Setup Portal rendering diagnostics. v2.9.40: Fixed Setup Portal rendering. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",