4runr-os 2.10.9 → 2.10.13

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

@@ -1,259 +1,259 @@
-//! Portal Monitoring — live Gateway snapshot from Prometheus `GET /metrics` (via CLI WebSocket).
-
-use ratatui::layout::{Alignment, Constraint, Direction, Layout};
-use ratatui::prelude::*;
-use ratatui::widgets::{Block, Borders, Clear, Paragraph, Wrap};
-
-use crate::app::AppState;
-
-const BRAND_PURPLE: Color = Color::Rgb(138, 43, 226);
-const CYBER_CYAN: Color = Color::Rgb(0, 255, 255);
-const NEON_GREEN: Color = Color::Rgb(57, 255, 20);
-const TEXT_DIM: Color = Color::Rgb(100, 100, 120);
-const TEXT_PRIMARY: Color = Color::Rgb(230, 230, 240);
-const TEXT_WARN: Color = Color::Rgb(255, 180, 80);
-const TEXT_HEADER: Color = Color::Rgb(0, 200, 255);
-const BG_PANEL: Color = Color::Rgb(18, 18, 25);
-const SEPARATOR_COLOR: Color = Color::Rgb(60, 60, 80);
-
-fn gateway_display_url(state: &AppState) -> String {
-    state
-        .gateway_url
-        .as_deref()
-        .or(state.connection_portal.last_successful_url.as_deref())
-        .unwrap_or("(not linked)")
-        .to_string()
-}
-
-/// Full-screen Portal Monitoring (standalone base screen).
-pub fn render(f: &mut Frame, state: &mut AppState) {
-    let area = f.size();
-    if area.width == 0 || area.height == 0 {
-        return;
-    }
-
-    let chunks = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints([
-            Constraint::Length(3),
-            Constraint::Min(6),
-            Constraint::Length(3),
-        ])
-        .split(area);
-
-    let body_inner_h = chunks[1].height.saturating_sub(2) as usize;
-    state.portal_monitoring.viewport_lines = body_inner_h.max(5);
-
-    f.render_widget(Clear, area);
-    f.render_widget(Block::default().style(Style::default().bg(BG_PANEL)), area);
-
-    // Header
-    let title = Block::default()
-        .title(" Portal Monitoring ")
-        .title_style(Style::default().fg(BRAND_PURPLE).bold())
-        .borders(Borders::ALL)
-        .border_style(Style::default().fg(CYBER_CYAN))
-        .style(Style::default().bg(BG_PANEL));
-    f.render_widget(title, chunks[0]);
-
-    let url = gateway_display_url(state);
-    
-    // Build formatted content lines with styling
-    let mut body_lines: Vec<Line> = vec![];
-    
-    // Gateway URL header
-    body_lines.push(Line::from(vec![
-        Span::styled("Linked Gateway: ", Style::default().fg(TEXT_DIM)),
-        Span::styled(url, Style::default().fg(CYBER_CYAN).bold()),
-    ]));
-    body_lines.push(Line::from(""));
-
-    if state.portal_monitoring.loading && state.portal_monitoring.content_lines.is_empty() {
-        body_lines.push(Line::from(Span::styled(
-            "⏳ Fetching Prometheus /metrics from Gateway…",
-            Style::default().fg(TEXT_WARN),
-        )));
-    } else if let Some(ref err) = state.portal_monitoring.error {
-        body_lines.push(Line::from(vec![
-            Span::styled("✗ Error: ", Style::default().fg(Color::Red).bold()),
-            Span::styled(err, Style::default().fg(TEXT_PRIMARY)),
-        ]));
-        body_lines.push(Line::from(""));
-        body_lines.push(Line::from(Span::styled(
-            "Press R to retry",
-            Style::default().fg(TEXT_DIM),
-        )));
-    } else if state.portal_monitoring.content_lines.is_empty() {
-        body_lines.push(Line::from(Span::styled(
-            "No snapshot yet. Press R to fetch /metrics.",
-            Style::default().fg(TEXT_DIM),
-        )));
-    } else {
-        // Parse and format content lines with enhanced readability
-        let mut in_section = false;
-        let mut section_name = "";
-        
-        for raw_line in &state.portal_monitoring.content_lines {
-            let line_text = raw_line.trim();
-            
-            // Detect section headers
-            if line_text.starts_with("Live link check") 
-                || line_text.starts_with("Dependency checks") 
-                || line_text.starts_with("Prometheus /metrics") 
-                || line_text.starts_with("Top HTTP routes") {
-                in_section = true;
-                section_name = line_text;
-                body_lines.push(Line::from(Span::styled(
-                    format!("━━ {} ━━", line_text),
-                    Style::default().fg(TEXT_HEADER).bold(),
-                )));
-                continue;
-            }
-            
-            // Empty lines
-            if line_text.is_empty() {
-                body_lines.push(Line::from(""));
-                in_section = false;
-                continue;
-            }
-            
-            // Special formatting for different line types
-            if line_text.starts_with("LIVE:") {
-                body_lines.push(Line::from(Span::styled(
-                    line_text,
-                    Style::default().fg(NEON_GREEN).bold(),
-                )));
-            } else if line_text.starts_with("✓") || line_text.starts_with("/health OK") {
-                body_lines.push(Line::from(Span::styled(
-                    line_text,
-                    Style::default().fg(NEON_GREEN),
-                )));
-            } else if line_text.starts_with("⚠") || line_text.contains("degraded") || line_text.contains("not ready") {
-                body_lines.push(Line::from(Span::styled(
-                    line_text,
-                    Style::default().fg(TEXT_WARN),
-                )));
-            } else if line_text.starts_with("  •") {
-                // Dependency check lines - color based on status
-                let color = if line_text.contains(": up") {
-                    NEON_GREEN
-                } else if line_text.contains(": down") {
-                    Color::Red
-                } else {
-                    TEXT_WARN
-                };
-                body_lines.push(Line::from(Span::styled(
-                    line_text,
-                    Style::default().fg(color),
-                )));
-            } else if line_text.starts_with("  ") {
-                // Indented content (route metrics, etc)
-                body_lines.push(Line::from(Span::styled(
-                    line_text,
-                    Style::default().fg(TEXT_PRIMARY),
-                )));
-            } else if line_text.contains("total") || line_text.contains("latency") || line_text.contains("created") {
-                // Metrics lines - highlight numbers
-                let parts: Vec<&str> = line_text.split_whitespace().collect();
-                if parts.len() >= 2 {
-                    let (label, value) = line_text.split_at(line_text.rfind(char::is_whitespace).unwrap_or(line_text.len()));
-                    body_lines.push(Line::from(vec![
-                        Span::styled(format!("{}  ", label.trim()), Style::default().fg(TEXT_DIM)),
-                        Span::styled(value.trim(), Style::default().fg(CYBER_CYAN).bold()),
-                    ]));
-                } else {
-                    body_lines.push(Line::from(Span::styled(
-                        line_text,
-                        Style::default().fg(TEXT_PRIMARY),
-                    )));
-                }
-            } else {
-                // Default text
-                body_lines.push(Line::from(Span::styled(
-                    line_text,
-                    Style::default().fg(TEXT_PRIMARY),
-                )));
-            }
-        }
-    }
-
-    // Calculate scrolling
-    let total = body_lines.len();
-    let max_scroll = total.saturating_sub(body_inner_h.min(total.max(1)));
-    let start = state.portal_monitoring.scroll_offset.min(max_scroll);
-    let end = (start + body_inner_h).min(total);
-    let window: Vec<Line> = body_lines[start..end].to_vec();
-
-    let body = Paragraph::new(window)
-        .wrap(Wrap { trim: true })
-        .style(Style::default().bg(BG_PANEL))
-        .block(
-            Block::default()
-                .title(vec![
-                    Span::styled(" ", Style::default()),
-                    Span::styled("Traffic & Observability", Style::default().fg(NEON_GREEN).bold()),
-                    Span::styled(" ", Style::default()),
-                ])
-                .borders(Borders::ALL)
-                .border_style(Style::default().fg(SEPARATOR_COLOR))
-                .style(Style::default().bg(BG_PANEL)),
-        );
-    f.render_widget(body, chunks[1]);
-
-    // Footer with better visual hierarchy
-    let status = if state.portal_monitoring.loading {
-        vec![
-            Span::styled("⏳ ", Style::default().fg(TEXT_WARN)),
-            Span::styled("loading", Style::default().fg(TEXT_WARN)),
-        ]
-    } else {
-        vec![
-            Span::styled("● ", Style::default().fg(NEON_GREEN)),
-            Span::styled("live", Style::default().fg(NEON_GREEN)),
-        ]
-    };
-    
-    // Auto-refresh status
-    let auto_status = if state.portal_monitoring.auto_refresh_enabled {
-        Span::styled("auto ✓", Style::default().fg(NEON_GREEN))
-    } else {
-        Span::styled("auto ✗", Style::default().fg(TEXT_DIM))
-    };
-    
-    // Last refresh timer
-    let refresh_info = if let Some(last) = state.portal_monitoring.last_refresh {
-        let elapsed = last.elapsed().as_secs();
-        format!(" ~{}s ago", elapsed)
-    } else {
-        " never".to_string()
-    };
-    
-    let mut footer_spans = vec![
-        Span::styled("ESC ", Style::default().fg(BRAND_PURPLE).bold()),
-        Span::styled("Main  ", Style::default().fg(TEXT_DIM)),
-        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
-        Span::styled("R ", Style::default().fg(CYBER_CYAN).bold()),
-        Span::styled("refresh  ", Style::default().fg(TEXT_DIM)),
-        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
-        Span::styled("A ", Style::default().fg(CYBER_CYAN).bold()),
-        Span::styled("toggle auto  ", Style::default().fg(TEXT_DIM)),
-        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
-        Span::styled("↑↓ ", Style::default().fg(CYBER_CYAN).bold()),
-        Span::styled("scroll  ", Style::default().fg(TEXT_DIM)),
-        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
-    ];
-    footer_spans.extend(status);
-    footer_spans.push(Span::styled(refresh_info.as_str(), Style::default().fg(TEXT_DIM)));
-    footer_spans.push(Span::styled("  ", Style::default()));
-    footer_spans.push(auto_status);
-    
-    let footer = Paragraph::new(Line::from(footer_spans))
-        .alignment(Alignment::Center)
-        .block(
-            Block::default()
-                .borders(Borders::ALL)
-                .border_style(Style::default().fg(SEPARATOR_COLOR))
-                .style(Style::default().bg(BG_PANEL)),
-        );
-    f.render_widget(footer, chunks[2]);
-}
+//! Portal Monitoring — live Gateway snapshot from Prometheus `GET /metrics` (via CLI WebSocket).
+
+use ratatui::layout::{Alignment, Constraint, Direction, Layout};
+use ratatui::prelude::*;
+use ratatui::widgets::{Block, Borders, Clear, Paragraph, Wrap};
+
+use crate::app::AppState;
+
+const BRAND_PURPLE: Color = Color::Rgb(138, 43, 226);
+const CYBER_CYAN: Color = Color::Rgb(0, 255, 255);
+const NEON_GREEN: Color = Color::Rgb(57, 255, 20);
+const TEXT_DIM: Color = Color::Rgb(100, 100, 120);
+const TEXT_PRIMARY: Color = Color::Rgb(230, 230, 240);
+const TEXT_WARN: Color = Color::Rgb(255, 180, 80);
+const TEXT_HEADER: Color = Color::Rgb(0, 200, 255);
+const BG_PANEL: Color = Color::Rgb(18, 18, 25);
+const SEPARATOR_COLOR: Color = Color::Rgb(60, 60, 80);
+
+fn gateway_display_url(state: &AppState) -> String {
+    state
+        .gateway_url
+        .as_deref()
+        .or(state.connection_portal.last_successful_url.as_deref())
+        .unwrap_or("(not linked)")
+        .to_string()
+}
+
+/// Full-screen Portal Monitoring (standalone base screen).
+pub fn render(f: &mut Frame, state: &mut AppState) {
+    let area = f.size();
+    if area.width == 0 || area.height == 0 {
+        return;
+    }
+
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([
+            Constraint::Length(3),
+            Constraint::Min(6),
+            Constraint::Length(3),
+        ])
+        .split(area);
+
+    let body_inner_h = chunks[1].height.saturating_sub(2) as usize;
+    state.portal_monitoring.viewport_lines = body_inner_h.max(5);
+
+    f.render_widget(Clear, area);
+    f.render_widget(Block::default().style(Style::default().bg(BG_PANEL)), area);
+
+    // Header
+    let title = Block::default()
+        .title(" Portal Monitoring ")
+        .title_style(Style::default().fg(BRAND_PURPLE).bold())
+        .borders(Borders::ALL)
+        .border_style(Style::default().fg(CYBER_CYAN))
+        .style(Style::default().bg(BG_PANEL));
+    f.render_widget(title, chunks[0]);
+
+    let url = gateway_display_url(state);
+    
+    // Build formatted content lines with styling
+    let mut body_lines: Vec<Line> = vec![];
+    
+    // Gateway URL header
+    body_lines.push(Line::from(vec![
+        Span::styled("Linked Gateway: ", Style::default().fg(TEXT_DIM)),
+        Span::styled(url, Style::default().fg(CYBER_CYAN).bold()),
+    ]));
+    body_lines.push(Line::from(""));
+
+    if state.portal_monitoring.loading && state.portal_monitoring.content_lines.is_empty() {
+        body_lines.push(Line::from(Span::styled(
+            "⏳ Fetching Prometheus /metrics from Gateway…",
+            Style::default().fg(TEXT_WARN),
+        )));
+    } else if let Some(ref err) = state.portal_monitoring.error {
+        body_lines.push(Line::from(vec![
+            Span::styled("✗ Error: ", Style::default().fg(Color::Red).bold()),
+            Span::styled(err, Style::default().fg(TEXT_PRIMARY)),
+        ]));
+        body_lines.push(Line::from(""));
+        body_lines.push(Line::from(Span::styled(
+            "Press R to retry",
+            Style::default().fg(TEXT_DIM),
+        )));
+    } else if state.portal_monitoring.content_lines.is_empty() {
+        body_lines.push(Line::from(Span::styled(
+            "No snapshot yet. Press R to fetch /metrics.",
+            Style::default().fg(TEXT_DIM),
+        )));
+    } else {
+        // Parse and format content lines with enhanced readability
+        let mut in_section = false;
+        let mut section_name = "";
+        
+        for raw_line in &state.portal_monitoring.content_lines {
+            let line_text = raw_line.trim();
+            
+            // Detect section headers
+            if line_text.starts_with("Live link check") 
+                || line_text.starts_with("Dependency checks") 
+                || line_text.starts_with("Prometheus /metrics") 
+                || line_text.starts_with("Top HTTP routes") {
+                in_section = true;
+                section_name = line_text;
+                body_lines.push(Line::from(Span::styled(
+                    format!("━━ {} ━━", line_text),
+                    Style::default().fg(TEXT_HEADER).bold(),
+                )));
+                continue;
+            }
+            
+            // Empty lines
+            if line_text.is_empty() {
+                body_lines.push(Line::from(""));
+                in_section = false;
+                continue;
+            }
+            
+            // Special formatting for different line types
+            if line_text.starts_with("LIVE:") {
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(NEON_GREEN).bold(),
+                )));
+            } else if line_text.starts_with("✓") || line_text.starts_with("/health OK") {
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(NEON_GREEN),
+                )));
+            } else if line_text.starts_with("⚠") || line_text.contains("degraded") || line_text.contains("not ready") {
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(TEXT_WARN),
+                )));
+            } else if line_text.starts_with("  •") {
+                // Dependency check lines - color based on status
+                let color = if line_text.contains(": up") {
+                    NEON_GREEN
+                } else if line_text.contains(": down") {
+                    Color::Red
+                } else {
+                    TEXT_WARN
+                };
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(color),
+                )));
+            } else if line_text.starts_with("  ") {
+                // Indented content (route metrics, etc)
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(TEXT_PRIMARY),
+                )));
+            } else if line_text.contains("total") || line_text.contains("latency") || line_text.contains("created") {
+                // Metrics lines - highlight numbers
+                let parts: Vec<&str> = line_text.split_whitespace().collect();
+                if parts.len() >= 2 {
+                    let (label, value) = line_text.split_at(line_text.rfind(char::is_whitespace).unwrap_or(line_text.len()));
+                    body_lines.push(Line::from(vec![
+                        Span::styled(format!("{}  ", label.trim()), Style::default().fg(TEXT_DIM)),
+                        Span::styled(value.trim(), Style::default().fg(CYBER_CYAN).bold()),
+                    ]));
+                } else {
+                    body_lines.push(Line::from(Span::styled(
+                        line_text,
+                        Style::default().fg(TEXT_PRIMARY),
+                    )));
+                }
+            } else {
+                // Default text
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(TEXT_PRIMARY),
+                )));
+            }
+        }
+    }
+
+    // Calculate scrolling
+    let total = body_lines.len();
+    let max_scroll = total.saturating_sub(body_inner_h.min(total.max(1)));
+    let start = state.portal_monitoring.scroll_offset.min(max_scroll);
+    let end = (start + body_inner_h).min(total);
+    let window: Vec<Line> = body_lines[start..end].to_vec();
+
+    let body = Paragraph::new(window)
+        .wrap(Wrap { trim: true })
+        .style(Style::default().bg(BG_PANEL))
+        .block(
+            Block::default()
+                .title(vec![
+                    Span::styled(" ", Style::default()),
+                    Span::styled("Traffic & Observability", Style::default().fg(NEON_GREEN).bold()),
+                    Span::styled(" ", Style::default()),
+                ])
+                .borders(Borders::ALL)
+                .border_style(Style::default().fg(SEPARATOR_COLOR))
+                .style(Style::default().bg(BG_PANEL)),
+        );
+    f.render_widget(body, chunks[1]);
+
+    // Footer with better visual hierarchy
+    let status = if state.portal_monitoring.loading {
+        vec![
+            Span::styled("⏳ ", Style::default().fg(TEXT_WARN)),
+            Span::styled("loading", Style::default().fg(TEXT_WARN)),
+        ]
+    } else {
+        vec![
+            Span::styled("● ", Style::default().fg(NEON_GREEN)),
+            Span::styled("live", Style::default().fg(NEON_GREEN)),
+        ]
+    };
+    
+    // Auto-refresh status
+    let auto_status = if state.portal_monitoring.auto_refresh_enabled {
+        Span::styled("auto ✓", Style::default().fg(NEON_GREEN))
+    } else {
+        Span::styled("auto ✗", Style::default().fg(TEXT_DIM))
+    };
+    
+    // Last refresh timer
+    let refresh_info = if let Some(last) = state.portal_monitoring.last_refresh {
+        let elapsed = last.elapsed().as_secs();
+        format!(" ~{}s ago", elapsed)
+    } else {
+        " never".to_string()
+    };
+    
+    let mut footer_spans = vec![
+        Span::styled("ESC ", Style::default().fg(BRAND_PURPLE).bold()),
+        Span::styled("Main  ", Style::default().fg(TEXT_DIM)),
+        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
+        Span::styled("R ", Style::default().fg(CYBER_CYAN).bold()),
+        Span::styled("refresh  ", Style::default().fg(TEXT_DIM)),
+        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
+        Span::styled("A ", Style::default().fg(CYBER_CYAN).bold()),
+        Span::styled("toggle auto  ", Style::default().fg(TEXT_DIM)),
+        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
+        Span::styled("↑↓ ", Style::default().fg(CYBER_CYAN).bold()),
+        Span::styled("scroll  ", Style::default().fg(TEXT_DIM)),
+        Span::styled("│  ", Style::default().fg(SEPARATOR_COLOR)),
+    ];
+    footer_spans.extend(status);
+    footer_spans.push(Span::styled(refresh_info.as_str(), Style::default().fg(TEXT_DIM)));
+    footer_spans.push(Span::styled("  ", Style::default()));
+    footer_spans.push(auto_status);
+    
+    let footer = Paragraph::new(Line::from(footer_spans))
+        .alignment(Alignment::Center)
+        .block(
+            Block::default()
+                .borders(Borders::ALL)
+                .border_style(Style::default().fg(SEPARATOR_COLOR))
+                .style(Style::default().bg(BG_PANEL)),
+        );
+    f.render_widget(footer, chunks[2]);
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.10.9",
+  "version": "2.10.13",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.9: EBUSY fix — no parallel `npm -g` while 4r deferred update runs (lock + preinstall guard); longer delay before background npm. v2.10.8: Prisma/PORT. See docs/4RUNR-DB-IMPLEMENTATION-PLAN.md, docs/MONITORING-IMPROVEMENTS-V1.md",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.13: Watchdog process stops Docker on ANY exit (crash, force-kill, terminal close). v2.10.12: Graceful shutdown. See docs",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",