safari-mcp 2.1.3 → 2.1.5

package/index.js

@@ -15,14 +15,30 @@ import { randomUUID } from "node:crypto";
 import { execFileSync } from "node:child_process";
 
 // ========== 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.
 try {
   const myPid = process.pid;
   const lines = execFileSync("pgrep", ["-af", "node.*/safari-mcp/index\\.js"], { encoding: "utf8" }).trim().split("\n");
   for (const line of lines) {
     const pid = parseInt(line.split(/\s+/)[0], 10);
     if (pid && pid !== myPid) {
-      try { process.kill(pid, "SIGTERM"); } catch {}
-      console.error(`[Safari MCP] Killed stale instance PID ${pid}`);
+      // Check how long the process has been running (elapsed time in seconds)
+      let elapsedSec = 0;
+      try {
+        const etime = execFileSync("ps", ["-o", "etime=", "-p", String(pid)], { encoding: "utf8" }).trim();
+        // etime format: [[DD-]HH:]MM:SS — parse to seconds
+        const parts = etime.replace(/-/g, ":").split(":").map(Number);
+        if (parts.length === 2) elapsedSec = parts[0] * 60 + parts[1];
+        else if (parts.length === 3) elapsedSec = parts[0] * 3600 + parts[1] * 60 + parts[2];
+        else if (parts.length === 4) elapsedSec = parts[0] * 86400 + parts[1] * 3600 + parts[2] * 60 + parts[3];
+      } catch {}
+      if (elapsedSec > 10) {
+        try { process.kill(pid, "SIGTERM"); } catch {}
+        console.error(`[Safari MCP] Killed stale instance PID ${pid} (running ${elapsedSec}s)`);
+      } else {
+        console.error(`[Safari MCP] Skipping fresh instance PID ${pid} (running ${elapsedSec}s)`);
+      }
     }
   }
 } catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "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

@@ -1152,6 +1152,9 @@ export async function fill({ selector, value, ref }) {
     `var pm=el.closest('.ProseMirror')||el.querySelector('.ProseMirror');if(pm){try{var v=null;if(pm.pmViewDesc&&pm.pmViewDesc.view)v=pm.pmViewDesc.view;else if(pm.cmView&&pm.cmView.view)v=pm.cmView.view;else{var keys=Object.keys(pm);for(var ki=0;ki<keys.length;ki++){var o=pm[keys[ki]];if(o&&o.state&&o.dispatch){v=o;break;}}}if(v&&v.state&&v.dispatch){var doc=v.state.doc;var hasContent=doc.textContent&&doc.textContent.trim().length>0;if(hasContent){var endPos=doc.content.size>1?doc.content.size-1:doc.content.size;v.dispatch(v.state.tr.insertText(' ${val}',endPos));v.focus();return 'Filled CE (ProseMirror append)';}else{var tr=v.state.tr;tr.replaceWith(0,doc.content.size,v.state.schema.text('${val}'));v.dispatch(tr);v.focus();return 'Filled CE (ProseMirror replace)';}}}catch(e){}}` +
     // Closure/Medium detection — signal for native paste
     `var isClosure=Object.keys(el).some(function(k){return k.startsWith('closure_uid_');})||location.hostname.includes('medium.com');if(isClosure){return '__CLOSURE_NATIVE_PASTE__';}` +
+    // Synthetic ClipboardEvent paste — works on ProseMirror, TipTap, Slate, and most modern editors
+    // that don't respond to execCommand but DO handle paste events
+    `try{el.focus();var sel2=window.getSelection();if(sel2.rangeCount){var rng=document.createRange();rng.selectNodeContents(el);sel2.removeAllRanges();sel2.addRange(rng);}var dt=new DataTransfer();dt.setData('text/plain','${val}');var pe=new ClipboardEvent('paste',{bubbles:true,cancelable:true,clipboardData:dt});var handled=!el.dispatchEvent(pe);if(handled||el.textContent.indexOf('${val.substring(0, 20)}')>=0){return 'Filled CE (synthetic paste)';}}catch(ep){}` +
     // Default contenteditable: selectAll+delete+insert (safer than textContent='')
     `document.execCommand('selectAll');document.execCommand('delete');document.execCommand('insertText',false,'${val}');el.dispatchEvent(new Event('input',{bubbles:true}));el.dispatchEvent(new Event('blur',{bubbles:true}));return 'Filled contenteditable';}` +
     // Standard input/textarea with _valueTracker