4runr-os 2.9.134 → 2.9.136

package/mk3-tui/src/app.rs

@@ -113,6 +113,8 @@ pub struct ConnectionPortalState {
     pub username: String,
     pub focused_field: PortalField,
     pub connecting: bool,
+    /// When `connecting` became true (for elapsed timer in the portal UI).
+    pub connecting_started: Option<Instant>,
     pub connection_success: bool,
     pub error: Option<String>,
     pub last_successful_url: Option<String>,
@@ -127,6 +129,7 @@ impl Default for ConnectionPortalState {
             username: String::new(),
             focused_field: PortalField::GatewayUrl,
             connecting: false,
+            connecting_started: None,
             connection_success: false,
             error: None,
             last_successful_url: None,
@@ -141,10 +144,21 @@ impl ConnectionPortalState {
         self.username = String::new();
         self.focused_field = PortalField::GatewayUrl;
         self.connecting = false;
+        self.connecting_started = None;
         self.connection_success = false;
         self.error = None;
         self.activity_log.clear();
     }
+
+    pub fn begin_connecting(&mut self) {
+        self.connecting = true;
+        self.connecting_started = Some(Instant::now());
+    }
+
+    pub fn finish_connecting(&mut self) {
+        self.connecting = false;
+        self.connecting_started = None;
+    }
     
     pub fn toggle_field(&mut self) {
         self.focused_field = match self.focused_field {
@@ -160,8 +174,9 @@ impl ConnectionPortalState {
             message,
         });
         
-        // Keep only last 20 entries to prevent memory bloat
-        if self.activity_log.len() > 20 {
+        // Keep last N lines so the portal can show a full connect trace on small terminals
+        const MAX_ACTIVITY: usize = 80;
+        if self.activity_log.len() > MAX_ACTIVITY {
             self.activity_log.remove(0);
         }
     }
@@ -1924,7 +1939,7 @@ impl App {
             KeyCode::Esc => {
                 // Drop stale connect attempt + UI state so the next open is not "pre-broken".
                 self.state.pending_gateway_connect_id = None;
-                self.state.connection_portal.connecting = false;
+                self.state.connection_portal.finish_connecting();
                 self.state.connection_portal.error = None;
                 self.state.connection_portal.activity_log.clear();
                 self.state.navigation.navigate_to_base(Screen::Main);
@@ -1953,7 +1968,7 @@ impl App {
                 self.state.gateway_url = None;
                 self.state.connected = false;
                 self.state.gateway_healthy = false;
-                self.state.connection_portal.connecting = false;
+                self.state.connection_portal.finish_connecting();
                 self.state.connection_portal.connection_success = false;
                 self.state.connection_portal.error = None;
                 self.state.pending_gateway_connect_id = None;
@@ -2009,8 +2024,8 @@ impl App {
                 }
                 
                 // Connect to Gateway
-                self.state.connection_portal.connecting = true;
                 self.state.connection_portal.error = None;
+                self.state.connection_portal.begin_connecting();
                 
                 if let Some(ws) = ws_client {
                     let connect_data = serde_json::json!({
@@ -2025,13 +2040,13 @@ impl App {
                             self.state.pending_gateway_connect_id = Some(id);
                         }
                         Err(e) => {
-                            self.state.connection_portal.connecting = false;
+                            self.state.connection_portal.finish_connecting();
                             self.state.connection_portal.error = Some(format!("Failed to connect: {}", e));
                             self.add_log(format!("[ERROR] Gateway connection failed: {}", e));
                         }
                     }
                 } else {
-                    self.state.connection_portal.connecting = false;
+                    self.state.connection_portal.finish_connecting();
                     self.state.connection_portal.error = Some("WebSocket not connected".to_string());
                     self.add_log("[ERROR] WebSocket not connected".to_string());
                 }
@@ -2154,7 +2169,7 @@ impl App {
         self.state.connection_portal.username.clear();
         self.state.connection_portal.focused_field = PortalField::GatewayUrl;
         self.state.connection_portal.connection_success = false;
-        self.state.connection_portal.connecting = false;
+        self.state.connection_portal.finish_connecting();
 
         if let Some(ref det) = self.state.setup_portal.detection_result {
             let now = wall_clock_hms();

package/mk3-tui/src/main.rs

@@ -82,6 +82,7 @@ fn main() -> Result<()> {
     // Track real time for uptime (not from tick counter)
     let start_time = Instant::now();
     let mut last_tick = Instant::now();
+    let mut portal_connect_ui_tick = Instant::now();
     
     // Track previous screen to detect portal navigation
     let mut previous_screen: Option<crate::screens::Screen> = None;
@@ -101,7 +102,7 @@ fn main() -> Result<()> {
         // Check if portal is active - if so, skip base screen state updates
         // This prevents base screen from affecting portal performance
         use crate::screens::Screen;
-        let current_screen = app.state.navigation.current_screen();
+        let current_screen = app.state.navigation.current_screen().clone();
         let is_portal_active = matches!(
             current_screen,
             Screen::ConnectionPortal | Screen::SetupPortal | Screen::PortalMonitoring
@@ -135,6 +136,14 @@ fn main() -> Result<()> {
                 app.request_render("animation_tick"); // Request render for animation update
             }
         }
+
+        // Connection Portal: redraw while waiting on gateway.connect so the elapsed timer advances
+        if matches!(current_screen, Screen::ConnectionPortal) && app.state.connection_portal.connecting {
+            if portal_connect_ui_tick.elapsed() >= Duration::from_millis(500) {
+                portal_connect_ui_tick = Instant::now();
+                app.request_immediate_render("portal_connecting_tick");
+            }
+        }
         
         // ┌─────────────────────────────────────────────────────────┐
         // │ STEP 2: CHECK WEBSOCKET MESSAGES                       │
@@ -465,7 +474,7 @@ fn main() -> Result<()> {
                                                 
                                                 app.state.gateway_url = Some(url.to_string());
                                                 app.state.connection_portal.last_successful_url = Some(url.to_string());
-                                                app.state.connection_portal.connecting = false;
+                                                app.state.connection_portal.finish_connecting();
                                                 app.state.connection_portal.connection_success = true;  // Phase 1.3: Set success flag
                                                 // Dashboard "Demo Mode / NET" used `connected`, which was never set — align with Gateway link
                                                 app.state.connected = true;
@@ -596,7 +605,7 @@ fn main() -> Result<()> {
                                             
                                             if is_healthy {
                                                 app.state.gateway_healthy = true;
-                                                app.state.connection_portal.connecting = false;
+                                                app.state.connection_portal.finish_connecting();
                                                 let suffix = match deps_ready {
                                                     Some(true) => " — dependencies ready",
                                                     Some(false) => " — Gateway up; /ready reports deps degraded",
@@ -608,7 +617,7 @@ fn main() -> Result<()> {
                                                 ));
                                             } else {
                                                 app.state.gateway_healthy = false;
-                                                app.state.connection_portal.connecting = false;
+                                                app.state.connection_portal.finish_connecting();
                                                 let error = obj.get("error").and_then(|v| v.as_str()).unwrap_or("Unknown error");
                                                 app.add_log(format!("⚠ [{}] Gateway health check failed: {} ({}ms)", short_id, error, latency));
                                             }
@@ -660,7 +669,7 @@ fn main() -> Result<()> {
                             // Check if this is a response to gateway.connect command (Step 7.5)
                             else if Some(&resp.id) == app.state.pending_gateway_connect_id.as_ref() {
                                 app.state.pending_gateway_connect_id = None;
-                                app.state.connection_portal.connecting = false;
+                                app.state.connection_portal.finish_connecting();
                                 app.state.connection_portal.error = Some(error_msg.clone());
                                 
                                 // Parse activity log from error response if present

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

@@ -1,6 +1,8 @@
 /// Portal Connection Screen (formerly Gateway Connection)
 /// Clean, professional interface for connecting to Gateway servers
 
+use std::time::Instant;
+
 use ratatui::prelude::*;
 use ratatui::widgets::{Block, Borders, Paragraph, Wrap, Clear};
 use ratatui::layout::Alignment;
@@ -371,12 +373,16 @@ fn render_content_area(f: &mut Frame, area: Rect, state: &AppState) {
     if portal.error.is_some() {
         let err_msg = portal.error.as_ref().unwrap();
         if !portal.activity_log.is_empty() {
-            // Show error message first so user sees "port in use, try 3002", then activity log below
+            // Compact status/error strip; most vertical space for the activity log (CLI trace).
             use ratatui::layout::{Constraint, Direction, Layout};
-            // Give the error panel enough height so wrapped text does not visually collide with the log.
+            let total_h = area.height;
+            let log_min: u16 = 8;
+            let err_h = (total_h / 3)
+                .max(10)
+                .min(total_h.saturating_sub(log_min));
             let chunks = Layout::default()
                 .direction(Direction::Vertical)
-                .constraints([Constraint::Min(12), Constraint::Min(6)])
+                .constraints([Constraint::Length(err_h), Constraint::Min(log_min)])
                 .split(area);
             render_error(f, chunks[0], err_msg);
             render_activity_log(f, chunks[1], state);
@@ -386,7 +392,18 @@ fn render_content_area(f: &mut Frame, area: Rect, state: &AppState) {
     } else if session_linked(state) {
         render_success(f, area, state);
     } else if portal.connecting {
-        render_connecting(f, area, state);
+        if portal.activity_log.is_empty() {
+            render_connecting(f, area, state);
+        } else {
+            use ratatui::layout::{Constraint, Direction, Layout};
+            let strip = area.height.min(9).max(6);
+            let chunks = Layout::default()
+                .direction(Direction::Vertical)
+                .constraints([Constraint::Length(strip), Constraint::Min(4)])
+                .split(area);
+            render_connecting(f, chunks[0], state);
+            render_activity_log(f, chunks[1], state);
+        }
     } else if !portal.activity_log.is_empty() {
         // Show activity log with instructions when there's no error
         render_activity_log(f, area, state);
@@ -404,24 +421,68 @@ fn render_connecting(f: &mut Frame, area: Rect, state: &AppState) {
     } else {
         url_one.as_str()
     };
+    let elapsed_secs = portal
+        .connecting_started
+        .map(|t: Instant| t.elapsed().as_secs())
+        .unwrap_or(0);
     let block = Block::default()
-        .title(" ⏳ CONNECTING ")
+        .title(format!(" ⏳ CONNECTING — {}s ", elapsed_secs))
         .borders(Borders::ALL)
         .border_style(Style::default().fg(AMBER_WARN).bold())
         .style(Style::default().bg(BG_PANEL));
     let inner = block.inner(area);
     f.render_widget(block, area);
-    let lines = vec![
+
+    // Simple “pulse” bar: fill grows and wraps so the UI keeps moving while we wait on Node.
+    let bar_w = (inner.width.saturating_sub(4) as usize).clamp(8, 48);
+    let fill = (elapsed_secs as usize) % (bar_w + 1);
+    let bar: String = (0..bar_w)
+        .map(|i| if i < fill { '█' } else { '░' })
+        .collect();
+
+    let mut lines: Vec<Line> = vec![
         Line::from(""),
-        Line::from(Span::styled(
+        Line::from(vec![Span::styled(
             format!("Connecting to {} …", url),
-            Style::default().fg(AMBER_WARN).bold()
-        )).alignment(Alignment::Center),
-        Line::from(""),
-        Line::from(Span::styled("Please wait", Style::default().fg(TEXT_DIM))).alignment(Alignment::Center),
-        Line::from(""),
+            Style::default().fg(AMBER_WARN).bold(),
+        )])
+        .alignment(Alignment::Center),
+        Line::from(vec![Span::styled(
+            format!(
+                "Elapsed {}s — waiting on CLI (gateway autostart can take a few minutes)",
+                elapsed_secs
+            ),
+            Style::default().fg(CYBER_CYAN),
+        )])
+        .alignment(Alignment::Center),
     ];
-    let paragraph = Paragraph::new(lines).alignment(Alignment::Center);
+    if inner.height > 5 {
+        lines.push(Line::from(vec![Span::styled(
+            bar,
+            Style::default().fg(TEXT_DIM),
+        )])
+        .alignment(Alignment::Center));
+        lines.push(Line::from(""));
+        lines.push(
+            Line::from(Span::styled(
+                "See Connection Activity Log for live steps from the Gateway starter",
+                Style::default().fg(TEXT_DIM),
+            ))
+            .alignment(Alignment::Center),
+        );
+    }
+
+    let target_h = inner.height as usize;
+    while lines.len() < target_h {
+        lines.push(Line::from(Span::styled("", Style::default().bg(BG_PANEL))));
+    }
+    if lines.len() > target_h {
+        lines.truncate(target_h);
+    }
+
+    let paragraph = Paragraph::new(lines)
+        .alignment(Alignment::Center)
+        .style(Style::default().bg(BG_PANEL));
     f.render_widget(paragraph, inner);
 }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.134",
+  "version": "2.9.136",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.134: CRITICAL — copy-gateway no longer drops memory-logger.js (bad *.log regex). Gateway @4runr/shared bundle complete. Prior: 2.9.133 auto-update verify, TUI stderr logs. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.136: Gateway autostart diagnostics — port conflict check, bundle verification, spawn/stderr capture, HTTP detail on /health fails. Prior: 2.9.135 longer wait + timer. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",