safari-mcp 2.3.1 → 2.5.0

package/extension/background.js

@@ -242,6 +242,7 @@ async function handleCommand(type, payload) {
       await browser.tabs.goBack(tabId);
       await waitForTabSettled(tabId, 3000);
       const updated = await browser.tabs.get(tabId);
+      _setSessionTab(sessionId, updated.id, updated.url);
       return { title: updated.title, url: updated.url };
     }
 
@@ -249,6 +250,7 @@ async function handleCommand(type, payload) {
       await browser.tabs.goForward(tabId);
       await waitForTabSettled(tabId, 3000);
       const updated = await browser.tabs.get(tabId);
+      _setSessionTab(sessionId, updated.id, updated.url);
       return { title: updated.title, url: updated.url };
     }
 
@@ -524,7 +526,7 @@ async function handleCommand(type, payload) {
 
         // --- Visibility check ---
         const cs = window.getComputedStyle(el);
-        if (cs.display === "none" || cs.visibility === "hidden" || cs.opacity === "0") {
+        if (cs.display === "none" || cs.visibility === "hidden" || cs.visibility === "collapse" || parseFloat(cs.opacity) === 0) {
           return "Element not visible (display/visibility/opacity)";
         }
 

package/index.js

@@ -17,6 +17,8 @@ import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
+const MAX_BODY_SIZE = 10 * 1024 * 1024; // 10 MB cap on POST body — prevents DoS
+
 // ========== SINGLETON: kill stale instances from previous sessions ==========
 // NOTE: Claude Code VSCode may start 2 instances simultaneously (~40ms apart).
 // Only kill instances running >10 seconds (truly stale), not fresh siblings.
@@ -132,8 +134,11 @@ function _startMemoryMonitor() {
 }
 
 // Cleanup on exit
+let _cleaningUp = false;
 for (const sig of ["SIGINT", "SIGTERM", "SIGHUP"]) {
   process.on(sig, async () => {
+    if (_cleaningUp) return; // Prevent double-exit on rapid signal repeat
+    _cleaningUp = true;
     await _cleanupTabs();
     process.exit(0);
   });
@@ -257,7 +262,6 @@ try {
     }
 
     // POST /result — extension sends command result
-    const MAX_BODY_SIZE = 10 * 1024 * 1024; // 10 MB cap — prevents DoS from large payloads
     if (req.method === "POST" && req.url === "/result") {
       let body = "";
       req.on("data", (chunk) => { body += chunk; if (body.length > MAX_BODY_SIZE) { res.writeHead(413); res.end("Payload too large"); req.destroy(); } });
@@ -309,9 +313,9 @@ try {
           const safeNonce = String(nonce).replace(/[^0-9]/g, '');  // nonce is numeric only
           const safeProfile = (expectedProfile || "").replace(/[^\p{L}\p{N}\s\-_]/gu, '');  // whitelist: letters, numbers, spaces, hyphens, underscores
           // Check via AppleScript — look for the nonce in the profile window
-          const { execFile } = await import("node:child_process");
-          const { promisify } = await import("node:util");
-          const execFileAsync = promisify(execFile);
+          const { execFile: execFileCb } = await import("node:child_process");
+          const { promisify: pfy } = await import("node:util");
+          const execFileAsync = pfy(execFileCb);
           const script = `tell application "Safari"
             repeat with w in every window
               repeat with t in every tab of w

package/mcp-helpers.js

@@ -75,6 +75,8 @@ if (window.__mcpVersion !== 5) {
     if (!window.mcpIsVisible(el)) return false;
     if (el.disabled || el.getAttribute('aria-disabled') === 'true') return false;
     if (el.matches && el.matches('input[type="hidden"]')) return false;
+    var cs = window.getComputedStyle(el);
+    if (cs && cs.pointerEvents === 'none') return false;
     return true;
   };
   window.mcpPickActionable = function(el) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.3.1",
+  "version": "2.5.0",
   "mcpName": "io.github.achiya-automation/safari-mcp",
   "description": "Safari browser automation for AI agents — native macOS, zero Chrome overhead. 80 tools via AppleScript + JavaScript.",
   "type": "module",

package/safari-helper.swift

@@ -128,6 +128,57 @@ func performNativeClick(x: Double, y: Double, doubleClick: Bool = false, windowI
   return ["result": "clicked at (\(Int(x)),\(Int(y)))\(doubleClick ? " (double)" : "")\(targetInfo)"]
 }
 
+// ========== CGEvent Native Keyboard ==========
+// Sends keyboard events (keystrokes, shortcuts) targeted to a specific window
+// WITHOUT activating Safari or stealing focus. Same principle as native click.
+
+func performNativeKeyboard(keyCode: UInt16, flags: CGEventFlags = [], windowId: Int64 = 0) -> [String: Any] {
+  // Get Safari PID
+  var safariPID: pid_t = 0
+  if windowId > 0 {
+    let ws = NSWorkspace.shared
+    for app in ws.runningApplications {
+      if app.bundleIdentifier == "com.apple.Safari" {
+        safariPID = app.processIdentifier
+        break
+      }
+    }
+    if safariPID == 0 {
+      return ["error": "Safari process not found"]
+    }
+  }
+
+  let kWindowField = CGEventField(rawValue: 91)!
+  let kWindowHandlerField = CGEventField(rawValue: 92)!
+
+  guard let keyDown = CGEvent(keyboardEventSource: nil, virtualKey: keyCode, keyDown: true) else {
+    return ["error": "Failed to create key down event"]
+  }
+  guard let keyUp = CGEvent(keyboardEventSource: nil, virtualKey: keyCode, keyDown: false) else {
+    return ["error": "Failed to create key up event"]
+  }
+
+  keyDown.flags = flags
+  keyUp.flags = flags
+
+  if windowId > 0 {
+    keyDown.setIntegerValueField(kWindowField, value: windowId)
+    keyDown.setIntegerValueField(kWindowHandlerField, value: windowId)
+    keyUp.setIntegerValueField(kWindowField, value: windowId)
+    keyUp.setIntegerValueField(kWindowHandlerField, value: windowId)
+    keyDown.postToPid(safariPID)
+    usleep(30_000)
+    keyUp.postToPid(safariPID)
+  } else {
+    keyDown.post(tap: .cghidEventTap)
+    usleep(30_000)
+    keyUp.post(tap: .cghidEventTap)
+  }
+
+  let targetInfo = windowId > 0 ? " (window \(windowId), background)" : ""
+  return ["result": "key \(keyCode) pressed\(targetInfo)"]
+}
+
 // ========== Response Helper ==========
 
 func respond(_ obj: [String: Any]) {
@@ -166,6 +217,24 @@ if args.count >= 4 && args[1] == "--click" {
   exit(result["error"] != nil ? 1 : 0)
 }
 
+// ========== CLI Mode: --paste --window WID ==========
+// Convenience: Cmd+V via CGEvent (no activate needed)
+if args.count >= 2 && args[1] == "--paste" {
+  var windowId: Int64 = 0
+  var i = 2
+  while i < args.count {
+    if args[i] == "--window" && i + 1 < args.count {
+      windowId = Int64(args[i + 1]) ?? 0
+      i += 1
+    }
+    i += 1
+  }
+  // keyCode 9 = V key
+  let result = performNativeKeyboard(keyCode: 9, flags: .maskCommand, windowId: windowId)
+  respond(result)
+  exit(result["error"] != nil ? 1 : 0)
+}
+
 // ========== Daemon Mode: JSON lines on stdin ==========
 
 while let line = readLine(strippingNewline: true) {
@@ -187,9 +256,31 @@ while let line = readLine(strippingNewline: true) {
     continue
   }
 
+  // Handle CGEvent keyboard command
+  // {"keyboard": {"keyCode": 9, "flags": ["cmd"], "windowId": 4127}}
+  // keyCode 9 = V, flags: cmd/shift/alt/ctrl
+  if let kbData = json["keyboard"] as? [String: Any],
+     let keyCode = kbData["keyCode"] as? Int {
+    let windowId = Int64((kbData["windowId"] as? Int) ?? 0)
+    var flags: CGEventFlags = []
+    if let flagNames = kbData["flags"] as? [String] {
+      for f in flagNames {
+        switch f.lowercased() {
+          case "cmd": flags.insert(.maskCommand)
+          case "shift": flags.insert(.maskShift)
+          case "alt", "option": flags.insert(.maskAlternate)
+          case "ctrl", "control": flags.insert(.maskControl)
+          default: break
+        }
+      }
+    }
+    respond(performNativeKeyboard(keyCode: UInt16(keyCode), flags: flags, windowId: windowId))
+    continue
+  }
+
   // Handle AppleScript command
   guard let script = json["script"] as? String else {
-    respond(["error": "invalid input — expected 'script' or 'click'"])
+    respond(["error": "invalid input — expected 'script', 'click', or 'keyboard'"])
     continue
   }
 

package/safari.js

@@ -386,7 +386,7 @@ function _osascriptFastHelper(script, timeout) {
 function _helperNativeClick(x, y, doubleClick = false, windowId = 0, timeout = 5000) {
   return new Promise((resolve, reject) => {
     if (!_helperProc) startHelper();
-    if (!_helperProc || !_helperProc.stdin) {
+    if (!_helperProc || !_helperProc.stdin || !_helperProc.stdin.writable) {
       reject(new Error("safari-helper not available for native click"));
       return;
     }
@@ -420,6 +420,44 @@ function _helperNativeClick(x, y, doubleClick = false, windowId = 0, timeout = 5
   });
 }
 
+// Sends a CGEvent keyboard command to the Swift helper daemon.
+// No focus stealing — sends key events directly to the target window via PID.
+function _helperNativeKeyboard(keyCode, flags = [], windowId = 0, timeout = 5000) {
+  return new Promise((resolve, reject) => {
+    if (!_helperProc) startHelper();
+    if (!_helperProc || !_helperProc.stdin || !_helperProc.stdin.writable) {
+      reject(new Error("safari-helper not available for native keyboard"));
+      return;
+    }
+    let resolved = false;
+    const timer = setTimeout(() => {
+      if (resolved) return;
+      resolved = true;
+      const idx = _helperQueue.indexOf(cb);
+      if (idx >= 0) _helperQueue.splice(idx, 1);
+      reject(new Error("native keyboard timeout"));
+    }, timeout);
+
+    function cb(line) {
+      if (resolved) return;
+      resolved = true;
+      clearTimeout(timer);
+      try {
+        const parsed = JSON.parse(line);
+        if (parsed.error) reject(new Error(parsed.error));
+        else resolve(parsed.result ?? "");
+      } catch {
+        resolve(line);
+      }
+    }
+
+    _helperQueue.push(cb);
+    const cmd = { keyboard: { keyCode, flags } };
+    if (windowId) cmd.keyboard.windowId = windowId;
+    _helperProc.stdin.write(JSON.stringify(cmd) + "\n");
+  });
+}
+
 // Get Safari window bounds, toolbar height, and window ID for coordinate calculation
 async function _getSafariWindowGeometry() {
   await refreshTargetWindow();
@@ -696,301 +734,8 @@ export async function getPageSource({ maxLength = 200000 } = {}) {
 // Loaded from mcp-helpers.js at startup — enables syntax highlighting, linting, and easier maintenance
 const INJECT_MCP_HELPERS = readFileSync(join(__dirname, 'mcp-helpers.js'), 'utf8');
 
-// NOTE: Helper code previously inlined here (~300 lines) is now in mcp-helpers.js
-/* eslint-disable */
-const _LEGACY_INLINE_START = `if(window.__mcpVersion!==5){window.__mcpVersion=5;
-  window.__mcpRefs=window.__mcpRefs||{};
-  window.__mcpCachedRoots=null;
-  window.__mcpRootsDirty=true;
-  if(!window.__mcpRootsObserver){
-    window.__mcpRootsObserver=new MutationObserver(function(){window.__mcpRootsDirty=true;});
-    window.__mcpRootsObserver.observe(document.documentElement,{childList:true,subtree:true});
-  }
-  window.mcpCollectRoots=function(){
-    if(!window.__mcpRootsDirty&&window.__mcpCachedRoots)return window.__mcpCachedRoots;
-    var roots=[];
-    function collect(root){
-      roots.push(root);
-      var all=root.querySelectorAll('*');
-      for(var i=0;i<all.length;i++){
-        if(all[i].shadowRoot)collect(all[i].shadowRoot);
-      }
-    }
-    collect(document);
-    var iframes=document.querySelectorAll('iframe');
-    for(var i=0;i<iframes.length;i++){
-      try{var doc=iframes[i].contentDocument;if(doc)collect(doc);}catch(e){}
-    }
-    window.__mcpCachedRoots=roots;
-    window.__mcpRootsDirty=false;
-    return roots;
-  };
-  window.mcpQuerySelectorDeep=function(selector){
-    try{
-      var direct=document.querySelector(selector);
-      if(direct)return direct;
-    }catch(e){return null}
-    var roots=window.mcpCollectRoots();
-    for(var i=1;i<roots.length;i++){
-      try{
-        var found=roots[i].querySelector(selector);
-        if(found)return found;
-      }catch(e){}
-    }
-    var iframes=document.querySelectorAll('iframe');
-    for(var i=0;i<iframes.length;i++){
-      try{
-        var doc=iframes[i].contentDocument;
-        if(doc){var found=doc.querySelector(selector);if(found)return found;}
-      }catch(e){}
-    }
-    return null;
-  };
-  window.mcpElementFromPoint=function(x,y){
-    var el=document.elementFromPoint(x,y);
-    while(el&&el.shadowRoot){
-      try{
-        if(typeof el.shadowRoot.elementFromPoint!=='function')break;
-        var inner=el.shadowRoot.elementFromPoint(x,y);
-        if(!inner||inner===el)break;
-        el=inner;
-      }catch(e){break}
-    }
-    return el;
-  };
-  window.mcpIsVisible=function(el){
-    if(!el||el.nodeType!==1||!el.isConnected)return false;
-    var cs=window.getComputedStyle(el);
-    if(!cs||cs.display==='none'||cs.visibility==='hidden'||cs.visibility==='collapse'||cs.pointerEvents==='none'||cs.opacity==='0')return false;
-    var r=el.getBoundingClientRect();
-    return r.width>0&&r.height>0;
-  };
-  window.mcpIsActionable=function(el){
-    if(!window.mcpIsVisible(el))return false;
-    if(el.disabled||el.getAttribute('aria-disabled')==='true')return false;
-    if(el.matches&&el.matches('input[type="hidden"]'))return false;
-    return true;
-  };
-  window.mcpPickActionable=function(el){
-    var node=el&&el.nodeType===1?el:(el&&el.parentElement)||null;
-    while(node){
-      if(window.mcpIsActionable(node)&&node.matches&&node.matches('a[href],button,input:not([type="hidden"]),textarea,select,summary,label,option,[role],[onclick],[tabindex],[contenteditable=""],[contenteditable="true"]'))return node;
-      node=node.parentElement;
-    }
-    return el&&el.nodeType===1?el:null;
-  };
-  window.mcpFindByAttr=function(attr,value,selector){
-    if(!value)return null;
-    var roots=window.mcpCollectRoots();
-    var sel=selector||('['+attr+']');
-    for(var i=0;i<roots.length;i++){
-      var els=roots[i].querySelectorAll(sel);
-      for(var j=0;j<els.length;j++){
-        var current=attr==='href'?els[j].href:els[j].getAttribute(attr);
-        if(current===value&&window.mcpIsVisible(els[j]))return els[j];
-      }
-    }
-    return null;
-  };
-  window.mcpNormalizeText=function(value){
-    return String(value||'').replace(/\\s+/g,' ').trim();
-  };
-  window.mcpResolveTarget=function(el){
-    var base=window.mcpPickActionable(el)||el;
-    if(!base)return null;
-    try{base.scrollIntoView({block:'center',inline:'center'});}catch(e){}
-    var r=base.getBoundingClientRect();
-    var dx=Math.min(12,Math.max(4,r.width/4));
-    var dy=Math.min(12,Math.max(4,r.height/4));
-    var pts=[
-      [r.left+r.width/2,r.top+r.height/2],
-      [r.left+dx,r.top+r.height/2],
-      [r.right-dx,r.top+r.height/2],
-      [r.left+r.width/2,r.top+dy],
-      [r.left+r.width/2,r.bottom-dy]
-    ];
-    for(var i=0;i<pts.length;i++){
-      var x=pts[i][0],y=pts[i][1];
-      if(x<0||y<0||x>window.innerWidth||y>window.innerHeight)continue;
-      var hit=window.mcpElementFromPoint(x,y);
-      if(!hit)continue;
-      if(base===hit||base.contains(hit)||hit.contains(base))return window.mcpPickActionable(hit)||hit;
-      // Overlay pattern: transparent button/link overlays a text label (e.g. dropdown items).
-      // If the hit is an interactive element sharing a nearby common ancestor, prefer it.
-      var hitAction=window.mcpPickActionable(hit);
-      if(hitAction&&hitAction!==base&&hitAction.matches&&hitAction.matches('button,a[href],[role="button"],[role="option"],[role="menuitem"]')){
-        var p=base.parentElement;
-        for(var k=0;k<4&&p;k++){
-          if(p.contains(hitAction))return hitAction;
-          p=p.parentElement;
-        }
-      }
-    }
-    return base;
-  };
-  window.mcpClick=function(el){
-    var target=window.mcpResolveTarget(el);
-    if(!window.mcpIsActionable(target))return false;
-    var r=target.getBoundingClientRect();
-    var x=r.left+r.width/2,y=r.top+r.height/2;
-    var beforeUrl=location.href;
-    var anchor=target.closest?target.closest('a[href]'):null;
-    var href=anchor&&anchor.href&&!anchor.href.startsWith('javascript:')?anchor.href:'';
-    var s={bubbles:true,cancelable:true,composed:true,view:window,clientX:x,clientY:y,button:0,detail:1};
-    var p={...s,pointerId:1,pointerType:'mouse',isPrimary:true,width:1,height:1,pressure:0.5};
-    target.dispatchEvent(new PointerEvent('pointerover',{...p,buttons:0}));
-    target.dispatchEvent(new MouseEvent('mouseover',{...s,buttons:0}));
-    target.dispatchEvent(new PointerEvent('pointerenter',{...p,buttons:0}));
-    target.dispatchEvent(new MouseEvent('mouseenter',{...s,buttons:0}));
-    target.dispatchEvent(new PointerEvent('pointermove',{...p,buttons:0}));
-    target.dispatchEvent(new MouseEvent('mousemove',{...s,buttons:0}));
-    target.dispatchEvent(new PointerEvent('pointerdown',{...p,buttons:1}));
-    target.dispatchEvent(new MouseEvent('mousedown',{...s,buttons:1}));
-    if(target.focus){try{target.focus({preventScroll:true});}catch(e){try{target.focus();}catch(_){}}}
-    target.dispatchEvent(new PointerEvent('pointerup',{...p,buttons:0,pressure:0}));
-    target.dispatchEvent(new MouseEvent('mouseup',{...s,buttons:0}));
-    try{
-      if(typeof target.click==='function'){
-        target.click();
-        if(href&&href!==beforeUrl){
-          location.href=href;
-        }
-      }
-    }catch(e){}
-    target.dispatchEvent(new MouseEvent('click',{...s,buttons:0}));
-    if(href&&href!==beforeUrl){
-      location.href=href;
-    }
-    var form=target.closest?target.closest('form'):null;
-    if(form&&(target.type==='submit'||(target.tagName==='BUTTON'&&target.type!=='button'&&target.type!=='reset'))){
-      try{form.requestSubmit?form.requestSubmit(target.type==='submit'?target:undefined):form.submit();}catch(e){}
-    }
-    return true;
-  };
-  window.mcpReactClick=function(el){
-    var startNode=window.mcpResolveTarget(el)||el;
-    if(!startNode)return false;
-    function makeSynth(targetNode, type){
-      var r=targetNode.getBoundingClientRect();
-      return{type:type||'click',target:targetNode,currentTarget:targetNode,
-        clientX:r.left+r.width/2,clientY:r.top+r.height/2,pageX:r.left+r.width/2+window.scrollX,pageY:r.top+r.height/2+window.scrollY,
-        preventDefault:function(){},stopPropagation:function(){},nativeEvent:new MouseEvent(type||'click'),persist:function(){},bubbles:true,cancelable:true};
-    }
-    // For React radio/checkbox inputs, onChange is the primary handler (not onClick)
-    var isToggle=startNode.tagName==='INPUT'&&(startNode.type==='radio'||startNode.type==='checkbox');
-    function tryOnChange(propsObj,targetNode){
-      if(!isToggle||!propsObj.onChange)return false;
-      var newChecked=startNode.type==='radio'?true:!startNode.checked;
-      propsObj.onChange({target:{value:startNode.value,checked:newChecked,type:startNode.type,name:startNode.name,id:startNode.id,tagName:'INPUT'},
-        currentTarget:targetNode,preventDefault:function(){},stopPropagation:function(){},nativeEvent:new Event('change'),persist:function(){},bubbles:true,cancelable:true,type:'change'});
-      return true;
-    }
-    var node=startNode;
-    for(var depth=0;depth<15&&node;depth++){
-      var pk=Object.keys(node).find(function(k){return k.startsWith('__reactProps$')});
-      if(pk&&node[pk]){
-        var props=node[pk];
-        if(tryOnChange(props,node))return true;
-        if(props.onClick){props.onClick(makeSynth(node,'click'));return true}
-        if(props.onMouseDown){props.onMouseDown(makeSynth(node,'mousedown'));return true}
-        if(props.onPointerDown){props.onPointerDown(makeSynth(node,'pointerdown'));return true}
-      }
-      var fk=Object.keys(node).find(function(k){return k.startsWith('__reactFiber$')||k.startsWith('__reactInternalInstance$')});
-      if(fk){
-        var f=node[fk];
-        while(f){
-          if(f.memoizedProps){
-            if(tryOnChange(f.memoizedProps,node))return true;
-            if(f.memoizedProps.onClick){f.memoizedProps.onClick(makeSynth(node,'click'));return true}
-            if(f.memoizedProps.onMouseDown){f.memoizedProps.onMouseDown(makeSynth(node,'mousedown'));return true}
-            if(f.memoizedProps.onPointerDown){f.memoizedProps.onPointerDown(makeSynth(node,'pointerdown'));return true}
-          }
-          f=f.return;
-        }
-      }
-      node=node.parentElement;
-    }
-    return false;
-  };
-  window.mcpClickWithReact=function(el){
-    var target=window.mcpResolveTarget(el)||el;
-    var reactFired=false;
-    try{reactFired=window.mcpReactClick(target);}catch(e){}
-    var anchor=target&&target.closest?target.closest('a[href]'):null;
-    if(!reactFired||anchor)window.mcpClick(target);
-    return target;
-  };
-  window.mcpFindRef=function(ref){
-    var el=window.mcpQuerySelectorDeep('[data-mcp-ref="'+ref+'"]');
-    if(el)return el;
-    if(!window.__mcpRefs||!window.__mcpRefs[ref])return null;
-    var m=window.__mcpRefs[ref];
-    if(m.id){el=window.mcpFindByAttr('id',m.id);if(el)return el}
-    if(m.testid){el=window.mcpFindByAttr('data-testid',m.testid);if(el)return el}
-    if(m.nameAttr){el=window.mcpFindByAttr('name',m.nameAttr);if(el)return el}
-    if(m.href){el=window.mcpFindByAttr('href',m.href,'a[href]');if(el)return el}
-    if(m.al){el=window.mcpFindByAttr('aria-label',m.al);if(el)return el}
-    if(m.ph){el=window.mcpFindByAttr('placeholder',m.ph);if(el)return el}
-    if(m.text){
-      el=window.mcpFindText(m.text,true)||window.mcpFindText(m.text,false);
-      if(el)return el;
-    }
-    if(m.cx!==undefined&&m.cy!==undefined){
-      try{
-        window.scrollTo(window.scrollX,Math.max(0,m.cy-window.innerHeight/2));
-      }catch(e){}
-      el=window.mcpElementFromPoint(m.cx-window.scrollX,m.cy-window.scrollY);
-      if(el)return window.mcpPickActionable(el)||el;
-    }
-    return null;
-  };
-  window.mcpFindText=function(text,exact){
-    var needle=window.mcpNormalizeText(text);
-    var best=null,bestScore=Infinity;
-    function consider(node){
-      var target=window.mcpPickActionable(node)||node;
-      if(!window.mcpIsVisible(target))return;
-      var r=target.getBoundingClientRect();
-      var area=r.width*r.height;
-      var interactive=target.matches&&target.matches('a[href],button,input:not([type="hidden"]),textarea,select,summary,label,[role=button],[role=link],[role=tab],[onclick],[tabindex]');
-      var score=area+(interactive?0:1000000);
-      if(score<bestScore){best=target;bestScore=score}
-    }
-    var roots=window.mcpCollectRoots();
-    for(var i=0;i<roots.length;i++){
-      var attrEls=roots[i].querySelectorAll('[aria-label],[placeholder],[title],[data-testid],[alt]');
-      for(var j=0;j<attrEls.length;j++){
-        var a=attrEls[j];
-        var vals=[a.getAttribute('aria-label'),a.getAttribute('placeholder'),a.getAttribute('title'),a.getAttribute('data-testid'),a.getAttribute('alt')];
-        for(var k=0;k<vals.length;k++){
-          var val=vals[k];
-          if(!val)continue;
-          var normalized=window.mcpNormalizeText(val);
-          if(exact?normalized===needle:normalized.includes(needle)){consider(a);break}
-        }
-      }
-      var tw=document.createTreeWalker(roots[i],NodeFilter.SHOW_TEXT,null);
-      while(tw.nextNode()){
-        var n=tw.currentNode;
-        var t=window.mcpNormalizeText(n.textContent);
-        if(!t)continue;
-        if(exact?(t!==needle):!t.includes(needle))continue;
-        if(n.parentElement)consider(n.parentElement);
-      }
-    }
-    if(!best){
-      var allEls=document.querySelectorAll('*');
-      for(var i=0;i<allEls.length;i++){
-        var el=allEls[i];
-        var it=window.mcpNormalizeText(el.innerText);
-        if(!it)continue;
-        if(exact?(it!==needle):!it.includes(needle))continue;
-        consider(el);
-      }
-    }
-    return best;
-  };
-}`;
+// NOTE: ~300 lines of legacy inline helpers were here — now in mcp-helpers.js (deleted in v2.4.0)
+
 
 // Precomputed escaped helper string — avoids re-escaping ~4KB on every injection call
 const _HELPERS_ESCAPED = INJECT_MCP_HELPERS
@@ -1219,6 +964,7 @@ export async function nativeClick({ selector, text, x, y, ref, doubleClick = fal
 
 export async function fill({ selector, value, ref }) {
   if (ref) selector = refSelector(ref);
+  if (!selector) throw new Error("fill requires selector or ref");
   const sel = selector.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
   // Proper escaping order: backslashes first, then quotes
   const val = value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "");
@@ -1362,6 +1108,19 @@ export async function pressKey({ key, modifiers = [] }) {
 
     // Cmd+V (paste) — read clipboard via AppleScript (no activate!), inject via JS
     if (k === "v") {
+      // Cross-origin iframe: JS can't paste into it, use CGEvent Cmd+V (no focus steal)
+      const activeTag = await runJS(`document.activeElement ? document.activeElement.tagName : ''`);
+      if (activeTag === 'IFRAME') {
+        try {
+          const geo = await _getSafariWindowGeometry();
+          await _helperNativeKeyboard(9, ["cmd"], geo.windowId);
+        } catch {
+          await _helperNativeKeyboard(9, ["cmd"], 0);
+        }
+        await new Promise(r => setTimeout(r, 300));
+        return `Pressed: ${modifiers.join("+")}+v (CGEvent Cmd+V into iframe, no focus steal)`;
+      }
+
       const clipText = await osascript(`the clipboard as text`).catch(() => "");
       if (clipText) {
         const escaped = clipText.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
@@ -1445,6 +1204,61 @@ export async function pressKey({ key, modifiers = [] }) {
   return `Pressed: ${modifiers.length ? modifiers.join("+") + "+" : ""}${key}`;
 }
 
+// Native typing via clipboard paste — for cross-origin iframes (Intercom, Zendesk, etc.)
+// JS can't access content inside cross-origin iframes, so we use OS-level CGEvent:
+// 1. Save current clipboard
+// 2. Set clipboard to our text
+// 3. Cmd+V via CGEvent keyboard (targeted to window — NO focus steal, NO activate)
+// 4. Restore clipboard
+// Requires nativeClick to have focused the input inside the iframe first.
+async function _nativeTypeViaClipboard(text) {
+  // Save current clipboard
+  let savedClipboard = null;
+  try {
+    const { stdout } = await execFileAsync("pbpaste", []);
+    savedClipboard = stdout;
+  } catch {}
+
+  // Set clipboard to our text via pipe (safe from shell injection)
+  await new Promise((resolve, reject) => {
+    const proc = spawn("pbcopy", [], { stdio: ["pipe", "ignore", "ignore"] });
+    proc.stdin.write(text);
+    proc.stdin.end();
+    proc.on("close", resolve);
+    proc.on("error", reject);
+  });
+
+  // Paste via CGEvent Cmd+V targeted to Safari window — NO activate, NO focus steal
+  try {
+    const geo = await _getSafariWindowGeometry();
+    // keyCode 9 = V key, flags: ["cmd"]
+    await _helperNativeKeyboard(9, ["cmd"], geo.windowId);
+  } catch {
+    // Fallback: try without windowId (global)
+    await _helperNativeKeyboard(9, ["cmd"], 0);
+  }
+
+  // Wait for paste to settle
+  await new Promise(r => setTimeout(r, 300));
+
+  // Restore clipboard after delay
+  if (savedClipboard !== null) {
+    setTimeout(async () => {
+      try {
+        await new Promise((resolve, reject) => {
+          const proc = spawn("pbcopy", [], { stdio: ["pipe", "ignore", "ignore"] });
+          proc.stdin.write(savedClipboard);
+          proc.stdin.end();
+          proc.on("close", resolve);
+          proc.on("error", reject);
+        });
+      } catch {}
+    }, 3000);
+  }
+
+  return `Typed ${text.length} chars (native paste into iframe)`;
+}
+
 export async function typeText({ text, selector, ref }) {
   if (ref) selector = refSelector(ref);
   if (selector) {
@@ -1454,6 +1268,13 @@ export async function typeText({ text, selector, ref }) {
     await new Promise((r) => setTimeout(r, 30));
   }
 
+  // Cross-origin iframe detection: JS can't access content inside cross-origin iframes.
+  // When activeElement is an IFRAME, use native clipboard paste via System Events.
+  const activeTag = await runJS(`document.activeElement ? document.activeElement.tagName : ''`);
+  if (activeTag === 'IFRAME') {
+    return await _nativeTypeViaClipboard(text);
+  }
+
   // Use execCommand("insertText") — the ONLY approach that works for BOTH:
   // 1. Regular inputs/textareas (execCommand works natively)
   // 2. ContentEditable (ProseMirror/Draft.js/Slate) — execCommand causes real DOM mutation
@@ -1473,6 +1294,11 @@ export async function typeText({ text, selector, ref }) {
     `if('value' in el){var start=el.selectionStart||0;el.value=el.value.substring(0,start)+'${safeText}'+el.value.substring(el.selectionEnd||start);el.selectionStart=el.selectionEnd=start+${text.length};el.dispatchEvent(new Event('input',{bubbles:true}));el.dispatchEvent(new Event('change',{bubbles:true}));return 'Typed '+${text.length}+' chars via value set';}return 'Could not type';})()`
   );
 
+  // If JS typing failed and we're somehow in an iframe context, try native fallback
+  if (result === 'Could not type') {
+    return await _nativeTypeViaClipboard(text);
+  }
+
   return result;
 }
 
@@ -1678,7 +1504,7 @@ export async function screenshot({ fullPage = false } = {}) {
         }
         // Compress: convert PNG to JPEG (50% quality) + resize to max 1200px width
         // Cuts ~600KB PNG → ~60KB JPEG — critical for staying under 20MB context limit
-        const jpgFile = tmpFile.replace('.png', '.jpg');
+        const jpgFile = tmpFile.replace(/\.png$/, '.jpg');
         try {
           await execFileAsync("sips", [
             "-s", "format", "jpeg",
@@ -3433,6 +3259,8 @@ export async function scrollToElement({ selector, text, block = "center", timeou
 // Navigate + wait + read — the most common 3-step workflow
 export async function navigateAndRead(url, { maxLength = 50000 } = {}) {
   await refreshTargetWindow();
+  // Suppress onbeforeunload dialogs (same as navigate())
+  await runJS("window.onbeforeunload=null", { timeout: 2000 }).catch(() => {});
   let targetUrl = url;
   if (!/^https?:\/\//i.test(targetUrl)) targetUrl = "https://" + targetUrl;
   const safeUrl = targetUrl.replace(/"/g, '\\"');