@hypothesi/tauri-mcp-server 0.11.2 → 0.13.0

package/dist/driver/scripts/find-element.js

@@ -1,26 +1,139 @@
 /**
- * Find an element using various selector strategies
+ * Find elements using various selector strategies and return structured data
  *
  * @param {Object} params
  * @param {string} params.selector - Element selector, ref ID (e.g., "ref=e3"), or text
  * @param {string} params.strategy - Selector strategy: 'css', 'xpath', or 'text'
+ * @param {number|null} params.nth - Zero-based index to pick one of several matching elements
+ * @param {number} params.limit - Maximum number of matches to return
+ * @param {string[]} params.properties - Computed CSS properties to include
+ * @param {boolean} params.visibleOnly - Return only rendered elements
+ * @param {boolean} params.includeHtml - Include outerHTML for each match
  */
 (function(params) {
-   const { selector, strategy } = params;
-
-   var element = window.__MCP__.resolveRef(selector, strategy);
-
-   if (element) {
-      const outerHTML = element.outerHTML;
-      // Truncate very long HTML to avoid overwhelming output
-      const truncated = outerHTML.length > 5000
-         ? outerHTML.substring(0, 5000) + '...'
-         : outerHTML;
-      var msg = 'Found element: ' + truncated;
-      var count = window.__MCP__.countAll(selector, strategy);
-      if (count > 1) msg += '\n(+' + (count - 1) + ' more match' + (count - 1 === 1 ? '' : 'es') + ')';
-      return msg;
+   const { selector, strategy, nth, limit, properties, visibleOnly, includeHtml } = params;
+
+   function getAccessibleName(element) {
+      try {
+         if (window.ariaApi && typeof window.ariaApi.getName === 'function') {
+            return window.ariaApi.getName(element) || null;
+         }
+      } catch (e) {
+         // Ignore aria-api errors
+      }
+      return null;
+   }
+
+   function getAttributes(element) {
+      const attrs = {
+         id: element.id || null,
+         class: element.className || null,
+         role: element.getAttribute('role') || null,
+         'aria-label': element.getAttribute('aria-label') || null,
+         'data-testid': element.getAttribute('data-testid') || null,
+         href: element.getAttribute('href') || null,
+         type: element.getAttribute('type') || null,
+         disabled: element.hasAttribute('disabled') ? '' : null,
+      };
+      // Remove null values
+      const result = {};
+      for (const key in attrs) {
+         if (attrs[key] !== null) {
+            result[key] = attrs[key];
+         }
+      }
+      return result;
+   }
+
+   function getStyles(element) {
+      if (!properties || properties.length === 0) return null;
+      const computed = window.getComputedStyle(element);
+      const result = {};
+      for (let i = 0; i < properties.length; i++) {
+         const prop = properties[i];
+         result[prop] = computed.getPropertyValue(prop);
+      }
+      return result;
+   }
+
+   function isInteractive(element) {
+      return element.matches && element.matches(window.__MCP__.INTERACTIVE_SELECTOR);
+   }
+
+   // Get all candidates first
+   var allMatches = window.__MCP__.resolveAll(selector, strategy);
+
+   // Filter by visibility if requested
+   var matches = visibleOnly
+      ? allMatches.filter(function(el) { return window.__MCP__.isRendered(el); })
+      : allMatches;
+
+   const totalMatches = matches.length;
+
+   // Apply nth if specified
+   if (typeof nth === 'number') {
+      if (!matches[nth]) {
+         return JSON.stringify({
+            selector: selector,
+            strategy: strategy,
+            totalMatches: totalMatches,
+            returned: 0,
+            truncated: false,
+            matches: [],
+            error: 'nth=' + nth + ' is out of range, ' + totalMatches + ' matches for ' + selector
+         });
+      }
+      matches = [matches[nth]];
    }
 
-   return 'Element not found';
+   // Apply limit
+   const truncated = matches.length > limit;
+   if (truncated) {
+      matches = matches.slice(0, limit);
+   }
+
+   const returned = matches.length;
+
+   const results = matches.map(function(element, index) {
+      const rect = element.getBoundingClientRect();
+      const ref = window.__MCP__.reverseRefs && window.__MCP__.reverseRefs.has(element)
+         ? Array.from(window.__MCP__.reverseRefs.entries()).find(([k, v]) => v === element)[0]
+         : null;
+
+      const match = {
+         nth: typeof nth === 'number' ? nth : (index + (typeof nth !== 'number' ? 0 : 0)),
+         ref: ref,
+         tag: element.tagName.toLowerCase(),
+         text: (element.textContent || '').trim(),
+         accessibleName: getAccessibleName(element),
+         attributes: getAttributes(element),
+         rect: {
+            x: Math.round(rect.left),
+            y: Math.round(rect.top),
+            width: Math.round(rect.width),
+            height: Math.round(rect.height),
+         },
+         visible: window.__MCP__.isRendered(element),
+         interactive: isInteractive(element),
+      };
+
+      const styles = getStyles(element);
+      if (styles) match.styles = styles;
+
+      if (includeHtml) {
+         const html = element.outerHTML;
+         match.html = html.length > 2000 ? html.substring(0, 2000) + '…' : html;
+      }
+
+      return match;
+   });
+
+   return JSON.stringify({
+      selector: selector,
+      strategy: strategy,
+      totalMatches: totalMatches,
+      returned: returned,
+      truncated: truncated,
+      matches: results,
+   });
 })

package/dist/driver/scripts/focus.js

@@ -4,15 +4,42 @@
  * @param {Object} params
  * @param {string} params.selector - CSS selector, XPath, text, or ref ID (e.g., "ref=e3") for element to focus
  * @param {string} params.strategy - Selector strategy: 'css', 'xpath', or 'text'
+ * @param {number|null} params.nth - Zero-based index to pick one of several matching elements
  */
 (function(params) {
-   const { selector, strategy } = params;
+   const { selector, strategy, nth } = params;
 
    function resolveElement(selectorOrRef) {
       if (!selectorOrRef) return null;
-      var el = window.__MCP__.resolveRef(selectorOrRef, strategy);
-      if (!el) throw new Error('Element not found: ' + selectorOrRef);
-      return el;
+      var matches = window.__MCP__.resolveAll(selectorOrRef, strategy);
+
+      if (matches.length === 0) throw new Error('Element not found: ' + selectorOrRef);
+      if (typeof nth === 'number') {
+         if (!matches[nth]) {
+            throw new Error('nth=' + nth + ' is out of range, ' + matches.length + ' matches for ' + selectorOrRef);
+         }
+         return matches[nth];
+      }
+      if (matches.length > 1 && strategy === 'text') {
+         throw new Error(describeAmbiguity(selectorOrRef, matches));
+      }
+      return matches[0];
+   }
+
+   function describeAmbiguity(selectorOrRef, matches) {
+      var lines = ['Ambiguous text selector "' + selectorOrRef + '" matched ' + matches.length + ' visible elements. Pass nth, or use a CSS selector or ref.'];
+      for (var i = 0; i < Math.min(matches.length, 5); i++) {
+         var el = matches[i];
+         var rect = el.getBoundingClientRect();
+         var text = (el.textContent || '').trim().substring(0, 50);
+         var tag = el.tagName.toLowerCase();
+         var className = el.className || '';
+         lines.push('  nth=' + i + '  ' + tag + (className ? '.' + className.split(' ')[0] : '') + '  "' + text + '"  rect ' + Math.round(rect.left) + ',' + Math.round(rect.top) + ' ' + Math.round(rect.width) + 'x' + Math.round(rect.height));
+      }
+      if (matches.length > 5) {
+         lines.push('  ... and ' + (matches.length - 5) + ' more');
+      }
+      return lines.join('\n');
    }
 
    const element = resolveElement(selector);

package/dist/driver/scripts/html2canvas-loader.js

@@ -58,14 +58,32 @@ export function buildScreenshotCaptureScript(format, quality) {
     return `
       ${HTML2CANVAS_RESOLVER_SCRIPT}
 
-      // Capture the entire document
+      // Render the document, but crop the output to the visible viewport. Without
+      // explicit bounds html2canvas allocates a canvas for the full scrollable
+      // document, which is both inconsistent with the native implementations and
+      // can time out on long pages.
       const element = document.documentElement;
       if (!element) {
          throw new Error('document.documentElement is null');
       }
 
+      const viewportWidth = Math.max(element.clientWidth, window.innerWidth || 0);
+      const viewportHeight = Math.max(element.clientHeight, window.innerHeight || 0);
+      const viewportX = window.scrollX || window.pageXOffset || 0;
+      const viewportY = window.scrollY || window.pageYOffset || 0;
+
       // Capture the webview
-      const canvas = await html2canvasFn(element, ${HTML2CANVAS_OPTIONS_SCRIPT});
+      const canvas = await html2canvasFn(element, {
+         ...${HTML2CANVAS_OPTIONS_SCRIPT},
+         x: viewportX,
+         y: viewportY,
+         width: viewportWidth,
+         height: viewportHeight,
+         windowWidth: viewportWidth,
+         windowHeight: viewportHeight,
+         scrollX: viewportX,
+         scrollY: viewportY,
+      });
       if (!canvas) {
          throw new Error('html2canvas returned null canvas');
       }

package/dist/driver/scripts/index.d.ts

@@ -8,9 +8,7 @@ export declare const SCRIPTS: {
     readonly resolveRef: string;
     readonly interact: string;
     readonly swipe: string;
-    readonly keyboard: string;
     readonly waitFor: string;
-    readonly getStyles: string;
     readonly focus: string;
     readonly findElement: string;
     readonly domSnapshot: string;
@@ -28,9 +26,9 @@ export declare function getResolveRefSource(): string;
  */
 export declare function buildScript(script: string, params: Record<string, unknown>): string;
 /**
- * Build a script for typing text (uses the keyboard script's typeText function)
+ * Build a script for typing text
  */
-export declare function buildTypeScript(selector: string, text: string, strategy?: string): string;
+export declare function buildTypeScript(selector: string, text: string, strategy?: string, nth?: number | null): string;
 /**
  * Build a script for key events (press, down, up)
  */

package/dist/driver/scripts/index.js

@@ -16,9 +16,7 @@ export const SCRIPTS = {
     resolveRef: loadScript('resolve-ref'),
     interact: loadScript('interact'),
     swipe: loadScript('swipe'),
-    keyboard: loadScript('keyboard'),
     waitFor: loadScript('wait-for'),
-    getStyles: loadScript('get-styles'),
     focus: loadScript('focus'),
     findElement: loadScript('find-element'),
     domSnapshot: loadScript('dom-snapshot'),
@@ -40,21 +38,52 @@ export function buildScript(script, params) {
     return `(${script})(${JSON.stringify(params)})`;
 }
 /**
- * Build a script for typing text (uses the keyboard script's typeText function)
+ * Build a script for typing text
  */
-export function buildTypeScript(selector, text, strategy) {
-    const escapedText = text.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
-    const escapedSelector = selector.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+export function buildTypeScript(selector, text, strategy, nth) {
     const strat = strategy || 'css';
+    const nthValue = nth ?? null;
     return `
       (function() {
-         const selector = '${escapedSelector}';
-         const strategy = '${strat}';
-         const text = '${escapedText}';
+         const selector = ${JSON.stringify(selector)};
+         const strategy = ${JSON.stringify(strat)};
+         const text = ${JSON.stringify(text)};
+         const nth = ${JSON.stringify(nthValue)};
 
-         var element = window.__MCP__.resolveRef(selector, strategy);
-         if (!element) throw new Error('Element not found: ' + selector);
+         function resolveElement(selectorOrRef) {
+            if (!selectorOrRef) return null;
+            var matches = window.__MCP__.resolveAll(selectorOrRef, strategy);
 
+            if (matches.length === 0) throw new Error('Element not found: ' + selectorOrRef);
+            if (typeof nth === 'number') {
+               if (!matches[nth]) {
+                  throw new Error('nth=' + nth + ' is out of range, ' + matches.length + ' matches for ' + selectorOrRef);
+               }
+               return matches[nth];
+            }
+            if (matches.length > 1 && strategy === 'text') {
+               throw new Error(describeAmbiguity(selectorOrRef, matches));
+            }
+            return matches[0];
+         }
+
+         function describeAmbiguity(selectorOrRef, matches) {
+            var lines = ['Ambiguous text selector "' + selectorOrRef + '" matched ' + matches.length + ' visible elements. Pass nth, or use a CSS selector or ref.'];
+            for (var i = 0; i < Math.min(matches.length, 5); i++) {
+               var el = matches[i];
+               var rect = el.getBoundingClientRect();
+               var text = (el.textContent || '').trim().substring(0, 50);
+               var tag = el.tagName.toLowerCase();
+               var className = el.className || '';
+               lines.push('  nth=' + i + '  ' + tag + (className ? '.' + className.split(' ')[0] : '') + '  "' + text + '"  rect ' + Math.round(rect.left) + ',' + Math.round(rect.top) + ' ' + Math.round(rect.width) + 'x' + Math.round(rect.height));
+            }
+            if (matches.length > 5) {
+               lines.push('  ... and ' + (matches.length - 5) + ' more');
+            }
+            return lines.join('\\n');
+         }
+
+         var element = resolveElement(selector);
          element.focus();
 
          // Use native prototype setter to bypass React's value tracker

package/dist/driver/scripts/interact.js

@@ -1,11 +1,12 @@
 /**
- * Webview interaction script - handles click, double-click, long-press, and scroll actions
+ * Webview interaction script - handles click, double-click, long-press, scroll, swipe, hover, and right-click actions
  * This script is injected into the webview and executed with parameters.
  *
  * @param {Object} params
  * @param {string} params.action - The action to perform
  * @param {string|null} params.selector - CSS selector, XPath, text, or ref ID (e.g., "ref=e3") for the element
  * @param {string} params.strategy - Selector strategy: 'css', 'xpath', or 'text'
+ * @param {number|null} params.nth - Zero-based index to pick one of several matching elements
  * @param {number|null} params.x - X coordinate
  * @param {number|null} params.y - Y coordinate
  * @param {number} params.duration - Duration for long-press
@@ -13,13 +14,39 @@
  * @param {number} params.scrollY - Vertical scroll amount
  */
 (function(params) {
-   const { action, selector, strategy, x, y, duration, scrollX, scrollY } = params;
+   const { action, selector, strategy, nth, x, y, duration, scrollX, scrollY } = params;
 
    function resolveElement(selectorOrRef) {
       if (!selectorOrRef) return null;
-      var el = window.__MCP__.resolveRef(selectorOrRef, strategy);
-      if (!el) throw new Error('Element not found: ' + selectorOrRef);
-      return el;
+      var matches = window.__MCP__.resolveAll(selectorOrRef, strategy);
+
+      if (matches.length === 0) throw new Error('Element not found: ' + selectorOrRef);
+      if (typeof nth === 'number') {
+         if (!matches[nth]) {
+            throw new Error('nth=' + nth + ' is out of range, ' + matches.length + ' matches for ' + selectorOrRef);
+         }
+         return matches[nth];
+      }
+      if (matches.length > 1 && strategy === 'text') {
+         throw new Error(describeAmbiguity(selectorOrRef, matches));
+      }
+      return matches[0];
+   }
+
+   function describeAmbiguity(selectorOrRef, matches) {
+      var lines = ['Ambiguous text selector "' + selectorOrRef + '" matched ' + matches.length + ' visible elements. Pass nth, or use a CSS selector or ref.'];
+      for (var i = 0; i < Math.min(matches.length, 5); i++) {
+         var el = matches[i];
+         var rect = el.getBoundingClientRect();
+         var text = (el.textContent || '').trim().substring(0, 50);
+         var tag = el.tagName.toLowerCase();
+         var className = el.className || '';
+         lines.push('  nth=' + i + '  ' + tag + (className ? '.' + className.split(' ')[0] : '') + '  "' + text + '"  rect ' + Math.round(rect.left) + ',' + Math.round(rect.top) + ' ' + Math.round(rect.width) + 'x' + Math.round(rect.height));
+      }
+      if (matches.length > 5) {
+         lines.push('  ... and ' + (matches.length - 5) + ' more');
+      }
+      return lines.join('\n');
    }
 
    function matchHint() {
@@ -62,6 +89,19 @@
       clientY: targetY,
    };
 
+   const pointerOptions = {
+      ...eventOptions,
+      pointerId: 1,
+      pointerType: 'mouse',
+      isPrimary: true,
+   };
+
+   const rightButtonOptions = {
+      ...eventOptions,
+      button: 2,
+      buttons: 2,
+   };
+
    if (action === 'click') {
       if (element) {
          element.dispatchEvent(new MouseEvent('mousedown', eventOptions));
@@ -94,6 +134,27 @@
       return `Long-pressed at (${targetX}, ${targetY}) for ${duration}ms` + matchHint();
    }
 
+   if (action === 'hover') {
+      if (element) {
+         element.dispatchEvent(new PointerEvent('pointerover', pointerOptions));
+         element.dispatchEvent(new PointerEvent('pointerenter', pointerOptions));
+         element.dispatchEvent(new MouseEvent('mouseover', eventOptions));
+         element.dispatchEvent(new MouseEvent('mouseenter', eventOptions));
+         element.dispatchEvent(new PointerEvent('pointermove', pointerOptions));
+         element.dispatchEvent(new MouseEvent('mousemove', eventOptions));
+      }
+      return `Hovered at (${targetX}, ${targetY})` + matchHint();
+   }
+
+   if (action === 'right-click') {
+      if (element) {
+         element.dispatchEvent(new MouseEvent('mousedown', rightButtonOptions));
+         element.dispatchEvent(new MouseEvent('mouseup', rightButtonOptions));
+         element.dispatchEvent(new MouseEvent('contextmenu', rightButtonOptions));
+      }
+      return `Right-clicked at (${targetX}, ${targetY})` + matchHint();
+   }
+
    if (action === 'scroll') {
       const scrollTarget = element || window;
       if (scrollX !== 0 || scrollY !== 0) {

package/dist/driver/scripts/resolve-ref.js

@@ -15,6 +15,84 @@
 
    var REF_PATTERN = /^\[?(?:ref=)?(e\d+)\]?$/;
 
+   var NON_RENDERED_TAGS = {
+      SCRIPT: 1, STYLE: 1, TITLE: 1, HEAD: 1, META: 1,
+      LINK: 1, TEMPLATE: 1, NOSCRIPT: 1, BASE: 1,
+   };
+
+   var INTERACTIVE_SELECTOR = 'a,button,input,select,textarea,summary,' +
+      '[role=button],[role=link],[role=tab],[role=menuitem],[role=option],[tabindex]';
+
+   function isRendered(element) {
+      if (!element || element.nodeType !== 1) return false;
+      if (NON_RENDERED_TAGS[element.tagName]) return false;
+      if (element.hidden) return false;
+      if (element.getClientRects().length === 0) return false;
+      try {
+         var style = window.getComputedStyle(element);
+         if (style.display === 'none') return false;
+         if (style.visibility === 'hidden' || style.visibility === 'collapse') return false;
+      } catch (e) {
+         return false;
+      }
+      return true;
+   }
+
+   function hasMatchingDescendant(element, needle) {
+      var descendants = element.querySelectorAll('*');
+      for (var i = 0; i < descendants.length; i++) {
+         var el = descendants[i];
+         if (!isRendered(el)) continue;
+         var content = (el.textContent || '').trim();
+         if (content.indexOf(needle) !== -1) return true;
+      }
+      return false;
+   }
+
+   function preferInteractive(el) {
+      if (el.matches(INTERACTIVE_SELECTOR)) return el;
+      var host = el.closest(INTERACTIVE_SELECTOR);
+      return host && isRendered(host) ? host : el;
+   }
+
+   function dedupe(arr) {
+      var seen = new Set();
+      var result = [];
+      for (var i = 0; i < arr.length; i++) {
+         var el = arr[i];
+         if (!seen.has(el)) {
+            seen.add(el);
+            result.push(el);
+         }
+      }
+      return result;
+   }
+
+   function textCandidates(needle) {
+      var all = document.body ? document.body.querySelectorAll('*') : [],
+          exact = [], partial = [];
+
+      for (var i = 0; i < all.length; i++) {
+         var el = all[i],
+             content = (el.textContent || '').trim(),
+             attributeText = [
+                el.getAttribute('placeholder'),
+                el.getAttribute('aria-label'),
+                el.getAttribute('title'),
+             ].filter(Boolean),
+             exactAttribute = attributeText.indexOf(needle) !== -1,
+             partialAttribute = attributeText.some(function(value) { return value.indexOf(needle) !== -1; }),
+             textMatch = content.indexOf(needle) !== -1;
+
+         if (!textMatch && !partialAttribute) continue;
+         if (!isRendered(el)) continue;
+         if (textMatch && el.querySelector('*') && hasMatchingDescendant(el, needle)) continue;
+         (content === needle || exactAttribute ? exact : partial).push(preferInteractive(el));
+      }
+
+      return dedupe(exact.length > 0 ? exact : partial);
+   }
+
    function xpathForText(text) {
       // Escape single quotes for XPath by splitting on ' and using concat()
       if (text.indexOf("'") === -1) {
@@ -47,39 +125,26 @@
       }
 
       if (strategy === 'text') {
-         // First try: match element text content
-         var xpath = xpathForText(selectorOrRef);
-         var result = document.evaluate(xpath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
-         if (result.singleNodeValue) return result.singleNodeValue;
-
-         // Fallback: search placeholder, aria-label, and title attributes
-         var attrSelectors = [
-            '[placeholder*="' + selectorOrRef.replace(/"/g, '\\"') + '"]',
-            '[aria-label*="' + selectorOrRef.replace(/"/g, '\\"') + '"]',
-            '[title*="' + selectorOrRef.replace(/"/g, '\\"') + '"]',
-         ];
-         for (var i = 0; i < attrSelectors.length; i++) {
-            var el = document.querySelector(attrSelectors[i]);
-            if (el) return el;
-         }
-         return null;
+         var candidates = textCandidates(selectorOrRef);
+         return candidates[0] || null;
       }
 
       if (strategy === 'xpath') {
          var result = document.evaluate(selectorOrRef, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
-         return result.singleNodeValue;
+         var node = result.singleNodeValue;
+         return (node && isRendered(node)) ? node : null;
       }
 
       // Default: CSS selector
       return document.querySelector(selectorOrRef);
    };
 
-   /**
-    * Resolve all matching elements as an Array.
-    * @param {string} selector  - Selector, XPath, or text
-    * @param {string} [strategy] - 'css' (default), 'xpath', or 'text'
-    * @returns {Element[]}
-    */
+/**
+     * Resolve all matching elements as an Array.
+     * @param {string} selector  - Selector, XPath, or text
+     * @param {string} [strategy] - 'css' (default), 'xpath', or 'text'
+     * @returns {Element[]}
+     */
    window.__MCP__.resolveAll = function(selector, strategy) {
       if (!selector) return [];
 
@@ -91,33 +156,15 @@
       }
 
       if (strategy === 'text') {
-         // First try: match element text content
-         var xpath = xpathForText(selector);
-         var snapshot = document.evaluate(xpath, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-         var results = [];
-         for (var i = 0; i < snapshot.snapshotLength; i++) {
-            results.push(snapshot.snapshotItem(i));
-         }
-         if (results.length > 0) return results;
-
-         // Fallback: search placeholder, aria-label, and title attributes
-         var attrSelectors = [
-            '[placeholder*="' + selector.replace(/"/g, '\\"') + '"]',
-            '[aria-label*="' + selector.replace(/"/g, '\\"') + '"]',
-            '[title*="' + selector.replace(/"/g, '\\"') + '"]',
-         ];
-         for (var i = 0; i < attrSelectors.length; i++) {
-            var found = Array.from(document.querySelectorAll(attrSelectors[i]));
-            if (found.length > 0) return results.concat(found);
-         }
-         return results;
+         return textCandidates(selector);
       }
 
       if (strategy === 'xpath') {
          var snapshot = document.evaluate(selector, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
          var results = [];
          for (var i = 0; i < snapshot.snapshotLength; i++) {
-            results.push(snapshot.snapshotItem(i));
+            var node = snapshot.snapshotItem(i);
+            if (node && isRendered(node)) results.push(node);
          }
          return results;
       }
@@ -126,13 +173,17 @@
       return Array.from(document.querySelectorAll(selector));
    };
 
-   /**
-    * Count all matching elements.
-    * @param {string} selector  - Selector, XPath, or text
-    * @param {string} [strategy] - 'css' (default), 'xpath', or 'text'
-    * @returns {number}
-    */
+/**
+     * Count all matching elements.
+     * @param {string} selector  - Selector, XPath, or text
+     * @param {string} [strategy] - 'css' (default), 'xpath', or 'text'
+     * @returns {number}
+     */
    window.__MCP__.countAll = function(selector, strategy) {
       return window.__MCP__.resolveAll(selector, strategy).length;
    };
+
+   // Export for reuse by other scripts
+   window.__MCP__.isRendered = isRendered;
+   window.__MCP__.INTERACTIVE_SELECTOR = INTERACTIVE_SELECTOR;
 })();