4runr-os 2.10.42 → 2.10.44

package/apps/gateway/package-lock.json

@@ -4782,9 +4782,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.353",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.353.tgz",
-      "integrity": "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w==",
+      "version": "1.5.354",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.354.tgz",
+      "integrity": "sha512-JaBHwWcfIdmSAfWM5l3uwjGd431j8YEMikZ+K/2nXVuBqJKyZ0f+2h4n4JY5AyNiZmnY9qQr2RU3v9DxDmHMNg==",
       "dev": true,
       "license": "ISC"
     },

package/mk3-tui/src/app.rs

@@ -311,7 +311,7 @@ impl Default for PortalMonitoringState {
             viewport_lines: 18,
             last_refresh: None,
             auto_refresh_interval: Duration::from_secs(5),
-            auto_refresh_enabled: true,
+            auto_refresh_enabled: false,
             last_http_for_delta: None,
             last_instant_for_delta: None,
             section_overrides: HashMap::new(),
@@ -922,6 +922,31 @@ impl App {
         Ok(display)
     }
 
+    pub fn scroll_portal_monitoring_by(&mut self, delta: isize) {
+        use crate::ui::portal_monitoring::portal_monitoring_scroll_max;
+        let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
+        let sw = self.state.portal_monitoring.summary_clip_width.max(24);
+        let max_scroll = portal_monitoring_scroll_max(&self.state, sw, inner_h);
+        let current = self.state.portal_monitoring.scroll_offset;
+        self.state.portal_monitoring.scroll_offset = if delta < 0 {
+            current.saturating_sub(delta.unsigned_abs())
+        } else {
+            current.saturating_add(delta as usize).min(max_scroll)
+        };
+        self.request_immediate_render("portal_obs_scroll");
+    }
+
+    fn cancel_portal_monitoring_requests(&mut self) {
+        self.state.pending_gateway_observability_id = None;
+        self.state.pending_monitoring_refresh_id = None;
+        self.state.pending_monitoring_logs_id = None;
+        self.state.pending_monitoring_drill_id = None;
+        self.state.portal_monitoring.loading = false;
+        self.state.portal_monitoring.section_refresh_loading = None;
+        self.state.portal_monitoring.logs_fetch_loading = false;
+        self.state.portal_monitoring.metrics_drill_loading = false;
+    }
+
     /// CLI ↔ TUI WebSocket lost: drop Gateway link UI and leave Portal Monitoring / Connection Portal so the session does not appear still "connected".
     pub fn on_cli_backend_disconnect(&mut self) {
         use crate::screens::Screen;
@@ -2693,7 +2718,9 @@ impl App {
         key: KeyEvent,
         ws_client: Option<&WebSocketClient>,
     ) -> anyhow::Result<bool> {
-        use crate::ui::portal_monitoring::portal_monitoring_scroll_max;
+        use crate::ui::portal_monitoring::{
+            portal_monitoring_scroll_max, portal_monitoring_section_offset,
+        };
         use crossterm::event::KeyModifiers;
         if key.modifiers.contains(KeyModifiers::CONTROL) {
             match key.code {
@@ -2734,37 +2761,13 @@ impl App {
             self.request_immediate_render("portal_help_open");
             return Ok(false);
         }
-        // R is context-sensitive: Overview → full `gateway.observability` snapshot; any other
-        // section → `monitoring.refresh` for that section only (cheaper; matches expanded detail).
+        // R is deliberately global: refresh the full snapshot without changing the current view.
         if key.code == KeyCode::Char('r') || key.code == KeyCode::Char('R') {
             if let Some(ws) = ws_client {
-                let sections = MonitoringSection::all();
-                let idx = self
-                    .state
-                    .advanced_monitoring
-                    .monitoring_state
-                    .selected_index;
-                let current = sections.get(idx).copied();
                 self.state.portal_observability_last_poll = None;
-                self.state.pending_gateway_observability_id = None;
-                self.state.pending_monitoring_refresh_id = None;
-                self.state.pending_monitoring_logs_id = None;
-                self.state.pending_monitoring_drill_id = None;
-                self.state.portal_monitoring.loading = false;
-                self.state.portal_monitoring.section_refresh_loading = None;
-                self.state.portal_monitoring.logs_fetch_loading = false;
-                self.state.portal_monitoring.metrics_drill = None;
-                self.state.portal_monitoring.metrics_drill_lines.clear();
-                self.state.portal_monitoring.metrics_drill_loading = false;
+                self.cancel_portal_monitoring_requests();
                 self.state.portal_monitoring.last_refresh = Some(std::time::Instant::now());
-                match current {
-                    Some(MonitoringSection::Overview) | None => {
-                        self.begin_portal_observability_request(ws);
-                    }
-                    Some(sec) => {
-                        self.begin_monitoring_refresh_request(ws, sec);
-                    }
-                }
+                self.begin_portal_observability_request(ws);
                 self.request_immediate_render("portal_obs_refresh");
             } else {
                 self.state.portal_monitoring.error =
@@ -2774,12 +2777,25 @@ impl App {
             return Ok(false);
         }
         if key.code == KeyCode::Char('l') || key.code == KeyCode::Char('L') {
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .select_section(MonitoringSection::Logs);
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .expand_section(MonitoringSection::Logs);
             if let Some(ws) = ws_client {
+                self.cancel_portal_monitoring_requests();
                 self.begin_monitoring_logs_request(ws);
-                self.state
-                    .advanced_monitoring
-                    .monitoring_state
-                    .expand_section(MonitoringSection::Logs);
+                let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
+                let sw = self.state.portal_monitoring.summary_clip_width.max(24);
+                self.state.portal_monitoring.scroll_offset = portal_monitoring_section_offset(
+                    &self.state,
+                    sw,
+                    inner_h,
+                    MonitoringSection::Logs,
+                );
                 self.request_immediate_render("portal_monitoring_logs");
             } else {
                 self.state.portal_monitoring.error =
@@ -2790,7 +2806,23 @@ impl App {
         }
 
         if key.code == KeyCode::Char('h') || key.code == KeyCode::Char('H') {
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .select_section(MonitoringSection::Metrics);
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .expand_section(MonitoringSection::Metrics);
             self.state.portal_monitoring.trend_view = !self.state.portal_monitoring.trend_view;
+            let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
+            let sw = self.state.portal_monitoring.summary_clip_width.max(24);
+            self.state.portal_monitoring.scroll_offset = portal_monitoring_section_offset(
+                &self.state,
+                sw,
+                inner_h,
+                MonitoringSection::Metrics,
+            );
             let status = if self.state.portal_monitoring.trend_view {
                 "enabled"
             } else {
@@ -2817,103 +2849,97 @@ impl App {
 
         // Phase 3: extended dependency view (GET /api/monitoring/dependencies/detail)
         if key.code == KeyCode::Char('t') || key.code == KeyCode::Char('T') {
-            let sections = MonitoringSection::all();
-            let idx = self
-                .state
+            self.state
                 .advanced_monitoring
                 .monitoring_state
-                .selected_index;
-            let current = sections.get(idx).copied();
-            let expanded = current
-                .and_then(|sec| {
-                    self.state
-                        .advanced_monitoring
-                        .monitoring_state
-                        .sections
-                        .get(&sec)
-                        .map(|s| s.expanded)
-                })
-                .unwrap_or(false);
-            if current == Some(MonitoringSection::Dependencies) && expanded {
-                if let Some(ws) = ws_client {
-                    self.begin_dependencies_detail_drill(ws);
-                    self.request_immediate_render("portal_deps_drill");
-                } else {
-                    self.state.portal_monitoring.error =
-                        Some("WebSocket to CLI is not connected.".to_string());
-                    self.request_immediate_render("portal_obs_no_ws");
-                }
-                return Ok(false);
+                .select_section(MonitoringSection::Dependencies);
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .expand_section(MonitoringSection::Dependencies);
+            let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
+            let sw = self.state.portal_monitoring.summary_clip_width.max(24);
+            self.state.portal_monitoring.scroll_offset = portal_monitoring_section_offset(
+                &self.state,
+                sw,
+                inner_h,
+                MonitoringSection::Dependencies,
+            );
+            if let Some(ws) = ws_client {
+                self.cancel_portal_monitoring_requests();
+                self.begin_dependencies_detail_drill(ws);
+                self.request_immediate_render("portal_deps_drill");
+            } else {
+                self.state.portal_monitoring.error =
+                    Some("WebSocket to CLI is not connected.".to_string());
+                self.request_immediate_render("portal_obs_no_ws");
             }
+            return Ok(false);
         }
 
         // Phase 4: diagnostics for the local CLI/TUI bridge + Gateway reachability.
         if key.code == KeyCode::Char('s') || key.code == KeyCode::Char('S') {
-            let sections = MonitoringSection::all();
-            let idx = self
-                .state
+            self.state
                 .advanced_monitoring
                 .monitoring_state
-                .selected_index;
-            let current = sections.get(idx).copied();
-            let expanded = current
-                .and_then(|sec| {
-                    self.state
-                        .advanced_monitoring
-                        .monitoring_state
-                        .sections
-                        .get(&sec)
-                        .map(|s| s.expanded)
-                })
-                .unwrap_or(false);
-            if current == Some(MonitoringSection::System) && expanded {
-                if let Some(ws) = ws_client {
-                    self.begin_system_diagnostics_request(ws);
-                    self.request_immediate_render("portal_system_diagnostics");
-                } else {
-                    self.state.portal_monitoring.error =
-                        Some("WebSocket to CLI is not connected.".to_string());
-                    self.request_immediate_render("portal_obs_no_ws");
-                }
-                return Ok(false);
+                .select_section(MonitoringSection::System);
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .expand_section(MonitoringSection::System);
+            let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
+            let sw = self.state.portal_monitoring.summary_clip_width.max(24);
+            self.state.portal_monitoring.scroll_offset = portal_monitoring_section_offset(
+                &self.state,
+                sw,
+                inner_h,
+                MonitoringSection::System,
+            );
+            if let Some(ws) = ws_client {
+                self.cancel_portal_monitoring_requests();
+                self.begin_system_diagnostics_request(ws);
+                self.request_immediate_render("portal_system_diagnostics");
+            } else {
+                self.state.portal_monitoring.error =
+                    Some("WebSocket to CLI is not connected.".to_string());
+                self.request_immediate_render("portal_obs_no_ws");
             }
+            return Ok(false);
         }
 
         if key.code == KeyCode::Right {
-            let sections = MonitoringSection::all();
-            let idx = self
-                .state
+            self.state
                 .advanced_monitoring
                 .monitoring_state
-                .selected_index;
-            let current = sections.get(idx).copied();
-            let expanded = current
-                .and_then(|sec| {
-                    self.state
-                        .advanced_monitoring
-                        .monitoring_state
-                        .sections
-                        .get(&sec)
-                        .map(|s| s.expanded)
-                })
-                .unwrap_or(false);
-            if current == Some(MonitoringSection::Metrics) && expanded {
-                if let Some(ws) = ws_client {
-                    let panel = self
-                        .state
-                        .portal_monitoring
-                        .metrics_drill
-                        .map(|p| p.next())
-                        .unwrap_or(MetricsDrillPanel::Http);
-                    self.begin_monitoring_drill_request(ws, panel);
-                    self.request_immediate_render("portal_metrics_drill");
-                } else {
-                    self.state.portal_monitoring.error =
-                        Some("WebSocket to CLI is not connected.".to_string());
-                    self.request_immediate_render("portal_obs_no_ws");
-                }
-                return Ok(false);
+                .select_section(MonitoringSection::Metrics);
+            self.state
+                .advanced_monitoring
+                .monitoring_state
+                .expand_section(MonitoringSection::Metrics);
+            let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
+            let sw = self.state.portal_monitoring.summary_clip_width.max(24);
+            self.state.portal_monitoring.scroll_offset = portal_monitoring_section_offset(
+                &self.state,
+                sw,
+                inner_h,
+                MonitoringSection::Metrics,
+            );
+            if let Some(ws) = ws_client {
+                self.cancel_portal_monitoring_requests();
+                let panel = self
+                    .state
+                    .portal_monitoring
+                    .metrics_drill
+                    .map(|p| p.next())
+                    .unwrap_or(MetricsDrillPanel::Http);
+                self.begin_monitoring_drill_request(ws, panel);
+                self.request_immediate_render("portal_metrics_drill");
+            } else {
+                self.state.portal_monitoring.error =
+                    Some("WebSocket to CLI is not connected.".to_string());
+                self.request_immediate_render("portal_obs_no_ws");
             }
+            return Ok(false);
         }
 
         if key.code == KeyCode::Left {
@@ -2963,20 +2989,46 @@ impl App {
 
         match key.code {
             KeyCode::Up => {
-                self.state
+                if self
+                    .state
                     .advanced_monitoring
                     .monitoring_state
-                    .select_previous_wrapped();
-                self.state.portal_monitoring.scroll_offset = 0;
-                self.request_immediate_render("portal_monitoring_select");
+                    .selected_section
+                    == Some(MonitoringSection::Logs)
+                    && self.state.portal_monitoring.scroll_offset > 0
+                {
+                    self.state.portal_monitoring.scroll_offset =
+                        self.state.portal_monitoring.scroll_offset.saturating_sub(1);
+                    self.request_immediate_render("portal_obs_scroll");
+                } else {
+                    self.state
+                        .advanced_monitoring
+                        .monitoring_state
+                        .select_previous_wrapped();
+                    self.state.portal_monitoring.scroll_offset = 0;
+                    self.request_immediate_render("portal_monitoring_select");
+                }
             }
             KeyCode::Down => {
-                self.state
+                if self
+                    .state
                     .advanced_monitoring
                     .monitoring_state
-                    .select_next_wrapped();
-                self.state.portal_monitoring.scroll_offset = 0;
-                self.request_immediate_render("portal_monitoring_select");
+                    .selected_section
+                    == Some(MonitoringSection::Logs)
+                    && self.state.portal_monitoring.scroll_offset < max_scroll
+                {
+                    self.state.portal_monitoring.scroll_offset =
+                        (self.state.portal_monitoring.scroll_offset + 1).min(max_scroll);
+                    self.request_immediate_render("portal_obs_scroll");
+                } else {
+                    self.state
+                        .advanced_monitoring
+                        .monitoring_state
+                        .select_next_wrapped();
+                    self.state.portal_monitoring.scroll_offset = 0;
+                    self.request_immediate_render("portal_monitoring_select");
+                }
             }
             KeyCode::PageUp => {
                 let step = inner_h.saturating_sub(3).max(1);

package/mk3-tui/src/main.rs

@@ -890,19 +890,46 @@ fn main() -> Result<()> {
                                                         .to_string(),
                                                 );
                                             }
+                                            let preserve_scroll =
+                                                app.state.portal_monitoring.scroll_offset;
+                                            let preserve_metrics_drill =
+                                                app.state.portal_monitoring.metrics_drill;
+                                            let preserve_metrics_drill_lines = app
+                                                .state
+                                                .portal_monitoring
+                                                .metrics_drill_lines
+                                                .clone();
+                                            let preserve_logs = app
+                                                .state
+                                                .portal_monitoring
+                                                .section_overrides
+                                                .get(&crate::monitoring::MonitoringSection::Logs)
+                                                .cloned();
                                             app.state.portal_monitoring.last_updated =
                                                 Some(snapshot);
                                             app.state.portal_monitoring.content_lines = lines;
                                             app.state.portal_monitoring.section_overrides.clear();
+                                            if let Some(logs) = preserve_logs {
+                                                app.state
+                                                    .portal_monitoring
+                                                    .section_overrides
+                                                    .insert(
+                                                        crate::monitoring::MonitoringSection::Logs,
+                                                        logs,
+                                                    );
+                                            }
                                             app.state.portal_monitoring.section_refresh_loading =
                                                 None;
                                             app.state.portal_monitoring.logs_fetch_loading = false;
-                                            app.state.portal_monitoring.metrics_drill = None;
-                                            app.state.portal_monitoring.metrics_drill_lines.clear();
+                                            app.state.portal_monitoring.metrics_drill =
+                                                preserve_metrics_drill;
+                                            app.state.portal_monitoring.metrics_drill_lines =
+                                                preserve_metrics_drill_lines;
                                             app.state.portal_monitoring.metrics_drill_loading =
                                                 false;
                                             app.state.portal_monitoring.error = None;
-                                            app.state.portal_monitoring.scroll_offset = 0;
+                                            app.state.portal_monitoring.scroll_offset =
+                                                preserve_scroll;
                                         } else {
                                             app.state.portal_monitoring.error = Some(
                                                 "Unexpected observability response.".to_string(),
@@ -1548,6 +1575,8 @@ fn main() -> Result<()> {
         // Handle ESC on both Press and Release so we never miss it (e.g. when stuck on "Detecting...")
         if crossterm::event::poll(Duration::from_millis(1))? {
             let on_setup = app.state.navigation.current_screen() == &screens::Screen::SetupPortal;
+            let on_portal_monitoring =
+                app.state.navigation.current_screen() == &screens::Screen::PortalMonitoring;
             let on_standalone_input = matches!(
                 app.state.navigation.current_screen(),
                 &screens::Screen::ConnectionPortal
@@ -1571,8 +1600,14 @@ fn main() -> Result<()> {
                     if on_standalone_input {
                         debug_log::log_input("Mouse", &format!("{:?}", mouse));
                     }
-                    // Handle mouse scroll events for Setup Portal
-                    if on_setup {
+                    // Handle mouse scroll events for standalone portals
+                    if on_portal_monitoring {
+                        match mouse.kind {
+                            MouseEventKind::ScrollUp => app.scroll_portal_monitoring_by(-3),
+                            MouseEventKind::ScrollDown => app.scroll_portal_monitoring_by(3),
+                            _ => {}
+                        }
+                    } else if on_setup {
                         if !app.state.setup_portal.detecting {
                             match mouse.kind {
                                 MouseEventKind::ScrollUp => {

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

@@ -294,6 +294,17 @@ impl MonitoringState {
         }
     }
 
+    /// Move keyboard focus directly to a specific section.
+    pub fn select_section(&mut self, section: MonitoringSection) {
+        if let Some(index) = MonitoringSection::all()
+            .iter()
+            .position(|candidate| *candidate == section)
+        {
+            self.selected_index = index;
+            self.selected_section = Some(section);
+        }
+    }
+
     /// Collapse a specific section
     pub fn collapse_section(&mut self, section: MonitoringSection) {
         if let Some(state) = self.sections.get_mut(&section) {

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

@@ -468,6 +468,27 @@ pub fn portal_monitoring_scroll_max(
     total.saturating_sub(content_h.min(total.max(1)))
 }
 
+/// Best-effort scroll offset that brings a section header into view.
+pub fn portal_monitoring_section_offset(
+    state: &AppState,
+    summary_width: usize,
+    body_inner_h: usize,
+    section: MonitoringSection,
+) -> usize {
+    let body_lines = build_body_lines(state, summary_width);
+    let target = section.display_name();
+    let raw_offset = body_lines
+        .iter()
+        .position(|line| {
+            line.spans
+                .iter()
+                .any(|span| span.content.as_ref().contains(target))
+        })
+        .unwrap_or(0);
+    let max_scroll = portal_monitoring_scroll_max(state, summary_width, body_inner_h);
+    raw_offset.min(max_scroll)
+}
+
 /// Build scrollable section lines. **Phase 1:** collapsed summaries and ●/⚠/✖ colors are derived only from
 /// `parse_snapshot` of `content_lines`; `MonitoringState.sections` controls **expand** + **selection** only
 /// (not `SectionState.status` / `summary`).
@@ -857,7 +878,7 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
     ]);
 
     let keys_hint = Line::from(vec![Span::styled(
-        "R sect/full · H trends · E export · Metrics ▼ + →/← drill · Dep ▼ + T detail · Sys ▼ + S diagnostics · L logs · A auto",
+        "R full refresh · L logs · wheel/Pg scroll · H metrics trends · → metrics drill · T dependencies · S system · A live",
         Style::default().fg(TEXT_DIM),
     )]);
 
@@ -962,7 +983,7 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
             Span::styled("expand  ", Style::default().fg(TEXT_DIM)),
             Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
             Span::styled("R ", Style::default().fg(CYBER_CYAN).bold()),
-            Span::styled("full/sect  ", Style::default().fg(TEXT_DIM)),
+            Span::styled("refresh  ", Style::default().fg(TEXT_DIM)),
             Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
             Span::styled("L ", Style::default().fg(CYBER_CYAN).bold()),
             Span::styled("logs  ", Style::default().fg(TEXT_DIM)),
@@ -1011,16 +1032,19 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
             )]),
             Line::from(""),
             Line::from("Navigation"),
-            Line::from("  ↑/↓ select section    Enter/Space expand/collapse    PgUp/PgDn scroll"),
+            Line::from(
+                "  ↑/↓ select section    Enter/Space expand/collapse    PgUp/PgDn/mouse scroll",
+            ),
+            Line::from("  When Logs is selected, ↑/↓ scroll log content first."),
             Line::from("  ESC close help / return to Main"),
             Line::from(""),
             Line::from("Actions"),
-            Line::from("  R refresh current row (Overview = full snapshot)"),
-            Line::from(
-                "  L fetch Gateway logs    H toggle trends    E export JSON to current directory",
-            ),
-            Line::from("  Metrics expanded: → cycle HTTP/Runs/Queue/SSE drill, ← leave drill"),
-            Line::from("  Dependencies expanded: T detail    System expanded: S diagnostics"),
+            Line::from("  R full snapshot refresh without closing your current section"),
+            Line::from("  L jump to Logs + fetch Gateway logs"),
+            Line::from("  H jump to Metrics + toggle trends    → Metrics drill    ← leave drill"),
+            Line::from("  T jump to Dependencies detail    S jump to System diagnostics"),
+            Line::from("  A toggle live auto-refresh (off by default for stable reading)"),
+            Line::from("  E export diagnostics JSON to the current working directory"),
             Line::from(""),
             Line::from("Recovery"),
             Line::from(

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.10.42",
+  "version": "2.10.44",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.42: Prevents stale global MK3 binaries from masking packaged TUI fixes. v2.10.41: Stabilizes Portal Monitoring refresh/log shortcuts and log scrolling.",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.44: Stabilizes Portal Monitoring reading mode, global refresh, logs, and shortcut behavior. v2.10.43: Makes Portal Monitoring footer shortcuts jump to their sections and fixes log scrolling.",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",