4runr-os 2.9.16 → 2.9.17

package/mk3-tui/src/app.rs

@@ -721,12 +721,15 @@ impl App {
                             }
                         }
                         "connect portal" | "portal" => {
-                            self.push_overlay(Screen::ConnectionPortal);
+                            // Navigate to portal as base screen (standalone, not overlay)
+                            self.state.navigation.navigate_to_base(Screen::ConnectionPortal);
                             self.state.connection_portal.reset();
                             self.state.logs.push_back("[NAV] Opening Connection Portal...".into());
+                            self.request_render("open_connection_portal");
                         }
                         "setup" | "setup gateway" | "setup portal" => {
-                            self.push_overlay(Screen::SetupPortal);
+                            // Navigate to portal as base screen (standalone, not overlay)
+                            self.state.navigation.navigate_to_base(Screen::SetupPortal);
                             self.state.setup_portal.reset();
                             
                             // Auto-detect Gateway options when portal opens
@@ -1651,9 +1654,10 @@ impl App {
         }
         
         match key.code {
-            // ESC - Close portal
+            // ESC - Close portal and return to Main
             KeyCode::Esc => {
-                self.pop_overlay();
+                // Navigate back to Main (portals are now base screens, not overlays)
+                self.state.navigation.navigate_to_base(Screen::Main);
                 self.add_log("[NAV] Connection Portal closed".to_string());
                 self.request_render("portal_close");
             }
@@ -1770,15 +1774,16 @@ impl App {
         match key.code {
             // ESC - Cancel and close portal
             KeyCode::Esc => {
-                self.pop_overlay();
+                // 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_render("setup_portal_close");
             }
             
             // F2 - Go directly to Connection Portal
             KeyCode::F(2) => {
-                self.pop_overlay();
-                self.push_overlay(Screen::ConnectionPortal);
+                // Navigate to portal as base screen (standalone, not overlay)
+                self.state.navigation.navigate_to_base(Screen::ConnectionPortal);
                 self.add_log("[NAV] Opening Connection Portal...".to_string());
                 self.request_render("open_connection_portal");
             }
@@ -1814,9 +1819,8 @@ impl App {
                 self.state.connection_portal.error = None;
                 self.state.connection_portal.connection_success = false;
                 
-                // Navigate to Connection Portal
-                self.pop_overlay();
-                self.push_overlay(Screen::ConnectionPortal);
+                // Navigate to Connection Portal as base screen (standalone, not overlay)
+                self.state.navigation.navigate_to_base(Screen::ConnectionPortal);
                 
                 self.add_log(format!("[SETUP] Selected {} - Opening Connection Portal", 
                     self.state.setup_portal.selected_option.as_str()));

package/mk3-tui/src/main.rs

@@ -70,6 +70,9 @@ fn main() -> Result<()> {
     let start_time = Instant::now();
     let mut last_tick = Instant::now();
     
+    // Track previous screen to detect portal navigation
+    let mut previous_screen: Option<crate::screens::Screen> = None;
+    
     // Force initial render
     app.request_render("initial");
 
@@ -378,8 +381,9 @@ fn main() -> Result<()> {
                                                 // Bundle is running! Proceed to Connection Portal
                                                 app.add_log(format!("✓ [{}] Local Bundle detected and running", short_id));
                                                 app.state.connection_portal.gateway_url = "http://localhost:3001".to_string();
-                                                app.pop_overlay();
-                                                app.push_overlay(crate::screens::Screen::ConnectionPortal);
+                                                // Navigate to portal as base screen (standalone, not overlay)
+                                                app.state.navigation.navigate_to_base(crate::screens::Screen::ConnectionPortal);
+                                                app.request_render("setup_detect_success");
                                             } else if exists {
                                                 // Bundle exists but not running
                                                 app.add_log(format!("⚠ [{}] Local Bundle found but not running", short_id));
@@ -513,10 +517,31 @@ fn main() -> Result<()> {
         // Check if render is scheduled and throttle limit has passed
         // OPTIMIZATION: Removed input debounce check - using immediate render for typing
         if app.should_render() {
+            // Check if we're switching to a portal - clear terminal buffer for clean transition
+            // Clone current screen before mutable borrow
+            let current_screen = app.state.navigation.current_screen().clone();
+            let is_switching_to_portal = match (&previous_screen, &current_screen) {
+                (Some(prev), current) if prev != current => {
+                    matches!(current, crate::screens::Screen::ConnectionPortal | crate::screens::Screen::SetupPortal)
+                }
+                (None, current) => {
+                    matches!(current, crate::screens::Screen::ConnectionPortal | crate::screens::Screen::SetupPortal)
+                }
+                _ => false,
+            };
+            
+            if is_switching_to_portal {
+                // Clear terminal buffer when switching to portal for clean standalone rendering
+                terminal.clear()?;
+            }
+            
             let render_start = Instant::now();
             terminal.draw(|f| app.render(f))?;
             let render_duration = render_start.elapsed().as_millis() as u64;
             app.record_render(render_duration);
+            
+            // Update previous screen tracking
+            previous_screen = Some(current_screen);
         }
         
         // ┌─────────────────────────────────────────────────────────┐

package/mk3-tui/src/screens/mod.rs

@@ -33,7 +33,7 @@ impl Screen {
     pub fn is_overlay(&self) -> bool {
         matches!(
             self,
-            Screen::AgentBuilder | Screen::RunManager | Screen::Settings | Screen::AgentList | Screen::ConnectionPortal | Screen::SetupPortal
+            Screen::AgentBuilder | Screen::RunManager | Screen::Settings | Screen::AgentList
         )
     }
     
@@ -45,9 +45,9 @@ impl Screen {
         )
     }
     
-    /// Returns true if this screen is a base screen
+    /// Returns true if this screen is a base screen (full-screen standalone)
     pub fn is_base(&self) -> bool {
-        matches!(self, Screen::Boot | Screen::Main)
+        matches!(self, Screen::Boot | Screen::Main | Screen::ConnectionPortal | Screen::SetupPortal)
     }
     
     /// Returns the screen name for display

package/mk3-tui/src/ui/connection_portal.rs

@@ -17,20 +17,19 @@ const TEXT_MUTED: Color = Color::Rgb(60, 60, 80);
 const BG_PANEL: Color = Color::Rgb(18, 18, 25);
 const ERROR_RED: Color = Color::Rgb(255, 69, 69);
 
-/// Main render function
+/// Main render function - Full-screen standalone portal
 pub fn render(f: &mut Frame, state: &AppState) {
     let area = f.size();
     
-    // CRITICAL FIX: Clear the ENTIRE screen first to prevent artifacts
+    // CRITICAL: Clear the ENTIRE screen first - this is a standalone screen, not an overlay
     f.render_widget(Clear, area);
     
-    // Create a dimmed overlay over the entire screen (modal backdrop)
-    // Using very dark gray instead of pure black for better dimming effect
-    let overlay = Block::default()
-        .style(Style::default().bg(Color::Rgb(10, 10, 15)));
-    f.render_widget(overlay, area);
+    // Render full-screen background (no dimming - this is the only screen)
+    let bg = Block::default()
+        .style(Style::default().bg(BG_PANEL));
+    f.render_widget(bg, area);
     
-    // Calculate centered portal dimensions
+    // Calculate centered portal dimensions (smaller dialog on full-screen background)
     let portal_width = area.width.min(80).max(60);
     let portal_height = area.height.min(28).max(22);
     
@@ -44,7 +43,7 @@ pub fn render(f: &mut Frame, state: &AppState) {
         height: portal_height,
     };
     
-    // Clear the portal area again for clean rendering
+    // Clear the portal area for clean rendering
     f.render_widget(Clear, portal_area);
     
     // Render portal background

package/mk3-tui/src/ui/layout.rs

@@ -143,8 +143,8 @@ 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.16) - matches package.json
-    const PACKAGE_VERSION: &str = "2.9.16";
+    // Use npm package version (2.9.17) - matches package.json
+    const PACKAGE_VERSION: &str = "2.9.17";
     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

@@ -16,18 +16,17 @@ const TEXT_MUTED: Color = Color::Rgb(60, 60, 80);
 const BG_PANEL: Color = Color::Rgb(18, 18, 25);
 const ERROR_RED: Color = Color::Rgb(255, 69, 69);
 
-/// Render the Setup Portal screen (full-screen overlay)
+/// Render the Setup Portal screen - Full-screen standalone portal
 pub fn render(f: &mut Frame, state: &AppState) {
     let area = f.size();
     
-    // CRITICAL FIX: Clear the ENTIRE screen first to prevent artifacts
+    // CRITICAL: Clear the ENTIRE screen first - this is a standalone screen, not an overlay
     f.render_widget(Clear, area);
     
-    // Create a dimmed overlay over the entire screen (modal backdrop)
-    // Using very dark gray instead of pure black for better dimming effect
-    let overlay = Block::default()
-        .style(Style::default().bg(Color::Rgb(10, 10, 15)));
-    f.render_widget(overlay, area);
+    // Render full-screen background (no dimming - this is the only screen)
+    let bg = Block::default()
+        .style(Style::default().bg(BG_PANEL));
+    f.render_widget(bg, area);
     
     // Center the portal dialog - larger for better visibility
     let portal_width = area.width.min(110).max(85);
@@ -42,7 +41,7 @@ pub fn render(f: &mut Frame, state: &AppState) {
         height: portal_height,
     };
     
-    // Clear the portal area again for clean rendering
+    // Clear the portal area for clean rendering
     f.render_widget(Clear, portal_area);
     
     // Split portal into sections

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.16",
+  "version": "2.9.17",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.16: Portal complete isolation (pauses base screen state updates). v2.9.14: Portal standalone rendering. v2.9.13: Instant typing (0ms latency), 120 FPS animations. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.17: Portals are now standalone base screens (not overlays) - complete isolation, no background OS, terminal cleared on switch. v2.9.16: Portal complete isolation (pauses base screen state updates). v2.9.14: Portal standalone rendering. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",