safari-mcp 2.22.6 → 2.22.8

package/README.md

@@ -993,18 +993,6 @@ Other macOS MCP servers that complement Safari MCP:
 
 ---
 
-## Like it? Give it a ⭐
-
-If Safari MCP saves you from Chrome overhead, **a star helps others discover it:**
-
-[![Star this repo](https://img.shields.io/github/stars/achiya-automation/safari-mcp?style=social)](https://github.com/achiya-automation/safari-mcp)
-
-[Share on Twitter/X](https://twitter.com/intent/tweet?text=Safari%20MCP%20%E2%80%94%20Stop%20running%20Chrome%20just%20so%20your%20AI%20agent%20can%20browse.%2098%20tools%2C%20native%20Safari%2C%2060%25%20less%20CPU.&url=https%3A%2F%2Fgithub.com%2Fachiya-automation%2Fsafari-mcp) · [Share on LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fgithub.com%2Fachiya-automation%2Fsafari-mcp) · [Write about it](https://dev.to/)
-
-[![Star History Chart](https://api.star-history.com/svg?repos=achiya-automation/safari-mcp&type=Date)](https://star-history.com/#achiya-automation/safari-mcp&Date)
-
----
-
 ## Listed On
 
 [![Glama](https://glama.ai/mcp/servers/achiya-automation/safari-mcp/badges/score.svg)](https://glama.ai/mcp/servers/achiya-automation/safari-mcp) [![MCP Registry](https://img.shields.io/badge/MCP-Registry-purple)](https://registry.modelcontextprotocol.io/) [![MCP Scoreboard](https://mcpscoreboard.com/badge/05977769-8762-4e89-aff3-a0c5776843bb.svg)](https://mcpscoreboard.com/server/05977769-8762-4e89-aff3-a0c5776843bb/) [![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)

package/index.js

@@ -1861,10 +1861,16 @@ function _safeUrlForOutput(rawUrl) {
 // Receipts this daemon rotated on the caller's behalf (a cross-origin safari_navigate) stay
 // usable under their old name: callers routinely keep the first receipt they saw and ignore
 // the fresh one in the navigate result (nine consecutive "not valid for this origin" failures
-// in one session on 4.9.26). Whoever held the old capability held the tab.
+// in one session on 4.9.26). Whoever held the old capability held the tab. Every session that
+// held it follows the alias, other clients of an HTTP daemon included (_getActiveReceipt), so an
+// alias may only join two receipts of one tab: each rotation names the receipt it replaces.
 const _receiptAliases = new Map(); // old token → newer token
 function _aliasReceipt(oldToken, newToken) {
   if (!oldToken || !newToken || oldToken === newToken) return;
+  // Every older name of the tab points straight at its newest receipt. As a chain of one link per
+  // rotation, a receipt stopped resolving after eight (_receiptToken's hop limit): a handful of
+  // cross-origin navigations in one tab.
+  for (const [older, newer] of _receiptAliases) if (newer === oldToken) _receiptAliases.set(older, newToken);
   _receiptAliases.set(oldToken, newToken);
   if (_receiptAliases.size > 500) _receiptAliases.delete(_receiptAliases.keys().next().value);
 }
@@ -1920,8 +1926,10 @@ const _activeReceipts = new Map();
 function _receiptSessionKey() {
   return `${SESSION_ID}:${currentSessionId()}`;
 }
+// Resolved on every read: another client of an HTTP daemon can rotate this session's receipt
+// after it was stored, and the extension then knows only the new one.
 function _getActiveReceipt() {
-  return _activeReceipts.get(_receiptSessionKey()) || "";
+  return _receiptToken(_activeReceipts.get(_receiptSessionKey()));
 }
 function _setActiveReceipt(receipt) {
   _activeReceipts.set(_receiptSessionKey(), _receiptToken(receipt));
@@ -1975,6 +1983,39 @@ function _sanitizeTabResult(value) {
   };
 }
 
+// A receipt is bound to the origin it was minted on, so a cross-origin navigation the
+// caller itself asked for used to strand every following call ("not valid for this
+// origin", ~80×/week). The caller chose the destination, so rotating here is safe —
+// hand back the new receipt instead of letting the caller discover the trap. Every
+// navigation a caller asks for goes through here: safari_navigate, safari_navigate_and_read
+// and run_script's navigate and navigateAndRead steps. `usedReceipt` is the receipt the
+// navigation carried, read before it waited: a call alongside that names another tab makes
+// that tab the session's current one, and the rotation has to name the tab that navigated.
+// navigate_and_read answers with its page as a JSON string; a rotated result is an object.
+async function _rotateReceiptAfterNavigate(result, usedReceipt, oldUrl) {
+  let page = result;
+  if (typeof page === "string") {
+    try { page = JSON.parse(page); } catch { return result; }
+  }
+  const landed = page && typeof page === "object" ? page.url : "";
+  // The origin of the receipt the navigation carried: extensionOrFallback sends the newest one.
+  if (!landed || !usedReceipt || _originOf(landed) === (_receiptOrigins.get(_receiptToken(usedReceipt)) || _originOf(oldUrl))) {
+    return result;
+  }
+  try {
+    // Named for the alias below, as run_script getReceipt names it (see _receiptAliases).
+    const fresh = _sanitizeTabResult(await extensionOrFallback(
+      "get_tab_receipt", { ..._explicitReceipt({ receipt: usedReceipt }) }, () => null
+    ));
+    if (fresh?.receipt) {
+      _aliasReceipt(_receiptToken(usedReceipt), fresh.receipt); // the receipt extensionOrFallback sent
+      _setActiveReceipt(fresh.receipt);
+      return { ...page, receipt: fresh.receipt };
+    }
+  } catch { /* the navigation itself succeeded — a failed rotation must not fail the tool */ }
+  return result;
+}
+
 function _isBatchSemanticFailure(result) {
   if (Array.isArray(result)) return result.some(_isBatchSemanticFailure);
   if (result && typeof result === "object") return result.ok === false;
@@ -2089,7 +2130,7 @@ async function _runExtensionBatchAction(action, args = {}) {
       if (safeValue?.receipt) {
         // Rotation retires the old token. Keep it resolving to the new one, as navigate does,
         // so the tab stays reachable — and closable by the tab cap — by the name it was opened with.
-        _aliasReceipt(previous, safeValue.receipt);
+        _aliasReceipt(_receiptToken(previous), safeValue.receipt); // the receipt extensionOrFallback sent
         _setActiveReceipt(safeValue.receipt);
       }
       return safeValue;
@@ -2129,22 +2170,26 @@ async function _runExtensionBatchAction(action, args = {}) {
     case "navigate": {
       const url = String(args.url || "");
       if (!url) throw new Error("navigate requires url");
+      const oldUrl = safari.getActiveTabURL();
+      const usedReceipt = _getActiveReceipt();
       const raw = await extensionOrFallback(
-        "navigate", { url, timeout: args.timeout },
+        "navigate", { url, timeout: args.timeout, ..._explicitReceipt({ receipt: usedReceipt }) },
         () => safari.navigate(url)
       );
-      return syncResultUrl(raw, url);
+      return _rotateReceiptAfterNavigate(syncResultUrl(raw, url), usedReceipt, oldUrl);
     }
 
     case "navigateAndRead": {
       const url = String(args.url || "");
       if (!url) throw new Error("navigateAndRead requires url");
+      const oldUrl = safari.getActiveTabURL();
+      const usedReceipt = _getActiveReceipt();
       const raw = await extensionOrFallback(
-        "navigate_and_read", { url, maxLength: args.maxLength, timeout: args.timeout },
+        "navigate_and_read", { url, maxLength: args.maxLength, timeout: args.timeout, ..._explicitReceipt({ receipt: usedReceipt }) },
         async () => { await safari.navigate(url); return safari.readPage({ maxLength: args.maxLength }); }
       );
       safari.setActiveTabURL(url);
-      return normalize(raw);
+      return _rotateReceiptAfterNavigate(normalize(raw), usedReceipt, oldUrl);
     }
 
     case "readPage":
@@ -2388,9 +2433,13 @@ async function extensionOrFallback(extensionType, extensionPayload, fallbackFn)
         const reloadHandoff = extensionType === "reload_extension" && _isExtensionHost
           ? _prepareReloadHttpWorkerHandoff()
           : null;
+        const namedReceipt = _receiptToken(extensionPayload.receipt);
         const payload = {
           ...(attachActiveReceipt && activeReceipt ? { receipt: activeReceipt } : {}),
           ...extensionPayload,
+          // A receipt named when the call started follows a rotation of its tab made while the call
+          // waited above (by another client of an HTTP daemon): an alias joins receipts of one tab.
+          ...(namedReceipt ? { receipt: namedReceipt } : {}),
           ...(reloadHandoff ? { reloadHandoff: reloadHandoff.token } : {}),
           sessionId: `${SESSION_ID}:${currentSessionId()}`,
         };
@@ -2554,31 +2603,16 @@ server.tool(
     }
     const oldUrl = safari.getActiveTabURL();
     // extensionOrFallback claims the destination for this session once its guard passes.
-    let result = await extensionOrFallback(
-      "navigate", { url, ..._explicitReceipt({ receipt }) },
+    // Read once, before anything waits: a call alongside that names another tab makes that tab the
+    // session's current one, and the rotation below has to name the tab this call navigated.
+    const usedReceipt = _receiptToken(receipt || _getActiveReceipt());
+    const result = await extensionOrFallback(
+      "navigate", { url, ..._explicitReceipt({ receipt: usedReceipt }) },
       () => safari.navigate(url)
     );
     // Tab kept its identity, just changed URL — drop the stale old URL from ownership.
     if (oldUrl && oldUrl !== url && oldUrl !== 'about:blank') _removeOwnedURL(oldUrl);
-    // A receipt is bound to the origin it was minted on, so a cross-origin navigation the
-    // caller itself asked for used to strand every following call ("not valid for this
-    // origin", ~80×/week). The caller chose the destination, so rotating here is safe —
-    // hand back the new receipt instead of letting the caller discover the trap.
-    const landed = result && typeof result === "object" ? result.url : "";
-    const usedReceipt = _receiptToken(receipt || _getActiveReceipt());
-    if (landed && _originOf(landed) !== (_receiptOrigins.get(usedReceipt) || _originOf(oldUrl)) && usedReceipt) {
-      try {
-        const fresh = _sanitizeTabResult(await extensionOrFallback(
-          "get_tab_receipt", { ..._explicitReceipt({ receipt }) }, () => null
-        ));
-        if (fresh?.receipt) {
-          _aliasReceipt(usedReceipt, fresh.receipt);
-          _setActiveReceipt(fresh.receipt);
-          result = { ...result, receipt: fresh.receipt };
-        }
-      } catch { /* the navigation itself succeeded — a failed rotation must not fail the tool */ }
-    }
-    return textResult(result);
+    return textResult(await _rotateReceiptAfterNavigate(result, usedReceipt, oldUrl));
   }
 );
 
@@ -2662,7 +2696,7 @@ server.tool(
 
 server.tool(
   "safari_navigate_and_read",
-  "Navigate to a URL and return the page content in one step — saves 1 full round-trip vs navigate+read_page. Use instead of safari_navigate + safari_read_page.",
+  "Navigate to a URL and return the page content in one step — saves 1 full round-trip vs navigate+read_page. Use instead of safari_navigate + safari_read_page. Like safari_navigate, returns a fresh `receipt` when the origin changed; use that one from then on.",
   {
     receipt: z.string().optional().describe("Tab receipt from safari_new_tab — pins this call to that tab (survives reconnects/subagents)"),
     url: z.string().describe("URL to navigate to"),
@@ -2671,15 +2705,17 @@ server.tool(
   },
   async ({ url, maxLength, timeout, receipt }) => {
     const oldUrl = safari.getActiveTabURL();
+    // Read before anything waits, as safari_navigate does: the rotation names the tab that navigated.
+    const usedReceipt = _receiptToken(receipt || _getActiveReceipt());
     const result = await extensionOrFallback(
-      "navigate_and_read", { url, maxLength, timeout, ..._explicitReceipt({ receipt }) },
+      "navigate_and_read", { url, maxLength, timeout, ..._explicitReceipt({ receipt: usedReceipt }) },
       async () => {
         await safari.navigate(url);
         return safari.readPage({ maxLength });
       }
     );
     if (oldUrl && oldUrl !== url && oldUrl !== 'about:blank') _removeOwnedURL(oldUrl);
-    return textResult(result);
+    return textResult(await _rotateReceiptAfterNavigate(result, usedReceipt, oldUrl));
   }
 );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.22.6",
+  "version": "2.22.8",
   "mcpName": "io.github.achiya-automation/safari-mcp",
   "description": "Safari browser automation for AI agents — native macOS, zero Chrome overhead. 98 tools via AppleScript + JavaScript.",
   "type": "module",