safari-mcp 2.6.0 → 2.6.1

package/index.js

@@ -68,10 +68,11 @@ 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;
   }
   return false;
@@ -1116,21 +1117,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) }] };
   }
 );
 

package/package.json

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