4runr-os 2.10.42 → 2.10.43

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

@@ -922,6 +922,20 @@ 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");
+    }
+
     /// 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 +2707,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 {
@@ -2774,12 +2790,24 @@ 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.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 +2818,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 +2861,94 @@ 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.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.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 {
+                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 +2998,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

@@ -1548,6 +1548,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 +1573,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`).

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.10.42",
+  "version": "2.10.43",
   "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.43: Makes Portal Monitoring footer shortcuts jump to their sections and fixes log scrolling. v2.10.42: Prevents stale global MK3 binaries from masking packaged TUI fixes.",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",