Fix own-UI click leakage, S/E firing on the report page, add X kill switch

Mouse tracker now excludes its own panel/pill/canvas from every
measurement (trail, heatmap, dwell, clicks) instead of logging interactions
with its own controls as website activity. S/E are now gated to actual
website pages (landing and report pages are marked non-trackable, with a
Python-side URL check as a backstop). X is a new global hotkey that kills
the process outright via Api.quit_app().

Files changed (2) hide show

analysis.py +1 -0
browser_session.py +76 -30

analysis.py CHANGED Viewed

@@ -273,6 +273,7 @@ _TEMPLATE = r"""<!DOCTYPE html>
 <html>
 <head>
 <meta charset="utf-8">
 <title>InsightUX Session Report</title>
 <style>
   :root {

 <html>
 <head>
 <meta charset="utf-8">
+<meta name="insightux-report" content="true">
 <title>InsightUX Session Report</title>
 <style>
   :root {

browser_session.py CHANGED Viewed

@@ -225,34 +225,40 @@ class OneEuroFilter:
 CONTROL_JS = r"""
 (function(){
   if (window.__insightuxControl) { return; }
-  // The local landing page is already fully InsightUX-branded — don't
-  // stack a second banner on top of it.
-  if (document.querySelector('meta[name="insightux-landing"]')) { return; }
   window.__insightuxControl = true;
-  const banner = document.createElement('div');
-  banner.id = '__insightux_pill';
-  banner.style.cssText = `
-    position:fixed; top:0; left:0; right:0; z-index:2147483647;
-    display:flex; align-items:center; justify-content:space-between;
-    padding:7px 16px; font:12px -apple-system,Arial;
-    background:linear-gradient(90deg, rgba(20,18,26,0.95), rgba(30,20,40,0.95));
-    border-bottom:2px solid; border-image:linear-gradient(90deg,#7B2FBE,#FF2DF0) 1;
-    box-shadow:0 3px 14px rgba(0,0,0,0.35); pointer-events:none;
-  `;
-  banner.innerHTML = `
-    <span style="display:flex;align-items:center;gap:7px;">
-      <span style="width:8px;height:8px;border-radius:50%;background:linear-gradient(135deg,#7B2FBE,#FF2DF0);display:inline-block;"></span>
-      <b style="color:#f0ecf7;letter-spacing:0.02em;">InsightUX</b>
-      <span style="color:#7a7288;">Eye + Mouse Research Browser</span>
-    </span>
-    <span id="__insightux_status" style="color:#c9a6f5;">Press S to start tracking &middot; E to stop &middot; H heatmap &middot; M mouse panel</span>
-  `;
-  document.documentElement.appendChild(banner);
-  setInterval(function(){
-    if (!document.documentElement.contains(banner)) document.documentElement.appendChild(banner);
-  }, 1000);
   const statusEl = () => document.getElementById('__insightux_status');
   window.insightuxSetStatus = function(text){
@@ -270,6 +276,15 @@ CONTROL_JS = r"""
   document.addEventListener('keydown', function(e){
     const typingBlocked = isTypingTarget(e.target) || isTypingTarget(document.activeElement);
     const apiReady = !!(window.pywebview && window.pywebview.api);
     if (e.key === 's' || e.key === 'S' || e.key === 'e' || e.key === 'E') {
       console.log('[insightux] key=' + e.key, 'typingBlocked=' + typingBlocked, 'apiReady=' + apiReady, 'focusedEl=' + (document.activeElement && document.activeElement.tagName));
     }
@@ -368,9 +383,9 @@ TRACKING_JS = r"""
     function consider(el){
       if (full) return;
       // Never track InsightUX's own injected UI (the "press S/E" pill,
-      // the gaze-dot canvas) as if it were page content.
-      if (el.id === '__insightux_pill' || el.id === '__insightux_canvas') return;
-      if (el.closest && el.closest('#__insightux_pill, #__insightux_canvas')) return;
       const tag = el.tagName.toLowerCase();
       const explicit = !!(el.dataset && el.dataset.aoi);
       if (!explicit){
@@ -646,8 +661,18 @@ MOUSE_JS = r"""
     updatePanel();
   }, 2000);
   // ---- mouse position + hover tracking ----
   function updateMousePos(e){
     lastClientX = e.clientX; lastClientY = e.clientY;
     if (lastPageX === 0) lastPageX = e.pageX;
     if (lastPageY === 0) lastPageY = e.pageY;
@@ -665,6 +690,7 @@ MOUSE_JS = r"""
   document.addEventListener('click', function(e){
     if (!isTracking) return;
     if (e.target === canvas) return;
     if (!isInteractable(e.target)) return;
     const x = e.pageX, y = e.pageY;
@@ -962,9 +988,15 @@ MOUSE_JS = r"""
 # =============================================================================
-# API exposed to JS — start/stop are the only two entry points
 # =============================================================================
 class Api:
     def __init__(self):
         self.window = None
@@ -979,6 +1011,14 @@ class Api:
         if self.tracking:
             print("[browser_session]   already tracking, ignoring")
             return False
         if not os.path.exists(CALIBRATION_PATH):
             print(f"[browser_session]   no {CALIBRATION_PATH} found — run calibrate.py first")
             self._set_status("No calibration.pkl found — run calibrate.py first.")
@@ -1021,6 +1061,12 @@ class Api:
         self.mouse_close_timer.start()
         return True
     def _inject_tracking_overlay(self):
         try:
             self.window.evaluate_js(TRACKING_JS)

 CONTROL_JS = r"""
 (function(){
   if (window.__insightuxControl) { return; }
   window.__insightuxControl = true;
+  // S/E (start/stop tracking) only make sense on an actual website — not on
+  // the InsightUX landing/search page and not on a generated insights
+  // report page. X (quit the app) always works, on every page.
+  const isLanding   = !!document.querySelector('meta[name="insightux-landing"]');
+  const isReport    = !!document.querySelector('meta[name="insightux-report"]');
+  const isTrackable = !isLanding && !isReport;
+  if (isTrackable) {
+    const banner = document.createElement('div');
+    banner.id = '__insightux_pill';
+    banner.style.cssText = `
+      position:fixed; top:0; left:0; right:0; z-index:2147483647;
+      display:flex; align-items:center; justify-content:space-between;
+      padding:7px 16px; font:12px -apple-system,Arial;
+      background:linear-gradient(90deg, rgba(20,18,26,0.95), rgba(30,20,40,0.95));
+      border-bottom:2px solid; border-image:linear-gradient(90deg,#7B2FBE,#FF2DF0) 1;
+      box-shadow:0 3px 14px rgba(0,0,0,0.35); pointer-events:none;
+    `;
+    banner.innerHTML = `
+      <span style="display:flex;align-items:center;gap:7px;">
+        <span style="width:8px;height:8px;border-radius:50%;background:linear-gradient(135deg,#7B2FBE,#FF2DF0);display:inline-block;"></span>
+        <b style="color:#f0ecf7;letter-spacing:0.02em;">InsightUX</b>
+        <span style="color:#7a7288;">Eye + Mouse Research Browser</span>
+      </span>
+      <span id="__insightux_status" style="color:#c9a6f5;">Press S to start tracking &middot; E to stop &middot; H heatmap &middot; M mouse panel &middot; X quit</span>
+    `;
+    document.documentElement.appendChild(banner);
+    setInterval(function(){
+      if (!document.documentElement.contains(banner)) document.documentElement.appendChild(banner);
+    }, 1000);
+  }
   const statusEl = () => document.getElementById('__insightux_status');
   window.insightuxSetStatus = function(text){
   document.addEventListener('keydown', function(e){
     const typingBlocked = isTypingTarget(e.target) || isTypingTarget(document.activeElement);
     const apiReady = !!(window.pywebview && window.pywebview.api);
+    if (e.key === 'x' || e.key === 'X') {
+      if (typingBlocked || !apiReady) return;
+      window.pywebview.api.quit_app();
+      return;
+    }
+    if (!isTrackable) return;  // S/E do nothing on the landing page or a report page
     if (e.key === 's' || e.key === 'S' || e.key === 'e' || e.key === 'E') {
       console.log('[insightux] key=' + e.key, 'typingBlocked=' + typingBlocked, 'apiReady=' + apiReady, 'focusedEl=' + (document.activeElement && document.activeElement.tagName));
     }
     function consider(el){
       if (full) return;
       // Never track InsightUX's own injected UI (the "press S/E" pill,
+      // the gaze-dot canvas, the mouse tracker panel) as if it were page content.
+      if (el.id === '__insightux_pill' || el.id === '__insightux_canvas' || el.id === '__insightux_mouse_panel') return;
+      if (el.closest && el.closest('#__insightux_pill, #__insightux_canvas, #__insightux_mouse_panel')) return;
       const tag = el.tagName.toLowerCase();
       const explicit = !!(el.dataset && el.dataset.aoi);
       if (!explicit){
     updatePanel();
   }, 2000);
+  // ---- exclude InsightUX's own injected UI from every measurement ----
+  // (the status pill, the mouse-tracker panel, the heatmap canvas) — only
+  // real website elements should ever show up in trail/heatmap/dwell/clicks.
+  function isOwnUI(el){
+    if (!el) return false;
+    if (el.id === '__insightux_pill' || el.id === '__insightux_canvas' || el.id === '__insightux_mouse_panel') return true;
+    return !!(el.closest && el.closest('#__insightux_pill, #__insightux_canvas, #__insightux_mouse_panel'));
+  }
   // ---- mouse position + hover tracking ----
   function updateMousePos(e){
+    if (isOwnUI(e.target)) return;
     lastClientX = e.clientX; lastClientY = e.clientY;
     if (lastPageX === 0) lastPageX = e.pageX;
     if (lastPageY === 0) lastPageY = e.pageY;
   document.addEventListener('click', function(e){
     if (!isTracking) return;
     if (e.target === canvas) return;
+    if (isOwnUI(e.target)) return;
     if (!isInteractable(e.target)) return;
     const x = e.pageX, y = e.pageY;
 # =============================================================================
+# API exposed to JS — start/stop/quit are the entry points
 # =============================================================================
+# Pages tracking must never start on, checked against window.get_current_url()
+# as a Python-side backstop to CONTROL_JS's isTrackable check (belt and
+# suspenders — the JS guard can't run before the JS bridge is up).
+_NON_TRACKABLE_URL_MARKERS = ("insightux_landing.html", "analysis_report.html")
 class Api:
     def __init__(self):
         self.window = None
         if self.tracking:
             print("[browser_session]   already tracking, ignoring")
             return False
+        try:
+            current_url = self.window.get_current_url() or ""
+        except Exception:
+            current_url = ""
+        if any(marker in current_url for marker in _NON_TRACKABLE_URL_MARKERS):
+            print(f"[browser_session]   refusing to start on non-website page: {current_url}")
+            self._set_status("Start tracking only works on a website — search or open a page first.")
+            return False
         if not os.path.exists(CALIBRATION_PATH):
             print(f"[browser_session]   no {CALIBRATION_PATH} found — run calibrate.py first")
             self._set_status("No calibration.pkl found — run calibrate.py first.")
         self.mouse_close_timer.start()
         return True
+    def quit_app(self):
+        # X is an emergency kill switch, not a graceful shutdown — the user
+        # wants the terminal process gone immediately, camera/threads and all.
+        print("[browser_session] quit_app() called from JS -- terminating process")
+        os._exit(0)
     def _inject_tracking_overlay(self):
         try:
             self.window.evaluate_js(TRACKING_JS)