4runr-os 2.3.8 → 2.4.0

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

@@ -5,6 +5,16 @@ use ratatui::prelude::*;
 use ratatui::widgets::{Block, Borders, Paragraph, Wrap};
 use crate::app::AppState;
 
+// === 4RUNR BRAND COLORS (matching layout.rs) ===
+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 AMBER_WARN: Color = Color::Rgb(255, 191, 0);
+const TEXT_PRIMARY: Color = Color::Rgb(230, 230, 240);
+const TEXT_DIM: Color = Color::Rgb(100, 100, 120);
+const TEXT_MUTED: Color = Color::Rgb(60, 60, 80);
+const BG_PANEL: Color = Color::Rgb(18, 18, 25);
+
 /// Settings state
 #[derive(Debug, Clone)]
 pub struct SettingsState {
@@ -170,19 +180,20 @@ pub fn render(f: &mut Frame, state: &AppState) {
 
 fn render_header(f: &mut Frame, area: Rect, settings: &SettingsState) {
     let title = if settings.has_changes {
-        " Settings (Unsaved Changes) "
+        " ⚙️  Settings (Unsaved Changes ●) "
     } else {
-        " Settings "
+        " ⚙️  Settings "
     };
     
     let block = Block::default()
         .title(title)
         .borders(Borders::ALL)
         .border_style(Style::default().fg(if settings.has_changes {
-            Color::Yellow
+            AMBER_WARN
         } else {
-            Color::Cyan
-        }));
+            BRAND_PURPLE
+        }))
+        .style(Style::default().bg(BG_PANEL));
     
     f.render_widget(block, area);
 }
@@ -190,7 +201,8 @@ fn render_header(f: &mut Frame, area: Rect, settings: &SettingsState) {
 fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState) {
     let block = Block::default()
         .borders(Borders::ALL)
-        .border_style(Style::default().fg(Color::Cyan));
+        .border_style(Style::default().fg(CYBER_CYAN))
+        .style(Style::default().bg(BG_PANEL));
     
     let inner = block.inner(area);
     f.render_widget(block, area);
@@ -206,9 +218,9 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
         Line::from(vec![
             Span::styled(
                 if is_mode_focused { "▶ " } else { "  " },
-                Style::default().fg(Color::Yellow)
+                Style::default().fg(BRAND_PURPLE).bold()
             ),
-            Span::styled("Operation Mode", Style::default().bold()),
+            Span::styled("🌐 Operation Mode", Style::default().fg(TEXT_PRIMARY).bold()),
         ]),
         Line::from(vec![
             Span::raw("    "),
@@ -217,14 +229,14 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
                     if settings.mode == OperationMode::Local { "●" } else { " " },
                     if settings.mode == OperationMode::Connected { "●" } else { " " }
                 ),
-                Style::default().fg(if is_mode_focused { Color::Yellow } else { Color::White })
+                Style::default().fg(if is_mode_focused { CYBER_CYAN } else { TEXT_PRIMARY })
             ),
         ]),
         Line::from(vec![
             Span::raw("    "),
             Span::styled(
                 settings.mode.description(),
-                Style::default().fg(Color::DarkGray).italic()
+                Style::default().fg(TEXT_DIM).italic()
             ),
         ]),
         Line::from(""),
@@ -233,29 +245,29 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
         Line::from(vec![
             Span::styled(
                 if is_provider_focused { "▶ " } else { "  " },
-                Style::default().fg(Color::Yellow)
+                Style::default().fg(BRAND_PURPLE).bold()
             ),
-            Span::styled("AI Provider", Style::default().bold()),
+            Span::styled("🤖 AI Provider", Style::default().fg(TEXT_PRIMARY).bold()),
         ]),
         Line::from(vec![
-            Span::raw("    Provider: "),
+            Span::styled("    Provider: ", Style::default().fg(TEXT_DIM)),
             Span::styled(
                 &settings.ai_provider,
-                Style::default().fg(if is_provider_focused { Color::Yellow } else { Color::Cyan })
+                Style::default().fg(if is_provider_focused { CYBER_CYAN } else { TEXT_PRIMARY }).bold()
             ),
         ]),
         Line::from(vec![
-            Span::raw("    Model: "),
+            Span::styled("    Model: ", Style::default().fg(TEXT_DIM)),
             Span::styled(
                 &settings.ai_model,
-                Style::default().fg(if is_provider_focused { Color::Yellow } else { Color::Cyan })
+                Style::default().fg(if is_provider_focused { CYBER_CYAN } else { TEXT_PRIMARY })
             ),
         ]),
         Line::from(vec![
-            Span::raw("    API Key: "),
+            Span::styled("    API Key: ", Style::default().fg(TEXT_DIM)),
             Span::styled(
                 if settings.api_key_set { "Configured ✓" } else { "Not set" },
-                Style::default().fg(if settings.api_key_set { Color::Green } else { Color::Red })
+                Style::default().fg(if settings.api_key_set { NEON_GREEN } else { Color::Rgb(255, 69, 69) })
             ),
         ]),
         Line::from(""),
