safari-mcp 2.6.0 → 2.7.0

package/extension/background.js

@@ -37,6 +37,7 @@ browser.runtime.onMessage.addListener((msg, sender, sendResponse) => {
       if (pollAbort) { try { pollAbort.abort(); } catch {} pollAbort = null; }
       if (_reconnectTimer) { clearTimeout(_reconnectTimer); _reconnectTimer = null; }
       _reconnectDelay = 3000;
+      _stopHeartbeat();
       updateBadge("OFF");
     } else {
       updateBadge("");
@@ -102,6 +103,7 @@ async function connect() {
       isConnected = true;
       _reconnectDelay = 3000; // Reset backoff on success
       updateBadge("ON");
+      _startHeartbeat(); // Keep service worker alive between polls
       pollForCommands();
       return;
     }
@@ -2108,10 +2110,25 @@ async function waitForTabSettled(tabId, timeout = 3000) {
   // No else needed — if not loading, page is already settled
 }
 
-// ========== KEEP-ALIVE VIA ALARMS ==========
+// ========== KEEP-ALIVE VIA ALARMS + HEARTBEAT ==========
 // Safari kills service workers after ~30s of inactivity.
-// browser.alarms re-wakes the worker and reconnects if needed.
-// The active fetch() in pollForCommands() keeps the worker alive while connected.
+// Three-layer strategy:
+// 1. Active fetch() in pollForCommands() keeps the worker alive while connected
+// 2. Storage write every 20s keeps the worker alive between polls (Safari counts storage access as activity)
+// 3. browser.alarms (1 min minimum) re-wakes the worker if it was terminated
+let _heartbeatTimer = null;
+function _startHeartbeat() {
+  if (_heartbeatTimer) return;
+  _heartbeatTimer = setInterval(() => {
+    if (_enabled) {
+      browser.storage.local.set({ _heartbeat: Date.now() }).catch(() => {});
+    }
+  }, 20000); // Every 20s — keeps service worker alive between alarm intervals
+}
+function _stopHeartbeat() {
+  if (_heartbeatTimer) { clearInterval(_heartbeatTimer); _heartbeatTimer = null; }
+}
+
 browser.alarms.create("keepalive", { periodInMinutes: 1 });
 browser.alarms.onAlarm.addListener((alarm) => {
   if (alarm.name === "keepalive" || alarm.name === "reconnect") {
@@ -2119,6 +2136,8 @@ browser.alarms.onAlarm.addListener((alarm) => {
     if (!isConnected && _enabled && !_reconnectTimer) {
       scheduleReconnect();
     }
+    // Restart heartbeat in case it was lost on worker restart
+    if (_enabled && !_heartbeatTimer) _startHeartbeat();
   }
 });
 

package/index.js

@@ -68,12 +68,23 @@ const _ownedTabURLs = new Set();
 function _isURLOwned(url) {
   if (!url) return false;
   if (_ownedTabURLs.has(url)) return true;
-  // Match ignoring query params / fragments (URL may change slightly after load)
-  const urlBase = url.split('?')[0].split('#')[0];
+  // Match ignoring query params / fragments / trailing slashes (URL may change slightly after load)
+  const normalize = (u) => u.split('?')[0].split('#')[0].replace(/\/+$/, '');
+  const urlBase = normalize(url);
   for (const owned of _ownedTabURLs) {
-    const ownedBase = owned.split('?')[0].split('#')[0];
+    const ownedBase = normalize(owned);
     if (urlBase === ownedBase) return true;
   }
+  // Same-origin redirect: if a tab navigated from an owned URL to a different path
+  // on the same origin (e.g. /login/device → /login/device/select_account), it's still ours
+  try {
+    const urlOrigin = new URL(url).origin;
+    for (const owned of _ownedTabURLs) {
+      try {
+        if (new URL(owned).origin === urlOrigin && urlBase.startsWith(normalize(owned))) return true;
+      } catch {}
+    }
+  } catch {}
   return false;
 }
 
@@ -122,48 +133,73 @@ async function _cleanupTabs() {
   _openedTabs.clear();
 }
 
-// Periodic memory check — if WebKit exceeds limit, close oldest MCP tabs
+// Periodic memory check — proactive monitoring with warning + action thresholds
+const WEBKIT_WARNING_THRESHOLD_MB = Math.round(WEBKIT_MEMORY_LIMIT_MB * 0.7); // 70% = warning
 let _memoryCheckTimer = null;
+let _lastMemoryWarningTime = 0;
+
+function _getWebKitMemoryMB() {
+  try {
+    const pids = execFileSync("pgrep", ["-Ef", "WebKit|WebContent"], { encoding: "utf8" }).trim();
+    if (!pids) return 0;
+    const pidList = pids.split("\n").join(",");
+    const psOut = execFileSync("ps", ["-p", pidList, "-o", "rss="], { encoding: "utf8" }).trim();
+    const totalKB = psOut.split("\n").reduce((sum, l) => sum + (parseInt(l.trim(), 10) || 0), 0);
+    return totalKB / 1024;
+  } catch { return 0; }
+}
+
+async function _closeOldestMCPTab() {
+  let oldestIdx = null, oldestTime = Infinity;
+  for (const [idx, info] of _openedTabs) {
+    if (info.openedAt < oldestTime) { oldestTime = info.openedAt; oldestIdx = idx; }
+  }
+  if (oldestIdx !== null) {
+    try {
+      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);
+  }
+}
+
 function _startMemoryMonitor() {
+  const checkInterval = Math.min(MEMORY_CHECK_INTERVAL_MS, 30000); // Max 30s between checks
   _memoryCheckTimer = setInterval(async () => {
     try {
-      // Use pgrep + ps directly — avoids spawning bash, grep, awk pipeline
-      let psOut = "0";
-      try {
-        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();
-          const totalKB = psOut.split("\n").reduce((sum, l) => sum + (parseInt(l.trim(), 10) || 0), 0);
-          psOut = String(totalKB / 1024);
+      const webkitMB = _getWebKitMemoryMB();
+      if (webkitMB <= 0) return;
+
+      // Warning threshold — log only (once per 5 min)
+      if (webkitMB > WEBKIT_WARNING_THRESHOLD_MB && webkitMB <= WEBKIT_MEMORY_LIMIT_MB) {
+        if (Date.now() - _lastMemoryWarningTime > 300000) {
+          console.error(`[Safari MCP] ⚠️ WebKit memory warning: ${Math.round(webkitMB)}MB (threshold: ${WEBKIT_WARNING_THRESHOLD_MB}MB, limit: ${WEBKIT_MEMORY_LIMIT_MB}MB) — ${_openedTabs.size} MCP tabs open`);
+          _lastMemoryWarningTime = Date.now();
         }
-      } catch { psOut = "0"; }
-      const webkitMB = parseFloat(psOut) || 0;
+      }
+
+      // Action threshold — close oldest tabs (up to 2) to recover memory
       if (webkitMB > WEBKIT_MEMORY_LIMIT_MB && _openedTabs.size > 1) {
-        console.error(`[Safari MCP] ⚠️ WebKit using ${Math.round(webkitMB)}MB (limit: ${WEBKIT_MEMORY_LIMIT_MB}MB) — closing oldest MCP tab`);
-        let oldestIdx = null, oldestTime = Infinity;
-        for (const [idx, info] of _openedTabs) {
-          if (info.openedAt < oldestTime) { oldestTime = info.openedAt; oldestIdx = idx; }
-        }
-        if (oldestIdx !== null) {
-          try {
-            // 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);
+        console.error(`[Safari MCP] 🔴 WebKit over limit: ${Math.round(webkitMB)}MB — closing oldest MCP tabs`);
+        await _closeOldestMCPTab();
+        // If still over limit and have more tabs, close another
+        if (_openedTabs.size > 1) {
+          const afterMB = _getWebKitMemoryMB();
+          if (afterMB > WEBKIT_MEMORY_LIMIT_MB) {
+            await _closeOldestMCPTab();
+          }
         }
       }
     } catch {}
-  }, MEMORY_CHECK_INTERVAL_MS);
+  }, checkInterval);
   _memoryCheckTimer.unref();
 }
 
@@ -1116,21 +1152,29 @@ server.tool(
       }
     }
 
-    const result = await extensionOrFallback(
+    const rawResult = await extensionOrFallback(
       "new_tab", { url },
       () => safari.newTab(url)
     );
+    // AppleScript fallback returns a JSON string; extension returns an object — normalize
+    let result = rawResult;
+    if (typeof rawResult === 'string') {
+      try { result = JSON.parse(rawResult); } catch {}
+    }
     // Sync safari.js tracking when extension handled new_tab
     if (result?.tabIndex) {
       safari.setActiveTabIndex(result.tabIndex);
       _trackTab(result.tabIndex, url);
     }
-    if (result?.url) {
-      safari.setActiveTabURL(result.url);
+    if (result?.url || url) {
+      // Prefer requested URL over about:blank for tracking (page hasn't loaded yet)
+      const trackUrl = (!result?.url || result.url === 'about:blank') && url ? url : result.url;
+      safari.setActiveTabURL(trackUrl);
       // Also register actual URL (may differ from requested due to redirects)
-      _addOwnedURL(result.url);
+      _addOwnedURL(trackUrl);
+      if (url && url !== trackUrl) _addOwnedURL(url);  // also own the requested URL (handles www redirects)
     }
-    return { content: [{ type: "text", text: typeof result === 'string' ? result : JSON.stringify(result) }] };
+    return { content: [{ type: "text", text: typeof rawResult === 'string' ? rawResult : JSON.stringify(result) }] };
   }
 );
 
@@ -1222,12 +1266,17 @@ server.tool(
         // Find the new tab(s) — could be about:blank initially (OAuth popups)
         for (const tab of nowTabs) {
           if (!beforeIds.has(`${tab.index}:${tab.url}`)) {
-            // Wait briefly for about:blank to resolve to actual URL
+            // Wait for about:blank to resolve to actual URL — dynamic polling instead of fixed delay
             if (tab.url === 'about:blank') {
-              await new Promise(r => setTimeout(r, 1000));
-              const refreshed = await extensionOrFallback("list_tabs", {}, () => safari.listTabs());
-              const refreshedTabs = typeof refreshed === 'string' ? JSON.parse(refreshed) : refreshed;
-              const resolved = refreshedTabs.find(t => t.index === tab.index);
+              let resolved = null;
+              for (let attempt = 0; attempt < 10; attempt++) {
+                await new Promise(r => setTimeout(r, 300)); // 300ms intervals, max 3s total
+                const refreshed = await extensionOrFallback("list_tabs", {}, () => safari.listTabs());
+                const refreshedTabs = typeof refreshed === 'string' ? JSON.parse(refreshed) : refreshed;
+                resolved = refreshedTabs.find(t => t.index === tab.index);
+                if (resolved && resolved.url !== 'about:blank') break;
+                resolved = null;
+              }
               if (resolved && resolved.url !== 'about:blank') {
                 if (urlContains && !resolved.url.includes(urlContains)) continue;
                 await extensionOrFallback("switch_tab", { index: resolved.index }, () => safari.switchTab(resolved.index));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.6.0",
+  "version": "2.7.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",
@@ -28,11 +28,20 @@
     "web-automation",
     "anthropic",
     "windsurf",
-    "continue-dev"
+    "continue-dev",
+    "devtools",
+    "testing",
+    "scraping",
+    "screenshot",
+    "ai-automation"
   ],
   "author": "Achiya Automation <info@achiya-automation.com>",
   "license": "MIT",
-  "homepage": "https://github.com/achiya-automation/safari-mcp",
+  "homepage": "https://achiya-automation.com",
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/achiya-automation"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/achiya-automation/safari-mcp.git"
@@ -53,7 +62,6 @@
     "safari-helper",
     "safari-helper.swift",
     "extension/",
-    "xcode/",
     "glama.json",
     "LICENSE",
     "README.md"