safari-mcp 2.22.13 → 2.22.15

package/package.json

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

package/safari.js

@@ -8,7 +8,7 @@ import { promisify } from "node:util";
 import { tmpdir, homedir } from "node:os";
 import { join, dirname, resolve as resolvePath } from "node:path";
 import { readFile, writeFile, unlink, appendFile, mkdir } from "node:fs/promises";
-import { readFileSync, realpathSync } from "node:fs";
+import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { randomUUID } from "node:crypto";
 import { VIEWPORT_SCRIPT, SAFE_AREA_SCRIPT, PWA_SCRIPT, WEBKIT_COMPAT_SCRIPT, ALL_SHEETS_FN } from "./injected-validators.js";
@@ -998,7 +998,7 @@ function _windowById(id) {
 // Page JavaScript that answers "1" when the page carries exactly `marker`: in window.name, or in
 // window.__mcpTabMarker once a page has taken window.name over.
 function _markerCheckJS(marker) {
-  const safeMarker = String(marker).replace(/'/g, "\\'");
+  const safeMarker = String(marker).replace(/\\/g, "\\\\").replace(/'/g, "\\'");
   return `(function(){try{return (window.name==='${safeMarker}'||window.__mcpTabMarker==='${safeMarker}')?'1':'0'}catch(e){return '0'}})()`;
 }
 
@@ -1426,9 +1426,16 @@ export const SCREEN_LOCKED_MSG =
   "safari_type_text / safari_press_key, and safari_upload_file without forceNative.";
 
 export async function isScreenLocked() {
-  return execFileAsync("/bin/sh", ["-c",
-    "ioreg -n Root -d1 -r -a 2>/dev/null | grep -c CGSSessionScreenIsLocked || true"])
-    .then((r) => String(r.stdout).trim() !== "0").catch(() => false);
+  try {
+    const { stdout } = await execFileAsync("/usr/sbin/ioreg", ["-n", "Root", "-d1", "-r", "-a"], { timeout: 2000 });
+    const matches = [...String(stdout).matchAll(/<key>\s*(?:CGSSessionScreenIsLocked|IOConsoleLocked)\s*<\/key>\s*<(true|false)\s*\/>/g)];
+    if (matches.length) return matches.some(match => match[1] === "true");
+    // ioreg omits the key on an unlocked session. A present but unreadable value or
+    // a broken probe must fail toward blocked input, never toward CGEvent.
+    return /<key>\s*(?:CGSSessionScreenIsLocked|IOConsoleLocked)\s*<\/key>/.test(String(stdout));
+  } catch {
+    return true;
+  }
 }
 
 export async function assertScreenUnlocked(probe = isScreenLocked) {
@@ -3235,7 +3242,7 @@ export async function selectOption({ selector, value, ref }) {
   const val = String(value).replace(/\\/g, "\\\\").replace(/'/g, "\\'");
   let finder;
   if (ref) {
-    finder = `mcpFindRef('${String(ref).replace(/'/g, "\\'")}')`;
+    finder = `mcpFindRef('${escJsSingleQuote(ref)}')`;
   } else if (selector) {
     const sel = escJsSingleQuote(selector);
     finder = `(document.querySelector('${sel}')||mcpQuerySelectorDeep('${sel}'))`;
@@ -3257,7 +3264,7 @@ export async function reactSelectSet({ selector, ref, value }) {
   if (value === undefined || value === null) throw new Error("reactSelectSet requires 'value' (option label)");
   let finder;
   if (ref) {
-    const safeRef = String(ref).replace(/'/g, "\\'");
+    const safeRef = escJsSingleQuote(ref);
     finder = `mcpFindRef('${safeRef}')`;
   } else if (selector) {
     const sel = escJsSingleQuote(selector);
@@ -3274,7 +3281,7 @@ export async function reactSelectListOptions({ selector, ref }) {
   await ensureHelpers();
   let finder;
   if (ref) {
-    const safeRef = String(ref).replace(/'/g, "\\'");
+    const safeRef = escJsSingleQuote(ref);
     finder = `mcpFindRef('${safeRef}')`;
   } else if (selector) {
     const sel = escJsSingleQuote(selector);
@@ -3511,7 +3518,7 @@ export async function pressKey({ key, modifiers = [] }) {
 
   // Non-modifier keys: pure JavaScript (no System Events)
   const jsKey = jsKeyMap[k] || key;
-  const safeKey = jsKey.replace(/'/g, "\\'");
+  const safeKey = escJsSingleQuote(jsKey);
   // W3C `code` values: special keys are NOT "Key"-prefixed ("Enter", "ArrowUp", ...);
   // only letters are ("KeyA"), digits are "Digit1". Apps that route on event.code
   // (Notion, Monaco, Google Docs) ignore a bogus "KeyEnter".
@@ -3526,7 +3533,7 @@ export async function pressKey({ key, modifiers = [] }) {
     || (/^[a-z]$/i.test(jsKey) ? "Key" + jsKey.toUpperCase()
       : /^[0-9]$/.test(jsKey) ? "Digit" + jsKey
         : jsKey);
-  const safeCode = jsCode.replace(/'/g, "\\'");
+  const safeCode = escJsSingleQuote(jsCode);
   const shiftKey = hasShift;
   const altKey = modifiers.some((m) => m.toLowerCase() === "alt");
 
@@ -3687,7 +3694,7 @@ export async function replaceEditorContent({ text }) {
   // then call onChange(text) to sync React. Works for Airtable-style embeds
   // and is a no-op on plain Monaco (VS Code web, GitHub) where setValue
   // already covers the state.
-  const preflightFirstLine = text.split('\n')[0].slice(0, 20).replace(/'/g, "\\'");
+  const preflightFirstLine = escJsSingleQuote(text.split('\n')[0].slice(0, 20));
   const monacoPreflight = await runJS(
     `(function(){
       var m = (typeof monaco !== 'undefined') ? monaco : window.monaco;
@@ -5174,7 +5181,7 @@ export async function uploadFile({ selector, filePath, forceNative = false, veri
     xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
   };
   const mime = mimeMap[ext] || "application/octet-stream";
-  const safeName = fileName.replace(/'/g, "\\'");
+  const safeName = escJsSingleQuote(fileName);
 
   // forceNative: skip synthetic injection entirely. Attempting it first would leave a stray
   // media item behind on sites that register the pickup in their UI without ingesting it
@@ -5406,7 +5413,7 @@ export async function pasteImageFromFile({ filePath, locate = null }) {
   // Read image as base64
   const fileData = await readFile(filePath);
   const base64 = fileData.toString("base64");
-  const fileName = filePath.split("/").pop().replace(/'/g, "\\'");
+  const fileName = escJsSingleQuote(filePath.split("/").pop());
 
   // Use runJSLarge — images are often >260KB as base64
   const result = await runJSLarge(
@@ -5658,7 +5665,7 @@ export function getNextSnapshotGen() { return _snapshotGen++; }
 export async function takeSnapshot({ selector, _gen } = {}) {
   // Use provided gen (from tool path) or allocate a new one (direct call)
   const gen = _gen != null ? _gen : _snapshotGen++;
-  const root = selector ? `document.querySelector('${selector.replace(/'/g, "\\'")}')` : "document.body";
+  const root = selector ? `document.querySelector('${escJsSingleQuote(selector)}')` : "document.body";
 
   const result = await runJS(
     `(function(){
@@ -5890,7 +5897,7 @@ export async function runScript({ steps, onStep, actions: overrides = {} }) {
 // ========== ACCESSIBILITY SNAPSHOT ==========
 
 export async function getAccessibilityTree({ selector, maxDepth = 5 }) {
-  const sel = selector ? `'${selector.replace(/'/g, "\\'")}'` : "null";
+  const sel = selector ? `'${escJsSingleQuote(selector)}'` : "null";
   return runJS(
     `(function(){
       function buildTree(el, depth) {
@@ -6235,7 +6242,7 @@ export async function clearNetworkCapture() {
 }
 
 export async function getNetworkDetails({ limit = 50, filter } = {}) {
-  const filterStr = filter ? `.filter(function(r){return r.url.includes('${filter.replace(/'/g, "\\'")}')})` : "";
+  const filterStr = filter ? `.filter(function(r){return r.url.includes('${escJsSingleQuote(filter)}')})` : "";
   return runJS(
     `JSON.stringify((window.__mcp_network||[])${filterStr}.slice(-${Number(limit)}))`
   );
@@ -6343,7 +6350,7 @@ export async function throttleNetwork({ profile, latency, downloadKbps, uploadKb
 // ========== CONSOLE FILTER ==========
 
 export async function getConsoleByLevel({ level }) {
-  const safeLevel = level.replace(/'/g, "\\'");
+  const safeLevel = escJsSingleQuote(level);
   return runJS(
     `JSON.stringify((window.__mcp_console||[]).filter(function(m){return m.level==='${safeLevel}'}))`
   );
@@ -6352,7 +6359,7 @@ export async function getConsoleByLevel({ level }) {
 // ========== DATA EXTRACTION ==========
 
 export async function extractTables({ selector, limit = 10 }) {
-  const sel = selector ? `'${selector.replace(/'/g, "\\'")}'` : "'table'";
+  const sel = selector ? `'${escJsSingleQuote(selector)}'` : "'table'";
   return runJS(
     `(function(){
       var tables = [...document.querySelectorAll(${sel})].slice(0, ${Number(limit)});
@@ -6417,7 +6424,7 @@ export async function extractImages({ limit = 50 }) {
 
 export async function extractLinks({ limit = 100, filter }) {
   const filterStr = filter
-    ? `.filter(function(a){return a.href.includes('${filter.replace(/'/g, "\\'")}')||a.textContent.includes('${filter.replace(/'/g, "\\'")}')})`
+    ? `.filter(function(a){return a.href.includes('${escJsSingleQuote(filter)}')||a.textContent.includes('${escJsSingleQuote(filter)}')})`
     : "";
   return runJS(
     `JSON.stringify([...document.querySelectorAll('a[href]')]${filterStr}.slice(0,${Number(limit)}).map(function(a){
@@ -6469,8 +6476,8 @@ export async function getComputedStyles({ selector, properties }) {
 // ========== INDEXEDDB ==========
 
 export async function getIndexedDB({ dbName, storeName, limit = 20 }) {
-  const safeDb = dbName.replace(/'/g, "\\'");
-  const safeStore = storeName.replace(/'/g, "\\'");
+  const safeDb = escJsSingleQuote(dbName);
+  const safeStore = escJsSingleQuote(storeName);
   // `do JavaScript` can't await a Promise — route async work through the Node-side poller.
   return _evaluateAsync(
     `(async function(){
@@ -6610,6 +6617,17 @@ export function macosCompatNote(productVersion) {
   return { version: raw, major, risky, line };
 }
 
+// A Homebrew upgrade deletes the node binary a long-running server still executes, and System
+// Settings cannot grant anything to a file that is gone. Seen on 9.10.26: node 26.9.0 was replaced
+// by 26.11.0 under a LaunchAgent daemon started two days earlier, and doctor went from 6/6 to 3/6
+// (Apple Events -1743, both helper permissions false). Only a restart onto the current node helps.
+export function staleNodeNote(execPath = process.execPath, exists = existsSync) {
+  if (exists(execPath)) return null;
+  return `⚠ This server still runs node from ${execPath}, which no longer exists: node was upgraded or removed while the server kept running. ` +
+    "macOS permission checks can fail for a binary that is gone, and System Settings cannot grant anything to it. " +
+    "Restart the server on the current node, then grant the permissions to the new binary if macOS asks.";
+}
+
 export async function doctor() {
   const checks = [];
   const add = (ok, label, detail, fix) => checks.push({ ok, label, detail, fix: ok ? null : fix });
@@ -6657,7 +6675,7 @@ export async function doctor() {
   // Homebrew node upgrade changes that path, so the grant has to follow the new binary.
   add(!!pf && pf.screenRecording === true, "Screen Recording (screenshots)",
     pf ? (pf.screenRecording ? "permitted" : "NOT permitted — screenshots taken through AppleScript and safari_save_pdf fail (extension screenshots don't need it)") : "unknown (helper not responding)",
-    `System Settings > Privacy & Security > Screen & System Audio Recording → enable ${process.ppid === 1 ? `node at ${process.execPath} (this server runs under launchd)` : "the terminal/IDE that launched this server"}.`);
+    `System Settings > Privacy & Security > Screen & System Audio Recording → enable ${process.ppid !== 1 ? "the terminal/IDE that launched this server" : staleNodeNote() ? "the node this server runs on after a restart (see the warning above)" : `node at ${process.execPath} (this server runs under launchd)`}.`);
 
   // 6. Helper codesign identity — a stale/ad-hoc id breaks the Accessibility grant on reinstall
   let idOk = false, idDetail = "";
@@ -6685,6 +6703,8 @@ export async function doctor() {
   const passed = checks.filter((c) => c.ok).length;
   const lines = [`Safari MCP doctor — ${passed}/${checks.length} checks passed`, ""];
   if (osLine) lines.push(osLine, "");
+  const nodeNote = staleNodeNote();
+  if (nodeNote) lines.push(nodeNote, "");
   // Not a pass/fail check — a state the user has to be able to see here rather than dig out
   // of the host's env, so "why did it touch my tab" has an answer in the same report (#92).
   lines.push(