4runr-os 2.9.57 → 2.9.59

package/mk3-tui/src/main.rs

@@ -7,6 +7,7 @@ use ratatui::prelude::*;
 use std::time::{Duration, Instant};
 
 mod app;
+mod debug_log;
 mod io;
 mod screens;
 mod storage;
@@ -600,9 +601,18 @@ fn main() -> Result<()> {
             if is_switching {
                 #[cfg(debug_assertions)]
                 eprintln!("[MAIN] SCREEN SWITCH: {:?} -> {:?} (clearing)", previous_screen, current_screen);
+                debug_log::log_screen(
+                    &format!("{:?}", previous_screen.as_ref().unwrap_or(&current_screen)),
+                    &format!("{:?}", current_screen),
+                );
                 terminal.clear()?;
             }
             
+            // When on Setup Portal, sync terminal buffer to real console size (fixes windowed-mode corruption)
+            if matches!(current_screen, crate::screens::Screen::SetupPortal) {
+                let _ = terminal.autoresize();
+            }
+            
             let render_start = Instant::now();
             terminal.draw(|f| app.render(f))?;
             let render_duration = render_start.elapsed().as_millis() as u64;
@@ -618,8 +628,12 @@ fn main() -> Result<()> {
         // OPTIMIZATION: Reduced poll timeout to 1ms for faster input detection
         // This allows loop to run ~1000 times/second when idle, but input is detected immediately
         if crossterm::event::poll(Duration::from_millis(1))? {
+            let on_setup = app.state.navigation.current_screen() == &screens::Screen::SetupPortal;
             match event::read()? {
                 Event::Key(key) => {
+                    if on_setup {
+                        debug_log::log_input("Key", &format!("{:?}", key));
+                    }
                     if key.kind == KeyEventKind::Press {
                         if app.handle_input(key, &mut io_handler, ws_client.as_ref())? {
                             break; // Exit requested
@@ -627,8 +641,11 @@ fn main() -> Result<()> {
                     }
                 }
                 Event::Mouse(mouse) => {
+                    if on_setup {
+                        debug_log::log_input("Mouse", &format!("{:?}", mouse));
+                    }
                     // Handle mouse scroll events for Setup Portal
-                    if app.state.navigation.current_screen() == &screens::Screen::SetupPortal {
+                    if on_setup {
                         if !app.state.setup_portal.detecting {
                             match mouse.kind {
                                 MouseEventKind::ScrollUp => {
@@ -644,9 +661,11 @@ fn main() -> Result<()> {
                         }
                     }
                 }
-                Event::Resize(_width, _height) => {
+                Event::Resize(w, h) => {
+                    if on_setup {
+                        debug_log::log_input("Resize", &format!("{}x{}", w, h));
+                    }
                     // Terminal was resized - force immediate re-render with correct dimensions
-                    // This fixes the initial render issue where portal dimensions might be wrong
                     terminal.clear()?;
                     app.request_immediate_render("terminal_resize");
                 }

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

@@ -5,6 +5,20 @@ use ratatui::prelude::*;
 use ratatui::widgets::{Block, Borders, Paragraph, Wrap, Clear, List, ListItem};
 use crate::app::{AppState, GatewayOption};
 
+/// When SETUP_PORTAL_DEBUG=1 or SETUP_PORTAL_DEBUG_FILE is set, log to file (and optionally stderr).
+fn setup_debug_enabled() -> bool {
+    std::env::var("SETUP_PORTAL_DEBUG").as_deref() == Ok("1")
+        || std::env::var("SETUP_PORTAL_DEBUG_FILE").is_ok()
+}
+
+fn dbg_log(msg: &str) {
+    if setup_debug_enabled() {
+        crate::debug_log::log(msg);
+        #[cfg(debug_assertions)]
+        eprintln!("{}", msg);
+    }
+}
+
 // === 4RUNR BRAND COLORS (matching layout.rs) ===
 const BRAND_PURPLE: Color = Color::Rgb(138, 43, 226);
 const CYBER_CYAN: Color = Color::Rgb(0, 255, 255);
@@ -27,14 +41,22 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
 
     let area = f.size();
 
-    // Debug: log dimensions when building with debug_assertions (cargo run / debug build)
-    #[cfg(debug_assertions)]
-    {
+    // Debug: log dimensions when SETUP_PORTAL_DEBUG=1 (release) or in debug build
+    let do_dbg = setup_debug_enabled() || cfg!(debug_assertions);
+    if do_dbg {
         static mut LAST_DIMS: Option<(u16, u16)> = None;
+        static mut FRAME_COUNT: u64 = 0;
+        static mut BANNER_SHOWN: bool = false;
         unsafe {
+            if !BANNER_SHOWN {
+                eprintln!("[SETUP_PORTAL] Debug logging active (SETUP_PORTAL_DEBUG=1 or debug build). Redirect stderr to capture, e.g. 4r 2> setup-debug.log");
+                BANNER_SHOWN = true;
+            }
+            FRAME_COUNT += 1;
             let changed = LAST_DIMS.map_or(true, |(w, h)| w != area.width || h != area.height);
-            if changed {
-                eprintln!("[SETUP_PORTAL] R#{} DIMS: {}x{} (prev: {:?})", render_id, area.width, area.height, LAST_DIMS);
+            if changed || FRAME_COUNT <= 15 || FRAME_COUNT % 60 == 0 {
+                eprintln!("[SETUP_PORTAL] R#{} frame={} DIMS: {}x{} (changed={})", 
+                    render_id, FRAME_COUNT, area.width, area.height, changed);
                 LAST_DIMS = Some((area.width, area.height));
             }
         }
@@ -72,6 +94,28 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
         width: portal_width,
         height: portal_height,
     };
+    if do_dbg {
+        dbg_log(&format!("[SETUP_PORTAL] portal_area: x={} y={} w={} h={}", 
+            portal_area.x, portal_area.y, portal_area.width, portal_area.height));
+    }
+
+    // File strategy: one composite RENDER line per frame (throttled) so file has full trace
+    if setup_debug_enabled() {
+        static mut RENDER_LOG_COUNT: u64 = 0;
+        unsafe {
+            RENDER_LOG_COUNT += 1;
+            let throttle = RENDER_LOG_COUNT <= 25 || RENDER_LOG_COUNT % 30 == 0;
+            if throttle {
+                let sel = format!("{:?}", state.setup_portal.selected_option);
+                crate::debug_log::log_render(&format!(
+                    "frame={} dims={}x{} portal=({},{},{},{}) selected={}",
+                    RENDER_LOG_COUNT, area.width, area.height,
+                    portal_area.x, portal_area.y, portal_area.width, portal_area.height,
+                    sel
+                ));
+            }
+        }
+    }
 
     // Split portal into sections
     use ratatui::layout::{Constraint, Direction, Layout};
@@ -99,6 +143,23 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
         .direction(Direction::Vertical)
         .constraints(constraints)
         .split(portal_area);
+    if do_dbg {
+        let c = &chunks[2];
+        dbg_log(&format!("[SETUP_PORTAL] content chunk: x={} y={} w={} h={}", c.x, c.y, c.width, c.height));
+    }
+    if setup_debug_enabled() {
+        static mut N: u64 = 0;
+        unsafe {
+            N += 1;
+            if N <= 25 || N % 30 == 0 {
+                let c = &chunks[2];
+                crate::debug_log::log_render(&format!(
+                    "content_chunk=({},{},{},{})",
+                    c.x, c.y, c.width, c.height
+                ));
+            }
+        }
+    }
 
     render_header(f, chunks[0], state);
     render_description(f, chunks[1]);
@@ -165,6 +226,18 @@ fn render_content(f: &mut Frame, area: Rect, state: &mut AppState, render_id: u6
 }
 
 fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, _render_id: u64) {
+    if setup_debug_enabled() {
+        static mut N: u64 = 0;
+        unsafe {
+            N += 1;
+            if N <= 10 || N % 30 == 0 {
+                crate::debug_log::log_render(&format!(
+                    "list area=({},{},{},{})",
+                    area.x, area.y, area.width, area.height
+                ));
+            }
+        }
+    }
     // Clear this rect first so no duplicate rows from previous frame
     f.render_widget(Clear, area);
 
@@ -207,6 +280,18 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, _render_
         .style(Style::default().bg(BG_PANEL));
 
     let inner = block.inner(area);
+    if setup_debug_enabled() {
+        static mut N: u64 = 0;
+        unsafe {
+            N += 1;
+            if N <= 10 || N % 30 == 0 {
+                crate::debug_log::log_render(&format!(
+                    "list inner=({},{},{},{})",
+                    inner.x, inner.y, inner.width, inner.height
+                ));
+            }
+        }
+    }
     f.render_widget(block, area);
     
     // Fill inner area
@@ -219,6 +304,18 @@ fn render_options_list(f: &mut Frame, area: Rect, state: &mut AppState, _render_
 }
 
 fn render_option_details(f: &mut Frame, area: Rect, state: &AppState, _render_id: u64) {
+    if setup_debug_enabled() {
+        static mut N: u64 = 0;
+        unsafe {
+            N += 1;
+            if N <= 10 || N % 30 == 0 {
+                crate::debug_log::log_render(&format!(
+                    "details area=({},{},{},{})",
+                    area.x, area.y, area.width, area.height
+                ));
+            }
+        }
+    }
     // Clear this rect first so no leftover from previous option
     f.render_widget(Clear, area);
 
@@ -315,12 +412,27 @@ fn render_option_details(f: &mut Frame, area: Rect, state: &AppState, _render_id
         .style(Style::default().bg(BG_PANEL));
     
     let inner = block.inner(area);
+    if setup_debug_enabled() {
+        static mut N: u64 = 0;
+        unsafe {
+            N += 1;
+            if N <= 10 || N % 30 == 0 {
+                crate::debug_log::log_render(&format!(
+                    "details inner=({},{},{},{})",
+                    inner.x, inner.y, inner.width, inner.height
+                ));
+            }
+        }
+    }
     f.render_widget(block, area);
     
     // Validate area before rendering
     let terminal_size = f.size();
     if inner.width == 0 || inner.height == 0 || 
        inner.x >= terminal_size.width || inner.y >= terminal_size.height {
+        if setup_debug_enabled() {
+            dbg_log("[DETAILS] SKIP render: inner or terminal invalid");
+        }
         return;
     }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.57",
+  "version": "2.9.59",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.57: Auto-update fix for Windows (shell, where 4r, better errors). v2.9.56: Setup Portal debug in debug builds. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.59: Setup Portal file debug (SETUP_PORTAL_DEBUG_FILE). v2.9.58: Autoresize + stderr debug. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",