refactor: update servo configuration, rename NullEngine to ScaffoldEngine, and add input tracing.

sguzman · sguzman · commit b823a4b66ac0 · 2026-04-25T05:58:04.000-06:00
diff --git a/src/app/input.rs b/src/app/input.rs
@@ -317,12 +317,18 @@ impl BrazenApp {
                     };
                     if !suppress_engine_input {
                         if pressed {
+                            if input_logging {
+                                tracing::trace!(target: "brazen::input", key = %key_name, ?modifiers, repeat = repeat, "forwarding KeyDown to engine");
+                            }
                             self.engine.handle_input(InputEvent::KeyDown {
                                 key: key_name,
                                 modifiers,
                                 repeat,
                             });
                         } else {
+                            if input_logging {
+                                tracing::trace!(target: "brazen::input", key = %key_name, ?modifiers, "forwarding KeyUp to engine");
+                            }
                             self.engine.handle_input(InputEvent::KeyUp {
                                 key: key_name,
                                 modifiers,
@@ -334,12 +340,15 @@ impl BrazenApp {
                     if suppress_engine_input {
                         continue;
                     }
+                    if input_logging {
+                        tracing::trace!(target: "brazen::input", text = %text, "text input event received");
+                    }
                     
                     // SUPPRESS single-character text input to avoid "double typing".
                     // Servo's KeyboardEvent (KeyDown) already handles printable characters.
                     if text.chars().count() == 1 {
                         if input_logging {
-                            tracing::trace!(target: "brazen::input", text = %text, "suppressing single-char text input to avoid duplication");
+                            tracing::trace!(target: "brazen::input", text = %text, "suppressing single-char text input to avoid duplication in engine");
                         }
                         continue;
                     }
diff --git a/src/app/tests.rs b/src/app/tests.rs
@@ -132,6 +132,8 @@ use super::*;
         ) {
             callback(Ok(()));
         }
+
+        fn select_all(&mut self) {}
     }
 
     #[test]
@@ -202,6 +204,12 @@ use super::*;
             dom_snapshot: None,
             network_log: VecDeque::new(),
             extracted_entities: Vec::new(),
+            terminal_history: Vec::new(),
+            terminal_input: String::new(),
+            terminal_busy: false,
+            observe_dom: false,
+            control_terminal: false,
+            use_mcp_tools: false,
         };
 
         let mut ready_engine = MockEngine {
diff --git a/src/servo_upstream.rs b/src/servo_upstream.rs
@@ -13,12 +13,14 @@ use crate::servo_resources::{
 };
 use dpi::PhysicalSize;
 use libservo::{
-    Code, CompositionEvent, CompositionState, DeviceIntPoint, DeviceIntRect, DeviceIntSize,
-    DevicePoint, EventLoopWaker, ImeEvent, InputEvent, Key, KeyState, KeyboardEvent, LoadStatus,
-    Location, Modifiers, MouseButton, MouseButtonAction, MouseButtonEvent, MouseLeftViewportEvent,
-    MouseMoveEvent, NamedKey, Opts, RenderingContext, Servo, ServoBuilder, ServoDelegate,
-    SoftwareRenderingContext, WebView, WebViewBuilder, WebViewDelegate, WebViewPoint, WheelDelta,
+    CompositionState, Key, KeyState, Location, Modifiers, NamedKey, Opts, Servo, ServoBuilder,
+    ServoDelegate, WebView, WebViewBuilder, WebViewDelegate, prefs,
+    Code, CompositionEvent, DeviceIntPoint, DeviceIntRect, DeviceIntSize,
+    DevicePoint, EventLoopWaker, ImeEvent, InputEvent, KeyboardEvent, LoadStatus,
+    MouseButton, MouseButtonAction, MouseButtonEvent, MouseLeftViewportEvent,
+    MouseMoveEvent, WebViewPoint, WheelDelta,
     WheelEvent, WheelMode, WebResourceLoad, WebResourceResponse,
+    RenderingContext, SoftwareRenderingContext,
 };
 use libservo::clipboard_delegate::{ClipboardDelegate, StringRequest};
 use tracing_log::LogTracer;
@@ -377,20 +379,16 @@ impl ServoUpstreamRuntime {
         if let Some(cache_dir) = &config.cache_path {
             std::fs::create_dir_all(cache_dir).ok();
         }
-        let opts = Opts {
-            ignore_certificate_errors: config.ignore_certificate_errors,
-            certificate_path: resolved_certificate_path
-                .as_ref()
-                .map(|path| path.display().to_string()),
-            config_dir: config
-                .storage_path
-                .as_ref()
-                .and_then(|p| p.parent().map(|p| p.to_path_buf())),
-            user_agent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Brazen/0.1.0".to_string(),
-            cache_dir: config.cache_path.clone(),
-            cookie_file: config.cookies_path.clone(),
-            ..Opts::default()
-        };
+        let mut opts = libservo::Opts::default();
+        opts.ignore_certificate_errors = config.ignore_certificate_errors;
+        opts.certificate_path = resolved_certificate_path.as_ref().map(|p| p.display().to_string());
+        opts.config_dir = config.storage_path.as_ref().and_then(|p| p.parent().map(|p| p.to_path_buf()));
+
+        // Set preferences
+        let mut preferences = prefs::get().clone();
+        preferences.user_agent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36".to_string();
+        prefs::set(preferences);
+
         let frame_ready = Arc::new(AtomicBool::new(true));
         let rendering_context = Rc::new(
             SoftwareRenderingContext::new(PhysicalSize::new(width, height))
@@ -663,6 +661,15 @@ impl ServoUpstreamRuntime {
     }
 
     pub fn handle_keyboard(&self, key: &str, pressed: bool, modifiers: KeyModifiers, repeat: bool) {
+        tracing::trace!(
+            target: "brazen::servo::input",
+            key = %key,
+            pressed = pressed,
+            modifiers = ?modifiers,
+            repeat = repeat,
+            "keyboard event received in upstream runtime"
+        );
+
         let state = if pressed {
             KeyState::Down
         } else {
diff --git a/tests/bootstrap.rs b/tests/bootstrap.rs
@@ -1,6 +1,6 @@
 use brazen::commands::{AppCommand, CommandOutcome, dispatch_command};
 use brazen::config::{BrazenConfig, LoggingConfig, default_config_toml};
-use brazen::engine::{BrowserEngine, BrowserTab, EngineEvent, EngineStatus, NullEngine};
+use brazen::engine::{BrowserEngine, BrowserTab, EngineEvent, EngineStatus, ScaffoldEngine};
 use brazen::logging::{LoggingPlan, init_tracing};
 use brazen::permissions::{Capability, PermissionDecision};
 use brazen::platform_paths::PlatformPaths;
@@ -17,7 +17,7 @@ impl EngineFactory for TestFactory {
         _mount_manager: brazen::mounts::MountManager,
         _session: std::sync::Arc<std::sync::RwLock<brazen::session::SessionSnapshot>>,
     ) -> Box<dyn BrowserEngine> {
-        Box::new(NullEngine::new())
+        Box::new(ScaffoldEngine::new())
     }
 }
 
@@ -305,11 +305,20 @@ fn command_dispatch_routes_navigation_and_panel_state() {
         visit_counts: std::collections::HashMap::new(),
         visit_total: 0,
         revisit_total: 0,
+        dom_snapshot: None,
+        network_log: std::collections::VecDeque::new(),
+        extracted_entities: Vec::new(),
+        terminal_history: Vec::new(),
+        terminal_input: String::new(),
+        terminal_busy: false,
+        observe_dom: false,
+        control_terminal: false,
+        use_mcp_tools: false,
         pending_window_screenshot: std::sync::Arc::new(std::sync::Mutex::new(None)),
         mount_manager: brazen::mounts::MountManager::new(),
         runtime_paths,
     };
-    let mut engine = NullEngine::new();
+    let mut engine = ScaffoldEngine::new();
 
     let outcome = dispatch_command(
         &mut shell,
@@ -408,11 +417,20 @@ fn command_dispatch_rejects_invalid_urls() {
         visit_counts: std::collections::HashMap::new(),
         visit_total: 0,
         revisit_total: 0,
+        dom_snapshot: None,
+        network_log: std::collections::VecDeque::new(),
+        extracted_entities: Vec::new(),
+        terminal_history: Vec::new(),
+        terminal_input: String::new(),
+        terminal_busy: false,
+        observe_dom: false,
+        control_terminal: false,
+        use_mcp_tools: false,
         pending_window_screenshot: std::sync::Arc::new(std::sync::Mutex::new(None)),
         mount_manager: brazen::mounts::MountManager::new(),
         runtime_paths,
     };
-    let mut engine = NullEngine::new();
+    let mut engine = ScaffoldEngine::new();
 
     let outcome = dispatch_command(
         &mut shell,
@@ -468,7 +486,7 @@ bind = "http://127.0.0.1:9999"
 
 #[test]
 fn null_engine_emits_navigation_event() {
-    let mut engine = NullEngine::new();
+    let mut engine = ScaffoldEngine::new();
     engine.navigate("https://example.com");
     let events = engine.take_events();
     assert!(events.iter().any(|event| {
diff --git a/tests/servo_rendering_about_blank.rs b/tests/servo_rendering_about_blank.rs
@@ -16,6 +16,9 @@ mod tests {
             resources_dir: None,
             certificate_path: None,
             ignore_certificate_errors: false,
+            cookies_path: None,
+            storage_path: None,
+            cache_path: None,
         };
         let (tx, _) = std::sync::mpsc::channel();
         let mount_manager = MountManager::new();
diff --git a/tests/servo_rendering_data_url.rs b/tests/servo_rendering_data_url.rs
@@ -19,6 +19,9 @@ mod tests {
             resources_dir: None,
             certificate_path: None,
             ignore_certificate_errors: false,
+            cookies_path: None,
+            storage_path: None,
+            cache_path: None,
         };
         let (tx, _) = std::sync::mpsc::channel();
         let mount_manager = MountManager::new();
diff --git a/tests/servo_runtime.rs b/tests/servo_runtime.rs
@@ -6,8 +6,22 @@ mod tests {
 
     #[test]
     fn servo_embedder_renders_frame_after_surface_attach() {
-        let config = ServoEmbedderConfig::from_engine_config(&EngineConfig::default());
-        let mut embedder = ServoEmbedder::new(config);
+        let config = ServoEmbedderConfig::from_brazen_config(&brazen::config::BrazenConfig::default());
+        let mount_manager = brazen::mounts::MountManager::new();
+        let session = std::sync::Arc::new(std::sync::RwLock::new(brazen::session::SessionSnapshot::new("test".to_string(), "now".to_string())));
+        let paths = brazen::platform_paths::RuntimePaths {
+            config_path: "brazen.toml".into(),
+            data_dir: "data".into(),
+            logs_dir: "logs".into(),
+            profiles_dir: "profiles".into(),
+            cache_dir: "cache".into(),
+            downloads_dir: "downloads".into(),
+            crash_dumps_dir: "crash-dumps".into(),
+            active_profile_dir: "profiles/default".into(),
+            session_path: "profiles/default/session.json".into(),
+            audit_log_path: "logs/audit.jsonl".into(),
+        };
+        let mut embedder = ServoEmbedder::new(config, mount_manager, session, paths);
         embedder.init().unwrap();
         embedder.attach_surface(
             brazen::engine::RenderSurfaceHandle {
diff --git a/tests/test_observability.rs b/tests/test_observability.rs
@@ -49,6 +49,7 @@ impl BrowserEngine for MockEngine {
     fn go_back(&mut self) {}
     fn go_forward(&mut self) {}
     fn attach_surface(&mut self, _handle: RenderSurfaceHandle) {}
+    fn select_all(&mut self) {}
 }
 
 fn create_mock_shell_state() -> ShellState {
@@ -119,6 +120,15 @@ fn create_mock_shell_state() -> ShellState {
             audit_log_path: root.join("audit.log"),
         },
         pending_window_screenshot: Arc::new(std::sync::Mutex::new(None)),
+        dom_snapshot: None,
+        network_log: std::collections::VecDeque::new(),
+        extracted_entities: Vec::new(),
+        terminal_history: Vec::new(),
+        terminal_input: String::new(),
+        terminal_busy: false,
+        observe_dom: false,
+        control_terminal: false,
+        use_mcp_tools: false,
     }
 }
 
