4runr-os 2.9.60 → 2.9.62

package/mk3-tui/src/app.rs

@@ -1812,20 +1812,21 @@ impl App {
     // ============================================================
     
     fn handle_setup_portal_input(&mut self, key: KeyEvent, _ws_client: Option<&WebSocketClient>) -> anyhow::Result<bool> {
-        // Guard: Don't process if already detecting
+        // ESC always closes the portal (even when detecting), so user can always get out
+        if key.code == KeyCode::Esc {
+            self.state.setup_portal.detecting = false;
+            self.state.navigation.navigate_to_base(Screen::Main);
+            self.add_log("[NAV] Setup Portal closed".to_string());
+            self.request_immediate_render("setup_portal_close");
+            return Ok(false);
+        }
+
+        // Don't process other keys while detecting
         if self.state.setup_portal.detecting {
             return Ok(false);
         }
 
         match key.code {
-            // ESC - Cancel and close portal
-            KeyCode::Esc => {
-                // Navigate back to Main (portals are now base screens, not overlays)
-                self.state.navigation.navigate_to_base(Screen::Main);
-                self.add_log("[NAV] Setup Portal closed".to_string());
-                self.request_immediate_render("setup_portal_close");
-            }
-            
             // F2 - Go directly to Connection Portal
             KeyCode::F(2) => {
                 // Navigate to portal as base screen (standalone, not overlay)

package/mk3-tui/src/main.rs

@@ -592,13 +592,14 @@ 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 only on screen switch (no clear on Setup Portal nav = no flicker)
+            // Clear only on screen switch (but not when switching TO Setup Portal; we'll clear after autoresize)
             let is_switching = match (&previous_screen, &current_screen) {
                 (Some(prev), current) => prev != current,
                 (None, _) => true,
             };
+            let switching_to_setup_portal = is_switching && matches!(current_screen, crate::screens::Screen::SetupPortal);
 
-            if is_switching {
+            if is_switching && !switching_to_setup_portal {
                 #[cfg(debug_assertions)]
                 eprintln!("[MAIN] SCREEN SWITCH: {:?} -> {:?} (clearing)", previous_screen, current_screen);
                 debug_log::log_screen(
@@ -608,9 +609,19 @@ fn main() -> Result<()> {
                 terminal.clear()?;
             }
             
-            // When on Setup Portal, sync terminal buffer to real console size (fixes windowed-mode corruption)
+            // When on Setup Portal: autoresize → clear → draw (fixes windowed-mode corruption)
+            // Order matters: resize buffer to match console size BEFORE clearing so we clear the entire visible area.
             if matches!(current_screen, crate::screens::Screen::SetupPortal) {
-                let _ = terminal.autoresize();
+                terminal.autoresize()?;
+                terminal.clear()?;
+                if switching_to_setup_portal {
+                    #[cfg(debug_assertions)]
+                    eprintln!("[MAIN] ENTERED Setup Portal (autoresize + clear)");
+                    debug_log::log_screen(
+                        &format!("{:?}", previous_screen.as_ref().unwrap_or(&current_screen)),
+                        &format!("{:?}", current_screen),
+                    );
+                }
             }
             
             let render_start = Instant::now();

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.60";
+    const PACKAGE_VERSION: &str = "2.9.62";
     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/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.60",
+  "version": "2.9.62",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.60: Setup Portal debug shows log file path. v2.9.59: File debug. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.62: Setup Portal windowed fix (autoresize then clear then draw). v2.9.61: ESC always closes. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",