safari-mcp 2.1.6 → 2.1.7

package/extension/background.js

@@ -92,6 +92,11 @@ async function connect() {
           updateBadge("OFF");
           return; // Do NOT poll — let the correct profile's extension handle commands
         }
+        // Notify server that we passed profile verification
+        await fetch(`${HTTP_URL}/extension-verified`, {
+          method: "POST",
+          signal: AbortSignal.timeout(3000),
+        }).catch(() => {});
         await _discoverProfileWindow();
       }
       isConnected = true;

package/glama.json

@@ -1,9 +1,11 @@
 {
+  "$schema": "https://glama.ai/mcp/schemas/server.json",
   "name": "Safari MCP Server",
   "description": "Native Safari browser automation for AI agents. 80+ tools via AppleScript — zero overhead, keeps logins, runs silently in background.",
   "repository": "https://github.com/achiya-automation/safari-mcp",
   "homepage": "https://github.com/achiya-automation/safari-mcp",
   "author": "achiya-automation",
+  "maintainers": ["achiya-automation"],
   "license": "MIT",
   "categories": ["browser-automation", "web-scraping", "developer-tools"],
   "tags": ["safari", "macos", "browser", "automation", "applescript", "mcp"],

package/index.js

@@ -235,7 +235,9 @@ try {
 
     // POST /connect — extension announces it's alive
     if (req.method === "POST" && req.url === "/connect") {
-      if (!_extensionConnected) {
+      // When SAFARI_PROFILE is set, don't mark as connected until profile is verified.
+      // A personal-profile extension connecting first would incorrectly set the flag.
+      if (!process.env.SAFARI_PROFILE && !_extensionConnected) {
         _extensionConnected = true;
         console.error("[Safari MCP] Extension connected via HTTP polling");
       }
@@ -245,6 +247,18 @@ try {
       return;
     }
 
+    // POST /extension-verified — extension confirmed it's in the correct profile
+    if (req.method === "POST" && req.url === "/extension-verified") {
+      if (!_extensionConnected) {
+        _extensionConnected = true;
+        console.error("[Safari MCP] Extension connected and profile-verified via HTTP polling");
+      }
+      _extensionLastPollTime = Date.now();
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ status: "verified" }));
+      return;
+    }
+
     // POST /verify-profile — extension asks server to check which profile has a nonce tab
     if (req.method === "POST" && req.url === "/verify-profile") {
       let body = "";

package/package.json

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

@@ -7,7 +7,7 @@ import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { tmpdir } from "node:os";
 import { join, dirname } from "node:path";
-import { readFile, writeFile, unlink } from "node:fs/promises";
+import { readFile, writeFile, unlink, appendFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 // Extension bridge is handled by index.js (WebSocket server on port 9223)
 
@@ -99,6 +99,16 @@ let _activeTabURL = null;   // URL-based tracking (stable even when tabs shift)
 let _lastResolveTime = 0;   // Cache: skip resolve if verified recently
 const RESOLVE_CACHE_MS = 1500; // Re-verify tab every 1.5 seconds (was 5s — too stale)
 
+// ========== DIAGNOSTIC LOG ==========
+// File-based log for profile/focus issues — survives MCP restart, visible to user
+const _LOG_FILE = '/tmp/safari-mcp-profile.log';
+function _logProfile(msg) {
+  const ts = new Date().toISOString().replace('T', ' ').substring(0, 19);
+  const line = `[${ts}] ${msg}\n`;
+  console.error(`[Safari MCP] ${msg}`);
+  appendFile(_LOG_FILE, line).catch(() => {});
+}
+
 // ========== PROFILE TARGETING ==========
 // Set SAFARI_PROFILE env var to target a specific Safari profile window.
 // Safari shows profile windows as: "ProfileName — Tab Title"
@@ -106,7 +116,7 @@ const SAFARI_PROFILE = process.env.SAFARI_PROFILE || null;
 let _targetWindowRef = null; // null = not yet discovered. Updated by refreshTargetWindow()
 let _targetWindowId = null;  // Numeric window ID (for CGEvent window targeting)
 let _targetWindowCacheTime = 0;
-const TARGET_WINDOW_CACHE_MS = 5000;
+const TARGET_WINDOW_CACHE_MS = 2000; // Reduced from 5s — faster detection of window changes
 let _profileWindowMissing = false; // True when profile window is not found
 
 // Get the target window ref, falling back to 'front window' ONLY when no profile is configured
@@ -125,14 +135,16 @@ async function refreshTargetWindow(force = false) {
   const now = Date.now();
   if (!force && _targetWindowRef && (now - _targetWindowCacheTime) < TARGET_WINDOW_CACHE_MS) return;
   const safeProfile = SAFARI_PROFILE.replace(/"/g, '\\"');
+  // Find profile window by name AND verify the window ID still matches
   const result = await osascriptFast(
-    `tell application "Safari"\n  repeat with w in every window\n    if name of w starts with "${safeProfile} \u2014" then return id of w\n  end repeat\n  return 0\nend tell`
-  ).catch(() => '0');
-  const id = Number(result);
+    `tell application "Safari"\n  repeat with w in every window\n    if name of w starts with "${safeProfile} \u2014" then return (id of w as text) & "|" & name of w\n  end repeat\n  return "0|"\nend tell`
+  ).catch(() => '0|');
+  const [idStr, windowName] = String(result).split('|');
+  const id = Number(idStr);
   if (id > 0) {
     const newRef = `window id ${id}`;
     if (_targetWindowRef && _targetWindowRef !== newRef) {
-      console.error(`[Safari MCP] Profile window changed: ${_targetWindowRef} → ${newRef}`);
+      _logProfile(`Profile window changed: ${_targetWindowRef} → ${newRef} ("${windowName}")`);
     }
     _targetWindowRef = newRef;
     _targetWindowId = id;
@@ -144,18 +156,46 @@ async function refreshTargetWindow(force = false) {
     _targetWindowId = null;
     _targetWindowCacheTime = 0;
     _profileWindowMissing = true;
-    console.error(`[Safari MCP] WARNING: Profile "${SAFARI_PROFILE}" window not found — refusing to use front window`);
+    _logProfile(`WARNING: Profile "${SAFARI_PROFILE}" window not found — refusing to use front window`);
   }
 }
 
+// Background verification: periodically check that cached window ID still belongs to profile
+if (SAFARI_PROFILE) {
+  setInterval(async () => {
+    if (!_targetWindowRef || !_targetWindowId) return;
+    try {
+      const name = await osascriptFast(
+        `tell application "Safari" to return name of ${_targetWindowRef}`
+      ).catch(() => '');
+      if (name && !name.startsWith(`${SAFARI_PROFILE} \u2014`)) {
+        // Window ID no longer belongs to profile — invalidate cache immediately
+        _logProfile(`SAFETY: Window ${_targetWindowRef} no longer belongs to profile "${SAFARI_PROFILE}" (name: "${name}") — invalidating`);
+        _targetWindowRef = null;
+        _targetWindowId = null;
+        _targetWindowCacheTime = 0;
+        _profileWindowMissing = true;
+        // Try to rediscover immediately
+        await refreshTargetWindow(true);
+      }
+    } catch {
+      // Window might have been closed — invalidate and rediscover
+      _targetWindowRef = null;
+      _targetWindowId = null;
+      _targetWindowCacheTime = 0;
+      await refreshTargetWindow(true);
+    }
+  }, 3000); // Check every 3 seconds
+}
+
 // Initialize profile window at startup (ES module top-level await)
 if (SAFARI_PROFILE) {
   await new Promise(r => setTimeout(r, 50)); // Let helper process initialize
   await refreshTargetWindow(true);
   if (_targetWindowRef) {
-    console.error(`[Safari MCP] Profile "${SAFARI_PROFILE}" → targeting ${_targetWindowRef}`);
+    _logProfile(`Startup: Profile "${SAFARI_PROFILE}" → targeting ${_targetWindowRef}`);
   } else {
-    console.error(`[Safari MCP] WARNING: Profile "${SAFARI_PROFILE}" window NOT found at startup`);
+    _logProfile(`WARNING: Profile "${SAFARI_PROFILE}" window NOT found at startup`);
   }
 }
 
@@ -811,11 +851,21 @@ const INJECT_MCP_HELPERS = `if(window.__mcpVersion!==5){window.__mcpVersion=5;
         clientX:r.left+r.width/2,clientY:r.top+r.height/2,pageX:r.left+r.width/2+window.scrollX,pageY:r.top+r.height/2+window.scrollY,
         preventDefault:function(){},stopPropagation:function(){},nativeEvent:new MouseEvent(type||'click'),persist:function(){},bubbles:true,cancelable:true};
     }
+    // For React radio/checkbox inputs, onChange is the primary handler (not onClick)
+    var isToggle=startNode.tagName==='INPUT'&&(startNode.type==='radio'||startNode.type==='checkbox');
+    function tryOnChange(propsObj,targetNode){
+      if(!isToggle||!propsObj.onChange)return false;
+      var newChecked=startNode.type==='radio'?true:!startNode.checked;
+      propsObj.onChange({target:{value:startNode.value,checked:newChecked,type:startNode.type,name:startNode.name,id:startNode.id,tagName:'INPUT'},
+        currentTarget:targetNode,preventDefault:function(){},stopPropagation:function(){},nativeEvent:new Event('change'),persist:function(){},bubbles:true,cancelable:true,type:'change'});
+      return true;
+    }
     var node=startNode;
     for(var depth=0;depth<15&&node;depth++){
       var pk=Object.keys(node).find(function(k){return k.startsWith('__reactProps$')});
       if(pk&&node[pk]){
         var props=node[pk];
+        if(tryOnChange(props,node))return true;
         if(props.onClick){props.onClick(makeSynth(node,'click'));return true}
         if(props.onMouseDown){props.onMouseDown(makeSynth(node,'mousedown'));return true}
         if(props.onPointerDown){props.onPointerDown(makeSynth(node,'pointerdown'));return true}
@@ -825,6 +875,7 @@ const INJECT_MCP_HELPERS = `if(window.__mcpVersion!==5){window.__mcpVersion=5;
         var f=node[fk];
         while(f){
           if(f.memoizedProps){
+            if(tryOnChange(f.memoizedProps,node))return true;
             if(f.memoizedProps.onClick){f.memoizedProps.onClick(makeSynth(node,'click'));return true}
             if(f.memoizedProps.onMouseDown){f.memoizedProps.onMouseDown(makeSynth(node,'mousedown'));return true}
             if(f.memoizedProps.onPointerDown){f.memoizedProps.onPointerDown(makeSynth(node,'pointerdown'));return true}
@@ -1527,30 +1578,35 @@ export async function replaceEditorContent({ text }) {
 export async function screenshot({ fullPage = false } = {}) {
   await refreshTargetWindow();
   const tmpFile = join(tmpdir(), `safari-screenshot-${Date.now()}.png`);
-  let savedTabIdx = null;
   try {
-    // If working on a background tab, temporarily switch to it for screenshot
+    // Check if target tab is a background tab — if so, use JS screenshot to avoid tab jumping
+    let isBackgroundTab = false;
     if (_activeTabIndex) {
       try {
         const currentIdx = await osascriptFast(
           `tell application "Safari" to return index of current tab of ${getTargetWindowRef()}`
         );
-        if (Number(currentIdx) !== _activeTabIndex) {
-          savedTabIdx = Number(currentIdx);
-          await osascriptFast(
-            `tell application "Safari" to set current tab of ${getTargetWindowRef()} to tab ${_activeTabIndex} of ${getTargetWindowRef()}`
-          );
-          await new Promise(r => setTimeout(r, 200)); // Let Safari render the tab
-        }
+        isBackgroundTab = Number(currentIdx) !== _activeTabIndex;
       } catch (_) {}
     }
-    const skipScreencapture = false; // Always try screencapture now
+    // When on a background tab, go straight to JS-based screenshot (no tab switch, no focus steal)
+    const skipScreencapture = isBackgroundTab;
 
     // Try screencapture — use osascript's do shell script to bypass VS Code permission issue
     const windowId = !skipScreencapture ? await osascript(
       `tell application "Safari" to return id of ${getTargetWindowRef()}`
     ).catch(() => null) : null;
 
+    // Save frontmost app BEFORE screencapture (it may steal focus on macOS Tahoe)
+    let previousApp = null;
+    if (windowId) {
+      try {
+        previousApp = (await osascriptFast(
+          `tell application "System Events" to return name of first application process whose frontmost is true`
+        )).trim();
+      } catch (_) {}
+    }
+
     if (windowId) {
       try {
         if (fullPage) {
@@ -1585,6 +1641,12 @@ export async function screenshot({ fullPage = false } = {}) {
             );
           }
         }
+        // Restore focus if screencapture stole it (common on macOS Tahoe)
+        if (previousApp && previousApp !== "Safari") {
+          await osascriptFast(
+            `tell application "${previousApp}" to activate`
+          ).catch(() => {});
+        }
         // Compress: convert PNG to JPEG (50% quality) + resize to max 1200px width
         // Cuts ~600KB PNG → ~60KB JPEG — critical for staying under 20MB context limit
         const jpgFile = tmpFile.replace('.png', '.jpg');
@@ -1638,14 +1700,6 @@ export async function screenshot({ fullPage = false } = {}) {
     throw new Error("screencapture failed — Screen Recording permission may have been lost. Grant permission in System Settings → Privacy & Security → Screen Recording, then restart Safari.");
   } finally {
     await unlink(tmpFile).catch(() => {});
-    // Restore user's tab if we switched
-    if (savedTabIdx) {
-      try {
-        await osascriptFast(
-          `tell application "Safari" to set current tab of ${getTargetWindowRef()} to tab ${savedTabIdx} of ${getTargetWindowRef()}`
-        );
-      } catch (_) {}
-    }
   }
 }