safari-mcp 2.1.4 → 2.1.6

package/README.md

@@ -9,13 +9,14 @@
 [![Node.js](https://img.shields.io/badge/Node.js-18%2B-green)](https://nodejs.org/)
 [![macOS](https://img.shields.io/badge/macOS-only-blue)](https://www.apple.com/macos/)
 [![MCP](https://img.shields.io/badge/MCP-compatible-purple)](https://modelcontextprotocol.io)
+[![CI](https://github.com/achiya-automation/safari-mcp/actions/workflows/ci.yml/badge.svg)](https://github.com/achiya-automation/safari-mcp/actions/workflows/ci.yml)
 [![npm downloads](https://img.shields.io/npm/dm/safari-mcp)](https://www.npmjs.com/package/safari-mcp)
 [![GitHub stars](https://img.shields.io/github/stars/achiya-automation/safari-mcp?style=social)](https://github.com/achiya-automation/safari-mcp/stargazers)
 [![achiya-automation/safari-mcp MCP server](https://glama.ai/mcp/servers/achiya-automation/safari-mcp/badges/score.svg)](https://glama.ai/mcp/servers/achiya-automation/safari-mcp)
 
 **80 tools** · **Zero dependencies** · **~5ms per command** · **60% less CPU than Chrome**
 
-[Quick Start](#quick-start) · [All 80 Tools](#tools-80) · [Why Safari MCP?](#safari-mcp-vs-alternatives) · [Architecture](#architecture)
+[Quick Start](#quick-start) · [All 80 Tools](#tools-80) · [Examples](examples/) · [Why Safari MCP?](#safari-mcp-vs-alternatives) · [Architecture](#architecture) · [Changelog](CHANGELOG.md)
 
 ![Safari MCP Demo](https://github.com/achiya-automation/safari-mcp/releases/download/v2.1.2/safari-mcp-showcase.gif)
 
@@ -63,6 +64,12 @@
 
 ### Install
 
+**Option A — npm (recommended):**
+```bash
+npm install -g safari-mcp
+```
+
+**Option B — from source:**
 ```bash
 git clone https://github.com/achiya-automation/safari-mcp.git
 cd safari-mcp
@@ -447,7 +454,9 @@ Safari MCP works with any MCP-compatible client:
 
 ## Contributing
 
-PRs welcome! The codebase is two files:
+PRs welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for setup instructions.
+
+The codebase is two files:
 - `safari.js` — Safari automation layer (AppleScript + JavaScript)
 - `index.js` — MCP server with tool definitions
 

package/extension/background.js

@@ -1548,6 +1548,8 @@ async function handleCommand(type, payload) {
 const _sessionTabCache = new Map();
 const TAB_CACHE_MS = 3000; // Re-verify tab URL match every 3s
 const _DEFAULT_SESSION = "__default__"; // Fallback for commands without sessionId
+const SESSION_MAX_AGE_MS = 5 * 60 * 1000; // 5 min — prune stale sessions
+const MAX_SESSIONS = 50; // Hard cap on session cache size
 
 function _getSessionCache(sessionId) {
   const sid = sessionId || _DEFAULT_SESSION;
@@ -1557,6 +1559,29 @@ function _getSessionCache(sessionId) {
   return _sessionTabCache.get(sid);
 }
 
+// Prune stale sessions — runs every 60s
+function _pruneSessionCache() {
+  const now = Date.now();
+  for (const [sid, cache] of _sessionTabCache) {
+    if (sid === _DEFAULT_SESSION) continue;
+    // Remove sessions with no active tab that haven't been used in 5 min
+    if (!cache.tabId && (now - cache.time) > SESSION_MAX_AGE_MS) {
+      _sessionTabCache.delete(sid);
+    }
+  }
+  // Hard cap: if still too many, remove oldest
+  if (_sessionTabCache.size > MAX_SESSIONS) {
+    const sorted = [..._sessionTabCache.entries()]
+      .filter(([sid]) => sid !== _DEFAULT_SESSION)
+      .sort((a, b) => a[1].time - b[1].time);
+    while (_sessionTabCache.size > MAX_SESSIONS && sorted.length) {
+      const [sid] = sorted.shift();
+      _sessionTabCache.delete(sid);
+    }
+  }
+}
+setInterval(_pruneSessionCache, 60000);
+
 function _setSessionTab(sessionId, tabId, tabUrl) {
   const cache = _getSessionCache(sessionId);
   cache.tabId = tabId;

package/index.js

@@ -46,6 +46,77 @@ try {
 // ========== SESSION ID (unique per MCP process — enables per-session tab tracking) ==========
 const SESSION_ID = randomUUID().slice(0, 8);
 
+// ========== MEMORY GUARD: track & auto-close MCP-opened tabs ==========
+const MAX_TABS = parseInt(process.env.MCP_MAX_TABS || "6", 10);
+const MEMORY_CHECK_INTERVAL_MS = parseInt(process.env.MCP_MEMORY_CHECK_MS || "60000", 10);
+const WEBKIT_MEMORY_LIMIT_MB = parseInt(process.env.MCP_WEBKIT_LIMIT_MB || "3000", 10);
+
+// Track tabs opened by THIS session (index → {url, openedAt})
+const _openedTabs = new Map();
+
+function _trackTab(tabIndex, url) {
+  _openedTabs.set(tabIndex, { url: url || "", openedAt: Date.now() });
+}
+
+function _untrackTab(tabIndex) {
+  _openedTabs.delete(tabIndex);
+}
+
+// Close all MCP-opened tabs on process exit
+async function _cleanupTabs() {
+  if (_openedTabs.size === 0) return;
+  console.error(`[Safari MCP] Cleanup: closing ${_openedTabs.size} MCP-opened tabs`);
+  const indices = [..._openedTabs.keys()].sort((a, b) => b - a);
+  for (const idx of indices) {
+    try {
+      safari.setActiveTabIndex(idx);
+      await safari.closeTab();
+    } catch {}
+  }
+  _openedTabs.clear();
+}
+
+// Periodic memory check — if WebKit exceeds limit, close oldest MCP tabs
+let _memoryCheckTimer = null;
+function _startMemoryMonitor() {
+  _memoryCheckTimer = setInterval(async () => {
+    try {
+      const psOut = execFileSync("bash", ["-c",
+        "ps aux | grep -i 'WebKit\\|WebContent' | grep -v grep | awk '{sum+=$6} END {print sum/1024}'"
+      ], { encoding: "utf8" }).trim();
+      const webkitMB = parseFloat(psOut) || 0;
+      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 {
+            safari.setActiveTabIndex(oldestIdx);
+            await safari.closeTab();
+          } catch {}
+          _untrackTab(oldestIdx);
+        }
+      }
+    } catch {}
+  }, MEMORY_CHECK_INTERVAL_MS);
+  _memoryCheckTimer.unref();
+}
+
+// Cleanup on exit
+for (const sig of ["SIGINT", "SIGTERM", "SIGHUP"]) {
+  process.on(sig, async () => {
+    await _cleanupTabs();
+    process.exit(0);
+  });
+}
+process.on("exit", () => {
+  if (_openedTabs.size > 0) {
+    console.error(`[Safari MCP] Exit: ${_openedTabs.size} tabs were tracked for cleanup`);
+  }
+});
+
 // ========== EXTENSION FOCUS SAFETY ==========
 // When SAFARI_PROFILE is set, the extension's browser.scripting.executeScript()
 // can steal window focus in Safari (bringing the automation window to front).
@@ -894,6 +965,22 @@ server.tool(
   "Open a new tab, optionally with a URL",
   { url: z.string().optional().describe("URL to open (empty for blank tab)") },
   async ({ url }) => {
+    // Enforce tab limit — close oldest MCP tab if at max
+    if (_openedTabs.size >= MAX_TABS) {
+      let oldestIdx = null, oldestTime = Infinity;
+      for (const [idx, info] of _openedTabs) {
+        if (info.openedAt < oldestTime) { oldestTime = info.openedAt; oldestIdx = idx; }
+      }
+      if (oldestIdx !== null) {
+        console.error(`[Safari MCP] Tab limit (${MAX_TABS}) reached — closing oldest tab #${oldestIdx}`);
+        try {
+          safari.setActiveTabIndex(oldestIdx);
+          await safari.closeTab();
+        } catch {}
+        _untrackTab(oldestIdx);
+      }
+    }
+
     const result = await extensionOrFallback(
       "new_tab", { url },
       () => safari.newTab(url)
@@ -901,6 +988,7 @@ server.tool(
     // 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);
@@ -914,7 +1002,9 @@ server.tool(
   "Close the current tab",
   {},
   async () => {
+    const activeIdx = safari.getActiveTabIndex();
     const result = await extensionOrFallback("close_tab", {}, () => safari.closeTab());
+    if (activeIdx !== null) _untrackTab(activeIdx);
     return { content: [{ type: "text", text: typeof result === 'string' ? result : JSON.stringify(result) }] };
   }
 );
@@ -1720,5 +1810,6 @@ server.tool(
 
 // ========== START SERVER ==========
 
+_startMemoryMonitor();
 const transport = new StdioServerTransport();
 await server.connect(transport);

package/package.json

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