4runr-os 2.9.95 → 2.9.96

package/mk3-tui/src/app.rs

@@ -1506,11 +1506,13 @@ impl App {
                 } else {
                     // Open detail view
                     if let Some(run) = self.state.run_manager.selected_run() {
-                        self.add_log(format!("[RUN] Viewing run: {}", run.name));
+                        let run_id = run.id.clone();
+                        let run_name = run.name.clone();
+                        self.add_log(format!("[RUN] Viewing run: {}", run_name));
                         self.state.run_manager.toggle_detail_view();
                         if self.state.operation_mode == OperationMode::Connected {
                             if let Some(ws) = ws_client {
-                                let data = serde_json::json!({ "runId": run.id.clone() });
+                                let data = serde_json::json!({ "runId": run_id });
                                 if let Ok(id) = ws.send_command("run.get", Some(data)) {
                                     self.state.pending_run_get_id = Some(id);
                                 }
@@ -1716,20 +1718,22 @@ impl App {
                     self.add_log("[AGENT] Connect to Gateway first to run on the server (key x).".to_string());
                 } else if self.state.agent_list.agents.is_empty() {
                     self.add_log("[AGENT] No agents in list.".to_string());
-                } else if let Some(agent) = self.get_selected_agent() {
+                } else if let Some((agent_name, agent_model)) =
+                    self.get_selected_agent().map(|a| (a.name.clone(), a.model.clone()))
+                {
                     if let Some(ws) = ws_client {
-                        let name = format!("TUI: {}", agent.name);
+                        let name = format!("TUI: {}", agent_name);
                         let input = serde_json::json!({
                             "agent_id": "test",
                             "data": {
-                                "prompt": format!("Quick run for local agent profile '{}' (model {}).", agent.name, agent.model)
+                                "prompt": format!("Quick run for local agent profile '{}' (model {}).", agent_name, agent_model)
                             }
                         });
                         let data = serde_json::json!({ "name": name, "input": input });
                         match ws.send_command("run.quick", Some(data)) {
                             Ok(id) => {
                                 self.state.pending_run_quick_id = Some(id);
-                                self.add_log(format!("[AGENT] Queued Gateway run for profile '{}' (x)", agent.name));
+                                self.add_log(format!("[AGENT] Queued Gateway run for profile '{}' (x)", agent_name));
                             }
                             Err(e) => self.add_log(format!("[ERROR] run.quick: {}", e)),
                         }

package/mk3-tui/src/debug_log.rs

@@ -0,0 +1,124 @@
+//! File-based debug logger for Setup Portal.
+//! When SETUP_PORTAL_DEBUG=1 or SETUP_PORTAL_DEBUG_FILE is set, all inputs and render state
+//! are written to a file so you can capture the full trace when reproducing the navigation bug.
+//!
+//! Usage:
+//!   set SETUP_PORTAL_DEBUG_FILE=setup-portal-debug.log
+//!   mk3-tui   (or 4r)
+//! Then open Setup Portal (windowed), reproduce the bug, exit. Inspect setup-portal-debug.log.
+
+use std::io::Write;
+use std::sync::Mutex;
+use std::sync::OnceLock;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+fn enabled() -> bool {
+    std::env::var("SETUP_PORTAL_DEBUG").as_deref() == Ok("1")
+        || std::env::var("SETUP_PORTAL_DEBUG_FILE").is_ok()
+}
+
+fn path() -> String {
+    std::env::var("SETUP_PORTAL_DEBUG_FILE")
+        .unwrap_or_else(|_| "setup-portal-debug.log".to_string())
+}
+
+static FILE: OnceLock<Mutex<Option<std::io::BufWriter<std::fs::File>>>> = OnceLock::new();
+
+fn ensure_open() -> bool {
+    if !enabled() {
+        return false;
+    }
+    let mutex = FILE.get_or_init(|| Mutex::new(None));
+    let mut guard = mutex.lock().unwrap();
+    if guard.is_none() {
+        let path = path();
+        match std::fs::OpenOptions::new()
+            .create(true)
+            .append(true)
+            .open(&path)
+        {
+            Ok(file_handle) => {
+                // Resolve full path so user always knows where the log is
+                let full_path: String = std::path::Path::new(&path)
+                    .canonicalize()
+                    .map(|p| p.display().to_string())
+                    .or_else(|_| std::env::current_dir().map(|cwd| cwd.join(&path).display().to_string()))
+                    .unwrap_or_else(|_| path.clone());
+                let _ = writeln!(
+                    std::io::stderr(),
+                    "[SETUP_PORTAL_DEBUG] Log file: {}",
+                    full_path
+                );
+                let mut w = std::io::BufWriter::new(file_handle);
+                let banner = format!("{} === Setup Portal debug log opened: {} ===\n", timestamp(), full_path);
+                let _ = w.write_all(banner.as_bytes());
+                let _ = w.flush();
+                *guard = Some(w);
+                return true;
+            }
+            Err(e) => {
+                let _ = writeln!(
+                    std::io::stderr(),
+                    "[SETUP_PORTAL_DEBUG] Failed to open \"{}\": {}",
+                    path, e
+                );
+                return false;
+            }
+        }
+    }
+    true
+}
+
+fn log_raw(msg: &str) {
+    if !enabled() {
+        return;
+    }
+    if !ensure_open() {
+        return;
+    }
+    let mutex = FILE.get().unwrap();
+    let mut guard = mutex.lock().unwrap();
+    if let Some(ref mut w) = *guard {
+        let _ = w.write_all(msg.as_bytes());
+        let _ = w.write_all(b"\n");
+        let _ = w.flush();
+    }
+}
+
+fn timestamp() -> String {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|d| format!("{}.{:03}", d.as_secs(), d.subsec_millis()))
+        .unwrap_or_else(|_| "?.???".to_string())
+}
+
+/// Log a line with timestamp. Call from main or setup_portal when debug file is enabled.
+pub fn log(msg: &str) {
+    log_raw(&format!("{} {}", timestamp(), msg));
+}
+
+/// Log screen switch (enter/leave Setup Portal).
+pub fn log_screen(from: &str, to: &str) {
+    log(&format!("SCREEN {} -> {}", from, to));
+}
+
+/// Log an input event (key, mouse, resize).
+pub fn log_input(kind: &str, detail: &str) {
+    log(&format!("INPUT {} {}", kind, detail));
+}
+
+/// Log render state (dims, rects, selected option). Throttled by caller.
+pub fn log_render(msg: &str) {
+    log(&format!("RENDER {}", msg));
+}
+
+/// Log flicker-debug: when we clear and when we finish draw (to correlate with visible flicker).
+/// Writes to debug file when SETUP_PORTAL_DEBUG or SETUP_PORTAL_DEBUG_FILE is set.
+pub fn log_flicker_debug(event: &str, detail: &str) {
+    let msg = format!("FLICKER {} {}", event, detail);
+    log(&msg);
+    // Also to stderr when file debug enabled, so "4r 2> setup-debug.log" captures it
+    if enabled() {
+        let _ = writeln!(std::io::stderr(), "[SETUP_PORTAL_DEBUG] {}", msg);
+    }
+}

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

@@ -126,16 +126,17 @@ fn render_header(f: &mut Frame, area: Rect, state: &AppState) {
     
     let portal = &state.connection_portal;
     
-    let (title, border_color) = if portal.connection_success {
+    let (title, border_color): (String, Color) = if portal.connection_success {
         let u = portal.last_successful_url.as_deref().unwrap_or(portal.gateway_url.as_str());
-        let short = u.replace("http://", "").replace("https://", "").split('/').next().unwrap_or(u).to_string();
-        (format!(" Portal Connection - Connected to {} ", short), NEON_GREEN)
+        let stripped = u.replace("http://", "").replace("https://", "");
+        let host = stripped.split('/').next().unwrap_or(u).to_string();
+        (format!(" Portal Connection - Connected to {} ", host), NEON_GREEN)
     } else if portal.error.is_some() {
-        (" Portal Connection - Error ", ERROR_RED)
+        (" Portal Connection - Error ".to_string(), ERROR_RED)
     } else if portal.connecting {
-        (" Portal Connection - Connecting... ", AMBER_WARN)
+        (" Portal Connection - Connecting... ".to_string(), AMBER_WARN)
     } else {
-        (" Portal Connection ", BRAND_PURPLE)
+        (" Portal Connection ".to_string(), BRAND_PURPLE)
     };
     
     let block = Block::default()
@@ -182,7 +183,8 @@ fn render_input_fields(f: &mut Frame, area: Rect, state: &AppState) {
     let portal = &state.connection_portal;
     if portal.connection_success {
         let url = state.gateway_url.as_deref().or(portal.last_successful_url.as_deref()).unwrap_or(portal.gateway_url.as_str());
-        let short = url.replace("http://", "").replace("https://", "").split('/').next().unwrap_or(url);
+        let stripped = url.replace("http://", "").replace("https://", "");
+        let short = stripped.split('/').next().unwrap_or(url);
         let block = Block::default().title(" URL ").borders(Borders::ALL).border_style(Style::default().fg(NEON_GREEN)).style(Style::default().bg(BG_PANEL));
         let inner = block.inner(area);
         f.render_widget(block, area);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.9.95",
+  "version": "2.9.96",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.95: Monorepo cleanup (archive legacy root trees), gateway deps/security (Fastify 5.x), fixed root scripts; prepublish syncs vendored gateway/mk3. ⚠️ Pre-MVP / Development Phase",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.9.96: npm bundle — copy-mk3 includes debug_log.rs (fixes global Rust build); mk3-tui borrow/type fixes (connection portal, run detail, run.quick). ⚠️ Pre-MVP / Development Phase",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",