safari-mcp 2.3.0 → 2.4.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)";
         }
 
@@ -1647,16 +1649,20 @@ async function _verifyProfileMatch(expectedProfile) {
     await new Promise(r => setTimeout(r, 500));
 
     // Ask the server to verify which profile has this nonce
-    const verifyRes = await fetch(`${HTTP_URL}/verify-profile`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ nonce, expectedProfile }),
-      signal: AbortSignal.timeout(5000),
-    });
-    // Clean up test tab
-    await browser.tabs.remove(checkTab.id).catch(() => {});
+    let verifyRes;
+    try {
+      verifyRes = await fetch(`${HTTP_URL}/verify-profile`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ nonce, expectedProfile }),
+        signal: AbortSignal.timeout(5000),
+      });
+    } finally {
+      // Always clean up test tab — even if fetch fails
+      await browser.tabs.remove(checkTab.id).catch(() => {});
+    }
 
-    if (verifyRes.ok) {
+    if (verifyRes && verifyRes.ok) {
       const result = await verifyRes.json();
       if (result.match) {
         await browser.storage.local.set({ mcpVerifiedProfile: expectedProfile });

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.
@@ -94,7 +96,7 @@ function _startMemoryMonitor() {
       // Use pgrep + ps directly — avoids spawning bash, grep, awk pipeline
       let psOut = "0";
       try {
-        const pids = execFileSync("pgrep", ["-f", "WebKit|WebContent"], { encoding: "utf8" }).trim();
+        const pids = execFileSync("pgrep", ["-Ef", "WebKit|WebContent"], { encoding: "utf8" }).trim();
         if (pids) {
           const pidList = pids.split("\n").join(",");
           psOut = execFileSync("ps", ["-p", pidList, "-o", "rss="], { encoding: "utf8" }).trim();
@@ -111,8 +113,17 @@ function _startMemoryMonitor() {
         }
         if (oldestIdx !== null) {
           try {
-            safari.setActiveTabIndex(oldestIdx);
-            await safari.closeTab();
+            // Re-resolve by URL before closing (indices shift as tabs change)
+            const info = _openedTabs.get(oldestIdx);
+            if (info?.url) {
+              const tabs = await safari.listTabs();
+              const parsed = typeof tabs === 'string' ? JSON.parse(tabs) : tabs;
+              const match = parsed.find(t => t.url === info.url);
+              if (match) {
+                safari.setActiveTabIndex(match.index);
+                await safari.closeTab();
+              }
+            }
           } catch {}
           _untrackTab(oldestIdx);
         }
@@ -123,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);
   });
@@ -250,7 +264,7 @@ try {
     // POST /result — extension sends command result
     if (req.method === "POST" && req.url === "/result") {
       let body = "";
-      req.on("data", (chunk) => (body += chunk));
+      req.on("data", (chunk) => { body += chunk; if (body.length > MAX_BODY_SIZE) { res.writeHead(413); res.end("Payload too large"); req.destroy(); } });
       req.on("end", () => {
         try {
           const msg = JSON.parse(body);
@@ -291,7 +305,7 @@ try {
     // POST /verify-profile — extension asks server to check which profile has a nonce tab
     if (req.method === "POST" && req.url === "/verify-profile") {
       let body = "";
-      req.on("data", (chunk) => (body += chunk));
+      req.on("data", (chunk) => { body += chunk; if (body.length > MAX_BODY_SIZE) { res.writeHead(413); res.end("Payload too large"); req.destroy(); } });
       req.on("end", async () => {
         try {
           const { nonce, expectedProfile } = JSON.parse(body);
@@ -299,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
@@ -343,7 +357,7 @@ try {
     // POST /proxy-command — secondary instances send commands through primary
     if (req.method === "POST" && req.url === "/proxy-command") {
       let body = "";
-      req.on("data", (chunk) => (body += chunk));
+      req.on("data", (chunk) => { body += chunk; if (body.length > MAX_BODY_SIZE) { res.writeHead(413); res.end("Payload too large"); req.destroy(); } });
       req.on("end", async () => {
         try {
           const { type, payload } = JSON.parse(body);
@@ -391,6 +405,7 @@ setTimeout(() => {
 }, 2000);
 
 async function _checkPrimaryExtension() {
+  if (_isExtensionHost) return; // Already hosting — stop polling
   try {
     const res = await fetch(`http://127.0.0.1:${HTTP_PORT}/proxy-check`, {
       method: "GET",
@@ -1126,12 +1141,16 @@ server.tool(
               if (resolved && resolved.url !== 'about:blank') {
                 if (urlContains && !resolved.url.includes(urlContains)) continue;
                 await extensionOrFallback("switch_tab", { index: resolved.index }, () => safari.switchTab(resolved.index));
+                safari.setActiveTabIndex(resolved.index);
+                safari.setActiveTabURL(resolved.url);
                 return { content: [{ type: "text", text: `Found new tab: ${resolved.title} (${resolved.url})` }] };
               }
               continue;
             }
             if (urlContains && !tab.url.includes(urlContains)) continue;
             await extensionOrFallback("switch_tab", { index: tab.index }, () => safari.switchTab(tab.index));
+            safari.setActiveTabIndex(tab.index);
+            safari.setActiveTabURL(tab.url);
             return { content: [{ type: "text", text: `Found new tab: ${tab.title} (${tab.url})` }] };
           }
         }

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.0",
+  "version": "2.4.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.js

@@ -6,7 +6,7 @@
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { tmpdir } from "node:os";
-import { join, dirname } from "node:path";
+import { join, dirname, resolve as resolvePath } from "node:path";
 import { readFile, writeFile, unlink, appendFile } from "node:fs/promises";
 import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -84,11 +84,9 @@ function cleanupHelper() {
     _helperProc = null;
   }
 }
+// Signal handlers (SIGINT/SIGTERM/SIGHUP) are registered in index.js only.
+// cleanupHelper runs via process.on("exit"), which fires when index.js calls process.exit().
 process.on("exit", cleanupHelper);
-process.on("SIGINT", () => { cleanupHelper(); process.exit(0); });
-process.on("SIGTERM", () => { cleanupHelper(); process.exit(0); });
-// SIGHUP = terminal closed, uncaught = crash — still clean up
-process.on("SIGHUP", () => { cleanupHelper(); process.exit(0); });
 process.on("uncaughtException", (err) => { console.error("Uncaught:", err); cleanupHelper(); process.exit(1); });
 
 // ========== ACTIVE TAB TRACKING ==========
@@ -388,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;
     }
@@ -698,301 +696,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
@@ -1221,6 +926,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, "");
@@ -1680,7 +1386,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",
@@ -2170,8 +1876,7 @@ export async function drag({ sourceSelector, targetSelector, sourceX, sourceY, t
 // ========== FILE PATH SAFETY ==========
 // Prevent reading sensitive system files via upload/paste tools
 function _validateFilePath(filePath) {
-  const { resolve } = require("node:path");
-  const resolved = resolve(filePath);
+  const resolved = resolvePath(filePath);
   if (resolved.includes('..')) throw new Error("Path traversal not allowed: " + filePath);
   const blocked = ['.ssh', '.gnupg', '.aws', '.config/gcloud', 'credentials', '.env', '.npmrc', '.netrc', 'id_rsa', 'id_ed25519', '.keychain'];
   const lower = resolved.toLowerCase();
@@ -2198,10 +1903,10 @@ export async function uploadFile({ selector, filePath }) {
         repeat with w in every window
           if exists sheet 1 of w then
             try
-              click button "ביטול" of sheet 1 of w
+              click button "Cancel" of sheet 1 of w
             on error
               try
-                click button "Cancel" of sheet 1 of w
+                click button "ביטול" of sheet 1 of w
               on error
                 key code 53
               end try
@@ -2659,6 +2364,7 @@ export async function takeSnapshot({ selector, _gen } = {}) {
       }
 
       window.__mcpRefs = {};
+      window.__mcpRefsTime = Date.now();
       var root = ${root};
       if (!root) return 'Element not found';
       walk(root, 0);
@@ -3435,6 +3141,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, '\\"');