safari-mcp 2.3.0 → 2.3.1

package/extension/background.js

@@ -1647,16 +1647,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

@@ -94,7 +94,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 +111,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);
         }
@@ -248,9 +257,10 @@ 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));
+      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 +301,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);
@@ -343,7 +353,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 +401,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 +1137,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "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 ==========
@@ -2170,8 +2168,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 +2195,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 +2656,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);