4runr-os 2.10.49 → 2.10.51

package/mk3-tui/src/app.rs

@@ -746,7 +746,8 @@ impl App {
         ws: &WebSocketClient,
         section: MonitoringSection,
     ) {
-        if self.state.pending_monitoring_refresh_id.is_some()
+        if self.state.pending_gateway_observability_id.is_some()
+            || self.state.pending_monitoring_refresh_id.is_some()
             || self.state.pending_monitoring_logs_id.is_some()
             || self.state.pending_monitoring_drill_id.is_some()
         {
@@ -774,7 +775,8 @@ impl App {
 
     /// Phase 2: fetch Gateway log buffer (`monitoring.logs`).
     pub fn begin_monitoring_logs_request(&mut self, ws: &WebSocketClient) {
-        if self.state.pending_monitoring_refresh_id.is_some()
+        if self.state.pending_gateway_observability_id.is_some()
+            || self.state.pending_monitoring_refresh_id.is_some()
             || self.state.pending_monitoring_logs_id.is_some()
             || self.state.pending_monitoring_drill_id.is_some()
         {
@@ -805,7 +807,8 @@ impl App {
         ws: &WebSocketClient,
         panel: MetricsDrillPanel,
     ) {
-        if self.state.pending_monitoring_refresh_id.is_some()
+        if self.state.pending_gateway_observability_id.is_some()
+            || self.state.pending_monitoring_refresh_id.is_some()
             || self.state.pending_monitoring_logs_id.is_some()
             || self.state.pending_monitoring_drill_id.is_some()
         {
@@ -835,7 +838,8 @@ impl App {
 
     /// Phase 3: dependency pools + queue counts (`dependencies/detail`).
     pub fn begin_dependencies_detail_drill(&mut self, ws: &WebSocketClient) {
-        if self.state.pending_monitoring_refresh_id.is_some()
+        if self.state.pending_gateway_observability_id.is_some()
+            || self.state.pending_monitoring_refresh_id.is_some()
             || self.state.pending_monitoring_logs_id.is_some()
             || self.state.pending_monitoring_drill_id.is_some()
         {
@@ -863,7 +867,8 @@ impl App {
 
     /// Phase 4: run local CLI/host diagnostics for the System section.
     pub fn begin_system_diagnostics_request(&mut self, ws: &WebSocketClient) {
-        if self.state.pending_monitoring_refresh_id.is_some()
+        if self.state.pending_gateway_observability_id.is_some()
+            || self.state.pending_monitoring_refresh_id.is_some()
             || self.state.pending_monitoring_logs_id.is_some()
             || self.state.pending_monitoring_drill_id.is_some()
         {
@@ -931,24 +936,15 @@ impl App {
         self.request_immediate_render("portal_obs_scroll");
     }
 
-    /// Drop in-flight `monitoring.*` / drill work without orphaning `gateway.observability`
-    /// (clearing that id makes the snapshot response a no-op and can stall the portal).
-    fn cancel_portal_monitoring_aux_requests(&mut self) {
+    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;
-        if self.state.pending_gateway_observability_id.is_none() {
-            self.state.portal_monitoring.loading = false;
-        }
-    }
-
-    fn cancel_portal_monitoring_requests(&mut self) {
-        self.cancel_portal_monitoring_aux_requests();
-        self.state.pending_gateway_observability_id = None;
-        self.state.portal_monitoring.loading = false;
     }
 
     /// CLI ↔ TUI WebSocket lost: drop Gateway link UI and leave Portal Monitoring / Connection Portal so the session does not appear still "connected".
@@ -2815,7 +2811,7 @@ impl App {
                 .monitoring_state
                 .expand_section(MonitoringSection::Logs);
             if let Some(ws) = ws_client {
-                self.cancel_portal_monitoring_aux_requests();
+                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);
@@ -2895,7 +2891,7 @@ impl App {
                 MonitoringSection::Dependencies,
             );
             if let Some(ws) = ws_client {
-                self.cancel_portal_monitoring_aux_requests();
+                self.cancel_portal_monitoring_requests();
                 self.begin_dependencies_detail_drill(ws);
                 self.request_immediate_render("portal_deps_drill");
             } else {
@@ -2907,33 +2903,9 @@ impl App {
         }
 
         // Phase 4: diagnostics for the local CLI/TUI bridge + Gateway reachability.
-        // S toggles like L for logs: second press dismisses the drill (does not cancel in-flight
-        // gateway.observability — that was orphaning snapshots and making S feel "stuck").
+        // S toggles: show diagnostics → hide (remove override). While loading, S aborts the
+        // in-flight drill so a later S can fetch again (avoids orphaned request ids vs cancel+refetch).
         if key.code == KeyCode::Char('s') || key.code == KeyCode::Char('S') {
-            let system_lines_open = self
-                .state
-                .portal_monitoring
-                .section_overrides
-                .contains_key(&MonitoringSection::System);
-            let system_request_inflight = self
-                .state
-                .portal_monitoring
-                .section_refresh_loading
-                == Some(MonitoringSection::System);
-            if system_lines_open && !system_request_inflight {
-                self.state
-                    .advanced_monitoring
-                    .monitoring_state
-                    .collapse_section(MonitoringSection::System);
-                self.state
-                    .portal_monitoring
-                    .section_overrides
-                    .remove(&MonitoringSection::System);
-                self.state.portal_monitoring.scroll_offset = 0;
-                self.state.portal_monitoring.error = None;
-                self.request_immediate_render("portal_system_diagnostics_close");
-                return Ok(false);
-            }
             self.state
                 .advanced_monitoring
                 .monitoring_state
@@ -2950,8 +2922,26 @@ impl App {
                 inner_h,
                 MonitoringSection::System,
             );
+
+            let pm = &mut self.state.portal_monitoring;
+            let has_system_diag =
+                pm.section_overrides.contains_key(&MonitoringSection::System);
+            let system_loading = pm.section_refresh_loading == Some(MonitoringSection::System);
+
+            if has_system_diag && !system_loading {
+                pm.section_overrides.remove(&MonitoringSection::System);
+                self.request_immediate_render("portal_system_dismiss");
+                return Ok(false);
+            }
+            if system_loading {
+                self.state.pending_monitoring_drill_id = None;
+                self.state.portal_monitoring.section_refresh_loading = None;
+                self.request_immediate_render("portal_system_abort_fetch");
+                return Ok(false);
+            }
+
             if let Some(ws) = ws_client {
-                self.cancel_portal_monitoring_aux_requests();
+                self.cancel_portal_monitoring_requests();
                 self.begin_system_diagnostics_request(ws);
                 self.request_immediate_render("portal_system_diagnostics");
             } else {
@@ -2980,7 +2970,7 @@ impl App {
                 MonitoringSection::Metrics,
             );
             if let Some(ws) = ws_client {
-                self.cancel_portal_monitoring_aux_requests();
+                self.cancel_portal_monitoring_requests();
                 let panel = self
                     .state
                     .portal_monitoring
@@ -3056,9 +3046,29 @@ impl App {
                 .map(|section| section.expanded)
                 .unwrap_or(false);
 
+        let system_selected_and_diagnostics = self
+            .state
+            .advanced_monitoring
+            .monitoring_state
+            .selected_section
+            == Some(MonitoringSection::System)
+            && self
+                .state
+                .advanced_monitoring
+                .monitoring_state
+                .sections
+                .get(&MonitoringSection::System)
+                .map(|section| section.expanded)
+                .unwrap_or(false)
+            && self
+                .state
+                .portal_monitoring
+                .section_overrides
+                .contains_key(&MonitoringSection::System);
+
         match key.code {
             KeyCode::Up => {
-                if logs_selected_and_open {
+                if logs_selected_and_open || system_selected_and_diagnostics {
                     self.state.portal_monitoring.scroll_offset =
                         self.state.portal_monitoring.scroll_offset.saturating_sub(1);
                     self.request_immediate_render("portal_obs_scroll");
@@ -3072,7 +3082,7 @@ impl App {
                 }
             }
             KeyCode::Down => {
-                if logs_selected_and_open {
+                if logs_selected_and_open || system_selected_and_diagnostics {
                     self.state.portal_monitoring.scroll_offset =
                         (self.state.portal_monitoring.scroll_offset + 1).min(max_scroll);
                     self.request_immediate_render("portal_obs_scroll");