fi: automatic etension wake up

Author: louis030195

terminator/browser-extension/content.js

@@ -0,0 +1,11 @@
+// Minimal handshake to wake the MV3 service worker and ensure the WS connect loop runs.
+// Fires at document_start on all pages.
+(function () {
+  try {
+    chrome.runtime.sendMessage({ type: "terminator_content_handshake" }, () => {
+      // ignore response
+    });
+  } catch (_) {
+    // Ignore if not allowed on special pages
+  }
+})();

terminator/browser-extension/manifest.json

@@ -10,6 +10,14 @@
   "host_permissions": [
     "<all_urls>"
   ],
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["content.js"],
+      "run_at": "document_start",
+      "match_about_blank": true
+    }
+  ],
   "manifest_version": 3,
   "name": "Terminator Bridge",
   "permissions": [

terminator/browser-extension/worker.js

@@ -73,6 +73,29 @@ function connect() {
   };
 }
 
+// Ensure we have an active WS connection on first message from content script
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+  try {
+    if (!message || message.type !== "terminator_content_handshake") return;
+    log("Received handshake from content script", {
+      tab: sender.tab && sender.tab.id,
+    });
+    // Kick the connector if not already connected; otherwise noop
+    if (!socket || socket.readyState !== WebSocket.OPEN) {
+      log("WS not open; attempting connect() due to handshake");
+      connect();
+    }
+    sendResponse({ ok: true });
+  } catch (e) {
+    try {
+      sendResponse({ ok: false, error: String(e && (e.message || e)) });
+    } catch (_) {}
+    // swallow
+  }
+  // Keep listener alive for async sendResponse
+  return true;
+});
+
 function scheduleReconnect() {
   if (reconnectTimer) return;
   const delay = currentReconnectDelayMs;

terminator/src/browser_script.rs

@@ -2,66 +2,10 @@
 //!
 //! Simple and clean - just uses the extension bridge, no DevTools fallback.
 
-use crate::{AutomationError, Browser, Desktop, Selector, UIElement};
+use crate::{AutomationError, Desktop};
 use std::time::Duration;
 use tracing::{debug, error, info, warn};
 
-async fn wake_extension_service_worker_and_restore_focus(previously_focused: Option<UIElement>) {
-    // Best-effort: try to open Chrome's extensions page and click the Service Worker link
-    // Then restore the previously focused UI element to avoid disrupting the user.
-    let wake_attempt = (|| -> Result<(), AutomationError> {
-        let desktop = Desktop::new_default()?;
-
-        // Open in Chrome explicitly to ensure we're targeting the correct browser settings UI
-        let _chrome_window = desktop.open_url("chrome://extensions", Some(Browser::Chrome))?;
-
-        Ok(())
-    })();
-
-    if wake_attempt.is_err() {
-        warn!(
-            error = %wake_attempt.err().unwrap(),
-            "Failed to open chrome://extensions for service worker wakeup"
-        );
-        return;
-    }
-
-    // Give the page a brief moment to render
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    // Try a few selector variants that commonly match the service worker inspect link text
-    // This is intentionally permissive and case-insensitive via contains behavior in matchers.
-    let candidate_selectors = ["role:link|name:service worker"];
-
-    // Best-effort clicking; ignore errors if not found.
-    if let Ok(desktop) = Desktop::new_default() {
-        for selector_str in candidate_selectors.iter() {
-            let try_click = async {
-                let locator = desktop.locator(Selector::from(*selector_str));
-                match locator.first(Some(Duration::from_millis(1500))).await {
-                    Ok(link) => link.invoke().map(|_| true).unwrap_or(false),
-                    Err(_) => false,
-                }
-            };
-
-            if try_click.await {
-                info!(
-                    selector = *selector_str,
-                    "Clicked service worker link to wake extension"
-                );
-                // Allow devtools window to spawn and the worker to initialize
-                tokio::time::sleep(Duration::from_millis(800)).await;
-                break;
-            }
-        }
-    }
-
-    // Restore original focus to minimize disruption
-    if let Some(prev) = previously_focused {
-        let _ = prev.activate_window();
-    }
-}
-
 /// Execute JavaScript in browser using extension bridge ONLY
 pub async fn execute_script(
     browser_element: &crate::UIElement,
@@ -87,10 +31,9 @@ pub async fn execute_script(
     let ext = crate::extension_bridge::ExtensionBridge::global().await;
     if !ext.is_client_connected().await {
         info!("Waiting for extension client to connect...");
-        // Try a short wait first, then attempt to wake the service worker via extensions UI,
-        // then continue to wait up to the original overall budget (~60s total)
+        // Wait up to ~60s total for the client to connect. The MV3 service worker
+        // will be auto-woken by the content-script handshake on page load/navigation.
         let mut connected = false;
-        let mut attempted_wakeup = false;
         for i in 0..120 {
             tokio::time::sleep(Duration::from_millis(500)).await;
 
@@ -100,17 +43,6 @@ pub async fn execute_script(
                 break;
             }
 
-            // After ~4 seconds without a connection, try to wake the service worker once
-            if !attempted_wakeup && i >= 8 {
-                attempted_wakeup = true;
-                info!("Attempting to wake extension service worker via chrome://extensions");
-                wake_extension_service_worker_and_restore_focus(previously_focused.clone()).await;
-
-                // Re-focus the browser window to ensure the active tab is correct for evaluation
-                let _ = browser_element.focus();
-                tokio::time::sleep(Duration::from_millis(300)).await;
-            }
-
             if i % 6 == 5 {
                 info!(
                     "Still waiting for extension client... {}s",