@weavetab/mcp 2.5.0-beta.5 → 2.5.1

package/dist/state/delta.js

@@ -12,20 +12,19 @@ const INTERACTIVE_ROLES = new Set([
     'checkbox', 'radio', 'menuitem', 'tab', 'select',
 ]);
 function serializeProps(el, targetId) {
-    const isSecret = (el.backendNodeId !== undefined && targetId &&
+    const isSecretField = (el.backendNodeId !== undefined && targetId &&
         SessionSecretTracker.isNodeSecret(targetId, el.backendNodeId)) ||
-        el.label === '[REDACTED]' ||
-        el.value === '[REDACTED]' ||
         el.role === 'password' ||
         el.type === 'password';
+    const isSecretValue = isSecretField || el.value === '[REDACTED]';
     return {
-        label: isSecret ? '[REDACTED]' : (targetId ? SessionSecretTracker.redact(targetId, el.label ?? '') : (el.label ?? '')),
-        value: isSecret ? '[REDACTED]' : (targetId ? SessionSecretTracker.redact(targetId, el.value ?? '') : (el.value ?? '')),
+        label: targetId ? SessionSecretTracker.redact(targetId, el.label ?? '') : (el.label ?? ''),
+        value: isSecretValue ? '[REDACTED]' : (targetId ? SessionSecretTracker.redact(targetId, el.value ?? '') : (el.value ?? '')),
         disabled: String(!!el.disabled),
         role: el.role,
         href: el.href ?? '',
-        placeholder: isSecret ? '[REDACTED]' : (targetId ? SessionSecretTracker.redact(targetId, el.placeholder ?? '') : (el.placeholder ?? '')),
-        textContent: isSecret ? '[REDACTED]' : (targetId ? SessionSecretTracker.redact(targetId, el.textContent ?? '') : (el.textContent ?? '')),
+        placeholder: targetId ? SessionSecretTracker.redact(targetId, el.placeholder ?? '') : (el.placeholder ?? ''),
+        textContent: (isSecretField && el.textContent && !el.value) ? '[REDACTED]' : (targetId ? SessionSecretTracker.redact(targetId, el.textContent ?? '') : (el.textContent ?? '')),
         className: (el.className ?? '').split(' ').filter(Boolean).sort().join(' '),
     };
 }

package/dist/tools/automation.js

@@ -26,77 +26,77 @@ export async function browserAutomation(session, options, _config) {
         // Wrap the script in an IIFE using ONLY closure state for lifecycle.
         // No window.__wt_automations map. Stop signal read from a window boolean.
         // Results written to a window array per automation (mailbox, not registry).
-        const wrappedScript = `
-(function() {
-  var _id = ${JSON.stringify(id)};
-  var _persistent = ${JSON.stringify(persistent)};
-  var _onResult = ${JSON.stringify(onResult)};
-  var _active = true;
-  var _resultMailbox = window[${JSON.stringify(resultMailboxKey(id))}];
-  var wt = {
-    query: function(sel) {
-      return document.querySelector(sel) || (window.__Weavetab_shadowQuery ? window.__Weavetab_shadowQuery(sel) : null);
-    },
-    click: function(sel) {
-      var el = this.query(sel);
-      if (el) el.click();
-    },
-    fill: function(sel, val) {
-      var el = this.query(sel);
-      if (el) { 
-        el.value = val; 
-        el.dispatchEvent(new Event('input', {bubbles:true})); 
-        el.dispatchEvent(new Event('change', {bubbles:true})); 
-      }
-    }
-  };
-
-  // Create result mailbox as a plain array on window — single-purpose, not a registry
-  if (!_resultMailbox) {
-    _resultMailbox = [];
-    Object.defineProperty(window, ${JSON.stringify(resultMailboxKey(id))}, {
-      value: _resultMailbox,
-      writable: true,
-      configurable: true,
-      enumerable: false
-    });
-  }
-
-  function _report(data) {
-    var safeData;
-    try { JSON.stringify(data); safeData = data; } catch(e) { safeData = String(data); }
-    _resultMailbox.push({ data: safeData, timestamp: new Date().toISOString() });
-  }
-
-  function _checkStop() {
-    return window[${JSON.stringify(stopSignalKey(id))}] === true;
-  }
-
-  function _run() {
-    if (!_active) return;
-    if (_checkStop()) { _active = false; return; }
-    (async function() { return eval(${JSON.stringify(script)}); })().then(function(r) {
-      if (r !== undefined && _onResult !== 'ignore') _report(r);
-    }).catch(function(e) {
-      if (_onResult !== 'ignore') _report({ error: e.message || String(e) });
-    }).finally(function() {
-      if (_persistent && _active) {
-        setTimeout(_run, 100);
-      }
-    });
-  }
-
-  if (_persistent) {
-    _run();
-  } else {
-    (async function() { return eval(${JSON.stringify(script)}); })().then(function(r) {
-      if (r !== undefined && _onResult !== 'ignore') _report(r);
-      window[${JSON.stringify(stopSignalKey(id))}] = true;
-    }).catch(function(e) {
-      if (_onResult !== 'ignore') _report({ error: e.message || String(e) });
-      window[${JSON.stringify(stopSignalKey(id))}] = true;
-    });
-  }
+        const wrappedScript = `
+(function() {
+  var _id = ${JSON.stringify(id)};
+  var _persistent = ${JSON.stringify(persistent)};
+  var _onResult = ${JSON.stringify(onResult)};
+  var _active = true;
+  var _resultMailbox = window[${JSON.stringify(resultMailboxKey(id))}];
+  var wt = {
+    query: function(sel) {
+      return document.querySelector(sel) || (window.__Weavetab_shadowQuery ? window.__Weavetab_shadowQuery(sel) : null);
+    },
+    click: function(sel) {
+      var el = this.query(sel);
+      if (el) el.click();
+    },
+    fill: function(sel, val) {
+      var el = this.query(sel);
+      if (el) { 
+        el.value = val; 
+        el.dispatchEvent(new Event('input', {bubbles:true})); 
+        el.dispatchEvent(new Event('change', {bubbles:true})); 
+      }
+    }
+  };
+
+  // Create result mailbox as a plain array on window — single-purpose, not a registry
+  if (!_resultMailbox) {
+    _resultMailbox = [];
+    Object.defineProperty(window, ${JSON.stringify(resultMailboxKey(id))}, {
+      value: _resultMailbox,
+      writable: true,
+      configurable: true,
+      enumerable: false
+    });
+  }
+
+  function _report(data) {
+    var safeData;
+    try { JSON.stringify(data); safeData = data; } catch(e) { safeData = String(data); }
+    _resultMailbox.push({ data: safeData, timestamp: new Date().toISOString() });
+  }
+
+  function _checkStop() {
+    return window[${JSON.stringify(stopSignalKey(id))}] === true;
+  }
+
+  function _run() {
+    if (!_active) return;
+    if (_checkStop()) { _active = false; return; }
+    (async function() { return eval(${JSON.stringify(script)}); })().then(function(r) {
+      if (r !== undefined && _onResult !== 'ignore') _report(r);
+    }).catch(function(e) {
+      if (_onResult !== 'ignore') _report({ error: e.message || String(e) });
+    }).finally(function() {
+      if (_persistent && _active) {
+        setTimeout(_run, 100);
+      }
+    });
+  }
+
+  if (_persistent) {
+    _run();
+  } else {
+    (async function() { return eval(${JSON.stringify(script)}); })().then(function(r) {
+      if (r !== undefined && _onResult !== 'ignore') _report(r);
+      window[${JSON.stringify(stopSignalKey(id))}] = true;
+    }).catch(function(e) {
+      if (_onResult !== 'ignore') _report({ error: e.message || String(e) });
+      window[${JSON.stringify(stopSignalKey(id))}] = true;
+    });
+  }
 })();`;
         const resp = await session.Runtime.evaluate({
             expression: wrappedScript,
@@ -134,10 +134,10 @@ export async function browserAutomation(session, options, _config) {
         // Set stop signal boolean on window (single-purpose, same pattern as __wt_stop_requested)
         // The running IIFE checks this flag on each iteration and exits when set.
         await session.Runtime.evaluate({
-            expression: `(function() {
-        window[${JSON.stringify(stopSignalKey(id))}] = true;
-        // Also clear the result mailbox
-        delete window[${JSON.stringify(resultMailboxKey(id))}];
+            expression: `(function() {
+        window[${JSON.stringify(stopSignalKey(id))}] = true;
+        // Also clear the result mailbox
+        delete window[${JSON.stringify(resultMailboxKey(id))}];
       })()`,
             returnByValue: true,
         }).catch(() => { });
@@ -167,11 +167,11 @@ export async function browserAutomation(session, options, _config) {
         for (const [autoId] of automationRegistry) {
             try {
                 const resp = await session.Runtime.evaluate({
-                    expression: `(function() {
-            var mb = window[${JSON.stringify(resultMailboxKey(autoId))}];
-            if (!mb || mb.length === 0) return '[]';
-            var items = mb.splice(0, mb.length);
-            return JSON.stringify(items);
+                    expression: `(function() {
+            var mb = window[${JSON.stringify(resultMailboxKey(autoId))}];
+            if (!mb || mb.length === 0) return '[]';
+            var items = mb.splice(0, mb.length);
+            return JSON.stringify(items);
           })()`,
                     returnByValue: true,
                 });
@@ -194,11 +194,11 @@ export async function browserAutomation(session, options, _config) {
         for (const [autoId] of automationRegistry) {
             try {
                 const resp = await session.Runtime.evaluate({
-                    expression: `(function() {
-            var mb = window[${JSON.stringify(resultMailboxKey(autoId))}];
-            if (!mb || mb.length === 0) return '[]';
-            var items = mb.splice(0, mb.length);
-            return JSON.stringify(items);
+                    expression: `(function() {
+            var mb = window[${JSON.stringify(resultMailboxKey(autoId))}];
+            if (!mb || mb.length === 0) return '[]';
+            var items = mb.splice(0, mb.length);
+            return JSON.stringify(items);
           })()`,
                     returnByValue: true,
                 });

package/dist/tools/canvas.js

@@ -34,16 +34,19 @@ async function resolveCanvasViaCDP(session, backendNodeId) {
         throw new Error("Could not resolve canvas node to object");
     const { result } = await session.Runtime.callFunctionOn({
         objectId: object.objectId,
-        functionDeclaration: `function() {
-      var rect = this.getBoundingClientRect();
-      return JSON.stringify({
-        x: rect.left,
-        y: rect.top,
-        dataUrl: this.toDataURL('image/png')
-      });
+        functionDeclaration: `function() {
+      var rect = this.getBoundingClientRect();
+      return JSON.stringify({
+        x: rect.left,
+        y: rect.top,
+        dataUrl: this.toDataURL('image/png')
+      });
     }()`,
         returnByValue: true,
     });
+    if (typeof result.value !== 'string') {
+        throw new Error("Canvas data extraction failed (cross-origin/tainted canvas or detached node).");
+    }
     return JSON.parse(result.value);
 }
 async function resolveCanvasViaSelector(session, options, targetId) {
@@ -63,27 +66,47 @@ async function resolveCanvasViaSelector(session, options, targetId) {
     else {
         selector = "canvas";
     }
+    const probe = `(function() {
+      var selector = ${JSON.stringify(selector)};
+      var isDefault = selector === 'canvas';
+      var candidates = [];
+      if (isDefault) {
+        candidates = Array.prototype.slice.call(document.querySelectorAll('canvas')).filter(function(c) {
+          return !(c.closest('[data-wt-overlay]') || c.closest('.weavetab-overlay') || c.id === '__wt_ghost_canvas') && c.width > 0 && c.height > 0;
+        });
+      } else {
+        var el;
+        try { el = document.querySelector(selector); } catch(e) { el = null; }
+        if (el) candidates = [el];
+        if (candidates.length === 1 && (candidates[0].closest('[data-wt-overlay]') || candidates[0].closest('.weavetab-overlay') || candidates[0].id === '__wt_ghost_canvas')) {
+          return JSON.stringify({ error: 'Selector matched a WeaveTab overlay canvas (hidden). Try a more specific selector or use nodeId.', exists: false });
+        }
+      }
+      if (candidates.length === 0) {
+        var total = document.querySelectorAll('canvas').length;
+        if (total === 0) return JSON.stringify({ error: 'No <canvas> elements found on this page.', exists: false });
+        return JSON.stringify({ error: 'Selector did not match a usable <canvas> (' + total + ' on page — overlay or zero-size canvases are skipped). Try a more specific selector or use nodeId.', exists: false });
+      }
+      var target = candidates[0];
+      if (target.tagName !== 'CANVAS') return JSON.stringify({ error: 'Element is not a <canvas> — found <' + target.tagName.toLowerCase() + '> instead.', exists: false });
+      var r = target.getBoundingClientRect();
+      return JSON.stringify({ x: r.left, y: r.top, dataUrl: target.toDataURL('image/png'), exists: true });
+    })()`;
     const { omniEvaluate } = await import("../cdp/omni_broker.js");
-    const raw = await omniEvaluate(session, targetId, `(function() {
-      let el;
-      try { el = document.querySelector(${JSON.stringify(selector)}); } catch(e) { el = null; }
-      // Skip extension overlay canvases
-      if (el && (el.closest('[data-wt-overlay]') || el.closest('.weavetab-overlay') || el.id === '__wt_ghost_canvas')) {
-        var total = document.querySelectorAll('canvas').length;
-        return JSON.stringify({ error: 'Selector matched a WeaveTab overlay canvas (hidden). Found ' + total + ' <canvas> element(s) on page — try a more specific selector or use nodeId.', exists: false });
-      }
-      if (!el) {
-        var total = document.querySelectorAll('canvas').length;
-        if (total === 0) return JSON.stringify({ error: 'No <canvas> elements found on this page.', exists: false });
-        return JSON.stringify({ error: 'Selector did not match any element. Found ' + total + ' <canvas> element(s) on page — try a more specific selector or use nodeId.', exists: false });
-      }
-      if (el.tagName !== 'CANVAS') return JSON.stringify({ error: 'Element is not a <canvas> — found <' + el.tagName.toLowerCase() + '> instead.', exists: false });
-      var r = el.getBoundingClientRect();
-      return JSON.stringify({ x: r.left, y: r.top, dataUrl: el.toDataURL('image/png'), exists: true });
-    })()`);
-    const parsed = JSON.parse(raw || "{}");
+    const raw = await omniEvaluate(session, targetId, probe);
+    let parsed;
+    try {
+        parsed = JSON.parse(raw || "{}");
+    }
+    catch {
+        throw new Error("Canvas query returned a malformed response — retry with a specific selector.");
+    }
     if (parsed.error)
         throw new Error(parsed.error);
+    if (typeof parsed.dataUrl !== 'string' ||
+        !/^data:[^;]+;base64,[A-Za-z0-9+/]+={0,2}$/.test(parsed.dataUrl)) {
+        throw new Error("Canvas returned no usable image data (empty, hidden, detached, or tainted canvas).");
+    }
     return parsed;
 }
 export async function browserCanvas(session, options, _config) {

package/dist/tools/checkpoint.js

@@ -12,14 +12,56 @@
  *
  * Weavetab by fy2ne
  */
+import fs from "fs";
+import path from "path";
 import { logAction } from "../audit/logger.js";
 import { recordAction } from "../intelligence/trail.js";
 import { clearTabCache } from "../state/cache.js";
 import { sessionRegistry } from "../state/session.js";
-import { getConfigAgentId } from "../config/loader.js";
-// In-memory checkpoint registry keyed by targetId -> name -> CheckpointData
+import { getConfigAgentId, getSystemDir } from "../config/loader.js";
+// In-memory checkpoint registry keyed by targetId -> name -> CheckpointData.
+// Backed by ~/.weavetab-system/checkpoints/<targetId>.json so checkpoints
+// survive server restarts.
 const checkpointRegistry = new Map();
+const loadedTargets = new Set();
+function checkpointFilePath(targetId) {
+    const dir = getSystemDir("checkpoints");
+    const safe = targetId.replace(/[^a-zA-Z0-9_-]/g, "_") || "default";
+    return path.join(dir, `${safe}.json`);
+}
+function ensureTargetLoaded(targetId) {
+    if (loadedTargets.has(targetId))
+        return;
+    loadedTargets.add(targetId);
+    try {
+        const file = checkpointFilePath(targetId);
+        if (!fs.existsSync(file))
+            return;
+        const parsed = JSON.parse(fs.readFileSync(file, "utf-8"));
+        if (parsed?.checkpoints) {
+            checkpointRegistry.set(targetId, new Map(Object.entries(parsed.checkpoints)));
+        }
+    }
+    catch {
+        // Corrupt or unreadable file — start empty rather than crash.
+    }
+}
+function persistTarget(targetId) {
+    try {
+        const map = checkpointRegistry.get(targetId) ?? new Map();
+        const payload = {
+            targetId,
+            updatedAt: new Date().toISOString(),
+            checkpoints: Object.fromEntries(map),
+        };
+        fs.writeFileSync(checkpointFilePath(targetId), JSON.stringify(payload, null, 2), "utf-8");
+    }
+    catch {
+        // Persistence is best-effort; the in-memory registry remains authoritative.
+    }
+}
 export function getCheckpointsForTarget(targetId) {
+    ensureTargetLoaded(targetId);
     let map = checkpointRegistry.get(targetId);
     if (!map) {
         map = new Map();
@@ -28,7 +70,21 @@ export function getCheckpointsForTarget(targetId) {
     return map;
 }
 export function clearAllCheckpoints() {
+    const targets = new Set([...loadedTargets, ...checkpointRegistry.keys()]);
     checkpointRegistry.clear();
+    loadedTargets.clear();
+    // Also purge persisted checkpoints; otherwise ensureTargetLoaded() would
+    // lazily reload them from disk on the next access.
+    for (const targetId of targets) {
+        try {
+            const file = checkpointFilePath(targetId);
+            if (fs.existsSync(file))
+                fs.unlinkSync(file);
+        }
+        catch {
+            // Best-effort cleanup.
+        }
+    }
 }
 export async function browserCheckpoint(session, args, config) {
     let targetId = "default";
@@ -65,6 +121,8 @@ export async function browserCheckpoint(session, args, config) {
             };
         }
         const existed = targetCheckpoints.delete(args.name);
+        if (existed)
+            persistTarget(targetId);
         return {
             success: existed,
             action: "delete",
@@ -110,27 +168,27 @@ export async function browserCheckpoint(session, args, config) {
         };
         try {
             const evalRes = await Runtime.evaluate({
-                expression: `(function() {
-          var ls = {};
-          try {
-            for (var i = 0; i < localStorage.length; i++) {
-              var k = localStorage.key(i);
-              if (k) ls[k] = localStorage.getItem(k);
-            }
-          } catch(e) {}
-          var ss = {};
-          try {
-            for (var j = 0; j < sessionStorage.length; j++) {
-              var sk = sessionStorage.key(j);
-              if (sk) ss[sk] = sessionStorage.getItem(sk);
-            }
-          } catch(e) {}
-          return {
-            localStorage: ls,
-            sessionStorage: ss,
-            scroll: { x: window.scrollX || 0, y: window.scrollY || 0 },
-            title: document.title || ""
-          };
+                expression: `(function() {
+          var ls = {};
+          try {
+            for (var i = 0; i < localStorage.length; i++) {
+              var k = localStorage.key(i);
+              if (k) ls[k] = localStorage.getItem(k);
+            }
+          } catch(e) {}
+          var ss = {};
+          try {
+            for (var j = 0; j < sessionStorage.length; j++) {
+              var sk = sessionStorage.key(j);
+              if (sk) ss[sk] = sessionStorage.getItem(sk);
+            }
+          } catch(e) {}
+          return {
+            localStorage: ls,
+            sessionStorage: ss,
+            scroll: { x: window.scrollX || 0, y: window.scrollY || 0 },
+            title: document.title || ""
+          };
         })()`,
                 returnByValue: true,
             });
@@ -167,6 +225,7 @@ export async function browserCheckpoint(session, args, config) {
             domSnapshot,
         };
         targetCheckpoints.set(args.name, checkpoint);
+        persistTarget(targetId);
         logAction("browser_checkpoint", args.name, `Saved checkpoint at ${currentUrl}`);
         recordAction({
             timestamp: checkpoint.timestamp,
@@ -226,18 +285,18 @@ export async function browserCheckpoint(session, args, config) {
         // 3. Restore LocalStorage, SessionStorage, and Scroll position
         try {
             await Runtime.evaluate({
-                expression: `(function(ls, ss, scroll) {
-          try {
-            localStorage.clear();
-            for (var k in ls) { localStorage.setItem(k, ls[k]); }
-          } catch(e) {}
-          try {
-            sessionStorage.clear();
-            for (var sk in ss) { sessionStorage.setItem(sk, ss[sk]); }
-          } catch(e) {}
-          if (scroll) {
-            window.scrollTo(scroll.x, scroll.y);
-          }
+                expression: `(function(ls, ss, scroll) {
+          try {
+            localStorage.clear();
+            for (var k in ls) { localStorage.setItem(k, ls[k]); }
+          } catch(e) {}
+          try {
+            sessionStorage.clear();
+            for (var sk in ss) { sessionStorage.setItem(sk, ss[sk]); }
+          } catch(e) {}
+          if (scroll) {
+            window.scrollTo(scroll.x, scroll.y);
+          }
         })(${JSON.stringify(checkpoint.localStorage)}, ${JSON.stringify(checkpoint.sessionStorage)}, ${JSON.stringify(checkpoint.scroll)})`,
                 returnByValue: false,
             });

package/dist/tools/click.js

@@ -59,7 +59,7 @@ export async function weaveClick(session, args, config) {
             execution_ms: Date.now() - startMs,
             tab_id: targetId,
             url: initialUrl,
-            title: "",
+            title: clientMatch?.title || "",
             url_changed: false,
             dom_changed: false,
             stuck_warning: false,
@@ -355,9 +355,10 @@ export async function weaveClick(session, args, config) {
         if (hasOpenDialog(session)) {
             return { stuck: false, url: currentUrl, newMap: null, dialog_open: true };
         }
+        const isElectronSession = Boolean(clientMatch?.isElectron);
         await Promise.all([
             waitForDOMStable(session, 20, 150),
-            waitForNetworkIdle(session, 30, 150).catch(() => { })
+            isElectronSession ? Promise.resolve() : waitForNetworkIdle(session, 30, 150).catch(() => { })
         ]);
         const finalUrl = (await Page.getFrameTree()).frameTree.frame.url;
         // Fast path: URL changed → definitely not stuck, skip map rebuild
@@ -372,11 +373,11 @@ export async function weaveClick(session, args, config) {
             if (sel) {
                 try {
                     const { result: canvasCheck } = await session.Runtime.evaluate({
-                        expression: `(function(s) {
-              const el = document.querySelector(s);
-              if (!el) return false;
-              // Check if the element itself or its closest ancestor is a canvas
-              return el.tagName === 'CANVAS' || !!el.closest('canvas');
+                        expression: `(function(s) {
+              const el = document.querySelector(s);
+              if (!el) return false;
+              // Check if the element itself or its closest ancestor is a canvas
+              return el.tagName === 'CANVAS' || !!el.closest('canvas');
             })(${JSON.stringify(sel)})`,
                         returnByValue: true,
                     });
@@ -395,10 +396,10 @@ export async function weaveClick(session, args, config) {
             if (coords) {
                 try {
                     const { result: coordCanvasCheck } = await session.Runtime.evaluate({
-                        expression: `(function(x, y) {
-              const el = document.elementFromPoint(x, y);
-              if (!el) return false;
-              return el.tagName === 'CANVAS' || !!el.closest('canvas');
+                        expression: `(function(x, y) {
+              const el = document.elementFromPoint(x, y);
+              if (!el) return false;
+              return el.tagName === 'CANVAS' || !!el.closest('canvas');
             })(${coords.x}, ${coords.y})`,
                         returnByValue: true,
                     });
@@ -416,10 +417,20 @@ export async function weaveClick(session, args, config) {
         }
         let newMap = getCachedActionMap(targetId, finalUrl);
         if (!newMap) {
-            newMap = await buildActionMap(session, { lite: true }, targetId);
-            cacheActionMap(targetId, newMap);
+            const _emptyMap = { url: finalUrl, title: '', elements: [], targetId };
+            const timeoutMap = new Promise((resolve) => {
+                setTimeout(() => resolve(_emptyMap), 1500);
+            });
+            newMap = await Promise.race([
+                buildActionMap(session, { lite: true }, targetId),
+                timeoutMap
+            ]).catch(() => _emptyMap);
+            if (newMap.elements.length > 0) {
+                cacheActionMap(targetId, newMap);
+            }
         }
-        const delta = computeDelta(targetId, initialUrl, newMap.elements);
+        const safeMap = newMap || { url: finalUrl, title: '', elements: [], targetId };
+        const delta = computeDelta(targetId, initialUrl, safeMap.elements);
         const changesCount = delta ? delta.added.length + delta.removed.length + delta.changed.length : 0;
         // Check scroll position — same-page anchors scroll without URL/DOM change
         let scrollYAfter = 0;
@@ -437,22 +448,22 @@ export async function weaveClick(session, args, config) {
             const sel = safeSelector(element);
             if (sel) {
                 const { result: ckResult } = await session.Runtime.evaluate({
-                    expression: `(function(sel) {
-            var el = document.querySelector(sel);
-            if (!el) return null;
-            // Check the element itself
-            var t = (el.getAttribute('type') || '').toLowerCase();
-            if (t === 'radio' || t === 'checkbox') return el.checked;
-            // If it's a <label>, follow its 'for' attribute to the referenced input
-            if (el.tagName === 'LABEL') {
-              var forId = el.getAttribute('for');
-              var target = forId ? document.getElementById(forId) : el.querySelector('input');
-              if (target) {
-                var t2 = (target.getAttribute('type') || '').toLowerCase();
-                if (t2 === 'radio' || t2 === 'checkbox') return target.checked;
-              }
-            }
-            return null;
+                    expression: `(function(sel) {
+            var el = document.querySelector(sel);
+            if (!el) return null;
+            // Check the element itself
+            var t = (el.getAttribute('type') || '').toLowerCase();
+            if (t === 'radio' || t === 'checkbox') return el.checked;
+            // If it's a <label>, follow its 'for' attribute to the referenced input
+            if (el.tagName === 'LABEL') {
+              var forId = el.getAttribute('for');
+              var target = forId ? document.getElementById(forId) : el.querySelector('input');
+              if (target) {
+                var t2 = (target.getAttribute('type') || '').toLowerCase();
+                if (t2 === 'radio' || t2 === 'checkbox') return target.checked;
+              }
+            }
+            return null;
           })(${JSON.stringify(sel)})`,
                     returnByValue: true,
                 }).catch(() => ({ result: { value: null } }));
@@ -469,16 +480,16 @@ export async function weaveClick(session, args, config) {
             const sel = safeSelector(element);
             if (sel) {
                 const { result: ariaRes } = await session.Runtime.evaluate({
-                    expression: `(function(sel) {
-            const el = document.querySelector(sel);
-            if (!el) return null;
-            return JSON.stringify({
-              expanded: el.getAttribute('aria-expanded'),
-              selected: el.getAttribute('aria-selected'),
-              pressed: el.getAttribute('aria-pressed'),
-              checked: el.getAttribute('aria-checked'),
-              current: el.getAttribute('aria-current')
-            });
+                    expression: `(function(sel) {
+            const el = document.querySelector(sel);
+            if (!el) return null;
+            return JSON.stringify({
+              expanded: el.getAttribute('aria-expanded'),
+              selected: el.getAttribute('aria-selected'),
+              pressed: el.getAttribute('aria-pressed'),
+              checked: el.getAttribute('aria-checked'),
+              current: el.getAttribute('aria-current')
+            });
           })(${JSON.stringify(sel)})`,
                     returnByValue: true,
                 }).catch(() => ({ result: { value: null } }));
@@ -548,7 +559,7 @@ export async function weaveClick(session, args, config) {
         execution_ms: executionMs,
         tab_id: targetId,
         url: finalUrl,
-        title: newMap?.title || "",
+        title: newMap?.title || clientMatch?.title || "",
         url_changed: finalUrl !== initialUrl,
         ...(args.include_map ? { page_map: newMap ? toMarkdownTable(newMap.elements, finalUrl, newMap.title) : "" } : {}),
         dom_changed: !isStuck,