4runr-os 2.10.43 → 2.10.45

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(),
@@ -936,6 +936,17 @@ impl App {
         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;
@@ -2535,7 +2546,9 @@ impl App {
 
             // M — Portal Monitoring (after successful connect)
             KeyCode::Char('m') | KeyCode::Char('M')
-                if self.state.connection_portal.connection_success =>
+                if self.state.connection_portal.connection_success
+                    || (matches!(self.state.operation_mode, OperationMode::Connected)
+                        && self.state.gateway_url.is_some()) =>
             {
                 self.state
                     .navigation
@@ -2750,37 +2763,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 =
@@ -2790,6 +2779,29 @@ impl App {
             return Ok(false);
         }
         if key.code == KeyCode::Char('l') || key.code == KeyCode::Char('L') {
+            let logs_open = self
+                .state
+                .advanced_monitoring
+                .monitoring_state
+                .selected_section
+                == Some(MonitoringSection::Logs)
+                && self
+                    .state
+                    .advanced_monitoring
+                    .monitoring_state
+                    .sections
+                    .get(&MonitoringSection::Logs)
+                    .map(|section| section.expanded)
+                    .unwrap_or(false);
+            if logs_open && !self.state.portal_monitoring.logs_fetch_loading {
+                self.state
+                    .advanced_monitoring
+                    .monitoring_state
+                    .collapse_section(MonitoringSection::Logs);
+                self.state.portal_monitoring.scroll_offset = 0;
+                self.request_immediate_render("portal_monitoring_logs_close");
+                return Ok(false);
+            }
             self.state
                 .advanced_monitoring
                 .monitoring_state
@@ -2799,6 +2811,7 @@ impl App {
                 .monitoring_state
                 .expand_section(MonitoringSection::Logs);
             if let Some(ws) = ws_client {
+                self.cancel_portal_monitoring_requests();
                 self.begin_monitoring_logs_request(ws);
                 let inner_h = self.state.portal_monitoring.viewport_lines.max(5);
                 let sw = self.state.portal_monitoring.summary_clip_width.max(24);
@@ -2878,6 +2891,7 @@ impl App {
                 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 {
@@ -2907,6 +2921,7 @@ impl App {
                 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 {
@@ -2935,6 +2950,7 @@ impl App {
                 MonitoringSection::Metrics,
             );
             if let Some(ws) = ws_client {
+                self.cancel_portal_monitoring_requests();
                 let panel = self
                     .state
                     .portal_monitoring
@@ -3004,7 +3020,6 @@ impl App {
                     .monitoring_state
                     .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);
@@ -3025,7 +3040,6 @@ impl App {
                     .monitoring_state
                     .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);

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(),

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

@@ -878,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),
     )]);
 
@@ -983,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)),
@@ -1032,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.43",
+  "version": "2.10.45",
   "type": "module",
-  "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.",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.45: Fixes Portal Monitoring log toggle, log-bottom scroll, and monitor re-entry from linked Gateway sessions. v2.10.44: Stabilizes Portal Monitoring reading mode, global refresh, logs, and shortcut behavior.",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",