@@ -264,22 +276,22 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
         Line::from(vec![
             Span::styled(
                 if is_gateway_focused { "▶ " } else { "  " },
-                Style::default().fg(Color::Yellow)
+                Style::default().fg(BRAND_PURPLE).bold()
             ),
-            Span::styled("Gateway Connection", Style::default().bold()),
+            Span::styled("🔗 Gateway Connection", Style::default().fg(TEXT_PRIMARY).bold()),
         ]),
         Line::from(vec![
-            Span::raw("    URL: "),
+            Span::styled("    URL: ", Style::default().fg(TEXT_DIM)),
             Span::styled(
                 &settings.gateway_url,
-                Style::default().fg(if is_gateway_focused { Color::Yellow } else { Color::Cyan })
+                Style::default().fg(if is_gateway_focused { CYBER_CYAN } else { TEXT_PRIMARY })
             ),
         ]),
         Line::from(vec![
-            Span::raw("    Status: "),
+            Span::styled("    Status: ", Style::default().fg(TEXT_DIM)),
             Span::styled(
                 if settings.gateway_connected { "Connected ✓" } else { "Disconnected" },
-                Style::default().fg(if settings.gateway_connected { Color::Green } else { Color::DarkGray })
+                Style::default().fg(if settings.gateway_connected { NEON_GREEN } else { TEXT_MUTED })
             ),
         ]),
         Line::from(""),
@@ -288,9 +300,9 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
         Line::from(vec![
             Span::styled(
                 if is_autoupdate_focused { "▶ " } else { "  " },
-                Style::default().fg(Color::Yellow)
+                Style::default().fg(BRAND_PURPLE).bold()
             ),
-            Span::styled("Auto-Update", Style::default().bold()),
+            Span::styled("🔄 Auto-Update", Style::default().fg(TEXT_PRIMARY).bold()),
         ]),
         Line::from(vec![
             Span::raw("    "),
@@ -298,7 +310,7 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
                 format!("[{}] Enable automatic updates",
                     if settings.auto_update { "✓" } else { " " }
                 ),
-                Style::default().fg(if is_autoupdate_focused { Color::Yellow } else { Color::White })
+                Style::default().fg(if is_autoupdate_focused { CYBER_CYAN } else { TEXT_PRIMARY })
             ),
         ]),
     ];
