safari-mcp 2.7.6 → 2.7.8

package/extension/background.js

@@ -612,13 +612,14 @@ async function handleCommand(type, payload) {
             if (props.onMouseDown) { props.onMouseDown({ ...synth, type: "mousedown" }); reactFired = true; break; }
           }
           // Try __reactFiber$ / __reactInternalInstance$ (React 16/17)
+          // Traverse up to 20 levels — React portals (modals, dialogs) can have deeply nested fiber trees
           if (!reactFired) {
             const fk = keys.find(k => k.startsWith("__reactFiber$") || k.startsWith("__reactInternalInstance$"));
             if (fk && node[fk]) {
               let fiber = node[fk];
-              for (let f = 0; f < 10 && fiber; f++) {
+              for (let f = 0; f < 20 && fiber; f++) {
                 if (fiber.memoizedProps) {
-                  if (fiber.memoizedProps.onClick) { fiber.memoizedProps.onClick({ type: "click", target: el, currentTarget: node, clientX: cx, clientY: cy, preventDefault() {}, stopPropagation() {}, persist() {}, bubbles: true }); reactFired = true; break; }
+                  if (fiber.memoizedProps.onClick) { fiber.memoizedProps.onClick({ type: "click", target: el, currentTarget: node, clientX: cx, clientY: cy, preventDefault() {}, stopPropagation() {}, persist() {}, bubbles: true, nativeEvent: new MouseEvent("click"), isDefaultPrevented() { return false; }, isPropagationStopped() { return false; } }); reactFired = true; break; }
                 }
                 fiber = fiber.return;
               }
@@ -723,6 +724,11 @@ async function handleCommand(type, payload) {
             try {
               let view = pmEl.pmViewDesc && pmEl.pmViewDesc.view;
               if (!view) { const keys = Object.keys(pmEl); for (let i=0;i<keys.length;i++) { const o=pmEl[keys[i]]; if(o&&o.state&&o.dispatch){view=o;break;} } }
+              // Walk React Fiber tree to find EditorView (LinkedIn, Tiptap-React, etc.)
+              if (!view) {
+                const fk = Object.keys(pmEl).find(function(k){return k.startsWith("__reactFiber$")||k.startsWith("__reactInternalInstance$");});
+                if (fk) { let fiber = pmEl[fk]; for (let d=0;d<20&&fiber;d++) { const props = fiber.memoizedProps||(fiber.stateNode&&fiber.stateNode.props); if(props) { const v = props.editorView||props.view; if(v&&v.state&&v.dispatch){view=v;break;} } fiber=fiber.return; } }
+              }
               if (view && view.state && view.dispatch) {
                 const { state } = view;
                 const doc = state.doc;
@@ -742,6 +748,14 @@ async function handleCommand(type, payload) {
               }
             } catch (e) { /* fall through */ }
           }
+          // ProseMirror detected but no view found — use char-by-char with beforeinput
+          if (!ceResult && pmEl) {
+            try {
+              el.focus();
+              (window.__mcpClosureType || function(){})(value, el);
+              ceResult = "Filled contenteditable (ProseMirror char-by-char, " + value.length + " chars)";
+            } catch (e) { /* fall through */ }
+          }
 
           // === Draft.js: use React fiber to access EditorState ===
           if (!ceResult) {
@@ -821,6 +835,7 @@ async function handleCommand(type, payload) {
           if (!ceResult) {
             document.execCommand("selectAll", false, null);
             document.execCommand("delete", false, null);
+            el.dispatchEvent(new InputEvent("beforeinput", { inputType: "insertText", data: value, bubbles: true, cancelable: true }));
             document.execCommand("insertText", false, value);
             ceResult = "Filled contenteditable";
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.7.6",
+  "version": "2.7.8",
   "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-helper.swift

@@ -324,13 +324,30 @@ while let line = readLine(strippingNewline: true) {
     continue
   }
 
-  var errorDict: NSDictionary?
-  let result = nsScript.executeAndReturnError(&errorDict)
+  // Execute on a background thread to avoid blocking stdin reading.
+  // Heavy pages (SourceForge, etc.) can cause executeAndReturnError() to block
+  // for 10-30+ seconds, preventing ALL subsequent commands from being read.
+  let semaphore = DispatchSemaphore(value: 0)
+  var scriptResult: NSAppleEventDescriptor?
+  var scriptError: NSDictionary?
+
+  DispatchQueue.global(qos: .userInitiated).async {
+    var errorDict: NSDictionary?
+    scriptResult = nsScript.executeAndReturnError(&errorDict)
+    scriptError = errorDict
+    semaphore.signal()
+  }
+
+  // Wait up to 30 seconds for the script to complete.
+  // If it times out, respond with error but don't block the loop forever.
+  let waitResult = semaphore.wait(timeout: .now() + 30.0)
 
-  if let error = errorDict {
+  if waitResult == .timedOut {
+    respond(["error": "AppleScript execution timed out (30s)"])
+  } else if let error = scriptError {
     let msg = (error["NSAppleScriptErrorMessage"] as? String) ?? "AppleScript error"
     respond(["error": msg])
   } else {
-    respond(["result": result.stringValue ?? ""])
+    respond(["result": scriptResult?.stringValue ?? ""])
   }
 }

package/safari.js

@@ -1131,7 +1131,12 @@ export async function fill({ selector, value, ref }) {
   const result = await runJS(
     `(function(){try{var el=document.querySelector('${sel}');if(!el){var q=function(r){var a=r.querySelectorAll('*');for(var i=0;i<a.length;i++){if(a[i].shadowRoot){el=a[i].shadowRoot.querySelector('${sel}');if(el)return el;el=q(a[i].shadowRoot);if(el)return el;}}return null;};el=q(document);}if(!el)return 'Element not found: ${sel}';el.focus();if(el.isContentEditable||el.getAttribute('contenteditable')==='true'){` +
     // ProseMirror detection
-    `var pm=el.closest('.ProseMirror')||el.querySelector('.ProseMirror');if(pm){try{var v=null;if(pm.pmViewDesc&&pm.pmViewDesc.view)v=pm.pmViewDesc.view;else if(pm.cmView&&pm.cmView.view)v=pm.cmView.view;else{var keys=Object.keys(pm);for(var ki=0;ki<keys.length;ki++){var o=pm[keys[ki]];if(o&&o.state&&o.dispatch){v=o;break;}}}if(v&&v.state&&v.dispatch){var doc=v.state.doc;var hasContent=doc.textContent&&doc.textContent.trim().length>0;if(hasContent){var endPos=doc.content.size>1?doc.content.size-1:doc.content.size;v.dispatch(v.state.tr.insertText(' ${val}',endPos));v.focus();return 'Filled CE (ProseMirror append)';}else{var tr=v.state.tr;tr.replaceWith(0,doc.content.size,v.state.schema.text('${val}'));v.dispatch(tr);v.focus();return 'Filled CE (ProseMirror replace)';}}}catch(e){}}` +
+    `var pm=el.closest('.ProseMirror')||el.querySelector('.ProseMirror');if(pm){try{var v=null;if(pm.pmViewDesc&&pm.pmViewDesc.view)v=pm.pmViewDesc.view;else if(pm.cmView&&pm.cmView.view)v=pm.cmView.view;else{var keys=Object.keys(pm);for(var ki=0;ki<keys.length;ki++){var o=pm[keys[ki]];if(o&&o.state&&o.dispatch){v=o;break;}}}` +
+    // React Fiber walk for ProseMirror view (LinkedIn, Tiptap-React)
+    `if(!v){var fk=Object.keys(pm).find(function(k){return k.startsWith('__reactFiber$')||k.startsWith('__reactInternalInstance$');});if(fk){var fiber=pm[fk];for(var d=0;d<20&&fiber;d++){var props=fiber.memoizedProps||(fiber.stateNode&&fiber.stateNode.props);if(props){var pv=props.editorView||props.view;if(pv&&pv.state&&pv.dispatch){v=pv;break;}}fiber=fiber.return;}}}` +
+    `if(v&&v.state&&v.dispatch){var doc=v.state.doc;var hasContent=doc.textContent&&doc.textContent.trim().length>0;if(hasContent){var endPos=doc.content.size>1?doc.content.size-1:doc.content.size;v.dispatch(v.state.tr.insertText(' ${val}',endPos));v.focus();return 'Filled CE (ProseMirror append)';}else{var tr=v.state.tr;tr.replaceWith(0,doc.content.size,v.state.schema.text('${val}'));v.dispatch(tr);v.focus();return 'Filled CE (ProseMirror replace)';}}}catch(e){}}` +
+    // ProseMirror detected but no view — use char-by-char with beforeinput
+    `if(pm&&!v){return '__PM_CHARBYCHAR__';}` +
     // Closure/Medium detection — signal for native paste
     `var isClosure=Object.keys(el).some(function(k){return k.startsWith('closure_uid_');})||location.hostname.includes('medium.com');if(isClosure){return '__CLOSURE_NATIVE_PASTE__';}` +
     // Synthetic ClipboardEvent paste — works on ProseMirror, TipTap, Slate, and most modern editors
@@ -1143,6 +1148,42 @@ export async function fill({ selector, value, ref }) {
     `var t=el._valueTracker;if(t)t.setValue('');var proto=el.tagName==='TEXTAREA'?window.HTMLTextAreaElement.prototype:window.HTMLInputElement.prototype;var s=Object.getOwnPropertyDescriptor(proto,'value');if(s&&s.set){s.set.call(el,'${val}');}else{el.value='${val}';}el.dispatchEvent(new Event('input',{bubbles:true}));el.dispatchEvent(new Event('change',{bubbles:true}));el.dispatchEvent(new Event('blur',{bubbles:true}));el.dispatchEvent(new Event('focusout',{bubbles:true}));el.focus();return 'Filled: '+el.value.substring(0,50);}catch(e){return 'ERR: '+e.message;}})()`
   );
 
+  // ProseMirror editor with no view access: use char-by-char with beforeinput events
+  if (result === "__PM_CHARBYCHAR__") {
+    const rawValue = value;
+    const lines = rawValue.split('\n');
+    const charInserts = lines.map((line, i) => {
+      const escaped = line.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+      let cmds = '';
+      if (i > 0) {
+        cmds += `t.dispatchEvent(new KeyboardEvent('keydown',{key:'Enter',keyCode:13,code:'Enter',bubbles:true,cancelable:true}));`;
+        cmds += `t.dispatchEvent(new InputEvent('beforeinput',{inputType:'insertParagraph',bubbles:true,cancelable:true}));`;
+        cmds += `document.execCommand('insertParagraph');`;
+        cmds += `t.dispatchEvent(new InputEvent('input',{inputType:'insertParagraph',bubbles:true}));`;
+        cmds += `t.dispatchEvent(new KeyboardEvent('keyup',{key:'Enter',keyCode:13,code:'Enter',bubbles:true}));`;
+      }
+      if (escaped.length > 0) {
+        // Insert text in one beforeinput + execCommand, then fire input
+        cmds += `t.dispatchEvent(new InputEvent('beforeinput',{data:'${escaped}',inputType:'insertText',bubbles:true,cancelable:true}));`;
+        cmds += `document.execCommand('insertText',false,'${escaped}');`;
+        cmds += `t.dispatchEvent(new InputEvent('input',{data:'${escaped}',inputType:'insertText',bubbles:true}));`;
+      }
+      return cmds;
+    }).join('');
+
+    const fillResult = await runJS(
+      `(function(){` +
+      `var el=document.querySelector('${selector.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}');` +
+      `if(!el)return 'Element not found';` +
+      `el.focus();el.click();` +
+      `var t=document.activeElement||el;` +
+      charInserts +
+      `return 'Filled CE (ProseMirror char-by-char)';` +
+      `})()`
+    );
+    return fillResult;
+  }
+
   // Closure/Medium editor: insert line-by-line via execCommand in small batches
   // No focus stealing, no System Events, no clipboard manipulation.
   // Medium's Closure editor accepts execCommand('insertText') for individual lines