safari-mcp 2.11.0 → 2.11.1

package/index.js

@@ -127,6 +127,20 @@ function _isURLOwned(url) {
   return false;
 }
 
+// Sentinel persisted when a blank tab (about:blank) is opened by this session.
+// A blank tab has no unique URL to own, but ownership must still survive an MCP
+// process restart (_openedTabs is in-memory only) — otherwise reopening blank
+// tabs falsely trips the "no tabs opened yet" guard. The sentinel is never a
+// real tab URL, so it cannot falsely match a user's page in _isURLOwned().
+const BLANK_TAB_SENTINEL = "__mcp-blank-tab__";
+
+function _markBlankTabOpened() {
+  if (!_ownedTabURLs.has(BLANK_TAB_SENTINEL)) {
+    _ownedTabURLs.add(BLANK_TAB_SENTINEL);
+    _saveOwnershipFile(_ownedTabURLs);
+  }
+}
+
 function _addOwnedURL(url) {
   if (url && url !== 'about:blank' && url !== 'favorites://') {
     _ownedTabURLs.add(url);
@@ -697,7 +711,7 @@ async function extensionOrFallback(extensionType, extensionPayload, fallbackFn)
       throw new Error(msg);
     } else if (currentUrl && !_isURLOwned(currentUrl)) {
       // about:blank tabs are owned if we have any tracked tabs (new_tab creates them at about:blank)
-      const isBlankOwned = (currentUrl === 'about:blank' || currentUrl === 'missing value') && _openedTabs.size > 0;
+      const isBlankOwned = (currentUrl === 'about:blank' || currentUrl === 'missing value') && (_openedTabs.size > 0 || _ownedTabURLs.has(BLANK_TAB_SENTINEL));
       if (!isBlankOwned) {
         const msg = `⚠️ Tab safety: refusing "${extensionType}" — current tab (${currentUrl}) was not opened by this MCP session. Use safari_new_tab or safari_switch_tab to target your own tab.`;
         console.error(`[Safari MCP] ${msg}`);
@@ -1354,6 +1368,9 @@ server.tool(
       _addOwnedURL(trackUrl);
       if (url && url !== trackUrl) _addOwnedURL(url);  // also own the requested URL (handles www redirects)
     }
+    // Blank tab (no URL requested): persist a restart-surviving ownership marker.
+    const _effectiveNewURL = (result?.url && result.url !== 'about:blank' && result.url !== 'missing value') ? result.url : url;
+    if (!_effectiveNewURL) _markBlankTabOpened();
     return { content: [{ type: "text", text: typeof rawResult === 'string' ? rawResult : JSON.stringify(result) }] };
   }
 );
@@ -1384,7 +1401,7 @@ server.tool(
         const target = parsed.find(t => t.index === index);
         if (target && target.url && !_isURLOwned(target.url)) {
           // about:blank / missing value tabs are owned if tracked in _openedTabs
-          const isBlankOwned = (target.url === 'about:blank' || target.url === 'missing value') && _openedTabs.has(index);
+          const isBlankOwned = (target.url === 'about:blank' || target.url === 'missing value') && (_openedTabs.has(index) || _ownedTabURLs.has(BLANK_TAB_SENTINEL));
           if (!isBlankOwned) {
             const msg = `⚠️ Tab safety: refusing switch_tab to index ${index} (${target.url}) — not opened by this MCP session. Use safari_new_tab to open your own tab.`;
             console.error(`[Safari MCP] ${msg}`);

package/package.json

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

@@ -107,6 +107,15 @@ function cleanupHelper() {
 // cleanupHelper runs via process.on("exit"), which fires when index.js calls process.exit().
 process.on("exit", cleanupHelper);
 process.on("uncaughtException", (err) => { console.error("Uncaught:", err); cleanupHelper(); process.exit(1); });
+// Unhandled promise rejections must NOT terminate the server. A single failed
+// async operation — e.g. a proxy fetch to the primary instance while it is
+// mid-restart, or an aborted fetch timeout — would otherwise bubble to the
+// uncaughtException handler above (Node's default for unhandled rejections) and
+// exit the whole MCP process, disconnecting every concurrent session. Log and
+// continue: the failed operation is localized, the process itself is healthy.
+process.on("unhandledRejection", (reason) => {
+  console.error("[Safari MCP] Unhandled rejection (non-fatal, continuing):", (reason && reason.stack) || reason);
+});
 
 // ========== SAFARI RUNNING CHECK ==========
 // Prevent AppleScript from auto-launching Safari when it's closed