@@ -312,35 +324,38 @@ fn render_settings_content(f: &mut Frame, area: Rect, settings: &SettingsState)
 
 fn render_actions(f: &mut Frame, area: Rect, settings: &SettingsState) {
     let block = Block::default()
-        .title(" Actions ")
+        .title(" ⌨️  Actions ")
         .borders(Borders::ALL)
-        .border_style(Style::default().fg(Color::DarkGray));
+        .border_style(Style::default().fg(TEXT_DIM))
+        .style(Style::default().bg(BG_PANEL));
     
     let inner = block.inner(area);
     f.render_widget(block, area);
     
     let text = if settings.has_changes {
         Line::from(vec![
-            Span::raw("↑/↓ Navigate  |  "),
-            Span::styled("Space", Style::default().fg(Color::Yellow)),
-            Span::raw(" Toggle  |  "),
-            Span::styled("Enter", Style::default().fg(Color::Green)),
-            Span::raw(" Save  |  "),
-            Span::styled("ESC", Style::default().fg(Color::Red)),
-            Span::raw(" Discard & Close"),
+            Span::styled("↑/↓", Style::default().fg(CYBER_CYAN).bold()),
+            Span::styled(" Navigate  │  ", Style::default().fg(TEXT_DIM)),
+            Span::styled("Space", Style::default().fg(AMBER_WARN).bold()),
+            Span::styled(" Toggle  │  ", Style::default().fg(TEXT_DIM)),
+            Span::styled("Enter", Style::default().fg(NEON_GREEN).bold()),
+            Span::styled(" Save  │  ", Style::default().fg(TEXT_DIM)),
+            Span::styled("ESC", Style::default().fg(Color::Rgb(255, 69, 69)).bold()),
+            Span::styled(" Discard & Close", Style::default().fg(TEXT_DIM)),
         ])
     } else {
         Line::from(vec![
-            Span::raw("↑/↓ Navigate  |  "),
-            Span::styled("Space", Style::default().fg(Color::Yellow)),
-            Span::raw(" Toggle  |  "),
-            Span::styled("ESC", Style::default().fg(Color::Red)),
-            Span::raw(" Close"),
+            Span::styled("↑/↓", Style::default().fg(CYBER_CYAN).bold()),
+            Span::styled(" Navigate  │  ", Style::default().fg(TEXT_DIM)),
+            Span::styled("Space", Style::default().fg(AMBER_WARN).bold()),
+            Span::styled(" Toggle  │  ", Style::default().fg(TEXT_DIM)),
+            Span::styled("ESC", Style::default().fg(BRAND_PURPLE).bold()),
+            Span::styled(" Close", Style::default().fg(TEXT_DIM)),
         ])
     };
     
     let paragraph = Paragraph::new(text)
-        .style(Style::default().fg(Color::DarkGray))
+        .style(Style::default().fg(TEXT_PRIMARY))
         .alignment(Alignment::Center);
     
     f.render_widget(paragraph, inner);

package/mk3-tui/src/websocket.rs

@@ -72,6 +72,9 @@ pub enum WsClientMessage {
     Response(ResponseMessage),
     Event(EventMessage),
     Error(String),
+    ConnectionLost,
+    Reconnecting,
+    ReconnectFailed(String),
 }
 
 pub struct WebSocketClient {
@@ -79,6 +82,7 @@ pub struct WebSocketClient {
     tx: mpsc::UnboundedSender<WsMessage>,
     rx: Arc<Mutex<mpsc::UnboundedReceiver<WsClientMessage>>>,
     connected: Arc<Mutex<bool>>,
+    pending_commands: Arc<Mutex<Vec<(String, String, Option<serde_json::Value>)>>>, // (id, command, data)
 }
 
 impl WebSocketClient {
@@ -102,6 +106,7 @@ impl WebSocketClient {
             tx: msg_tx,
             rx: Arc::new(Mutex::new(client_rx)),
             connected,
+            pending_commands: Arc::new(Mutex::new(Vec::new())),
         })
     }
 
@@ -146,7 +151,8 @@ impl WebSocketClient {
                 }
                 Err(e) => {
                     *connected.lock().unwrap() = false;
-                    let _ = client_tx.send(WsClientMessage::Error(e.to_string()));
+                    let _ = client_tx.send(WsClientMessage::ConnectionLost);
+                    let _ = client_tx.send(WsClientMessage::Error(format!("Connection error: {}", e)));
                     break;
                 }
                 _ => {}
@@ -188,15 +194,54 @@ impl WebSocketClient {
             timestamp,
             payload: CommandPayload {
                 command: command.to_string(),
-                data,
+                data: data.clone(),
             },
         });
 
         let json = serde_json::to_string(&cmd)?;
+        
+        // Track pending command for retry
+        if self.is_connected() {
+            self.pending_commands.lock().unwrap().push((id.clone(), command.to_string(), data));
+        }
+        
         self.tx.send(WsMessage::Text(json))?;
 
         Ok(id)
     }
+    
+    /// Retry pending commands after reconnection
+    pub fn retry_pending_commands(&self) -> Result<Vec<String>> {
+        let mut pending = self.pending_commands.lock().unwrap();
+        let mut retried_ids = Vec::new();
+        
+        for (old_id, command, data) in pending.drain(..) {
+            // Generate new ID for retry
+            let new_id = format!("retry-{}", uuid::Uuid::new_v4());
+            let timestamp = chrono::Utc::now().to_rfc3339();
+            
+            let cmd = Message::Command(CommandMessage {
+                id: new_id.clone(),
+                timestamp,
+                payload: CommandPayload {
+                    command,
+                    data,
+                },
+            });
+            
+            let json = serde_json::to_string(&cmd)?;
+            self.tx.send(WsMessage::Text(json))?;
+            
+            retried_ids.push(format!("{} -> {}", &old_id[old_id.len().saturating_sub(8)..], &new_id[new_id.len().saturating_sub(8)..]));
+        }
+        
+        Ok(retried_ids)
+    }
+    
+    /// Clear pending commands (e.g., on explicit disconnect)
+    pub fn clear_pending_commands(&self) {
+        self.pending_commands.lock().unwrap().clear();
+    }
 
     pub fn try_recv(&self) -> Option<WsClientMessage> {
         self.rx.lock().unwrap().try_recv().ok()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "4runr-os",
-  "version": "2.3.8",
+  "version": "2.4.0",
   "type": "module",
   "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.3.5: Fixed boot screen logo rendering (restored original working version), fully functional Agent Builder with input handling and TUI styling. Built with Rust + Ratatui. ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",