@weavetab/mcp 2.5.0-beta.5 → 2.5.1

package/dist/tools/scrape.js

@@ -4,79 +4,79 @@ import { sessionRegistry } from "../state/session.js";
 export async function browserScrape(session, options, _config) {
     const { query, type = "css", attributes = ["textContent"], multiple = true } = options;
     const res = await session.Runtime.evaluate({
-        expression: `(function() {
-      const results = [];
-      let nodes = [];
-
-      try {
-        if (${JSON.stringify(type)} === 'css') {
-          if (${multiple}) {
-            nodes = Array.from(document.querySelectorAll(${JSON.stringify(query)}));
-            // Shadow DOM fallback: if nothing found, try the extension's deep-shadow query helper.
-            // This handles Vue/React components that attach to shadow roots.
-            if (nodes.length === 0 && window.__Weavetab_shadowQuery_all) {
-              try { nodes = Array.from(window.__Weavetab_shadowQuery_all(${JSON.stringify(query)})); } catch (_) {}
-            }
-          } else {
-            const node = document.querySelector(${JSON.stringify(query)})
-              || (window.__Weavetab_shadowQuery ? window.__Weavetab_shadowQuery(${JSON.stringify(query)}) : null);
-            if (node) nodes = [node];
-          }
-        } else if (${JSON.stringify(type)} === 'xpath') {
-          // Use SNAPSHOT type — immune to DOM mutations that would invalidate an ITERATOR mid-walk.
-          const snap = document.evaluate(${JSON.stringify(query)}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-          const limit = ${multiple} ? snap.snapshotLength : Math.min(snap.snapshotLength, 1);
-          for (let i = 0; i < limit; i++) {
-            const n = snap.snapshotItem(i);
-            // Only Element nodes expose getAttribute / tagName / outerHTML safely.
-            if (n && n.nodeType === 1) nodes.push(n);
-          }
-        }
-      } catch (e) {
-        return { error: e.message };
-      }
-
-      const attrs = ${JSON.stringify(attributes)};
-      var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
-      nodes.forEach(node => {
-        const item = {};
-
-        // Secret containment: redact any element marked as sensitive.
-        const isSecret = node.hasAttribute && (
-          node.hasAttribute('data-wt-secret') ||
-          (node.tagName === 'INPUT' && (
-            node.type === 'password' ||
-            secretRegex.test(node.getAttribute('autocomplete') || '') ||
-            secretRegex.test(node.getAttribute('name') || '') ||
-            secretRegex.test(node.getAttribute('id') || '') ||
-            secretRegex.test(node.getAttribute('aria-label') || '')
-          ))
-        );
-
-        if (isSecret) {
-          // Replace ALL requested attributes with [REDACTED] — value never crosses boundary
-          attrs.forEach(attr => { item[attr] = '[REDACTED]'; });
-        } else {
-          attrs.forEach(attr => {
-            if (attr === 'textContent' || attr === 'innerText') {
-              item[attr] = node[attr]?.trim() || '';
-            } else if (attr === 'outerHTML') {
-              item[attr] = node.outerHTML;
-            } else if (attr === 'value') {
-              // Read live DOM property (not HTML attribute) so getter overrides work
-              item[attr] = node.value !== undefined ? String(node.value) : '';
-            } else {
-              item[attr] = node.getAttribute(attr) || node[attr] || '';
-            }
-          });
-        }
-
-        results.push(item);
-      });
-
-      const isXpath = ${JSON.stringify(type)} === 'xpath';
-      const shadowFallback = !isXpath && nodes.length > 0 && !document.querySelector(${JSON.stringify(query)});
-      return { data: results, usedShadowFallback: shadowFallback };
+        expression: `(function() {
+      const results = [];
+      let nodes = [];
+
+      try {
+        if (${JSON.stringify(type)} === 'css') {
+          if (${multiple}) {
+            nodes = Array.from(document.querySelectorAll(${JSON.stringify(query)}));
+            // Shadow DOM fallback: if nothing found, try the extension's deep-shadow query helper.
+            // This handles Vue/React components that attach to shadow roots.
+            if (nodes.length === 0 && window.__Weavetab_shadowQuery_all) {
+              try { nodes = Array.from(window.__Weavetab_shadowQuery_all(${JSON.stringify(query)})); } catch (_) {}
+            }
+          } else {
+            const node = document.querySelector(${JSON.stringify(query)})
+              || (window.__Weavetab_shadowQuery ? window.__Weavetab_shadowQuery(${JSON.stringify(query)}) : null);
+            if (node) nodes = [node];
+          }
+        } else if (${JSON.stringify(type)} === 'xpath') {
+          // Use SNAPSHOT type — immune to DOM mutations that would invalidate an ITERATOR mid-walk.
+          const snap = document.evaluate(${JSON.stringify(query)}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+          const limit = ${multiple} ? snap.snapshotLength : Math.min(snap.snapshotLength, 1);
+          for (let i = 0; i < limit; i++) {
+            const n = snap.snapshotItem(i);
+            // Only Element nodes expose getAttribute / tagName / outerHTML safely.
+            if (n && n.nodeType === 1) nodes.push(n);
+          }
+        }
+      } catch (e) {
+        return { error: e.message };
+      }
+
+      const attrs = ${JSON.stringify(attributes)};
+      var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
+      nodes.forEach(node => {
+        const item = {};
+
+        // Secret containment: redact any element marked as sensitive.
+        const isSecret = node.hasAttribute && (
+          node.hasAttribute('data-wt-secret') ||
+          (node.tagName === 'INPUT' && (
+            node.type === 'password' ||
+            secretRegex.test(node.getAttribute('autocomplete') || '') ||
+            secretRegex.test(node.getAttribute('name') || '') ||
+            secretRegex.test(node.getAttribute('id') || '') ||
+            secretRegex.test(node.getAttribute('aria-label') || '')
+          ))
+        );
+
+        if (isSecret) {
+          // Replace ALL requested attributes with [REDACTED] — value never crosses boundary
+          attrs.forEach(attr => { item[attr] = '[REDACTED]'; });
+        } else {
+          attrs.forEach(attr => {
+            if (attr === 'textContent' || attr === 'innerText') {
+              item[attr] = node[attr]?.trim() || '';
+            } else if (attr === 'outerHTML') {
+              item[attr] = node.outerHTML;
+            } else if (attr === 'value') {
+              // Read live DOM property (not HTML attribute) so getter overrides work
+              item[attr] = node.value !== undefined ? String(node.value) : '';
+            } else {
+              item[attr] = node.getAttribute(attr) || node[attr] || '';
+            }
+          });
+        }
+
+        results.push(item);
+      });
+
+      const isXpath = ${JSON.stringify(type)} === 'xpath';
+      const shadowFallback = !isXpath && nodes.length > 0 && !document.querySelector(${JSON.stringify(query)});
+      return { data: results, usedShadowFallback: shadowFallback };
     })()`,
         returnByValue: true
     });
@@ -90,87 +90,87 @@ export async function browserScrape(session, options, _config) {
         await new Promise(r => setTimeout(r, 300));
         // Build a fresh count expression depending on selector type.
         const countExpr = type === 'xpath'
-            ? `(function(){
-          try {
-            var s = document.evaluate(${JSON.stringify(query)}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-            return s.snapshotLength;
-          } catch(e) { return 0; }
+            ? `(function(){
+          try {
+            var s = document.evaluate(${JSON.stringify(query)}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+            return s.snapshotLength;
+          } catch(e) { return 0; }
         })()`
-            : `(function(){
-          var n = Array.from(document.querySelectorAll(${JSON.stringify(query)}));
-          if (n.length === 0 && window.__Weavetab_shadowQuery_all) {
-            try { n = Array.from(window.__Weavetab_shadowQuery_all(${JSON.stringify(query)})); } catch(_){}
-          }
-          return n.length;
+            : `(function(){
+          var n = Array.from(document.querySelectorAll(${JSON.stringify(query)}));
+          if (n.length === 0 && window.__Weavetab_shadowQuery_all) {
+            try { n = Array.from(window.__Weavetab_shadowQuery_all(${JSON.stringify(query)})); } catch(_){}
+          }
+          return n.length;
         })()`;
         const retry = await session.Runtime.evaluate({ expression: countExpr, returnByValue: true }).catch(() => null);
         if (retry?.result?.value && retry.result.value > 0) {
             // Re-run full scrape now that elements exist.
             // XPath path uses snapshot; CSS path uses querySelectorAll + shadow fallback.
             const fullExpr = type === 'xpath'
-                ? `(function(){
-            var attrs = ${JSON.stringify(attributes)};
-            var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
-            var snap = document.evaluate(${JSON.stringify(query)}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-            var limit = ${multiple} ? snap.snapshotLength : Math.min(snap.snapshotLength, 1);
-            var results = [];
-            for (var i = 0; i < limit; i++) {
-              var node = snap.snapshotItem(i);
-              if (!node || node.nodeType !== 1) continue;
-              var item = {};
-              var isSecret = node.hasAttribute && (
-                node.hasAttribute('data-wt-secret') ||
-                (node.tagName === 'INPUT' && (
-                  node.type === 'password' ||
-                  secretRegex.test(node.getAttribute('autocomplete') || '') ||
-                  secretRegex.test(node.getAttribute('name') || '') ||
-                  secretRegex.test(node.getAttribute('id') || '') ||
-                  secretRegex.test(node.getAttribute('aria-label') || '')
-                ))
-              );
-              if (isSecret) {
-                attrs.forEach(function(attr) { item[attr] = '[REDACTED]'; });
-              } else {
-                attrs.forEach(function(attr) {
-                  if (attr === 'textContent' || attr === 'innerText') { item[attr] = (node[attr] || '').trim(); }
-                  else if (attr === 'outerHTML') { item[attr] = node.outerHTML; }
-                  else { item[attr] = node.getAttribute ? (node.getAttribute(attr) || node[attr] || '') : ''; }
-                });
-              }
-              results.push(item);
-            }
-            return { data: results };
+                ? `(function(){
+            var attrs = ${JSON.stringify(attributes)};
+            var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
+            var snap = document.evaluate(${JSON.stringify(query)}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+            var limit = ${multiple} ? snap.snapshotLength : Math.min(snap.snapshotLength, 1);
+            var results = [];
+            for (var i = 0; i < limit; i++) {
+              var node = snap.snapshotItem(i);
+              if (!node || node.nodeType !== 1) continue;
+              var item = {};
+              var isSecret = node.hasAttribute && (
+                node.hasAttribute('data-wt-secret') ||
+                (node.tagName === 'INPUT' && (
+                  node.type === 'password' ||
+                  secretRegex.test(node.getAttribute('autocomplete') || '') ||
+                  secretRegex.test(node.getAttribute('name') || '') ||
+                  secretRegex.test(node.getAttribute('id') || '') ||
+                  secretRegex.test(node.getAttribute('aria-label') || '')
+                ))
+              );
+              if (isSecret) {
+                attrs.forEach(function(attr) { item[attr] = '[REDACTED]'; });
+              } else {
+                attrs.forEach(function(attr) {
+                  if (attr === 'textContent' || attr === 'innerText') { item[attr] = (node[attr] || '').trim(); }
+                  else if (attr === 'outerHTML') { item[attr] = node.outerHTML; }
+                  else { item[attr] = node.getAttribute ? (node.getAttribute(attr) || node[attr] || '') : ''; }
+                });
+              }
+              results.push(item);
+            }
+            return { data: results };
           })()`
-                : `(function(){
-            var nodes = Array.from(document.querySelectorAll(${JSON.stringify(query)}));
-            if (nodes.length === 0 && window.__Weavetab_shadowQuery_all) {
-              try { nodes = Array.from(window.__Weavetab_shadowQuery_all(${JSON.stringify(query)})); } catch(_){}
-            }
-            var attrs = ${JSON.stringify(attributes)};
-            var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
-            return { data: nodes.map(function(node) {
-              var item = {};
-              var isSecret = node.hasAttribute && (
-                node.hasAttribute('data-wt-secret') ||
-                (node.tagName === 'INPUT' && (
-                  node.type === 'password' ||
-                  secretRegex.test(node.getAttribute('autocomplete') || '') ||
-                  secretRegex.test(node.getAttribute('name') || '') ||
-                  secretRegex.test(node.getAttribute('id') || '') ||
-                  secretRegex.test(node.getAttribute('aria-label') || '')
-                ))
-              );
-              if (isSecret) {
-                attrs.forEach(function(attr) { item[attr] = '[REDACTED]'; });
-              } else {
-                attrs.forEach(function(attr) {
-                  if (attr === 'textContent' || attr === 'innerText') { item[attr] = (node[attr] || '').trim(); }
-                  else if (attr === 'outerHTML') { item[attr] = node.outerHTML; }
-                  else { item[attr] = node.getAttribute(attr) || node[attr] || ''; }
-                });
-              }
-              return item;
-            })};
+                : `(function(){
+            var nodes = Array.from(document.querySelectorAll(${JSON.stringify(query)}));
+            if (nodes.length === 0 && window.__Weavetab_shadowQuery_all) {
+              try { nodes = Array.from(window.__Weavetab_shadowQuery_all(${JSON.stringify(query)})); } catch(_){}
+            }
+            var attrs = ${JSON.stringify(attributes)};
+            var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
+            return { data: nodes.map(function(node) {
+              var item = {};
+              var isSecret = node.hasAttribute && (
+                node.hasAttribute('data-wt-secret') ||
+                (node.tagName === 'INPUT' && (
+                  node.type === 'password' ||
+                  secretRegex.test(node.getAttribute('autocomplete') || '') ||
+                  secretRegex.test(node.getAttribute('name') || '') ||
+                  secretRegex.test(node.getAttribute('id') || '') ||
+                  secretRegex.test(node.getAttribute('aria-label') || '')
+                ))
+              );
+              if (isSecret) {
+                attrs.forEach(function(attr) { item[attr] = '[REDACTED]'; });
+              } else {
+                attrs.forEach(function(attr) {
+                  if (attr === 'textContent' || attr === 'innerText') { item[attr] = (node[attr] || '').trim(); }
+                  else if (attr === 'outerHTML') { item[attr] = node.outerHTML; }
+                  else { item[attr] = node.getAttribute(attr) || node[attr] || ''; }
+                });
+              }
+              return item;
+            })};
           })()`;
             const res2 = await session.Runtime.evaluate({ expression: fullExpr, returnByValue: true }).catch(() => null);
             if (res2?.result?.value?.data) {

package/dist/tools/screenshot.d.ts

@@ -26,6 +26,8 @@ export interface ScreenshotOptions {
         width: number;
         height: number;
     };
+    /** CSS selector of an element — capture is cropped to its bounding rect. */
+    selector?: string;
     /** If false, keeps the WeaveTab UI overlay visible during capture.
      * Default: true — overlay is always hidden from agent captures. */
     hideOverlay?: boolean;

package/dist/tools/screenshot.js

@@ -9,14 +9,42 @@ export async function browserScreenshot(session, options = {}, _config) {
     });
     const vp = JSON.parse(vpResult.value);
     let clip;
+    let beyondViewport = !!options.fullPage;
     if (options.clip) {
         clip = { ...options.clip, scale: 1 };
     }
+    else if (options.selector) {
+        const { result: selResult } = await session.Runtime.evaluate({
+            expression: `(() => {
+        try {
+          const el = document.querySelector(${JSON.stringify(options.selector)});
+          if (!el) return JSON.stringify({ notFound: true });
+          const r = el.getBoundingClientRect();
+          return JSON.stringify({ x: r.x, y: r.y, width: r.width, height: r.height, docX: r.x + window.scrollX, docY: r.y + window.scrollY });
+        } catch (e) {
+          return JSON.stringify({ error: String(e && e.message || e) });
+        }
+      })()`,
+            returnByValue: true,
+        });
+        const sel = selResult?.value ? JSON.parse(selResult.value) : { notFound: true };
+        if (sel.error) {
+            throw new Error(`browser_screenshot selector failed: ${sel.error}`);
+        }
+        if (sel.notFound || !selResult?.value) {
+            throw new Error(`browser_screenshot: no element found for selector '${options.selector}'`);
+        }
+        if (sel.width === 0 || sel.height === 0) {
+            throw new Error(`browser_screenshot: element matched by '${options.selector}' has no size (display: none or not laid out)`);
+        }
+        clip = { x: sel.docX, y: sel.docY, width: sel.width, height: sel.height, scale: 1 };
+        beyondViewport = true;
+    }
     else if (options.fullPage) {
         const { result: scrollResult } = await session.Runtime.evaluate({
-            expression: `JSON.stringify({ 
-        w: Math.max(document.documentElement.scrollWidth, document.body.scrollWidth), 
-        h: Math.max(document.documentElement.scrollHeight, document.body.scrollHeight) 
+            expression: `JSON.stringify({ 
+        w: Math.max(document.documentElement.scrollWidth, document.body.scrollWidth), 
+        h: Math.max(document.documentElement.scrollHeight, document.body.scrollHeight) 
       })`,
             returnByValue: true,
         });
@@ -26,7 +54,7 @@ export async function browserScreenshot(session, options = {}, _config) {
     // ── Auto-compress: if viewport is wide, downscale to 1280px wide as JPEG 75% ──
     // This cuts token cost by 40-60% with no quality loss for text content.
     // Only applies when no explicit format/clip was requested.
-    const params = { format, captureBeyondViewport: !!options.fullPage };
+    const params = { format, captureBeyondViewport: beyondViewport };
     if (!options.clip && !options.format && vp.w > 1280) {
         const scale = 1280 / vp.w;
         params.format = 'jpeg';
@@ -67,6 +95,20 @@ export async function browserScreenshot(session, options = {}, _config) {
                 throw e;
             }
         }
+        const MAX_BASE64 = 2 * 1024 * 1024;
+        for (const q of [70, 40]) {
+            if (data.length <= MAX_BASE64)
+                break;
+            if (params.format === "jpeg" && (params.quality ?? 90) <= q)
+                break;
+            params.format = "jpeg";
+            params.quality = q;
+            const res = await session.Page.captureScreenshot(params);
+            data = res.data;
+        }
+        if (data.length > MAX_BASE64) {
+            throw new Error(`Screenshot payload exceeds the 2MB MCP size limit even at JPEG quality 40. Narrow the capture with clip or selector.`);
+        }
     }
     finally {
         // Restore secret fields and overlay visibility immediately after capture

package/dist/tools/scroll.d.ts

@@ -11,7 +11,7 @@ export interface ScrollResult {
     scrolled: string;
     direction: string;
     distance: number;
-    new_visible_count: number;
+    new_visible_count?: number;
     dom_changed: boolean;
 }
 export declare function browserScroll(session: CDP.Client, args: {
@@ -19,5 +19,7 @@ export declare function browserScroll(session: CDP.Client, args: {
     label?: string;
     direction: "up" | "down" | "left" | "right";
     distance?: number;
+    pixels?: number;
+    amount?: number;
     speed?: "human" | "read" | "fast";
 }, config: Config): Promise<ScrollResult | WeaveError>;

package/dist/tools/scroll.js

@@ -30,7 +30,8 @@ function applyEasing(t, type) {
     }
 }
 export async function browserScroll(session, args, config) {
-    let { id, label, direction, distance = 400, speed = "human" } = args;
+    let { id, label, direction, speed = "human" } = args;
+    let distance = args.distance ?? args.pixels ?? args.amount ?? 400;
     if (distance < 0) {
         distance = Math.abs(distance);
         if (direction === "down")
@@ -111,14 +112,14 @@ export async function browserScroll(session, args, config) {
         let elementFound = false;
         try {
             const res = await session.Runtime.evaluate({
-                expression: `(function(sel) {
-          const el = document.querySelector(sel) || (window.__Weavetab_shadowQuery ? window.__Weavetab_shadowQuery(sel) : null);
-          if (!el) return null;
-          const rect = el.getBoundingClientRect();
-          return {
-            x: rect.left + rect.width / 2,
-            y: rect.top + rect.height / 2
-          };
+                expression: `(function(sel) {
+          const el = document.querySelector(sel) || (window.__Weavetab_shadowQuery ? window.__Weavetab_shadowQuery(sel) : null);
+          if (!el) return null;
+          const rect = el.getBoundingClientRect();
+          return {
+            x: rect.left + rect.width / 2,
+            y: rect.top + rect.height / 2
+          };
         })(${JSON.stringify(scrollSelector)})`,
                 returnByValue: true
             });
@@ -151,12 +152,10 @@ export async function browserScroll(session, args, config) {
         const profile = profiles[speed];
         const totalPx = direction === 'down' ? distance : direction === 'up' ? -distance : 0;
         const totalPxX = direction === 'right' ? distance : direction === 'left' ? -distance : 0;
-        let map = getCachedActionMap(targetId, url);
-        if (!map) {
-            map = await buildActionMap(session, { lite: true }, targetId);
-            cacheActionMap(targetId, map);
+        const map = getCachedActionMap(targetId, url);
+        if (map) {
+            storeSnapshot(targetId, map.url, map.elements);
         }
-        storeSnapshot(targetId, map.url, map.elements);
         const viewportRes = await session.Runtime.evaluate({
             expression: `JSON.stringify({ x: window.innerWidth / 2, y: window.innerHeight / 2 })`,
             returnByValue: true
@@ -185,7 +184,6 @@ export async function browserScroll(session, args, config) {
         scrolled: id ?? label ?? "window",
         direction,
         distance,
-        new_visible_count: 0,
         dom_changed: true,
     };
 }

package/dist/tools/select.d.ts

@@ -5,9 +5,12 @@ export interface SelectOptions {
     selector?: string;
     ref?: string;
     id?: string;
+    target?: string;
     value: string;
 }
 export declare function browserSelect(session: CDP.Client, options: SelectOptions, _config: Config): Promise<{
     success: boolean;
     message: string;
+    value?: string;
+    selected?: string;
 }>;