@quanta-intellect/vessel-browser 0.1.11 → 0.1.12

package/out/main/index.js

@@ -62,25 +62,15 @@ class Tab {
       isReaderMode: false,
       adBlockingEnabled: options?.adBlockingEnabled ?? true
     };
-    this.view.webContents.on("before-input-event", (event, input) => {
+    this.view.webContents.on("before-input-event", (_event, input) => {
       if (!input.control && !input.meta) return;
+      if (input.type !== "keyDown") return;
       const key = input.key.toLowerCase();
       const wc = this.view.webContents;
-      if (input.type === "keyDown") {
-        if (key === "c") {
-          wc.copy();
-          event.preventDefault();
-        } else if (key === "v") {
-          wc.paste();
-          event.preventDefault();
-        } else if (key === "x") {
-          wc.cut();
-          event.preventDefault();
-        } else if (key === "a") {
-          wc.selectAll();
-          event.preventDefault();
-        }
-      }
+      if (key === "c") wc.copy();
+      else if (key === "v") wc.paste();
+      else if (key === "x") wc.cut();
+      else if (key === "a") wc.selectAll();
     });
     this.setupListeners();
     if (url) {
@@ -732,26 +722,46 @@ async function highlightOnPage(wc, resolvedSelector, text, label, durationMs, co
         var SKIP_TAGS = {SCRIPT:1,STYLE:1,NOSCRIPT:1,TEMPLATE:1,IFRAME:1,SVG:1};
         // Collect matching text nodes first, then wrap — avoids TreeWalker
         // seeing newly created nodes from surroundContents and re-matching.
-        var textNodes = [];
-        var walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT, {
-          acceptNode: function(node) {
-            var p = node.parentElement;
-            if (!p) return NodeFilter.FILTER_REJECT;
-            if (SKIP_TAGS[p.tagName]) return NodeFilter.FILTER_REJECT;
-            if (p.closest('[data-vessel-highlight]')) return NodeFilter.FILTER_REJECT;
-            var style = window.getComputedStyle(p);
-            if (style.display === 'none' || style.visibility === 'hidden' || style.opacity === '0') return NodeFilter.FILTER_REJECT;
-            if (p.offsetWidth === 0 && p.offsetHeight === 0) return NodeFilter.FILTER_REJECT;
-            return NodeFilter.FILTER_ACCEPT;
-          }
-        });
-        var node;
-        while ((node = walker.nextNode())) {
-          var idx = node.textContent.indexOf(searchText);
-          if (idx !== -1) {
-            textNodes.push({ node: node, idx: idx });
-            if (textNodes.length >= 20) break;
+        // Prioritize main content area over nav/sidebar/captions.
+        var contentRoots = ['main', 'article', '[role="main"]', '#mw-content-text', '.mw-parser-output', '#content', '.post-content', '.entry-content', '.article-body'];
+        var contentRoot = null;
+        for (var cr = 0; cr < contentRoots.length; cr++) {
+          contentRoot = document.querySelector(contentRoots[cr]);
+          if (contentRoot) break;
+        }
+        var NAV_ANCESTORS = 'nav, aside, footer, header, [role="navigation"], [role="complementary"], .sidebar, .navbox, .infobox, figcaption, .thumbcaption, .mw-jump-link';
+
+        function collectMatches(root, limit) {
+          var matches = [];
+          var w = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, {
+            acceptNode: function(n) {
+              var p = n.parentElement;
+              if (!p) return NodeFilter.FILTER_REJECT;
+              if (SKIP_TAGS[p.tagName]) return NodeFilter.FILTER_REJECT;
+              if (p.closest('[data-vessel-highlight]')) return NodeFilter.FILTER_REJECT;
+              if (p.closest(NAV_ANCESTORS)) return NodeFilter.FILTER_REJECT;
+              var style = window.getComputedStyle(p);
+              if (style.display === 'none' || style.visibility === 'hidden' || style.opacity === '0') return NodeFilter.FILTER_REJECT;
+              if (p.offsetWidth === 0 && p.offsetHeight === 0) return NodeFilter.FILTER_REJECT;
+              return NodeFilter.FILTER_ACCEPT;
+            }
+          });
+          var n;
+          while ((n = w.nextNode())) {
+            var idx = n.textContent.indexOf(searchText);
+            if (idx !== -1) {
+              matches.push({ node: n, idx: idx });
+              if (matches.length >= limit) break;
+            }
           }
+          return matches;
+        }
+
+        // First try: match inside main content area (skip nav/sidebar/captions)
+        var textNodes = contentRoot ? collectMatches(contentRoot, 20) : [];
+        // Fallback: if no matches in content area, search the whole body
+        if (textNodes.length === 0) {
+          textNodes = collectMatches(document.body, 20);
         }
         var count = 0;
         var firstMark = null;
@@ -1946,6 +1956,74 @@ function setSetting(key, value) {
   saveSettings();
   return { ...settings };
 }
+const Channels = {
+  // Tab management
+  TAB_CREATE: "tab:create",
+  TAB_CLOSE: "tab:close",
+  TAB_SWITCH: "tab:switch",
+  TAB_NAVIGATE: "tab:navigate",
+  TAB_BACK: "tab:back",
+  TAB_FORWARD: "tab:forward",
+  TAB_RELOAD: "tab:reload",
+  TAB_STATE_UPDATE: "tab:state-update",
+  // AI
+  AI_QUERY: "ai:query",
+  AI_STREAM_START: "ai:stream-start",
+  AI_STREAM_CHUNK: "ai:stream-chunk",
+  AI_STREAM_END: "ai:stream-end",
+  AI_CANCEL: "ai:cancel",
+  AI_FETCH_MODELS: "ai:fetch-models",
+  AGENT_RUNTIME_GET: "agent-runtime:get",
+  AGENT_RUNTIME_UPDATE: "agent-runtime:update",
+  AGENT_PAUSE: "agent:pause",
+  AGENT_RESUME: "agent:resume",
+  AGENT_SET_APPROVAL_MODE: "agent:set-approval-mode",
+  AGENT_APPROVAL_RESOLVE: "agent:approval-resolve",
+  AGENT_CHECKPOINT_CREATE: "agent:checkpoint-create",
+  AGENT_CHECKPOINT_RESTORE: "agent:checkpoint-restore",
+  AGENT_SESSION_CAPTURE: "agent:session-capture",
+  AGENT_SESSION_RESTORE: "agent:session-restore",
+  // Content
+  CONTENT_EXTRACT: "content:extract",
+  READER_MODE_TOGGLE: "reader:toggle",
+  // UI state
+  SIDEBAR_TOGGLE: "ui:sidebar-toggle",
+  SIDEBAR_RESIZE: "ui:sidebar-resize",
+  SIDEBAR_RESIZE_START: "ui:sidebar-resize-start",
+  SIDEBAR_RESIZE_COMMIT: "ui:sidebar-resize-commit",
+  SIDEBAR_CONTEXT_MENU: "ui:sidebar-context-menu",
+  FOCUS_MODE_TOGGLE: "ui:focus-mode-toggle",
+  SETTINGS_VISIBILITY: "ui:settings-visibility",
+  // Settings
+  SETTINGS_GET: "settings:get",
+  SETTINGS_SET: "settings:set",
+  SETTINGS_UPDATE: "settings:update",
+  SETTINGS_HEALTH_GET: "settings:health:get",
+  // Bookmarks
+  BOOKMARKS_GET: "bookmarks:get",
+  BOOKMARKS_UPDATE: "bookmarks:update",
+  BOOKMARK_SAVE: "bookmarks:save",
+  BOOKMARK_REMOVE: "bookmarks:remove",
+  FOLDER_CREATE: "bookmarks:folder-create",
+  FOLDER_REMOVE: "bookmarks:folder-remove",
+  FOLDER_RENAME: "bookmarks:folder-rename",
+  // Highlights
+  HIGHLIGHT_CAPTURE: "highlights:capture",
+  HIGHLIGHT_CAPTURE_RESULT: "highlights:capture-result",
+  HIGHLIGHT_SELECTION: "vessel:highlight-selection",
+  HIGHLIGHT_NAV_COUNT: "highlights:nav-count",
+  HIGHLIGHT_NAV_SCROLL: "highlights:nav-scroll",
+  HIGHLIGHT_NAV_REMOVE: "highlights:nav-remove",
+  HIGHLIGHT_NAV_CLEAR: "highlights:nav-clear",
+  SIDEBAR_HIGHLIGHT_ACTION: "highlights:sidebar-action",
+  // DevTools panel
+  DEVTOOLS_PANEL_TOGGLE: "devtools-panel:toggle",
+  DEVTOOLS_PANEL_STATE: "devtools-panel:state",
+  // Window controls
+  WINDOW_MINIMIZE: "window:minimize",
+  WINDOW_MAXIMIZE: "window:maximize",
+  WINDOW_CLOSE: "window:close"
+};
 function enableClipboardShortcuts(view) {
   view.webContents.on("before-input-event", (event, input) => {
     if (!input.control && !input.meta) return;
@@ -1972,6 +2050,102 @@ const CHROME_HEIGHT = 110;
 const DEFAULT_DEVTOOLS_PANEL_HEIGHT = 250;
 const MIN_DEVTOOLS_PANEL = 120;
 const MAX_DEVTOOLS_PANEL = 600;
+async function getSidebarContextTarget(sidebarView, x, y) {
+  try {
+    return await sidebarView.webContents.executeJavaScript(
+      `(() => {
+        const el = document.elementFromPoint(${x}, ${y});
+        const nav = el && typeof el.closest === "function"
+          ? el.closest(".highlight-nav")
+          : null;
+        const label = nav?.querySelector(".highlight-nav-label")?.textContent?.trim() || "";
+        return {
+          inHighlightNav: !!nav,
+          canRemoveCurrent: /\\d+\\s*\\/\\s*\\d+/.test(label),
+        };
+      })()`,
+      true
+    );
+  } catch {
+    return { inHighlightNav: false, canRemoveCurrent: false };
+  }
+}
+async function showSidebarContextMenu(mainWindow, sidebarView, params) {
+  const target = await getSidebarContextTarget(sidebarView, params.x, params.y);
+  const menu = new electron.Menu();
+  if (target.inHighlightNav) {
+    if (target.canRemoveCurrent) {
+      menu.append(
+        new electron.MenuItem({
+          label: "Remove Current Highlight",
+          click: () => sidebarView.webContents.send(
+            Channels.SIDEBAR_HIGHLIGHT_ACTION,
+            "remove-current"
+          )
+        })
+      );
+    }
+    menu.append(
+      new electron.MenuItem({
+        label: "Clear All Highlights",
+        click: () => sidebarView.webContents.send(
+          Channels.SIDEBAR_HIGHLIGHT_ACTION,
+          "clear-all"
+        )
+      })
+    );
+  }
+  if (params.isEditable) {
+    if (menu.items.length > 0) {
+      menu.append(new electron.MenuItem({ type: "separator" }));
+    }
+    menu.append(
+      new electron.MenuItem({
+        role: "undo",
+        enabled: params.editFlags.canUndo
+      })
+    );
+    menu.append(
+      new electron.MenuItem({
+        role: "redo",
+        enabled: params.editFlags.canRedo
+      })
+    );
+    menu.append(new electron.MenuItem({ type: "separator" }));
+    menu.append(
+      new electron.MenuItem({
+        role: "cut",
+        enabled: params.editFlags.canCut
+      })
+    );
+    menu.append(
+      new electron.MenuItem({
+        role: "copy",
+        enabled: params.editFlags.canCopy
+      })
+    );
+    menu.append(
+      new electron.MenuItem({
+        role: "paste",
+        enabled: params.editFlags.canPaste
+      })
+    );
+    menu.append(
+      new electron.MenuItem({
+        role: "selectAll",
+        enabled: params.editFlags.canSelectAll
+      })
+    );
+  } else if (params.selectionText?.trim()) {
+    if (menu.items.length > 0) {
+      menu.append(new electron.MenuItem({ type: "separator" }));
+    }
+    menu.append(new electron.MenuItem({ role: "copy" }));
+  }
+  if (menu.items.length === 0) return;
+  sidebarView.webContents.focus();
+  menu.popup({ window: mainWindow });
+}
 function getWindowIconPath() {
   const candidates = [
     path.join(electron.app.getAppPath(), "resources", "vessel-icon.png"),
@@ -2009,6 +2183,10 @@ function createMainWindow(onTabStateChange) {
     }
   });
   sidebarView.setBackgroundColor("#00000000");
+  sidebarView.webContents.on("context-menu", (event, params) => {
+    event.preventDefault();
+    void showSidebarContextMenu(mainWindow, sidebarView, params);
+  });
   mainWindow.contentView.addChildView(sidebarView);
   const devtoolsPanelView = new electron.WebContentsView({
     webPreferences: {
@@ -2097,68 +2275,6 @@ function layoutViews(state2) {
     });
   }
 }
-const Channels = {
-  // Tab management
-  TAB_CREATE: "tab:create",
-  TAB_CLOSE: "tab:close",
-  TAB_SWITCH: "tab:switch",
-  TAB_NAVIGATE: "tab:navigate",
-  TAB_BACK: "tab:back",
-  TAB_FORWARD: "tab:forward",
-  TAB_RELOAD: "tab:reload",
-  TAB_STATE_UPDATE: "tab:state-update",
-  // AI
-  AI_QUERY: "ai:query",
-  AI_STREAM_START: "ai:stream-start",
-  AI_STREAM_CHUNK: "ai:stream-chunk",
-  AI_STREAM_END: "ai:stream-end",
-  AI_CANCEL: "ai:cancel",
-  AI_FETCH_MODELS: "ai:fetch-models",
-  AGENT_RUNTIME_GET: "agent-runtime:get",
-  AGENT_RUNTIME_UPDATE: "agent-runtime:update",
-  AGENT_PAUSE: "agent:pause",
-  AGENT_RESUME: "agent:resume",
-  AGENT_SET_APPROVAL_MODE: "agent:set-approval-mode",
-  AGENT_APPROVAL_RESOLVE: "agent:approval-resolve",
-  AGENT_CHECKPOINT_CREATE: "agent:checkpoint-create",
-  AGENT_CHECKPOINT_RESTORE: "agent:checkpoint-restore",
-  AGENT_SESSION_CAPTURE: "agent:session-capture",
-  AGENT_SESSION_RESTORE: "agent:session-restore",
-  // Content
-  CONTENT_EXTRACT: "content:extract",
-  READER_MODE_TOGGLE: "reader:toggle",
-  // UI state
-  SIDEBAR_TOGGLE: "ui:sidebar-toggle",
-  SIDEBAR_RESIZE: "ui:sidebar-resize",
-  SIDEBAR_RESIZE_START: "ui:sidebar-resize-start",
-  SIDEBAR_RESIZE_COMMIT: "ui:sidebar-resize-commit",
-  FOCUS_MODE_TOGGLE: "ui:focus-mode-toggle",
-  SETTINGS_VISIBILITY: "ui:settings-visibility",
-  // Settings
-  SETTINGS_GET: "settings:get",
-  SETTINGS_SET: "settings:set",
-  SETTINGS_UPDATE: "settings:update",
-  SETTINGS_HEALTH_GET: "settings:health:get",
-  // Bookmarks
-  BOOKMARKS_GET: "bookmarks:get",
-  BOOKMARKS_UPDATE: "bookmarks:update",
-  BOOKMARK_SAVE: "bookmarks:save",
-  BOOKMARK_REMOVE: "bookmarks:remove",
-  FOLDER_CREATE: "bookmarks:folder-create",
-  FOLDER_REMOVE: "bookmarks:folder-remove",
-  FOLDER_RENAME: "bookmarks:folder-rename",
-  // Highlights
-  HIGHLIGHT_CAPTURE: "highlights:capture",
-  HIGHLIGHT_CAPTURE_RESULT: "highlights:capture-result",
-  HIGHLIGHT_SELECTION: "vessel:highlight-selection",
-  // DevTools panel
-  DEVTOOLS_PANEL_TOGGLE: "devtools-panel:toggle",
-  DEVTOOLS_PANEL_STATE: "devtools-panel:state",
-  // Window controls
-  WINDOW_MINIMIZE: "window:minimize",
-  WINDOW_MAXIMIZE: "window:maximize",
-  WINDOW_CLOSE: "window:close"
-};
 const SEARCH_ENGINE_HOSTS = [
   "google.",
   "bing.com",
@@ -2756,6 +2872,14 @@ const PRELOAD_EXTRACTION_SCRIPT = String.raw`
 `;
 const DIRECT_EXTRACTION_SCRIPT = String.raw`
   (function() {
+    // Time budget: stop expensive DOM traversals after this many ms so heavy
+    // pages (Newegg, Wikipedia, etc.) don't stall the agent for 30-60s+.
+    var BUDGET_MS = 5000;
+    var _budgetStart = performance.now();
+    function withinBudget() {
+      return (performance.now() - _budgetStart) < BUDGET_MS;
+    }
+
     function getCleanBodyText() {
       var removed = [];
       document
@@ -2913,20 +3037,40 @@ const DIRECT_EXTRACTION_SCRIPT = String.raw`
       const viewportArea = Math.max(1, viewportWidth() * viewportHeight());
       const overlays = [];
 
-      Array.from(document.body.querySelectorAll("*")).forEach((node) => {
+      // Use targeted selectors instead of querySelectorAll("*") to avoid
+      // expensive getComputedStyle/getBoundingClientRect on every DOM element.
+      // On heavy SPAs (e.g. Newegg) the wildcard could hit 10,000+ elements.
+      var candidates = new Set();
+
+      // Semantic overlays: dialogs, modals, aria-modal
+      document.body.querySelectorAll(
+        "dialog, [role='dialog'], [role='alertdialog'], [aria-modal='true']"
+      ).forEach(function(el) { candidates.add(el); });
+
+      // Fixed/sticky elements are the other overlay category — walk only
+      // direct children of body and high-level containers (depth ≤ 3)
+      // since real overlays are almost always near the top of the DOM tree.
+      var MAX_CANDIDATES = 2000;
+      var allElements = document.body.querySelectorAll("*");
+      for (var ci = 0; ci < allElements.length && candidates.size < MAX_CANDIDATES; ci++) {
+        candidates.add(allElements[ci]);
+      }
+
+      candidates.forEach(function(node) {
+        if (!withinBudget()) return;
         if (!(node instanceof HTMLElement)) return;
         if (!visible(node)) return;
 
-        const style = window.getComputedStyle(node);
+        var style = window.getComputedStyle(node);
         if (style.pointerEvents === "none") return;
 
-        const rect = node.getBoundingClientRect();
+        var rect = node.getBoundingClientRect();
         if (!inViewport(rect)) return;
 
-        const type = overlayType(node);
-        const dialogLike = type === "dialog" || type === "modal";
-        const areaRatio = (rect.width * rect.height) / viewportArea;
-        const blocksInteraction = dialogLike ||
+        var type = overlayType(node);
+        var dialogLike = type === "dialog" || type === "modal";
+        var areaRatio = (rect.width * rect.height) / viewportArea;
+        var blocksInteraction = dialogLike ||
           ((style.position === "fixed" || style.position === "sticky") &&
             parseZIndex(style) >= 10 &&
             areaRatio >= 0.3 &&
@@ -2936,17 +3080,17 @@ const DIRECT_EXTRACTION_SCRIPT = String.raw`
 
         overlays.push({
           element: node,
-          type,
+          type: type,
           role: text(node.getAttribute("role")),
           label: overlayLabel(node),
           selector: selectorFor(node),
           text: text(node.textContent)?.slice(0, 160),
-          blocksInteraction,
+          blocksInteraction: blocksInteraction,
           zIndex: parseZIndex(style),
         });
       });
 
-      return overlays.sort((a, b) => {
+      return overlays.sort(function(a, b) {
         if ((a.blocksInteraction ? 1 : 0) !== (b.blocksInteraction ? 1 : 0)) {
           return (b.blocksInteraction ? 1 : 0) - (a.blocksInteraction ? 1 : 0);
         }
@@ -3203,6 +3347,7 @@ const DIRECT_EXTRACTION_SCRIPT = String.raw`
 
     const navigation = [];
     document.querySelectorAll("nav a[href], [role='navigation'] a[href], header nav a[href]").forEach((el) => {
+      if (!withinBudget()) return;
       const item = serializeInteractive(el, "link");
       if (!item.text || !item.href || item.href.startsWith("#")) return;
       item.context = "nav";
@@ -3218,14 +3363,17 @@ const DIRECT_EXTRACTION_SCRIPT = String.raw`
 
     const interactiveElements = [];
     document.querySelectorAll("button, [role='button'], input[type='submit'], input[type='button']").forEach((el) => {
+      if (!withinBudget()) return;
       interactiveElements.push(serializeInteractive(el, "button"));
     });
     document.querySelectorAll("a[href]").forEach((el) => {
+      if (!withinBudget()) return;
       const item = serializeInteractive(el, "link");
       if (!item.text || !item.href || item.href.startsWith("#") || item.context === "nav") return;
       interactiveElements.push(item);
     });
     document.querySelectorAll("input:not([type='hidden']):not([type='submit']):not([type='button']), select, textarea").forEach((el) => {
+      if (!withinBudget()) return;
       const tag = el.tagName.toLowerCase();
       interactiveElements.push(
         serializeInteractive(el, tag === "select" ? "select" : tag === "textarea" ? "textarea" : "input"),
@@ -3250,7 +3398,7 @@ const DIRECT_EXTRACTION_SCRIPT = String.raw`
           serializeInteractive(el, tag === "select" ? "select" : tag === "textarea" ? "textarea" : "input"),
         );
       });
-      Array.from(document.querySelectorAll("button, input[type='submit'], input[type='image']"))
+      Array.from(form.querySelectorAll("button, input[type='submit'], input[type='image']"))
         .filter((el) => isSubmitControlForForm(el, form))
         .forEach((el) => {
         fields.push(serializeInteractive(el, "button"));
@@ -3486,6 +3634,7 @@ const SAFE_EXTRACTION_SCRIPT = String.raw`
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+const EXECUTE_SCRIPT_TIMEOUT_MS = 1500;
 async function waitForDomReady(webContents, timeoutMs = 1500) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
@@ -3507,10 +3656,20 @@ async function executeScript(webContents, script) {
   if (webContents.isDestroyed()) {
     return null;
   }
+  let timer = null;
   try {
-    return await webContents.executeJavaScript(script);
+    return await Promise.race([
+      webContents.executeJavaScript(script),
+      new Promise((resolve) => {
+        timer = setTimeout(() => resolve(null), EXECUTE_SCRIPT_TIMEOUT_MS);
+      })
+    ]);
   } catch {
     return null;
+  } finally {
+    if (typeof timer !== "undefined" && timer) {
+      clearTimeout(timer);
+    }
   }
 }
 function bestString(values) {
@@ -3591,18 +3750,30 @@ function mergePageContent(candidates, webContents) {
     url: mergedBase.url || webContents.getURL() || ""
   };
 }
+const EXTRACT_TIMEOUT_MS = 8e3;
+async function extractContentInner(webContents) {
+  await waitForDomReady(webContents);
+  const [preloadResult, directResult, safeResult] = await Promise.all([
+    executeScript(webContents, PRELOAD_EXTRACTION_SCRIPT),
+    executeScript(webContents, DIRECT_EXTRACTION_SCRIPT),
+    executeScript(webContents, SAFE_EXTRACTION_SCRIPT)
+  ]);
+  return mergePageContent(
+    [preloadResult, directResult, safeResult],
+    webContents
+  );
+}
 async function extractContent(webContents) {
   try {
-    await waitForDomReady(webContents);
-    const [preloadResult, directResult, safeResult] = await Promise.all([
-      executeScript(webContents, PRELOAD_EXTRACTION_SCRIPT),
-      executeScript(webContents, DIRECT_EXTRACTION_SCRIPT),
-      executeScript(webContents, SAFE_EXTRACTION_SCRIPT)
+    return await Promise.race([
+      extractContentInner(webContents),
+      new Promise(
+        (_, reject) => setTimeout(
+          () => reject(new Error("extractContent timeout")),
+          EXTRACT_TIMEOUT_MS
+        )
+      )
     ]);
-    return mergePageContent(
-      [preloadResult, directResult, safeResult],
-      webContents
-    );
   } catch {
     return {
       ...EMPTY_PAGE_CONTENT,
@@ -3833,6 +4004,10 @@ class AnthropicProvider {
       let iterationsUsed = 0;
       for (let i = 0; i < maxIterations; i++) {
         iterationsUsed = i + 1;
+        const msgTokenEstimate = JSON.stringify(messages).length;
+        const sysTokenEstimate = systemPrompt.length;
+        console.log(`[Vessel Agent] iteration=${i} messages=${messages.length} msgChars=${msgTokenEstimate} sysChars=${sysTokenEstimate} tools=${tools.length}`);
+        const streamStartTime = Date.now();
         const stream = this.client.messages.stream(
           {
             model: this.model,
@@ -3846,40 +4021,56 @@ class AnthropicProvider {
         let textContent = "";
         const toolUseBlocks = [];
         let currentToolUse = null;
-        for await (const event of stream) {
-          if (event.type === "content_block_start") {
-            if (event.content_block.type === "tool_use") {
-              currentToolUse = {
-                id: event.content_block.id,
-                name: event.content_block.name,
-                inputJson: ""
-              };
-            }
-          } else if (event.type === "content_block_delta") {
-            if (event.delta.type === "text_delta") {
-              textContent += event.delta.text;
-              onChunk(event.delta.text);
-            } else if (event.delta.type === "input_json_delta" && currentToolUse) {
-              currentToolUse.inputJson += event.delta.partial_json;
-            }
-          } else if (event.type === "content_block_stop" && currentToolUse) {
-            try {
-              toolUseBlocks.push({
-                id: currentToolUse.id,
-                name: currentToolUse.name,
-                input: JSON.parse(currentToolUse.inputJson || "{}")
-              });
-            } catch {
-              toolUseBlocks.push({
-                id: currentToolUse.id,
-                name: currentToolUse.name,
-                input: {}
-              });
+        const STREAM_IDLE_TIMEOUT_MS = 3e4;
+        let idleTimer = null;
+        const resetIdleTimer = () => {
+          if (idleTimer) clearTimeout(idleTimer);
+          idleTimer = setTimeout(() => {
+            this.abortController?.abort();
+          }, STREAM_IDLE_TIMEOUT_MS);
+        };
+        resetIdleTimer();
+        try {
+          for await (const event of stream) {
+            resetIdleTimer();
+            if (event.type === "content_block_start") {
+              if (event.content_block.type === "tool_use") {
+                currentToolUse = {
+                  id: event.content_block.id,
+                  name: event.content_block.name,
+                  inputJson: ""
+                };
+              }
+            } else if (event.type === "content_block_delta") {
+              if (event.delta.type === "text_delta") {
+                textContent += event.delta.text;
+                onChunk(event.delta.text);
+              } else if (event.delta.type === "input_json_delta" && currentToolUse) {
+                currentToolUse.inputJson += event.delta.partial_json;
+              }
+            } else if (event.type === "content_block_stop" && currentToolUse) {
+              try {
+                toolUseBlocks.push({
+                  id: currentToolUse.id,
+                  name: currentToolUse.name,
+                  input: JSON.parse(currentToolUse.inputJson || "{}")
+                });
+              } catch {
+                toolUseBlocks.push({
+                  id: currentToolUse.id,
+                  name: currentToolUse.name,
+                  input: {}
+                });
+              }
+              currentToolUse = null;
             }
-            currentToolUse = null;
           }
+        } finally {
+          if (idleTimer) clearTimeout(idleTimer);
         }
+        console.log(`[Vessel Agent] stream complete in ${Date.now() - streamStartTime}ms, toolCalls=${toolUseBlocks.length} textLen=${textContent.length}`);
         const finalMessage = await stream.finalMessage();
+        console.log(`[Vessel Agent] finalMessage received, stop_reason=${finalMessage.stop_reason}`);
         const assistantContent = [];
         if (textContent) {
           assistantContent.push({ type: "text", text: textContent });
@@ -3902,7 +4093,15 @@ class AnthropicProvider {
           onChunk(`
 <<tool:${tb.name}${argSummary ? ":" + argSummary : ""}>>
 `);
-          const result = await onToolCall(tb.name, tb.input);
+          let result;
+          const toolStartTime = Date.now();
+          console.log(`[Vessel Agent] executing tool: ${tb.name}`);
+          try {
+            result = await onToolCall(tb.name, tb.input);
+          } catch (toolErr) {
+            result = `Error: Tool execution failed — ${toolErr.message || toolErr}. Try a different approach or call read_page to refresh context.`;
+          }
+          console.log(`[Vessel Agent] tool ${tb.name} completed in ${Date.now() - toolStartTime}ms, resultLen=${result.length}`);
           toolResults.push({
             type: "tool_result",
             tool_use_id: tb.id,
@@ -4091,6 +4290,9 @@ class OpenAICompatProvider {
       let iterationsUsed = 0;
       for (let i = 0; i < maxIterations; i++) {
         iterationsUsed = i + 1;
+        const msgTokenEstimate = JSON.stringify(messages).length;
+        console.log(`[Vessel Agent OpenAI] iteration=${i} messages=${messages.length} msgChars=${msgTokenEstimate} tools=${openAITools.length}`);
+        const streamStartTime = Date.now();
         let textAccum = "";
         const toolCallAccums = {};
         let finishReason = null;
@@ -4125,10 +4327,21 @@ class OpenAICompatProvider {
             }
           }
         }
+        console.log(`[Vessel Agent OpenAI] stream complete in ${Date.now() - streamStartTime}ms, toolCalls=${Object.keys(toolCallAccums).length} textLen=${textAccum.length} finishReason=${finishReason}`);
         const toolCalls = Object.values(toolCallAccums);
+        for (const tc of Object.values(toolCallAccums)) {
+          if (!tc.id) tc.id = `call_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+        }
+        for (const tc of toolCalls) {
+          try {
+            JSON.parse(tc.argsJson || "{}");
+          } catch {
+            tc.argsJson = "{}";
+          }
+        }
         const assistantMsg = {
           role: "assistant",
-          content: textAccum || null,
+          content: textAccum || "",
           ...toolCalls.length > 0 && {
             tool_calls: toolCalls.map((tc) => ({
               id: tc.id,
@@ -4144,12 +4357,29 @@ class OpenAICompatProvider {
           try {
             args = JSON.parse(tc.argsJson || "{}");
           } catch {
+            onChunk(`
+<<tool:${tc.name}:⚠ invalid args>>
+`);
+            messages.push({
+              role: "tool",
+              tool_call_id: tc.id,
+              content: `Error: Invalid JSON in tool arguments. Please retry with valid JSON. Raw: ${tc.argsJson}`
+            });
+            continue;
           }
           const argSummary = args.url || args.text || args.direction || "";
           onChunk(`
 <<tool:${tc.name}${argSummary ? ":" + argSummary : ""}>>
 `);
-          const result = await onToolCall(tc.name, args);
+          let result;
+          const toolStartTime = Date.now();
+          console.log(`[Vessel Agent OpenAI] executing tool: ${tc.name}`);
+          try {
+            result = await onToolCall(tc.name, args);
+          } catch (toolErr) {
+            result = `Error: Tool execution failed — ${toolErr.message || toolErr}. Try a different approach or call read_page to refresh context.`;
+          }
+          console.log(`[Vessel Agent OpenAI] tool ${tc.name} completed in ${Date.now() - toolStartTime}ms, resultLen=${result.length}`);
           messages.push({
             role: "tool",
             tool_call_id: tc.id,
@@ -4320,7 +4550,20 @@ function isVisibleToUser(el) {
 }
 function formatInteractiveElements(elements) {
   if (elements.length === 0) return "None";
-  const items = limitItems(elements, 50);
+  const sorted = [...elements].sort((a, b) => {
+    const scoreEl = (el) => {
+      let s = 0;
+      if (el.visible === false) s += 100;
+      if (el.inViewport === false) s += 50;
+      if (el.context === "nav" || el.context === "footer" || el.context === "sidebar")
+        s += 30;
+      if (el.obscured) s += 20;
+      if (el.type === "link") s += 5;
+      return s;
+    };
+    return scoreEl(a) - scoreEl(b);
+  });
+  const items = limitItems(sorted, 50);
   return items.map((el) => {
     const prefix = el.index ? `[#${el.index}]` : "-";
     const parts = [prefix];
@@ -4486,7 +4729,10 @@ function formatStructuredEntities(entities) {
     if (entity.url && entity.url !== entity.name) {
       lines.push(`  url: ${entity.url}`);
     }
-    for (const [key, value] of Object.entries(entity.attributes).slice(0, 8)) {
+    for (const [key, value] of Object.entries(entity.attributes).slice(
+      0,
+      8
+    )) {
       const rendered = formatStructuredValue(value);
       if (rendered) {
         lines.push(`  ${key}: ${rendered}`);
@@ -4529,10 +4775,34 @@ function getHighlightsForPage(url) {
 function formatJsonLd(items) {
   if (!items || items.length === 0) return "";
   const lines = [];
-  const SKIP = /* @__PURE__ */ new Set(["@context", "image", "logo", "thumbnail", "potentialAction"]);
+  const SKIP = /* @__PURE__ */ new Set([
+    "@context",
+    "image",
+    "logo",
+    "thumbnail",
+    "potentialAction"
+  ]);
   const TYPE_FIELDS = {
-    Recipe: ["name", "url", "description", "recipeYield", "totalTime", "cookTime", "prepTime", "recipeIngredient", "recipeInstructions"],
-    Article: ["headline", "name", "url", "datePublished", "dateModified", "author", "description"],
+    Recipe: [
+      "name",
+      "url",
+      "description",
+      "recipeYield",
+      "totalTime",
+      "cookTime",
+      "prepTime",
+      "recipeIngredient",
+      "recipeInstructions"
+    ],
+    Article: [
+      "headline",
+      "name",
+      "url",
+      "datePublished",
+      "dateModified",
+      "author",
+      "description"
+    ],
     Product: ["name", "url", "description", "offers"],
     BreadcrumbList: ["itemListElement"],
     Organization: ["name", "url", "description"]
@@ -4545,9 +4815,11 @@ function formatJsonLd(items) {
     const renderValue = (val, depth = 0) => {
       if (val === null || val === void 0) return "";
       if (typeof val === "string") return val;
-      if (typeof val === "number" || typeof val === "boolean") return String(val);
+      if (typeof val === "number" || typeof val === "boolean")
+        return String(val);
       if (Array.isArray(val)) {
-        if (depth > 0) return val.map((v) => renderValue(v, depth + 1)).filter(Boolean).join(", ");
+        if (depth > 0)
+          return val.map((v) => renderValue(v, depth + 1)).filter(Boolean).join(", ");
         return val.map((v, i) => {
           const s = renderValue(v, depth + 1);
           return s ? `  ${i + 1}. ${s}` : "";
@@ -4577,6 +4849,24 @@ function formatJsonLd(items) {
   }
   return lines.join("\n");
 }
+function chooseAgentReadMode(page) {
+  const pageType = detectPageType(page);
+  switch (pageType) {
+    case "SEARCH_RESULTS":
+    case "PAGINATED_LIST":
+      return "results_only";
+    case "LOGIN":
+    case "SEARCH_READY":
+    case "SHOPPING":
+    case "FORM":
+      return "visible_only";
+    case "ARTICLE":
+      return "summary";
+    case "GENERAL":
+    default:
+      return "visible_only";
+  }
+}
 function normalizeComparable(value) {
   return value.toLowerCase().replace(/[^a-z0-9]+/g, " ").trim().replace(/\s+/g, " ");
 }
@@ -4621,7 +4911,9 @@ function collectJsonLdEntityItems(input, results = []) {
   const item = input;
   const type = item["@type"];
   const types = Array.isArray(type) ? type : [type];
-  const typeNames = types.filter((entry) => typeof entry === "string");
+  const typeNames = types.filter(
+    (entry) => typeof entry === "string"
+  );
   if ((typeof item.name === "string" || typeof item.url === "string") && !typeNames.some(
     (entry) => ["BreadcrumbList", "Organization", "WebSite", "WebPage"].includes(entry)
   )) {
@@ -4666,7 +4958,8 @@ function getResultCandidates(page) {
       score += 4;
     }
     if (element.context === "article") score += 3;
-    else if (element.context === "main" || element.context === "content") score += 1;
+    else if (element.context === "main" || element.context === "content")
+      score += 1;
     if (href && pageHost) {
       try {
         if (new URL(href).origin === new URL(pageHost).origin) score += 1;
@@ -4680,7 +4973,9 @@ function getResultCandidates(page) {
       score += 2;
     }
     if (/\b(card|tile|result|rating|review)\b/.test(haystack)) score += 1;
-    if (/\b(item|list|row|repo|repository|issue|pull request|event)\b/.test(haystack)) {
+    if (/\b(item|list|row|repo|repository|issue|pull request|event)\b/.test(
+      haystack
+    )) {
       score += 1;
     }
     if (text.length >= 12 && text.split(/\s+/).length >= 2) score += 1;
@@ -4699,7 +4994,9 @@ function getResultCandidates(page) {
       return score >= 4 || score >= 3 && (element.context === "article" || element.context === "main" || element.context === "content");
     }
     return score >= 4 || score >= 3 && element.context === "article";
-  }).sort((a, b) => b.score - a.score || (a.element.index ?? 0) - (b.element.index ?? 0));
+  }).sort(
+    (a, b) => b.score - a.score || (a.element.index ?? 0) - (b.element.index ?? 0)
+  );
   const seen = /* @__PURE__ */ new Set();
   return scored.map(({ element }) => element).filter((element) => {
     const key = `${normalizeComparable(element.text || "")}|${normalizeUrlForMatch(element.href) || ""}`;
@@ -4952,7 +5249,9 @@ function buildScopedContext(page, mode) {
         sections.push(`### Likely Search Results (${resultElements.length})`);
         sections.push(formatInteractiveElements(resultElements));
       } else {
-        sections.push("No likely primary result links were detected on this page.");
+        sections.push(
+          "No likely primary result links were detected on this page."
+        );
       }
       return sections.join("\n");
     }
@@ -4961,10 +5260,8 @@ function buildScopedContext(page, mode) {
       return buildStructuredContext(page);
   }
 }
-function analyzePageIntent(page) {
-  const hints = [];
+function detectPageType(page) {
   const url = page.url.toLowerCase();
-  (page.title || "").toLowerCase();
   const hasPasswordField = page.forms.some(
     (f) => f.fields.some((el) => el.inputType === "password")
   );
@@ -4983,47 +5280,85 @@ function analyzePageIntent(page) {
   const hasPagination = page.interactiveElements.some(
     (el) => (el.text || "").toLowerCase() === "next" || el.text === "›" || el.text === "»" || (el.label || "").toLowerCase().includes("next page")
   );
-  if (hasPasswordField) {
-    hints.push("Page type: LOGIN/SIGNUP");
-    hints.push("Suggested: vessel_login or vessel_fill_form → auto-fills credentials and submits");
-    const userField = page.forms.flatMap((f) => f.fields).find(
-      (el) => el.inputType === "email" || el.name === "email" || el.name === "username" || el.autocomplete === "username"
-    );
-    if (userField) {
-      hints.push(`Username field: #${userField.index} [${userField.label || userField.name || userField.placeholder || "input"}]`);
-    }
-  } else if (hasSearchInput && !hasResults) {
-    hints.push("Page type: SEARCH READY");
-    hints.push("Suggested: vessel_search → auto-finds search box, types query, and submits");
-  } else if (hasResults && hasSearchInput) {
-    hints.push("Page type: SEARCH RESULTS");
-    hints.push("Suggested: click a result link, or vessel_paginate for more results");
-    if (hasPagination) hints.push("Pagination detected — vessel_paginate available");
-  } else if (hasCart) {
-    hints.push("Page type: SHOPPING/CHECKOUT");
-    hints.push("Suggested: vessel_fill_form for payment/address fields");
-  } else if (formCount > 0 && !hasPasswordField) {
-    const totalFields = page.forms.reduce((n, f) => n + f.fields.length, 0);
-    hints.push(`Page type: FORM (${formCount} form${formCount > 1 ? "s" : ""}, ${totalFields} fields)`);
-    hints.push("Suggested: vessel_fill_form → fill all fields in one call");
-  } else if (hasPagination) {
-    hints.push("Page type: PAGINATED LIST");
-    hints.push("Suggested: vessel_paginate to navigate between pages");
-  } else if (page.content.length > 3e3 && page.interactiveElements.length < 10) {
-    hints.push("Page type: ARTICLE/CONTENT");
-    hints.push("Suggested: vessel_extract_content for readable text");
-  }
-  if (hints.length === 0) return "";
-  return `### Page Intent (Speedee)
-${hints.join("\n")}`;
+  if (hasPasswordField) return "LOGIN";
+  if (hasSearchInput && !hasResults) return "SEARCH_READY";
+  if (hasResults && hasSearchInput) return "SEARCH_RESULTS";
+  if (hasCart) return "SHOPPING";
+  if (formCount > 0 && !hasPasswordField) return "FORM";
+  if (hasPagination) return "PAGINATED_LIST";
+  if (page.content.length > 3e3 && page.interactiveElements.length < 10)
+    return "ARTICLE";
+  return "GENERAL";
 }
-function buildStructuredContext(page) {
-  const sections = [];
-  sections.push("## PAGE STRUCTURE");
-  sections.push("");
-  sections.push(
-    "**User Focus:** This page is from the active tab currently visible to the human user."
-  );
+function analyzePageIntent(page) {
+  const hints = [];
+  const pageType = detectPageType(page);
+  const hasPagination = page.interactiveElements.some(
+    (el) => (el.text || "").toLowerCase() === "next" || el.text === "›" || el.text === "»" || (el.label || "").toLowerCase().includes("next page")
+  );
+  switch (pageType) {
+    case "LOGIN": {
+      hints.push("Page type: LOGIN/SIGNUP");
+      hints.push(
+        "Suggested: vessel_login or vessel_fill_form → auto-fills credentials and submits"
+      );
+      const userField = page.forms.flatMap((f) => f.fields).find(
+        (el) => el.inputType === "email" || el.name === "email" || el.name === "username" || el.autocomplete === "username"
+      );
+      if (userField) {
+        hints.push(
+          `Username field: #${userField.index} [${userField.label || userField.name || userField.placeholder || "input"}]`
+        );
+      }
+      break;
+    }
+    case "SEARCH_READY":
+      hints.push("Page type: SEARCH READY");
+      hints.push(
+        "Suggested: vessel_search → auto-finds search box, types query, and submits"
+      );
+      break;
+    case "SEARCH_RESULTS":
+      hints.push("Page type: SEARCH RESULTS");
+      hints.push(
+        "Suggested: click a result link, or vessel_paginate for more results"
+      );
+      if (hasPagination)
+        hints.push("Pagination detected — vessel_paginate available");
+      break;
+    case "SHOPPING":
+      hints.push("Page type: SHOPPING/CHECKOUT");
+      hints.push("Suggested: vessel_fill_form for payment/address fields");
+      break;
+    case "FORM": {
+      const formCount = page.forms.length;
+      const totalFields = page.forms.reduce((n, f) => n + f.fields.length, 0);
+      hints.push(
+        `Page type: FORM (${formCount} form${formCount > 1 ? "s" : ""}, ${totalFields} fields)`
+      );
+      hints.push("Suggested: vessel_fill_form → fill all fields in one call");
+      break;
+    }
+    case "PAGINATED_LIST":
+      hints.push("Page type: PAGINATED LIST");
+      hints.push("Suggested: vessel_paginate to navigate between pages");
+      break;
+    case "ARTICLE":
+      hints.push("Page type: ARTICLE/CONTENT");
+      hints.push("Suggested: vessel_extract_content for readable text");
+      break;
+  }
+  if (hints.length === 0) return "";
+  return `### Page Intent (Speedee)
+${hints.join("\n")}`;
+}
+function buildStructuredContext(page) {
+  const sections = [];
+  sections.push("## PAGE STRUCTURE");
+  sections.push("");
+  sections.push(
+    "**User Focus:** This page is from the active tab currently visible to the human user."
+  );
   sections.push(`**URL:** ${page.url}`);
   sections.push(`**Title:** ${page.title}`);
   sections.push(`**Viewport:** ${formatViewport(page)}`);
@@ -5151,12 +5486,14 @@ const TOOL_DEFINITIONS = [
   {
     name: "current_tab",
     title: "Get Active Tab",
-    description: "Get the browser tab the human is actively looking at right now. Use this instead of list_tabs when you only need the focused tab."
+    description: "Get the browser tab the human is actively looking at right now. Use this instead of list_tabs when you only need the focused tab.",
+    tier: 0
   },
   {
     name: "list_tabs",
     title: "List Tabs",
-    description: "List all open browser tabs with their IDs, titles, and URLs."
+    description: "List all open browser tabs with their IDs, titles, and URLs.",
+    tier: 2
   },
   {
     name: "switch_tab",
@@ -5164,10 +5501,9 @@ const TOOL_DEFINITIONS = [
     description: "Switch to a browser tab by tab ID, or by matching part of the title or URL.",
     inputSchema: {
       tabId: zod.z.string().optional().describe("Exact tab ID to switch to"),
-      match: zod.z.string().optional().describe(
-        "Case-insensitive partial match against tab title or URL"
-      )
-    }
+      match: zod.z.string().optional().describe("Case-insensitive partial match against tab title or URL")
+    },
+    tier: 2
   },
   {
     name: "create_tab",
@@ -5175,7 +5511,8 @@ const TOOL_DEFINITIONS = [
     description: "Open a new browser tab, optionally navigating to a URL.",
     inputSchema: {
       url: zod.z.string().optional().describe("Optional URL to open")
-    }
+    },
+    tier: 2
   },
   // --- Navigation ---
   {
@@ -5184,22 +5521,26 @@ const TOOL_DEFINITIONS = [
     description: "Navigate the browser to a URL.",
     inputSchema: {
       url: zod.z.string().describe("The URL to navigate to")
-    }
+    },
+    tier: 0
   },
   {
     name: "go_back",
     title: "Go Back",
-    description: "Go back to the previous page in browser history."
+    description: "Go back to the previous page in browser history.",
+    tier: 1
   },
   {
     name: "go_forward",
     title: "Go Forward",
-    description: "Go forward in browser history."
+    description: "Go forward in browser history.",
+    tier: 2
   },
   {
     name: "reload",
     title: "Reload",
-    description: "Reload the current page."
+    description: "Reload the current page.",
+    tier: 2
   },
   // --- Interaction ---
   {
@@ -5209,7 +5550,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       index: zod.z.number().optional().describe("Element index from the page content listing"),
       selector: zod.z.string().optional().describe("CSS selector as fallback")
-    }
+    },
+    tier: 0
   },
   {
     name: "type_text",
@@ -5222,7 +5564,9 @@ const TOOL_DEFINITIONS = [
       mode: zod.z.enum(["default", "keystroke"]).optional().describe(
         '"default" sets value directly. "keystroke" simulates character-by-character key events.'
       )
-    }
+    },
+    tier: 0,
+    relevance: ["LOGIN", "FORM", "SEARCH_READY"]
   },
   {
     name: "select_option",
@@ -5233,7 +5577,9 @@ const TOOL_DEFINITIONS = [
       selector: zod.z.string().optional().describe("CSS selector as fallback"),
       label: zod.z.string().optional().describe("Visible option label to match"),
       value: zod.z.string().optional().describe("Option value attribute to match")
-    }
+    },
+    tier: 1,
+    relevance: ["FORM", "SHOPPING"]
   },
   {
     name: "submit_form",
@@ -5242,7 +5588,9 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       index: zod.z.number().optional().describe("Index of a form field or submit button"),
       selector: zod.z.string().optional().describe("Form or submit button selector")
-    }
+    },
+    tier: 1,
+    relevance: ["LOGIN", "FORM", "SEARCH_READY", "SHOPPING"]
   },
   {
     name: "press_key",
@@ -5252,7 +5600,8 @@ const TOOL_DEFINITIONS = [
       key: zod.z.string().describe("Keyboard key such as Enter or Escape"),
       index: zod.z.number().optional().describe("Element index to focus first"),
       selector: zod.z.string().optional().describe("CSS selector to focus first")
-    }
+    },
+    tier: 1
   },
   {
     name: "scroll",
@@ -5261,7 +5610,9 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       direction: zod.z.enum(["up", "down"]).describe("Scroll direction"),
       amount: zod.z.number().optional().describe("Pixels to scroll (default 500)")
-    }
+    },
+    tier: 0,
+    relevance: ["ARTICLE", "SEARCH_RESULTS", "PAGINATED_LIST"]
   },
   {
     name: "hover",
@@ -5270,7 +5621,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       index: zod.z.number().optional().describe("Element index number"),
       selector: zod.z.string().optional().describe("CSS selector as fallback")
-    }
+    },
+    tier: 2
   },
   {
     name: "focus",
@@ -5279,7 +5631,9 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       index: zod.z.number().optional().describe("Element index number"),
       selector: zod.z.string().optional().describe("CSS selector as fallback")
-    }
+    },
+    tier: 2,
+    relevance: ["FORM", "LOGIN"]
   },
   // --- Page & Content ---
   {
@@ -5289,21 +5643,36 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       enabled: zod.z.boolean().describe("Whether ad blocking should be enabled for the tab"),
       tabId: zod.z.string().optional().describe("Exact tab ID to target instead of the active tab"),
-      match: zod.z.string().optional().describe(
-        "Case-insensitive partial match against tab title or URL"
-      ),
+      match: zod.z.string().optional().describe("Case-insensitive partial match against tab title or URL"),
       reload: zod.z.boolean().optional().describe("Reload the tab after changing (default true)")
-    }
+    },
+    tier: 2
   },
   {
     name: "dismiss_popup",
     title: "Dismiss Popup",
-    description: "Dismiss a modal, popup, newsletter gate, cookie banner, or overlay using common close/decline actions."
+    description: "Dismiss a modal, popup, newsletter gate, cookie banner, or overlay using common close/decline actions.",
+    tier: 1
   },
   {
     name: "read_page",
     title: "Read Page",
-    description: "Re-read the current page content. Includes active text selection and visible unsaved highlights. Use after navigation or interaction to see updated content."
+    description: "Read the current page using a scoped mode. Defaults to a minimal navigation-focused brief; use mode='debug' only when narrower modes are insufficient.",
+    inputSchema: {
+      mode: zod.z.enum([
+        "summary",
+        "interactives_only",
+        "forms_only",
+        "text_only",
+        "visible_only",
+        "results_only",
+        "full",
+        "debug"
+      ]).optional().describe(
+        "Read mode: visible_only/results_only/forms_only/summary/text_only for narrow reads, full/debug for the complete page dump"
+      )
+    },
+    tier: 0
   },
   {
     name: "wait_for",
@@ -5313,7 +5682,8 @@ const TOOL_DEFINITIONS = [
       text: zod.z.string().optional().describe("Text that should appear in the page body"),
       selector: zod.z.string().optional().describe("CSS selector that should match an element"),
       timeoutMs: zod.z.number().optional().describe("Maximum time to wait in milliseconds (default 5000)")
-    }
+    },
+    tier: 2
   },
   // --- Checkpoints & Sessions ---
   {
@@ -5323,7 +5693,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       name: zod.z.string().optional().describe("Short checkpoint name"),
       note: zod.z.string().optional().describe("Optional note about why this checkpoint matters")
-    }
+    },
+    tier: 2
   },
   {
     name: "restore_checkpoint",
@@ -5332,7 +5703,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       checkpointId: zod.z.string().optional().describe("Exact checkpoint ID"),
       name: zod.z.string().optional().describe("Checkpoint name to match if ID is unknown")
-    }
+    },
+    tier: 2
   },
   {
     name: "save_session",
@@ -5340,7 +5712,9 @@ const TOOL_DEFINITIONS = [
     description: "Persist the current browser cookies, localStorage, and tab layout under a reusable session name.",
     inputSchema: {
       name: zod.z.string().describe("Session name such as github-logged-in")
-    }
+    },
+    tier: 2,
+    relevance: ["LOGIN"]
   },
   {
     name: "load_session",
@@ -5348,12 +5722,14 @@ const TOOL_DEFINITIONS = [
     description: "Load a previously saved named session, restoring cookies, localStorage, and saved tabs.",
     inputSchema: {
       name: zod.z.string().describe("Previously saved session name")
-    }
+    },
+    tier: 2
   },
   {
     name: "list_sessions",
     title: "List Sessions",
-    description: "List previously saved named browser sessions with cookie and storage counts."
+    description: "List previously saved named browser sessions with cookie and storage counts.",
+    tier: 2
   },
   {
     name: "delete_session",
@@ -5361,7 +5737,8 @@ const TOOL_DEFINITIONS = [
     description: "Delete a previously saved named browser session.",
     inputSchema: {
       name: zod.z.string().describe("Saved session name to delete")
-    }
+    },
+    tier: 2
   },
   // --- Bookmarks ---
   {
@@ -5371,7 +5748,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       folderId: zod.z.string().optional().describe("Exact bookmark folder ID to filter by"),
       folderName: zod.z.string().optional().describe("Exact bookmark folder name to filter by")
-    }
+    },
+    tier: 2
   },
   {
     name: "search_bookmarks",
@@ -5379,7 +5757,8 @@ const TOOL_DEFINITIONS = [
     description: "Search bookmarks by title, URL, note, folder name, or folder summary.",
     inputSchema: {
       query: zod.z.string().describe("Search term to match against saved bookmarks")
-    }
+    },
+    tier: 2
   },
   {
     name: "create_bookmark_folder",
@@ -5388,7 +5767,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       name: zod.z.string().describe("Folder name to create"),
       summary: zod.z.string().optional().describe("Optional one-sentence summary for this folder")
-    }
+    },
+    tier: 2
   },
   {
     name: "save_bookmark",
@@ -5400,12 +5780,15 @@ const TOOL_DEFINITIONS = [
       index: zod.z.number().optional().describe("Element index of a link to bookmark without opening"),
       selector: zod.z.string().optional().describe("CSS selector of a link to bookmark without opening"),
       folderId: zod.z.string().optional().describe("Folder ID to save into"),
-      folderName: zod.z.string().optional().describe("Folder name to save into. Created automatically if missing."),
+      folderName: zod.z.string().optional().describe(
+        "Folder name to save into. Created automatically if missing."
+      ),
       folderSummary: zod.z.string().optional().describe("Optional summary used if a new folder is created"),
       createFolderIfMissing: zod.z.boolean().optional().describe("Create folderName automatically when it does not exist"),
       note: zod.z.string().optional().describe("Optional note about why the page was saved"),
       onDuplicate: zod.z.enum(["ask", "update", "duplicate"]).optional().describe("How to handle duplicate URLs in the same folder")
-    }
+    },
+    tier: 1
   },
   {
     name: "organize_bookmark",
@@ -5423,7 +5806,8 @@ const TOOL_DEFINITIONS = [
       createFolderIfMissing: zod.z.boolean().optional().describe("Create folderName automatically when it does not exist"),
       note: zod.z.string().optional().describe("Optional note"),
       archive: zod.z.boolean().optional().describe('If true, organize into the default "Archive" folder')
-    }
+    },
+    tier: 2
   },
   {
     name: "archive_bookmark",
@@ -5436,7 +5820,8 @@ const TOOL_DEFINITIONS = [
       index: zod.z.number().optional().describe("Element index of a link to archive"),
       selector: zod.z.string().optional().describe("CSS selector of a link to archive"),
       note: zod.z.string().optional().describe("Optional note")
-    }
+    },
+    tier: 2
   },
   {
     name: "open_bookmark",
@@ -5445,7 +5830,8 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       bookmarkId: zod.z.string().describe("Exact bookmark ID to open"),
       newTab: zod.z.boolean().optional().describe("Open in a new tab instead of the current tab")
-    }
+    },
+    tier: 2
   },
   // --- Highlights ---
   {
@@ -5457,14 +5843,19 @@ const TOOL_DEFINITIONS = [
       selector: zod.z.string().optional().describe("CSS selector of element to highlight"),
       text: zod.z.string().optional().describe("Text to find and highlight on the page (all occurrences)"),
       label: zod.z.string().optional().describe("Annotation label to display near the highlight"),
-      durationMs: zod.z.number().optional().describe("Auto-clear after this many milliseconds (omit for permanent)"),
+      durationMs: zod.z.number().optional().describe(
+        "Auto-clear after this many milliseconds (omit for permanent)"
+      ),
       color: zod.z.enum(["yellow", "red", "green", "blue", "purple", "orange"]).optional().describe("Highlight color (default yellow)")
-    }
+    },
+    tier: 1,
+    relevance: ["ARTICLE", "SEARCH_RESULTS"]
   },
   {
     name: "clear_highlights",
     title: "Clear Highlights",
-    description: "Remove all visual highlights from the current page."
+    description: "Remove all visual highlights from the current page.",
+    tier: 2
   },
   // --- Speedee System: Flow State ---
   {
@@ -5472,11 +5863,14 @@ const TOOL_DEFINITIONS = [
     title: "Start Workflow",
     description: "Begin tracking a multi-step web workflow. Vessel will show progress after every action so you always know where you are.",
     inputSchema: {
-      goal: zod.z.string().describe("What this workflow accomplishes (e.g. 'Purchase item from Amazon')"),
+      goal: zod.z.string().describe(
+        "What this workflow accomplishes (e.g. 'Purchase item from Amazon')"
+      ),
       steps: zod.z.array(zod.z.string()).describe(
         "Ordered list of step labels (e.g. ['Log in', 'Search', 'Select item', 'Checkout'])"
       )
-    }
+    },
+    tier: 1
   },
   {
     name: "flow_advance",
@@ -5484,23 +5878,27 @@ const TOOL_DEFINITIONS = [
     description: "Mark the current workflow step as done and move to the next one.",
     inputSchema: {
       detail: zod.z.string().optional().describe("Brief note about what was accomplished")
-    }
+    },
+    tier: 1
   },
   {
     name: "flow_status",
     title: "Workflow Status",
-    description: "Check the current workflow progress."
+    description: "Check the current workflow progress.",
+    tier: 2
   },
   {
     name: "flow_end",
     title: "End Workflow",
-    description: "Clear the active workflow tracker."
+    description: "Clear the active workflow tracker.",
+    tier: 2
   },
   // --- Speedee System: Suggestion Engine ---
   {
     name: "suggest",
     title: "What Should I Do?",
-    description: "Analyze the current page and return the most relevant tools and suggested next actions. Call this when unsure what to do."
+    description: "Analyze the current page and return the most relevant tools and suggested next actions. Call this when unsure what to do.",
+    tier: 1
   },
   // --- Speedee System: Composable Macros ---
   {
@@ -5516,7 +5914,9 @@ const TOOL_DEFINITIONS = [
         })
       ).describe("Fields to fill"),
       submit: zod.z.boolean().optional().describe("Submit the form after filling (default false)")
-    }
+    },
+    tier: 1,
+    relevance: ["FORM", "LOGIN", "SHOPPING"]
   },
   {
     name: "login",
@@ -5529,7 +5929,9 @@ const TOOL_DEFINITIONS = [
       username_selector: zod.z.string().optional().describe("CSS selector for username field (auto-detected if omitted)"),
       password_selector: zod.z.string().optional().describe("CSS selector for password field (auto-detected if omitted)"),
       submit_selector: zod.z.string().optional().describe("CSS selector for submit button (auto-detected if omitted)")
-    }
+    },
+    tier: 1,
+    relevance: ["LOGIN"]
   },
   {
     name: "search",
@@ -5538,7 +5940,9 @@ const TOOL_DEFINITIONS = [
     inputSchema: {
       query: zod.z.string().describe("Search query text"),
       selector: zod.z.string().optional().describe("CSS selector for search input (auto-detected if omitted)")
-    }
+    },
+    tier: 1,
+    relevance: ["SEARCH_READY", "SEARCH_RESULTS"]
   },
   {
     name: "paginate",
@@ -5546,8 +5950,62 @@ const TOOL_DEFINITIONS = [
     description: "Navigate to the next or previous page of results. Auto-detects pagination controls.",
     inputSchema: {
       direction: zod.z.enum(["next", "prev"]).describe("Pagination direction"),
-      selector: zod.z.string().optional().describe("CSS selector for pagination link (auto-detected if omitted)")
-    }
+      selector: zod.z.string().optional().describe(
+        "CSS selector for pagination link (auto-detected if omitted)"
+      )
+    },
+    tier: 1,
+    relevance: ["SEARCH_RESULTS", "PAGINATED_LIST"]
+  },
+  // --- Speedee System: Expanded Macros ---
+  {
+    name: "accept_cookies",
+    title: "Accept Cookies",
+    description: "Dismiss cookie consent banners (OneTrust, CookieBot, GDPR popups, etc.). More targeted than dismiss_popup for consent-specific overlays.",
+    tier: 1
+  },
+  {
+    name: "extract_table",
+    title: "Extract Table",
+    description: "Extract a table from the page as structured JSON rows. Returns column headers and cell values.",
+    inputSchema: {
+      index: zod.z.number().optional().describe("Element index of the table to extract"),
+      selector: zod.z.string().optional().describe(
+        "CSS selector for the table (auto-detected if omitted — uses first table)"
+      )
+    },
+    tier: 1,
+    relevance: ["SEARCH_RESULTS", "ARTICLE"]
+  },
+  {
+    name: "scroll_to_element",
+    title: "Scroll To Element",
+    description: "Scroll a specific element into view by index or selector. Useful for navigating to off-screen content.",
+    inputSchema: {
+      index: zod.z.number().optional().describe("Element index to scroll to"),
+      selector: zod.z.string().optional().describe("CSS selector to scroll to"),
+      position: zod.z.enum(["center", "top", "bottom"]).optional().describe(
+        "Where to position the element in the viewport (default center)"
+      )
+    },
+    tier: 1
+  },
+  // --- Navigation Primitives ---
+  {
+    name: "wait_for_navigation",
+    title: "Wait For Navigation",
+    description: "Wait for the current page to finish loading after a click or form submission. Use when you clicked a link and need to wait for the new page before reading it.",
+    inputSchema: {
+      timeoutMs: zod.z.number().optional().describe("Maximum time to wait in milliseconds (default 10000)")
+    },
+    tier: 1
+  },
+  // --- Speedee System: Metrics ---
+  {
+    name: "metrics",
+    title: "Session Metrics",
+    description: "Show performance metrics for this session: total tool calls, average duration, per-tool breakdown, and error rates.",
+    tier: 2
   }
 ];
 function toAnthropicTools(defs) {
@@ -5572,6 +6030,74 @@ function toAnthropicTools(defs) {
   });
 }
 const AGENT_TOOLS = toAnthropicTools(TOOL_DEFINITIONS);
+const defByName = Object.fromEntries(
+  TOOL_DEFINITIONS.map((d) => [d.name, d])
+);
+const CONTEXT_HINTS = {
+  LOGIN: {
+    login: "⚡ LOGIN PAGE DETECTED — ",
+    fill_form: "⚡ Login fields detected — ",
+    type_text: "⚡ Credential fields on page — ",
+    save_session: "💡 Save session after successful login — "
+  },
+  SEARCH_READY: {
+    search: "⚡ SEARCH BOX DETECTED — ",
+    type_text: "⚡ Search input available — "
+  },
+  SEARCH_RESULTS: {
+    paginate: "⚡ PAGINATION DETECTED — ",
+    search: "⚡ Refine search — ",
+    highlight: "💡 Mark interesting results — "
+  },
+  SHOPPING: {
+    fill_form: "⚡ CHECKOUT FIELDS DETECTED — ",
+    select_option: "⚡ Payment/shipping options available — "
+  },
+  FORM: {
+    fill_form: "⚡ FORM DETECTED — ",
+    select_option: "⚡ Dropdown fields on page — ",
+    submit_form: "⚡ Form ready to submit — "
+  },
+  PAGINATED_LIST: {
+    paginate: "⚡ PAGINATION DETECTED — ",
+    scroll: "💡 Scroll to see more — "
+  },
+  ARTICLE: {
+    highlight: "💡 Mark interesting passages — ",
+    save_bookmark: "💡 Save for later — ",
+    scroll: "💡 Long content — scroll to continue — "
+  }
+};
+function scoreForContext(toolName, pageType) {
+  const def = defByName[toolName];
+  if (!def) return 500;
+  const tier = def.tier ?? 1;
+  if (tier === 0) return 0;
+  const isRelevant = !def.relevance || def.relevance.includes(pageType);
+  if (tier === 1 && isRelevant) return 10;
+  if (tier === 1 && !isRelevant) return 30;
+  if (tier === 2 && isRelevant) return 20;
+  return 40;
+}
+function pruneToolsForContext(tools, pageType) {
+  const ctx = pageType ?? "GENERAL";
+  const hints = CONTEXT_HINTS[ctx] ?? {};
+  const scored = tools.map((tool) => ({
+    tool,
+    score: scoreForContext(tool.name, ctx)
+  }));
+  scored.sort((a, b) => a.score - b.score);
+  return scored.map(({ tool, score }) => {
+    const hint = hints[tool.name];
+    if (hint && score <= 20) {
+      return {
+        ...tool,
+        description: hint + tool.description
+      };
+    }
+    return tool;
+  });
+}
 function trimText(value) {
   return typeof value === "string" ? value.trim() : "";
 }
@@ -6436,29 +6962,82 @@ function deleteNamedSession(name) {
   fs$1.unlinkSync(filePath);
   return true;
 }
+const DEFAULT_PAGE_SCRIPT_TIMEOUT_MS = 1500;
+const QUIET_NAVIGATION_WINDOW_MS = 1200;
+const PAGE_SCRIPT_TIMEOUT = /* @__PURE__ */ Symbol("page-script-timeout");
+function pageBusyError(action) {
+  return `Error: Page is still busy; ${action} timed out waiting for page scripts. Retry in a moment.`;
+}
+function normalizeReadPageMode(mode, pageContent) {
+  if (typeof mode === "string") {
+    const normalized = mode.trim().toLowerCase();
+    if (normalized === "debug") return "debug";
+    if (normalized === "full" || normalized === "summary" || normalized === "interactives_only" || normalized === "forms_only" || normalized === "text_only" || normalized === "visible_only" || normalized === "results_only") {
+      return normalized;
+    }
+  }
+  return pageContent ? chooseAgentReadMode(pageContent) : "visible_only";
+}
+async function executePageScript(wc, script, options) {
+  if (wc.isDestroyed()) return null;
+  const timeoutMs = Math.max(
+    150,
+    options?.timeoutMs ?? DEFAULT_PAGE_SCRIPT_TIMEOUT_MS
+  );
+  let timer = null;
+  try {
+    const result = await Promise.race([
+      wc.executeJavaScript(script, options?.userGesture ?? false),
+      new Promise((resolve) => {
+        timer = setTimeout(() => resolve(PAGE_SCRIPT_TIMEOUT), timeoutMs);
+      })
+    ]);
+    if (result === PAGE_SCRIPT_TIMEOUT) {
+      console.log(
+        `[Vessel pageScript] timed out after ${timeoutMs}ms (${options?.label || "page-script"})`
+      );
+      return PAGE_SCRIPT_TIMEOUT;
+    }
+    return result;
+  } catch {
+    return null;
+  } finally {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  }
+}
 function waitForLoad$1(wc, timeout = 5e3) {
   return new Promise((resolve) => {
     let finished = false;
+    console.log(
+      `[Vessel waitForLoad] started, isLoading=${wc.isLoading()}, timeout=${timeout}`
+    );
     const cleanup = () => {
       wc.removeListener("did-finish-load", onLoadEvent);
       wc.removeListener("did-stop-loading", onLoadEvent);
       wc.removeListener("did-fail-load", onLoadEvent);
     };
-    const finish = () => {
+    const finish = (reason) => {
       if (finished) return;
       finished = true;
+      console.log(`[Vessel waitForLoad] finished: ${reason}`);
       clearTimeout(timer);
       cleanup();
       resolve();
     };
     const onLoadEvent = () => {
-      if (!wc.isLoading()) {
-        finish();
+      const loading = wc.isLoading();
+      console.log(
+        `[Vessel waitForLoad] load event fired, isLoading=${loading}`
+      );
+      if (!loading) {
+        finish("load event");
       }
     };
-    const timer = setTimeout(finish, timeout);
+    const timer = setTimeout(() => finish("timeout"), timeout);
     if (!wc.isLoading()) {
-      finish();
+      finish("already loaded");
       return;
     }
     wc.on("did-finish-load", onLoadEvent);
@@ -6466,41 +7045,70 @@ function waitForLoad$1(wc, timeout = 5e3) {
     wc.on("did-fail-load", onLoadEvent);
   });
 }
-function waitForPotentialNavigation$1(wc, beforeUrl, timeout = 4e3) {
+function waitForPotentialNavigation$1(wc, beforeUrl, timeout = 2500) {
   return new Promise((resolve) => {
     let done = false;
+    let waitingForLoad = false;
+    const beforeTitle = wc.getTitle();
     const finish = () => {
       if (done) return;
       done = true;
       clearTimeout(timer);
+      clearInterval(poller);
       wc.removeListener("did-start-loading", onStart);
       wc.removeListener("did-navigate", onNavigate);
       wc.removeListener("did-navigate-in-page", onNavigateInPage);
+      wc.removeListener("did-stop-loading", onNativeChange);
+      wc.removeListener("page-title-updated", onNativeChange);
       resolve();
     };
-    const onStart = () => {
-      wc.removeListener("did-navigate", onNavigate);
-      wc.once("did-navigate", () => {
-        void waitForLoad$1(wc, timeout).then(finish);
-      });
+    const finishAfterLoad = () => {
+      if (waitingForLoad) return;
+      waitingForLoad = true;
       void waitForLoad$1(wc, timeout).then(finish);
     };
+    const onNativeChange = () => {
+      if (wc.isLoading()) {
+        finishAfterLoad();
+        return;
+      }
+      if (wc.getURL() !== beforeUrl || wc.getTitle() !== beforeTitle) {
+        finish();
+      }
+    };
+    const onStart = () => {
+      finishAfterLoad();
+    };
     const onNavigate = () => {
-      void waitForLoad$1(wc, timeout).then(finish);
+      finishAfterLoad();
     };
     const onNavigateInPage = () => finish();
-    const timer = setTimeout(finish, timeout);
-    if (wc.getURL() !== beforeUrl || wc.isLoading()) {
-      void waitForLoad$1(wc, timeout).then(finish);
+    const timer = setTimeout(
+      finish,
+      Math.min(timeout, QUIET_NAVIGATION_WINDOW_MS)
+    );
+    const poller = setInterval(onNativeChange, 100);
+    if (wc.getURL() !== beforeUrl || wc.getTitle() !== beforeTitle || wc.isLoading()) {
+      onNativeChange();
       return;
     }
     wc.once("did-start-loading", onStart);
     wc.once("did-navigate", onNavigate);
     wc.once("did-navigate-in-page", onNavigateInPage);
+    wc.on("did-stop-loading", onNativeChange);
+    wc.on("page-title-updated", onNativeChange);
   });
 }
+function getPostNavSummary(wc) {
+  const title = wc.getTitle();
+  return title ? `
+Page title: ${title}` : "";
+}
 async function scrollPage$1(wc, deltaY) {
-  const getScrollY = () => wc.executeJavaScript(`
+  const getScrollY = async () => {
+    const scrollY = await executePageScript(
+      wc,
+      `
       (function() {
         return Math.max(
           window.scrollY || 0,
@@ -6510,9 +7118,28 @@ async function scrollPage$1(wc, deltaY) {
           document.body?.scrollTop || 0,
         );
       })()
-    `);
+    `,
+      {
+        label: "read scroll position"
+      }
+    );
+    return typeof scrollY === "number" ? scrollY : 0;
+  };
   const beforeY = await getScrollY();
-  await wc.executeJavaScript(`window.scrollBy(0, ${deltaY})`);
+  const scrolled = await executePageScript(
+    wc,
+    `window.scrollBy(0, ${deltaY})`,
+    {
+      label: "scroll page"
+    }
+  );
+  if (scrolled === PAGE_SCRIPT_TIMEOUT) {
+    return {
+      beforeY,
+      afterY: beforeY,
+      movedY: 0
+    };
+  }
   await sleep$1(100);
   const afterY = await getScrollY();
   return {
@@ -6525,7 +7152,9 @@ function sleep$1(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function clickElement$1(wc, selector) {
-  const target = await wc.executeJavaScript(`
+  const target = await executePageScript(
+    wc,
+    `
     (async function() {
       function matchesTarget(candidate, el) {
         return !!candidate && (candidate === el || el.contains(candidate) || candidate.contains(el));
@@ -6589,7 +7218,15 @@ async function clickElement$1(wc, selector) {
         hiddenWindow: document.visibilityState !== "visible",
       };
     })()
-  `);
+  `,
+    {
+      timeoutMs: 2e3,
+      label: "resolve click target"
+    }
+  );
+  if (target === PAGE_SCRIPT_TIMEOUT) {
+    return pageBusyError("click");
+  }
   if (!target || typeof target !== "object") {
     return "Error: Could not resolve click target";
   }
@@ -6619,7 +7256,9 @@ async function clickElement$1(wc, selector) {
   return target.obstructed ? "Clicked via pointer events (target may be partially obstructed)" : "Clicked via pointer events";
 }
 async function activateElement$1(wc, selector) {
-  const activated = await wc.executeJavaScript(`
+  const activated = await executePageScript(
+    wc,
+    `
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
       if (!el) return { error: "Element not found" };
@@ -6632,7 +7271,14 @@ async function activateElement$1(wc, selector) {
       }
       return { error: "Element is not clickable" };
     })()
-  `);
+  `,
+    {
+      label: "activate element"
+    }
+  );
+  if (activated === PAGE_SCRIPT_TIMEOUT) {
+    return pageBusyError("activate");
+  }
   if (!activated || typeof activated !== "object") {
     return "Error: Could not activate element";
   }
@@ -6642,7 +7288,9 @@ async function activateElement$1(wc, selector) {
   return "Activated element via DOM click";
 }
 async function describeElementForClick$1(wc, selector) {
-  const result = await wc.executeJavaScript(`
+  const result = await executePageScript(
+    wc,
+    `
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
       if (!el) return { error: "Element not found" };
@@ -6653,7 +7301,14 @@ async function describeElementForClick$1(wc, selector) {
         href: anchor instanceof HTMLAnchorElement ? anchor.href : undefined,
       };
     })()
-  `);
+  `,
+    {
+      label: "describe element"
+    }
+  );
+  if (result === PAGE_SCRIPT_TIMEOUT) {
+    return { error: "Page is still busy" };
+  }
   if (!result || typeof result !== "object") {
     return { error: "Element not found" };
   }
@@ -6669,9 +7324,36 @@ async function clickResolvedSelector$1(wc, selector) {
   if (selector.startsWith("__vessel_idx:")) {
     const idx = Number(selector.slice("__vessel_idx:".length));
     const beforeUrl2 = wc.getURL();
-    const result = await wc.executeJavaScript(
-      `window.__vessel?.interactByIndex?.(${idx}, "click") || "Error: interactByIndex not available"`
+    const result = await executePageScript(
+      wc,
+      `window.__vessel?.interactByIndex?.(${idx}, "click") || "Error: interactByIndex not available"`,
+      {
+        label: "shadow click by index"
+      }
+    );
+    if (result === PAGE_SCRIPT_TIMEOUT) return pageBusyError("click");
+    if (typeof result === "string" && result.startsWith("Error")) return result;
+    await waitForPotentialNavigation$1(wc, beforeUrl2);
+    const afterUrl2 = wc.getURL();
+    return afterUrl2 !== beforeUrl2 ? `${result} -> ${afterUrl2}` : result;
+  }
+  if (selector.includes(" >>> ")) {
+    const beforeUrl2 = wc.getURL();
+    const result = await executePageScript(
+      wc,
+      `
+      (function() {
+        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
+        if (!el) return "Error[stale-index]: Shadow DOM element not found — call read_page to refresh.";
+        if (el instanceof HTMLElement) { el.focus(); el.click(); }
+        return "Clicked: " + (el.getAttribute("aria-label") || el.textContent?.trim().slice(0, 60) || el.tagName.toLowerCase());
+      })()
+    `,
+      {
+        label: "shadow click selector"
+      }
     );
+    if (result === PAGE_SCRIPT_TIMEOUT) return pageBusyError("click");
     if (typeof result === "string" && result.startsWith("Error")) return result;
     await waitForPotentialNavigation$1(wc, beforeUrl2);
     const afterUrl2 = wc.getURL();
@@ -6710,7 +7392,9 @@ async function dismissPopup$1(wc) {
     (overlay) => overlay.blocksInteraction
   ).length;
   const initialDormant = before.dormantOverlays.length;
-  const candidates = await wc.executeJavaScript(`
+  const candidates = await executePageScript(
+    wc,
+    `
     (function() {
       function text(value) {
         const trimmed = value == null ? "" : String(value).trim();
@@ -6889,7 +7573,15 @@ async function dismissPopup$1(wc) {
         .sort((a, b) => b.score - a.score)
         .slice(0, 8);
     })()
-  `);
+  `,
+    {
+      timeoutMs: 2e3,
+      label: "inspect popup candidates"
+    }
+  );
+  if (candidates === PAGE_SCRIPT_TIMEOUT) {
+    return pageBusyError("dismiss_popup");
+  }
   if (Array.isArray(candidates)) {
     for (const candidate of candidates) {
       if (!candidate || typeof candidate !== "object" || typeof candidate.selector !== "string") {
@@ -6924,7 +7616,8 @@ async function dismissPopup$1(wc) {
 async function resolveSelector$1(wc, index, selector) {
   if (selector) return selector;
   if (index == null) return null;
-  const authoritativeSelector = await wc.executeJavaScript(
+  const authoritativeSelector = await executePageScript(
+    wc,
     `
       (function() {
         return window.__vessel?.getElementSelector
@@ -6934,16 +7627,23 @@ async function resolveSelector$1(wc, index, selector) {
     `
   );
   if (typeof authoritativeSelector === "string" && authoritativeSelector) {
-    const resolves = await wc.executeJavaScript(
+    if (authoritativeSelector.includes(" >>> ")) {
+      const resolves2 = await executePageScript(
+        wc,
+        `!!window.__vessel?.resolveShadowSelector?.(${JSON.stringify(authoritativeSelector)})`
+      );
+      if (resolves2) return authoritativeSelector;
+      return `__vessel_idx:${index}`;
+    }
+    const resolves = await executePageScript(
+      wc,
       `!!document.querySelector(${JSON.stringify(authoritativeSelector)})`
     );
     if (resolves) return authoritativeSelector;
     return `__vessel_idx:${index}`;
   }
-  const page = await extractContent(wc);
-  const extractedSelector = findSelectorByIndex(page, index);
-  if (extractedSelector) return extractedSelector;
-  return wc.executeJavaScript(
+  const fallbackSelector = await executePageScript(
+    wc,
     `
       (function() {
         // Final fallback: replicate the legacy extraction order.
@@ -7019,6 +7719,13 @@ async function resolveSelector$1(wc, index, selector) {
       })()
     `
   );
+  if (typeof fallbackSelector === "string" && fallbackSelector) {
+    return fallbackSelector;
+  }
+  const page = await extractContent(wc);
+  const extractedSelector = findSelectorByIndex(page, index);
+  if (extractedSelector) return extractedSelector;
+  return null;
 }
 function getTabByMatch$1(tabManager, match) {
   if (!match) return null;
@@ -7049,11 +7756,38 @@ function isDangerousAction$1(name) {
 async function setElementValue$1(wc, selector, value) {
   if (selector.startsWith("__vessel_idx:")) {
     const idx = Number(selector.slice("__vessel_idx:".length));
-    return wc.executeJavaScript(
+    const result2 = await executePageScript(
+      wc,
       `window.__vessel?.interactByIndex?.(${idx}, "value", ${JSON.stringify(value)}) || "Error: interactByIndex not available"`
     );
+    return result2 === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result2 || "Error: interactByIndex not available";
   }
-  return wc.executeJavaScript(`
+  if (selector.includes(" >>> ")) {
+    const result2 = await executePageScript(
+      wc,
+      `
+      (function() {
+        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
+        if (!el) return "Error[stale-index]: Shadow DOM element not found — call read_page to refresh.";
+        if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement)) return "Error[not-input]: Element is not a text input";
+        var proto = el instanceof HTMLTextAreaElement ? HTMLTextAreaElement.prototype : HTMLInputElement.prototype;
+        var desc = Object.getOwnPropertyDescriptor(proto, "value");
+        if (desc && desc.set) { desc.set.call(el, ${JSON.stringify(value)}); } else { el.value = ${JSON.stringify(value)}; }
+        el.focus();
+        el.dispatchEvent(new Event("input", { bubbles: true }));
+        el.dispatchEvent(new Event("change", { bubbles: true }));
+        return "Typed into: " + (el.getAttribute("aria-label") || el.placeholder || el.name || "input");
+      })()
+    `,
+      {
+        label: "type text in shadow input"
+      }
+    );
+    return result2 === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result2 || "Error: Could not type into element";
+  }
+  const result = await executePageScript(
+    wc,
+    `
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
       if (!el) return 'Error[stale-index]: Element not found — the page may have changed. Call read_page to refresh.';
@@ -7086,10 +7820,17 @@ async function setElementValue$1(wc, selector, value) {
         (el.getAttribute('aria-label') || el.placeholder || el.name || 'input') +
         ' = ' + (el.type === 'password' ? '[hidden]' : String(el.value).slice(0, 80));
     })()
-  `);
+  `,
+    {
+      label: "type text"
+    }
+  );
+  return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result || "Error: Could not type into element";
 }
 async function typeKeystroke$1(wc, selector, value) {
-  return wc.executeJavaScript(`
+  const result = await executePageScript(
+    wc,
+    `
     (async function() {
       const el = document.querySelector(${JSON.stringify(selector)});
       if (!el) return 'Error[stale-index]: Element not found — the page may have changed. Call read_page to refresh.';
@@ -7126,7 +7867,13 @@ async function typeKeystroke$1(wc, selector, value) {
         (el.getAttribute('aria-label') || el.placeholder || el.name || 'input') +
         ' = ' + (el.type === 'password' ? '[hidden]' : String(el.value).slice(0, 80));
     })()
-  `);
+  `,
+    {
+      timeoutMs: 2e3,
+      label: "type keystrokes"
+    }
+  );
+  return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result || "Error: Could not type into element";
 }
 async function hoverElement$1(wc, selector) {
   const pos = await wc.executeJavaScript(`
@@ -7152,7 +7899,8 @@ async function hoverElement$1(wc, selector) {
   if ("error" in pos && typeof pos.error === "string") return pos.error;
   const x = typeof pos.x === "number" ? pos.x : null;
   const y = typeof pos.y === "number" ? pos.y : null;
-  if (x == null || y == null) return "Error: Could not resolve hover coordinates";
+  if (x == null || y == null)
+    return "Error: Could not resolve hover coordinates";
   wc.sendInputEvent({ type: "mouseMove", x, y });
   const label = typeof pos.label === "string" ? pos.label : "element";
   return `Hovered: ${label}`;
@@ -7183,7 +7931,9 @@ async function waitForCondition$1(wc, args) {
   }
   const startedAt = Date.now();
   while (Date.now() - startedAt < timeoutMs) {
-    const result = await wc.executeJavaScript(`
+    const result = await executePageScript(
+      wc,
+      `
       (function() {
         var selector = ${JSON.stringify(selector)};
         var text = ${JSON.stringify(text)};
@@ -7197,7 +7947,14 @@ async function waitForCondition$1(wc, args) {
         if (text && document.body && document.body.innerText && document.body.innerText.includes(text)) return 'text';
         return '';
       })()
-    `);
+    `,
+      {
+        label: "wait_for probe"
+      }
+    );
+    if (result === PAGE_SCRIPT_TIMEOUT) {
+      return pageBusyError("wait_for");
+    }
     if (result === "selector") {
       return `Matched selector ${selector}`;
     }
@@ -7281,7 +8038,9 @@ ${formatFolderStatus$1()}`;
 async function selectOption$1(wc, args) {
   const selector = await resolveSelector$1(wc, args.index, args.selector);
   if (!selector) return "Error: No select element index or selector provided";
-  return wc.executeJavaScript(`
+  const result = await executePageScript(
+    wc,
+    `
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
       if (!(el instanceof HTMLSelectElement)) {
@@ -7305,13 +8064,20 @@ async function selectOption$1(wc, args) {
       el.dispatchEvent(new Event('change', { bubbles: true }));
       return 'Selected: ' + ((option.textContent || option.value).trim().slice(0, 100));
     })()
-  `);
+  `,
+    {
+      label: "select option"
+    }
+  );
+  return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("select_option") : result || "Error: Could not select option";
 }
 async function submitForm$1(wc, args) {
   const beforeUrl = wc.getURL();
   let selector = await resolveSelector$1(wc, args.index, args.selector);
   if (!selector) {
-    selector = await wc.executeJavaScript(`
+    const discoveredSelector = await executePageScript(
+      wc,
+      `
       (function() {
         var forms = document.querySelectorAll('form');
         for (var i = 0; i < forms.length; i++) {
@@ -7321,10 +8087,20 @@ async function submitForm$1(wc, args) {
         }
         return forms.length > 0 ? 'form' : null;
       })()
-    `);
+    `,
+      {
+        label: "discover form"
+      }
+    );
+    if (discoveredSelector === PAGE_SCRIPT_TIMEOUT) {
+      return pageBusyError("submit_form");
+    }
+    selector = discoveredSelector || null;
     if (!selector) return "Error: No form found on the page";
   }
-  const formInfo = await wc.executeJavaScript(`
+  const formInfo = await executePageScript(
+    wc,
+    `
     (function() {
       const target = document.querySelector(${JSON.stringify(selector)});
       if (!target) return { error: 'Target not found' };
@@ -7418,7 +8194,18 @@ async function submitForm$1(wc, args) {
       form.submit();
       return { submitted: true, method };
     })()
-  `);
+  `,
+    {
+      timeoutMs: 2e3,
+      label: "submit form"
+    }
+  );
+  if (formInfo === PAGE_SCRIPT_TIMEOUT) {
+    return pageBusyError("submit_form");
+  }
+  if (!formInfo || typeof formInfo !== "object") {
+    return "Error: Could not inspect form";
+  }
   if (formInfo.error) return formInfo.error;
   if (formInfo.found && formInfo.method === "GET") {
     const url = new URL(formInfo.action);
@@ -7433,7 +8220,37 @@ async function submitForm$1(wc, args) {
   if (formInfo.submitted) {
     await waitForPotentialNavigation$1(wc, beforeUrl);
     const afterUrl = wc.getURL();
-    return afterUrl !== beforeUrl ? `Submitted form via ${formInfo.method} -> ${afterUrl}` : `Submitted form via ${formInfo.method}`;
+    if (afterUrl !== beforeUrl) {
+      return `Submitted form via ${formInfo.method} -> ${afterUrl}`;
+    }
+    await executePageScript(
+      wc,
+      `
+      (function() {
+        var active = document.activeElement;
+        if (!active || active === document.body) {
+          var inputs = document.querySelectorAll('input[type="text"], input[type="search"], input:not([type])');
+          for (var i = 0; i < inputs.length; i++) {
+            if (inputs[i].value) { active = inputs[i]; active.focus(); break; }
+          }
+        }
+        if (active && active !== document.body) {
+          active.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', code: 'Enter', keyCode: 13, bubbles: true, cancelable: true }));
+          active.dispatchEvent(new KeyboardEvent('keypress', { key: 'Enter', code: 'Enter', keyCode: 13, bubbles: true, cancelable: true }));
+          active.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter', code: 'Enter', keyCode: 13, bubbles: true, cancelable: true }));
+        }
+      })()
+    `,
+      {
+        label: "submit form enter fallback"
+      }
+    );
+    wc.sendInputEvent({ type: "keyDown", keyCode: "Return" });
+    await new Promise((r) => setTimeout(r, 50));
+    wc.sendInputEvent({ type: "keyUp", keyCode: "Return" });
+    await waitForPotentialNavigation$1(wc, beforeUrl, 3e3);
+    const finalUrl = wc.getURL();
+    return finalUrl !== beforeUrl ? `Submitted form (Enter fallback) -> ${finalUrl}` : `Submitted form via ${formInfo.method} (page may have updated dynamically)`;
   }
   return "Submitted form";
 }
@@ -7441,30 +8258,52 @@ async function pressKey$1(wc, args) {
   const key = typeof args.key === "string" ? args.key.trim() : "";
   if (!key) return "Error: No key provided";
   const selector = await resolveSelector$1(wc, args.index, args.selector);
-  return wc.executeJavaScript(`
+  const focusResult = await executePageScript(
+    wc,
+    `
     (function() {
-      const key = ${JSON.stringify(key)};
       const selector = ${JSON.stringify(selector)};
       const target =
         selector ? document.querySelector(selector) : document.activeElement;
       if (!target || !(target instanceof HTMLElement)) {
-        return selector ? 'Target not found' : 'No focused element';
-      }
-      target.focus();
-      const eventInit = { key, bubbles: true, cancelable: true };
-      target.dispatchEvent(new KeyboardEvent('keydown', eventInit));
-      target.dispatchEvent(new KeyboardEvent('keypress', eventInit));
-      const tag = target.tagName;
-      const type = target instanceof HTMLInputElement ? target.type : '';
-      if (key === 'Enter' &&
-          typeof target.click === 'function' &&
-          (tag === 'BUTTON' || (tag === 'INPUT' && (type === 'submit' || type === 'button')))) {
-        target.click();
+        return { error: selector ? 'Target not found' : 'No focused element' };
       }
-      target.dispatchEvent(new KeyboardEvent('keyup', eventInit));
-      return 'Pressed key: ' + key;
+      target.focus({ preventScroll: false });
+      return {
+        ok: true,
+        label:
+          target.getAttribute('aria-label') ||
+          target.getAttribute('name') ||
+          target.getAttribute('placeholder') ||
+          target.textContent?.trim().slice(0, 60) ||
+          target.tagName.toLowerCase(),
+      };
     })()
-  `);
+  `,
+    {
+      label: "focus before key press"
+    }
+  );
+  if (focusResult === PAGE_SCRIPT_TIMEOUT) {
+    return pageBusyError("press_key");
+  }
+  if (!focusResult || typeof focusResult !== "object") {
+    return "Error: Could not prepare key press";
+  }
+  if ("error" in focusResult && typeof focusResult.error === "string") {
+    return focusResult.error;
+  }
+  wc.focus();
+  const normalizedKey = key.length === 1 ? key : key[0].toUpperCase() + key.slice(1);
+  const electronKeyCode = normalizedKey === "Enter" ? "Return" : normalizedKey === "ArrowUp" ? "Up" : normalizedKey === "ArrowDown" ? "Down" : normalizedKey === "ArrowLeft" ? "Left" : normalizedKey === "ArrowRight" ? "Right" : normalizedKey;
+  wc.sendInputEvent({ type: "keyDown", keyCode: electronKeyCode });
+  if (key.length === 1) {
+    wc.sendInputEvent({ type: "char", keyCode: key });
+  }
+  await sleep$1(16);
+  wc.sendInputEvent({ type: "keyUp", keyCode: electronKeyCode });
+  const label = "label" in focusResult && typeof focusResult.label === "string" ? focusResult.label : null;
+  return label ? `Pressed key: ${key} on ${label}` : `Pressed key: ${key}`;
 }
 async function getPostActionState$1(ctx, name) {
   const tab = ctx.tabManager.getActiveTab();
@@ -7483,7 +8322,13 @@ async function getPostActionState$1(ctx, name) {
     "search",
     "paginate"
   ];
-  const interactActions = ["type_text", "select_option", "hover", "focus", "fill_form"];
+  const interactActions = [
+    "type_text",
+    "select_option",
+    "hover",
+    "focus",
+    "fill_form"
+  ];
   const tabActions = [
     "create_tab",
     "switch_tab",
@@ -7491,33 +8336,11 @@ async function getPostActionState$1(ctx, name) {
     "load_session"
   ];
   if (navActions.includes(name)) {
-    let warning = "";
-    try {
-      const page = await extractContent(wc);
-      const issue = getRecoverableAccessIssue(page);
-      if (issue) {
-        const blockedUrl = wc.getURL();
-        const canRecover = [
-          "navigate",
-          "open_bookmark",
-          "click",
-          "submit_form",
-          "reload",
-          "press_key"
-        ].includes(name) && tab.canGoBack();
-        if (canRecover && tab.goBack()) {
-          await waitForLoad$1(wc);
-          warning = `
-[warning: ${issue.summary} ${issue.recommendation ?? ""} Automatically returned to ${wc.getURL()} after landing on ${blockedUrl}.]`;
-        } else {
-          warning = `
-[warning: ${issue.summary} ${issue.recommendation ?? ""}${tab.canGoBack() ? "" : " No previous page was available for automatic recovery."}]`;
-        }
-      }
-    } catch {
+    if (wc.isLoading()) {
+      await waitForLoad$1(wc);
     }
-    return `${warning}
-[state: url=${wc.getURL()}, canGoBack=${tab.canGoBack()}, canGoForward=${tab.canGoForward()}, loading=${wc.isLoading()}]`;
+    return `
+[state: url=${wc.getURL()}, title=${JSON.stringify(wc.getTitle() || "")}, canGoBack=${tab.canGoBack()}, canGoForward=${tab.canGoForward()}, loading=${wc.isLoading()}]`;
   }
   if (interactActions.includes(name)) {
     return `
@@ -7534,7 +8357,69 @@ async function getPostActionState$1(ctx, name) {
   }
   return "";
 }
+const KNOWN_TOOLS = /* @__PURE__ */ new Set([
+  "current_tab",
+  "list_tabs",
+  "switch_tab",
+  "create_tab",
+  "navigate",
+  "go_back",
+  "go_forward",
+  "reload",
+  "click",
+  "type_text",
+  "select_option",
+  "submit_form",
+  "press_key",
+  "scroll",
+  "hover",
+  "focus",
+  "set_ad_blocking",
+  "dismiss_popup",
+  "read_page",
+  "wait_for",
+  "create_checkpoint",
+  "restore_checkpoint",
+  "save_session",
+  "load_session",
+  "list_sessions",
+  "delete_session",
+  "list_bookmarks",
+  "search_bookmarks",
+  "create_bookmark_folder",
+  "save_bookmark",
+  "organize_bookmark",
+  "archive_bookmark",
+  "open_bookmark",
+  "highlight",
+  "clear_highlights",
+  "flow_start",
+  "flow_advance",
+  "flow_status",
+  "flow_end",
+  "suggest",
+  "fill_form",
+  "login",
+  "search",
+  "paginate",
+  "accept_cookies",
+  "extract_table",
+  "scroll_to_element",
+  "metrics",
+  "wait_for_navigation"
+]);
 async function executeAction(name, args, ctx) {
+  if (!KNOWN_TOOLS.has(name)) {
+    for (const known of KNOWN_TOOLS) {
+      if (name.startsWith(known) && name.length > known.length) {
+        const remaining = name.slice(known.length);
+        const otherTools = [...KNOWN_TOOLS].filter(
+          (t) => remaining.includes(t)
+        );
+        return `Error: It looks like you tried to call multiple tools at once (${known}, ${otherTools.join(", ")}). Please call them one at a time — send one tool call per message.`;
+      }
+    }
+  }
   const tab = ctx.tabManager.getActiveTab();
   const tabId = ctx.tabManager.getActiveTabId();
   if (!tab && ![
@@ -7617,6 +8502,7 @@ async function executeAction(name, args, ctx) {
           const created = ctx.tabManager.getActiveTab();
           if (created) {
             await waitForLoad$1(created.view.webContents);
+            return `Created tab ${createdId}${getPostNavSummary(created.view.webContents)}`;
           }
           return `Created tab ${createdId}`;
         }
@@ -7624,7 +8510,7 @@ async function executeAction(name, args, ctx) {
           if (!wc || !tabId) return "Error: No active tab";
           ctx.tabManager.navigateTab(tabId, args.url);
           await waitForLoad$1(wc);
-          return `Navigated to ${wc.getURL()}`;
+          return `Navigated to ${wc.getURL()}${getPostNavSummary(wc)}`;
         }
         case "go_back": {
           if (!tab || !wc || !tabId) return "Error: No active tab";
@@ -7635,7 +8521,7 @@ async function executeAction(name, args, ctx) {
           ctx.tabManager.goBack(tabId);
           await waitForLoad$1(wc);
           const afterUrl = wc.getURL();
-          return afterUrl !== beforeUrl ? `Went back to ${afterUrl}` : `Back action completed but page stayed on ${afterUrl}`;
+          return afterUrl !== beforeUrl ? `Went back to ${afterUrl}${getPostNavSummary(wc)}` : `Back action completed but page stayed on ${afterUrl}`;
         }
         case "go_forward": {
           if (!tab || !wc || !tabId) return "Error: No active tab";
@@ -7646,7 +8532,7 @@ async function executeAction(name, args, ctx) {
           ctx.tabManager.goForward(tabId);
           await waitForLoad$1(wc);
           const afterUrl = wc.getURL();
-          return afterUrl !== beforeUrl ? `Went forward to ${afterUrl}` : `Forward action completed but page stayed on ${afterUrl}`;
+          return afterUrl !== beforeUrl ? `Went forward to ${afterUrl}${getPostNavSummary(wc)}` : `Forward action completed but page stayed on ${afterUrl}`;
         }
         case "reload": {
           if (!wc || !tabId) return "Error: No active tab";
@@ -7750,28 +8636,110 @@ async function executeAction(name, args, ctx) {
         }
         case "read_page": {
           if (!wc) return "Error: No active tab";
-          const content = await extractContent(wc);
-          const liveSelectionSection = formatLiveSelectionSection(
-            await captureLiveHighlightSnapshot(
-              wc,
-              getHighlightsForUrl(content.url)
-            )
+          console.log("[Vessel read_page] starting extraction with 6s timeout");
+          let content = null;
+          try {
+            content = await Promise.race([
+              extractContent(wc),
+              new Promise(
+                (resolve) => setTimeout(() => {
+                  console.log("[Vessel read_page] timeout fired, falling back");
+                  resolve(null);
+                }, 6e3)
+              )
+            ]);
+          } catch {
+            content = null;
+          }
+          console.log(
+            `[Vessel read_page] extraction result: ${content ? `content=${content.content.length}` : "null (timeout)"}`
           );
-          const structured = buildStructuredContext(content);
-          const truncated = content.content.length > 2e4 ? content.content.slice(0, 2e4) + "\n[Content truncated...]" : content.content;
-          const livePrefix = liveSelectionSection ? `${liveSelectionSection}
+          if (content) {
+            const liveSelectionSection = formatLiveSelectionSection(
+              await captureLiveHighlightSnapshot(
+                wc,
+                getHighlightsForUrl(content.url)
+              )
+            );
+            const livePrefix = liveSelectionSection ? `${liveSelectionSection}
 
 ` : "";
-          return `${livePrefix}${structured}
+            const requestedMode = normalizeReadPageMode(args.mode, content);
+            if (requestedMode === "debug" || requestedMode === "full") {
+              const structured = buildStructuredContext(content);
+              const truncated = content.content.length > 2e4 ? content.content.slice(0, 2e4) + "\n[Content truncated...]" : content.content;
+              return `${livePrefix}[read_page mode=debug]
+
+${structured}
 
 ## PAGE CONTENT
 
 ${truncated}`;
+            }
+            const scoped = buildScopedContext(content, requestedMode);
+            return [
+              livePrefix ? livePrefix.trimEnd() : "",
+              `[read_page mode=${requestedMode}]`,
+              "",
+              scoped,
+              "",
+              `Need more detail? Escalate with read_page(mode="debug") only if the narrow modes are insufficient.`
+            ].filter(Boolean).join("\n\n");
+          }
+          const title = wc.getTitle() || "(untitled)";
+          const url = wc.getURL();
+          return [
+            `# ${title}`,
+            `URL: ${url}`,
+            "",
+            "[Page content extraction timed out — the page JS thread is busy.]",
+            "[Use the search tool to search the site, or type_text/click to interact directly.]",
+            "[You can retry read_page in a few seconds once the page finishes loading.]"
+          ].join("\n");
         }
         case "wait_for": {
           if (!wc) return "Error: No active tab";
           return waitForCondition$1(wc, args);
         }
+        case "wait_for_navigation": {
+          if (!wc) return "Error: No active tab";
+          const timeout = typeof args.timeoutMs === "number" ? args.timeoutMs : 1e4;
+          const beforeUrl = wc.getURL();
+          if (wc.isLoading()) {
+            await new Promise((resolve) => {
+              const timer = setTimeout(resolve, timeout);
+              wc.once("did-stop-loading", () => {
+                clearTimeout(timer);
+                resolve();
+              });
+            });
+          } else {
+            await new Promise((resolve) => {
+              let navigated = false;
+              const timer = setTimeout(
+                () => {
+                  if (!navigated) resolve();
+                },
+                Math.min(timeout, 2e3)
+              );
+              wc.once("did-start-loading", () => {
+                navigated = true;
+                clearTimeout(timer);
+                const loadTimer = setTimeout(resolve, timeout);
+                wc.once("did-stop-loading", () => {
+                  clearTimeout(loadTimer);
+                  resolve();
+                });
+              });
+            });
+          }
+          const afterUrl = wc.getURL();
+          const title = wc.getTitle();
+          if (afterUrl !== beforeUrl) {
+            return `Navigation complete: ${title} (${afterUrl})`;
+          }
+          return `Page loaded: ${title} (${afterUrl})`;
+        }
         case "create_checkpoint": {
           const checkpoint = ctx.runtime.createCheckpoint(args.name, args.note);
           return `Created checkpoint ${checkpoint.name} (${checkpoint.id})`;
@@ -8031,12 +8999,26 @@ ${truncated}`;
         case "highlight": {
           if (!wc) return "Error: No active tab";
           const selector = await resolveSelector$1(wc, args.index, args.selector);
+          const highlightColor = args.color || "yellow";
+          const url = wc.getURL();
+          if (url && url !== "about:blank") {
+            const highlightText = typeof args.text === "string" ? args.text : void 0;
+            addHighlight(
+              url,
+              typeof selector === "string" ? selector : void 0,
+              highlightText,
+              typeof args.label === "string" ? args.label : void 0,
+              highlightColor,
+              "agent"
+            );
+          }
           return highlightOnPage(
             wc,
             selector,
             args.text,
             args.label,
-            args.durationMs
+            args.durationMs,
+            highlightColor
           );
         }
         case "clear_highlights": {
@@ -8047,7 +9029,8 @@ ${truncated}`;
         case "flow_start": {
           const goal = typeof args.goal === "string" ? args.goal : "";
           const steps = Array.isArray(args.steps) ? args.steps.map(String) : [];
-          if (!goal || steps.length === 0) return "Error: goal and steps are required";
+          if (!goal || steps.length === 0)
+            return "Error: goal and steps are required";
           const flow = ctx.runtime.startFlow(goal, steps, wc?.getURL());
           return `Flow started: ${flow.goal}
 ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`;
@@ -8092,47 +9075,70 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
             (el) => el.inputType === "search" || el.name === "q" || el.name === "query" || (el.placeholder || "").toLowerCase().includes("search")
           );
           const formCount = page.forms.length;
-          const totalFields = page.forms.reduce((n, f) => n + f.fields.length, 0);
-          const linkCount = page.interactiveElements.filter((el) => el.type === "link").length;
+          const totalFields = page.forms.reduce(
+            (n, f) => n + f.fields.length,
+            0
+          );
+          const linkCount = page.interactiveElements.filter(
+            (el) => el.type === "link"
+          ).length;
           const hasPagination = page.interactiveElements.some(
             (el) => (el.text || "").toLowerCase() === "next" || el.text === "›" || el.text === "»"
           );
           const hasOverlays = page.overlays.some((o) => o.blocksInteraction);
           if (hasOverlays) {
             suggestions.push("BLOCKING OVERLAY detected — dismiss it first:");
-            suggestions.push("  → dismiss_popup or click on close/accept button");
+            suggestions.push(
+              "  → dismiss_popup or click on close/accept button"
+            );
             suggestions.push("");
           }
           if (hasPasswordField) {
             suggestions.push("LOGIN PAGE detected:");
-            suggestions.push("  → login(username, password) — handles the full flow");
-            suggestions.push("  → Or fill_form + submit_form for manual control");
+            suggestions.push(
+              "  → login(username, password) — handles the full flow"
+            );
+            suggestions.push(
+              "  → Or fill_form + submit_form for manual control"
+            );
           } else if (hasSearchInput && linkCount < 10) {
             suggestions.push("SEARCH PAGE detected:");
-            suggestions.push("  → search(query) — finds the box, types, submits");
+            suggestions.push(
+              "  → search(query) — finds the box, types, submits"
+            );
           } else if (hasSearchInput && linkCount >= 10) {
             suggestions.push("SEARCH RESULTS detected:");
             suggestions.push("  → click on a result link");
-            if (hasPagination) suggestions.push("  → paginate('next') for more results");
+            if (hasPagination)
+              suggestions.push("  → paginate('next') for more results");
           } else if (formCount > 0) {
             suggestions.push(`FORM detected (${totalFields} fields):`);
             suggestions.push("  → fill_form(fields) — fill all fields at once");
           } else if (hasPagination) {
             suggestions.push("PAGINATED CONTENT:");
-            suggestions.push("  → read_page to read this page");
+            suggestions.push(
+              "  → read_page(mode='results_only') to inspect likely results"
+            );
             suggestions.push("  → paginate('next') for the next page");
           } else if (page.content.length > 3e3 && page.interactiveElements.length < 10) {
             suggestions.push("ARTICLE/CONTENT page:");
-            suggestions.push("  → read_page for readable text");
+            suggestions.push("  → read_page(mode='summary') for a fast brief");
+            suggestions.push(
+              "  → read_page(mode='text_only') for readable text"
+            );
             suggestions.push("  → scroll to see more");
           } else {
             suggestions.push("GENERAL PAGE:");
-            suggestions.push("  → read_page to understand the page structure");
+            suggestions.push(
+              "  → read_page(mode='visible_only') to inspect active controls"
+            );
             suggestions.push("  → click on any element by index");
             suggestions.push("  → navigate to go somewhere new");
           }
           suggestions.push("");
-          suggestions.push(`Available: ${page.interactiveElements.length} interactive elements, ${formCount} forms, ${linkCount} links`);
+          suggestions.push(
+            `Available: ${page.interactiveElements.length} interactive elements, ${formCount} forms, ${linkCount} links`
+          );
           return suggestions.join("\n");
         }
         case "fill_form": {
@@ -8146,11 +9152,19 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
               results.push(`Skipped: no selector for index=${field.index}`);
               continue;
             }
-            const result2 = await setElementValue$1(wc, sel, String(field.value || ""));
+            const result2 = await setElementValue$1(
+              wc,
+              sel,
+              String(field.value || "")
+            );
             results.push(result2);
           }
           if (args.submit) {
-            const firstSel = await resolveSelector$1(wc, fields[0]?.index, fields[0]?.selector);
+            const firstSel = await resolveSelector$1(
+              wc,
+              fields[0]?.index,
+              fields[0]?.selector
+            );
             if (firstSel) {
               const beforeUrl = wc.getURL();
               const submitResult = await submitForm$1(wc, { selector: firstSel });
@@ -8173,29 +9187,53 @@ ${results.join("\n")}`;
             await waitForLoad$1(wc);
             steps.push(`Navigated to ${wc.getURL()}`);
           }
-          const userSel = args.username_selector || await wc.executeJavaScript(`
+          const userSel = args.username_selector || await executePageScript(
+            wc,
+            `
               (function() {
                 var el = document.querySelector('input[type="email"], input[name="email"], input[name="username"], input[name="user"], input[autocomplete="username"], input[autocomplete="email"], input[type="text"]:not([name="search"]):not([name="q"])');
                 return el ? (el.id ? '#' + CSS.escape(el.id) : el.name ? 'input[name="' + el.name + '"]' : null) : null;
               })()
-            `);
-          if (!userSel) return "Error: Could not find username/email field. Try providing username_selector.";
-          const passSel = args.password_selector || await wc.executeJavaScript(`
+            `,
+            {
+              label: "find username field"
+            }
+          );
+          if (!userSel)
+            return "Error: Could not find username/email field. Try providing username_selector.";
+          const passSel = args.password_selector || await executePageScript(
+            wc,
+            `
               (function() {
                 var el = document.querySelector('input[type="password"]');
                 return el ? (el.id ? '#' + CSS.escape(el.id) : el.name ? 'input[name="' + el.name + '"]' : null) : null;
               })()
-            `);
-          if (!passSel) return "Error: Could not find password field. Try providing password_selector.";
-          const userResult = await setElementValue$1(wc, userSel, String(args.username || ""));
+            `,
+            {
+              label: "find password field"
+            }
+          );
+          if (!passSel)
+            return "Error: Could not find password field. Try providing password_selector.";
+          const userResult = await setElementValue$1(
+            wc,
+            userSel,
+            String(args.username || "")
+          );
           steps.push(userResult);
-          const passResult = await setElementValue$1(wc, passSel, String(args.password || ""));
+          const passResult = await setElementValue$1(
+            wc,
+            passSel,
+            String(args.password || "")
+          );
           steps.push(passResult);
           const beforeUrl = wc.getURL();
           if (args.submit_selector) {
             await clickResolvedSelector$1(wc, args.submit_selector);
           } else {
-            const clicked = await wc.executeJavaScript(`
+            const clicked = await executePageScript(
+              wc,
+              `
               (function() {
                 var btn = document.querySelector('button[type="submit"], input[type="submit"], form button:not([type="button"])');
                 if (btn) { btn.click(); return true; }
@@ -8203,8 +9241,16 @@ ${results.join("\n")}`;
                 if (form) { form.requestSubmit ? form.requestSubmit() : form.submit(); return true; }
                 return false;
               })()
-            `);
-            if (!clicked) return steps.join("\n") + "\nWarning: Could not find submit button. Credentials filled but form not submitted.";
+            `,
+              {
+                label: "submit login form"
+              }
+            );
+            if (clicked === PAGE_SCRIPT_TIMEOUT) {
+              return pageBusyError("login");
+            }
+            if (!clicked)
+              return steps.join("\n") + "\nWarning: Could not find submit button. Credentials filled but form not submitted.";
           }
           await waitForPotentialNavigation$1(wc, beforeUrl);
           const afterUrl = wc.getURL();
@@ -8212,42 +9258,137 @@ ${results.join("\n")}`;
             afterUrl !== beforeUrl ? `Submitted → ${afterUrl}` : "Form submitted (same page)"
           );
           return `Login flow complete:
-${steps.join("\n")}`;
-        }
-        case "search": {
-          if (!wc) return "Error: No active tab";
-          const searchSel = args.selector || await wc.executeJavaScript(`
-              (function() {
-                var el = document.querySelector('input[type="search"], input[name="q"], input[name="query"], input[name="search"], input[role="searchbox"], input[aria-label*="search" i], input[placeholder*="search" i]');
-                if (!el) {
-                  var inputs = document.querySelectorAll('input[type="text"]');
-                  for (var i = 0; i < inputs.length; i++) {
-                    var form = inputs[i].closest('form');
-                    if (form && (form.getAttribute('role') === 'search' || form.action?.includes('search'))) {
-                      el = inputs[i];
-                      break;
+${steps.join("\n")}`;
+        }
+        case "search": {
+          if (!wc) return "Error: No active tab";
+          const query = String(args.query || "");
+          if (!query) return "Error: No search query provided.";
+          const searchInfo = args.selector ? { selector: args.selector, formAction: null, formMethod: null } : await executePageScript(
+            wc,
+            `
+              (function() {
+                var SELECTORS = 'input[type="search"], input[name="q"], input[name="query"], input[name="search"], input[role="searchbox"], input[aria-label*="search" i], input[placeholder*="search" i]';
+                function find() {
+                  var el = document.querySelector(SELECTORS);
+                  if (!el) {
+                    var inputs = document.querySelectorAll('input[type="text"]');
+                    for (var i = 0; i < inputs.length; i++) {
+                      var form = inputs[i].closest('form');
+                      if (form && (form.getAttribute('role') === 'search' || (form.action && form.action.includes('search')))) {
+                        el = inputs[i];
+                        break;
+                      }
                     }
                   }
+                  if (!el) return null;
+                  var sel = el.id ? '#' + CSS.escape(el.id) : el.name ? 'input[name="' + el.name + '"]' : null;
+                  var form = el.closest('form');
+                  return {
+                    selector: sel,
+                    formAction: form ? form.action : null,
+                    formMethod: form ? (form.method || 'GET').toUpperCase() : null,
+                    inputName: el.name || 'q',
+                  };
                 }
-                return el ? (el.id ? '#' + CSS.escape(el.id) : el.name ? 'input[name="' + el.name + '"]' : null) : null;
+                return new Promise(function(resolve) {
+                  var result = find();
+                  if (result) { resolve(result); return; }
+                  var attempts = 0;
+                  var timer = setInterval(function() {
+                    result = find();
+                    if (result || ++attempts >= 20) {
+                      clearInterval(timer);
+                      resolve(result);
+                    }
+                  }, 250);
+                });
               })()
-            `);
-          if (!searchSel) return "Error: Could not find search input. Try providing a selector.";
-          await setElementValue$1(wc, searchSel, String(args.query || ""));
-          await wc.executeJavaScript(`
+            `,
+            {
+              timeoutMs: 1800,
+              label: "find search input"
+            }
+          );
+          if (searchInfo === PAGE_SCRIPT_TIMEOUT) {
+            return pageBusyError("search");
+          }
+          if (!searchInfo?.selector)
+            return "Error: Could not find search input. Try providing a selector.";
+          const fillResult = await setElementValue$1(
+            wc,
+            searchInfo.selector,
+            query
+          );
+          if (fillResult.startsWith("Error:")) {
+            return fillResult;
+          }
+          await sleep$1(100);
+          const focusResult = await executePageScript(
+            wc,
+            `
             (function() {
-              var el = document.querySelector(${JSON.stringify(searchSel)});
+              var el = document.querySelector(${JSON.stringify(searchInfo.selector)});
               if (el) el.focus();
             })()
-          `);
+          `,
+            {
+              label: "focus search input"
+            }
+          );
+          if (focusResult === PAGE_SCRIPT_TIMEOUT) {
+            return pageBusyError("search");
+          }
           await sleep$1(50);
           const beforeUrl = wc.getURL();
           wc.sendInputEvent({ type: "keyDown", keyCode: "Return" });
           await sleep$1(16);
           wc.sendInputEvent({ type: "keyUp", keyCode: "Return" });
-          await waitForPotentialNavigation$1(wc, beforeUrl);
-          const afterUrl = wc.getURL();
-          return afterUrl !== beforeUrl ? `Searched "${args.query}" → ${afterUrl}` : `Searched "${args.query}" (same page — results may have loaded dynamically)`;
+          await waitForPotentialNavigation$1(wc, beforeUrl, 3e3);
+          let afterUrl = wc.getURL();
+          if (afterUrl !== beforeUrl) {
+            return `Searched "${query}" → ${afterUrl}`;
+          }
+          const clickedSubmit = await executePageScript(
+            wc,
+            `
+            (function() {
+              var form = document.querySelector(${JSON.stringify(searchInfo.selector)})?.closest('form');
+              if (!form) return false;
+              var btn = form.querySelector('button[type="submit"], input[type="submit"], button:not([type])');
+              if (btn) { btn.click(); return true; }
+              // Try any button in the form
+              var anyBtn = form.querySelector('button');
+              if (anyBtn) { anyBtn.click(); return true; }
+              return false;
+            })()
+          `,
+            {
+              label: "click search submit"
+            }
+          );
+          if (clickedSubmit === PAGE_SCRIPT_TIMEOUT) {
+            return pageBusyError("search");
+          }
+          if (clickedSubmit) {
+            await waitForPotentialNavigation$1(wc, beforeUrl, 3e3);
+            afterUrl = wc.getURL();
+            if (afterUrl !== beforeUrl) {
+              return `Searched "${query}" (via submit button) → ${afterUrl}`;
+            }
+          }
+          if (searchInfo.formAction && searchInfo.formMethod === "GET") {
+            try {
+              const url = new URL(searchInfo.formAction);
+              url.searchParams.set(searchInfo.inputName || "q", query);
+              wc.loadURL(url.toString());
+              await waitForPotentialNavigation$1(wc, beforeUrl);
+              afterUrl = wc.getURL();
+              return `Searched "${query}" (via direct URL) → ${afterUrl}`;
+            } catch {
+            }
+          }
+          return `Searched "${query}" (same page — results may have loaded dynamically)`;
         }
         case "paginate": {
           if (!wc) return "Error: No active tab";
@@ -8256,7 +9397,9 @@ ${steps.join("\n")}`;
             return clickResolvedSelector$1(wc, args.selector);
           }
           const isNext = args.direction === "next";
-          const clicked = await wc.executeJavaScript(`
+          const clicked = await executePageScript(
+            wc,
+            `
             (function() {
               var patterns = ${isNext ? '["next", "Next", "›", "»", "→", ">", "Next Page", "Load More"]' : '["prev", "Prev", "Previous", "‹", "«", "←", "<", "Previous Page"]'};
               var links = document.querySelectorAll('a, button');
@@ -8275,12 +9418,156 @@ ${steps.join("\n")}`;
               }
               return false;
             })()
-          `);
-          if (!clicked) return `Error: Could not find ${args.direction} pagination control. Try providing a selector.`;
+          `,
+            {
+              label: "paginate"
+            }
+          );
+          if (clicked === PAGE_SCRIPT_TIMEOUT) {
+            return pageBusyError("paginate");
+          }
+          if (!clicked)
+            return `Error: Could not find ${args.direction} pagination control. Try providing a selector.`;
           await waitForPotentialNavigation$1(wc, beforeUrl);
           const afterUrl = wc.getURL();
           return afterUrl !== beforeUrl ? `Paginated ${args.direction} → ${afterUrl}` : `Clicked ${args.direction} (page may have updated dynamically)`;
         }
+        case "accept_cookies": {
+          if (!wc) return "Error: No active tab";
+          const dismissed = await executePageScript(
+            wc,
+            `
+            (function() {
+              // Common cookie consent selectors — OneTrust, CookieBot, GDPR banners
+              var selectors = [
+                '#onetrust-accept-btn-handler',
+                '#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll',
+                '[data-cookiefirst-action="accept"]',
+                '.cookie-consent-accept-all',
+                '#accept-cookies',
+                '.cc-accept',
+                '.cc-btn.cc-allow',
+                '[aria-label="Accept cookies"]',
+                '[aria-label="Accept all cookies"]',
+                '[data-testid="cookie-accept"]',
+              ];
+              // Also try text-matching on buttons
+              var textPatterns = ['accept all', 'accept cookies', 'allow all', 'allow cookies', 'agree', 'got it', 'ok', 'i agree', 'consent'];
+              for (var i = 0; i < selectors.length; i++) {
+                var el = document.querySelector(selectors[i]);
+                if (el && el instanceof HTMLElement) { el.click(); return "Dismissed cookie banner via: " + selectors[i]; }
+              }
+              var buttons = document.querySelectorAll('button, a[role="button"], [type="submit"]');
+              for (var j = 0; j < buttons.length; j++) {
+                var btn = buttons[j];
+                var text = (btn.textContent || '').trim().toLowerCase();
+                for (var k = 0; k < textPatterns.length; k++) {
+                  if (text === textPatterns[k] || text.startsWith(textPatterns[k])) {
+                    btn.click();
+                    return "Dismissed cookie banner via text match: " + text;
+                  }
+                }
+              }
+              return null;
+            })()
+          `,
+            {
+              label: "accept cookies"
+            }
+          );
+          if (dismissed === PAGE_SCRIPT_TIMEOUT) {
+            return pageBusyError("accept_cookies");
+          }
+          return dismissed || "No cookie consent banner detected. Try dismiss_popup for other overlays.";
+        }
+        case "extract_table": {
+          if (!wc) return "Error: No active tab";
+          const selector = args.selector ? args.selector : args.index != null ? await resolveSelector$1(wc, args.index, void 0) : null;
+          const tableJson = await wc.executeJavaScript(`
+            (function() {
+              var table = ${selector ? `document.querySelector(${JSON.stringify(selector)})` : "document.querySelector('table')"};
+              if (!table) return null;
+              var headers = [];
+              var headerRow = table.querySelector('thead tr') || table.querySelector('tr');
+              if (headerRow) {
+                headerRow.querySelectorAll('th, td').forEach(function(cell) {
+                  headers.push(cell.textContent.trim());
+                });
+              }
+              var rows = [];
+              var bodyRows = table.querySelectorAll('tbody tr');
+              if (bodyRows.length === 0) bodyRows = table.querySelectorAll('tr');
+              bodyRows.forEach(function(tr, idx) {
+                if (idx === 0 && headers.length > 0 && !table.querySelector('thead')) return;
+                var row = {};
+                tr.querySelectorAll('td, th').forEach(function(cell, ci) {
+                  var key = headers[ci] || ("col_" + ci);
+                  row[key] = cell.textContent.trim();
+                });
+                if (Object.keys(row).length > 0) rows.push(row);
+              });
+              return { headers: headers, rows: rows, rowCount: rows.length };
+            })()
+          `);
+          if (!tableJson) return "Error: No table found on the page.";
+          return `Extracted table (${tableJson.rowCount} rows):
+${JSON.stringify(tableJson, null, 2)}`;
+        }
+        case "metrics": {
+          const m = ctx.runtime.getMetrics();
+          const lines = [
+            `Session Metrics:`,
+            `  Total actions: ${m.totalActions}`,
+            `  Completed: ${m.completedActions}`,
+            `  Failed: ${m.failedActions}`,
+            `  Average duration: ${m.averageDurationMs}ms`,
+            ``,
+            `Tool breakdown:`
+          ];
+          for (const [name2, stats] of Object.entries(m.toolBreakdown)) {
+            lines.push(
+              `  ${name2}: ${stats.count} calls, avg ${stats.avgMs}ms${stats.errors > 0 ? `, ${stats.errors} errors` : ""}`
+            );
+          }
+          return lines.join("\n");
+        }
+        case "scroll_to_element": {
+          if (!wc) return "Error: No active tab";
+          const sel = await resolveSelector$1(wc, args.index, args.selector);
+          if (!sel)
+            return "Error: Provide an index or selector for the element to scroll to.";
+          const block = args.position === "top" ? "start" : args.position === "bottom" ? "end" : "center";
+          if (sel.startsWith("__vessel_idx:")) {
+            const idx = Number(sel.slice("__vessel_idx:".length));
+            return wc.executeJavaScript(`
+              (function() {
+                var el = window.__vessel?.interactByIndex && Object.values(window.__vessel)[2];
+                var ref = (function() { try { return document.querySelector('[data-vessel-idx="${idx}"]'); } catch(e) { return null; } })();
+                if (!ref) return "Error: Element not found";
+                ref.scrollIntoView({ behavior: "smooth", block: "${block}" });
+                return "Scrolled to element #${idx}";
+              })()
+            `);
+          }
+          if (sel.includes(" >>> ")) {
+            return wc.executeJavaScript(`
+              (function() {
+                var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(sel)});
+                if (!el) return "Error: Shadow DOM element not found";
+                el.scrollIntoView({ behavior: "smooth", block: "${block}" });
+                return "Scrolled to shadow DOM element";
+              })()
+            `);
+          }
+          return wc.executeJavaScript(`
+            (function() {
+              var el = document.querySelector(${JSON.stringify(sel)});
+              if (!el) return "Error: Element not found";
+              el.scrollIntoView({ behavior: "smooth", block: "${block}" });
+              return "Scrolled to element";
+            })()
+          `);
+        }
         default:
           return `Unknown tool: ${name}`;
       }
@@ -8294,9 +9581,17 @@ async function handleAIQuery(query, provider, activeWebContents, onChunk, onEnd,
   const isSummarize = lowerQuery.startsWith("summarize") || lowerQuery.startsWith("tldr") || lowerQuery === "summary";
   if (provider.streamAgentQuery && tabManager && activeWebContents && runtime) {
     try {
+      const extractStart = Date.now();
       const pageContent = await extractContent(activeWebContents);
-      const structuredContext = buildStructuredContext(pageContent);
-      const truncated = pageContent.content.length > 2e4 ? pageContent.content.slice(0, 2e4) + "\n[Content truncated...]" : pageContent.content;
+      console.log(
+        `[Vessel Agent] initial extractContent completed in ${Date.now() - extractStart}ms, contentLen=${pageContent.content.length}`
+      );
+      const pageType = detectPageType(pageContent);
+      const defaultReadMode = chooseAgentReadMode(pageContent);
+      const structuredContext = buildScopedContext(
+        pageContent,
+        defaultReadMode
+      );
       const runtimeState = runtime.getState();
       const recentCheckpoints = runtimeState.checkpoints.slice(-3).map((item) => `- ${item.name} (${item.id})`).join("\n");
       const activeTabTitle = pageContent.title || "(untitled)";
@@ -8311,13 +9606,14 @@ THE USER IS CURRENTLY LOOKING AT:
   Title: ${activeTabTitle}
   URL: ${activeTabUrl}${tabSummary}
 
-When the user says "this page", "this article", "this site", or asks about what they're viewing, they mean the page above. The content below is from that page — answer directly without needing to call read_page or current_tab first.
+When the user says "this page", "this article", "this site", or asks about what they're viewing, they mean the page above. The context below is from that page — answer directly without needing to call read_page or current_tab first.
 
 Current page context:
-${structuredContext}
+This brief is intentionally minimal and filtered for speed. It omits most page text and low-value chrome unless you explicitly ask for more.
+Default brief mode: ${defaultReadMode}
+Detected page type: ${pageType}
 
-Page content:
-${truncated}
+${structuredContext}
 
 Supervisor state:
 - paused: ${runtimeState.supervisor.paused ? "yes" : "no"}
@@ -8336,7 +9632,11 @@ Instructions:
 - Create a checkpoint before risky multi-step flows or before leaving an important state.
 - Use save_session after completing a login flow you may need again later, and load_session to resume that authenticated state in future runs.
 - Prefer select_option for dropdowns and submit_form for forms instead of guessing with clicks.
-- After clicking or navigating, use read_page to see the updated content.
+- After navigating to a new site, DO NOT call read_page immediately. Instead, act on what you already know: use the search tool to search the site, type_text to enter queries in search bars, or click on known navigation patterns. You know what major sites look like — use that knowledge. Only call read_page if you're genuinely stuck and need to discover unfamiliar page structure.
+- The page brief you start with is intentionally sparse. It is optimized for navigation speed, not completeness.
+- Escalate page reads progressively: read_page(mode="visible_only"), read_page(mode="results_only"), read_page(mode="forms_only"), read_page(mode="summary"), or read_page(mode="text_only") depending on what you need.
+- Use read_page(mode="debug") only as a last resort when the narrower modes are insufficient.
+- After clicking or submitting a form, prefer wait_for on a specific result signal or a narrow read_page mode. Do not jump straight to read_page(mode="debug").
 - If the user says they highlighted or selected text, use read_page before falling back to screenshots because it includes active selection and visible unsaved highlights.
 - If a page behaves abnormally or key UI fails to load, consider disabling ad blocking for that tab and reloading before retrying.
 - For broad discovery tasks, prefer direct sources, official sites, venue directories, and site-specific search over generic search engines, which often rate-limit automated browser traffic.
@@ -8344,13 +9644,19 @@ Instructions:
 - Reference interactive elements by their index number (shown as [#N] in the listings above).
 - Be concise. Explain what you're doing as you go.
 - For simple questions about the page, just answer directly without using tools.
-- You have a highlight tool that visually marks elements on the page for the user. Use it when the user asks you to highlight, mark, or draw attention to specific content. Colors: yellow (default), red (errors), green (success), blue (info), purple (important), orange (warnings).
-- After completing a task or answering a question, offer 1-2 brief, natural follow-up suggestions that make sense in context (e.g. "Want me to highlight any of these?" or "I can save these to a bookmark folder if you'd like"). Keep suggestions short and conversational — don't list every possible action.`;
+- VISUAL AWARENESS: The human is watching the browser alongside this chat. Highlights are your pointing finger — they show the user exactly what you're looking at on the page. Use them proactively: highlight key findings, important elements, errors, or anything you're referencing. Don't wait to be asked. If you mention something specific on the page, highlight it. Colors: yellow (default/attention), red (errors/warnings), green (success/good), blue (info/neutral), purple (important/notable), orange (caution). Clear highlights when moving to a new topic or page.
+- After completing a task or answering a question, offer 1-2 brief, natural follow-up suggestions that make sense in context (e.g. "Want me to highlight any of these?" or "I can save these to a bookmark folder if you'd like"). Keep suggestions short and conversational — don't list every possible action.
+- Call one tool at a time unless you are certain your provider supports parallel tool calls. Sequential calls are more reliable.
+- MINIMIZE TOOL CALLS: Every tool call takes time and costs a round trip. Be efficient. Don't use flow_start/flow_advance for simple multi-step tasks — just do the work. Don't call read_page after navigating — use search or type_text directly. Don't retry failed tools with slight variations — if search fails, go straight to type_text + press_key Enter, don't try read_page in between. The fastest path is usually: navigate → search → wait_for or read_page(mode="results_only") → click.
+- ACT, DON'T HEDGE: You have a full browser — you can navigate to any website, see live content, search, click, add to cart, fill forms, and interact with real pages in real time. Never claim you "don't have access" to a website's inventory, pricing, or content. If the user asks you to go somewhere and do something, start doing it immediately. Don't ask for permission to do what the user just asked you to do — that's redundant and frustrating. Jump straight into action.
+- USE YOUR KNOWLEDGE: You have broad, practical knowledge about technology, products, cooking, travel, finance, and countless other domains. When the user asks for recommendations, GIVE them — don't deflect to Reddit, YouTubers, or other sources. You know enough to recommend PC parts, suggest restaurants, pick a good laptop, or advise on most consumer decisions. Make a clear recommendation, explain your reasoning briefly, and then execute. If there's genuine ambiguity (e.g. AMD vs Intel is preference-dependent), state your pick and why, then ask only the questions that would actually change your recommendation. Never refuse a recommendation by claiming you're "not an expert" — the user chose to ask you, so help them.
+- NEVER USE EMOJIS unless the user uses them first.`;
       const actionCtx = { tabManager, runtime };
+      const contextualTools = pruneToolsForContext(AGENT_TOOLS, pageType);
       await provider.streamAgentQuery(
         systemPrompt,
         query,
-        AGENT_TOOLS,
+        contextualTools,
         onChunk,
         (name, args) => executeAction(name, args, actionCtx),
         onEnd,
@@ -8375,7 +9681,13 @@ Instructions:
   } else {
     prompt = buildGeneralPrompt(query);
   }
-  await provider.streamQuery(prompt.system, prompt.user, onChunk, onEnd, history);
+  await provider.streamQuery(
+    prompt.system,
+    prompt.user,
+    onChunk,
+    onEnd,
+    history
+  );
 }
 const DEFAULT_PAGE_FOLDER = "Vessel/Pages";
 const DEFAULT_NOTE_FOLDER = "Vessel/Research";
@@ -9473,6 +10785,21 @@ async function clickResolvedSelector(wc, selector) {
     const afterUrl2 = wc.getURL();
     return afterUrl2 !== beforeUrl2 ? `${result} -> ${afterUrl2}` : result;
   }
+  if (selector.includes(" >>> ")) {
+    const beforeUrl2 = wc.getURL();
+    const result = await wc.executeJavaScript(`
+      (function() {
+        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
+        if (!el) return "Error[stale-index]: Shadow DOM element not found — call read_page to refresh.";
+        if (el instanceof HTMLElement) { el.focus(); el.click(); }
+        return "Clicked: " + (el.getAttribute("aria-label") || el.textContent?.trim().slice(0, 60) || el.tagName.toLowerCase());
+      })()
+    `);
+    if (typeof result === "string" && result.startsWith("Error")) return result;
+    await waitForPotentialNavigation(wc, beforeUrl2);
+    const afterUrl2 = wc.getURL();
+    return afterUrl2 !== beforeUrl2 ? `${result} -> ${afterUrl2}` : result;
+  }
   const beforeUrl = wc.getURL();
   const elInfo = await describeElementForClick(wc, selector);
   if ("error" in elInfo) return `Error: ${elInfo.error}`;
@@ -9820,6 +11147,22 @@ async function setElementValue(wc, selector, value) {
       `window.__vessel?.interactByIndex?.(${idx}, "value", ${JSON.stringify(value)}) || "Error: interactByIndex not available"`
     );
   }
+  if (selector.includes(" >>> ")) {
+    return wc.executeJavaScript(`
+      (function() {
+        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
+        if (!el) return "Error[stale-index]: Shadow DOM element not found — call read_page to refresh.";
+        if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement)) return "Error[not-input]: Element is not a text input";
+        var proto = el instanceof HTMLTextAreaElement ? HTMLTextAreaElement.prototype : HTMLInputElement.prototype;
+        var desc = Object.getOwnPropertyDescriptor(proto, "value");
+        if (desc && desc.set) { desc.set.call(el, ${JSON.stringify(value)}); } else { el.value = ${JSON.stringify(value)}; }
+        el.focus();
+        el.dispatchEvent(new Event("input", { bubbles: true }));
+        el.dispatchEvent(new Event("change", { bubbles: true }));
+        return "Typed into: " + (el.getAttribute("aria-label") || el.placeholder || el.name || "input");
+      })()
+    `);
+  }
   return wc.executeJavaScript(`
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
@@ -10264,6 +11607,65 @@ function registerTools(server, tabManager, runtime) {
       ]
     })
   );
+  server.registerResource(
+    "vessel-recommended-tools",
+    "vessel://context/recommended-tools",
+    {
+      title: "Recommended Tools for Current Page",
+      description: "Context-aware tool recommendations based on the current page type (login, search, form, article, etc.). Returns tools sorted by relevance with contextual hints.",
+      mimeType: "application/json"
+    },
+    async () => {
+      const activeTab = tabManager.getActiveTab();
+      let pageType = "GENERAL";
+      let pageUrl = "";
+      let pageTitle = "";
+      if (activeTab) {
+        try {
+          const wc = activeTab.view.webContents;
+          pageUrl = wc.getURL();
+          pageTitle = wc.getTitle();
+          const page = await extractContent(wc);
+          pageType = detectPageType(page);
+        } catch {
+        }
+      }
+      const scored = TOOL_DEFINITIONS.map((def) => {
+        const tier = def.tier ?? 1;
+        const isRelevant = !def.relevance || def.relevance.includes(pageType);
+        let score;
+        if (tier === 0) score = 0;
+        else if (tier === 1 && isRelevant) score = 10;
+        else if (tier === 2 && isRelevant) score = 20;
+        else if (tier === 1) score = 30;
+        else score = 40;
+        return {
+          name: `vessel_${def.name}`,
+          title: def.title,
+          description: def.description,
+          tier,
+          relevance: isRelevant ? "high" : "low",
+          score
+        };
+      });
+      scored.sort((a, b) => a.score - b.score);
+      const result = {
+        pageType,
+        pageUrl,
+        pageTitle,
+        recommended: scored.filter((t) => t.score <= 20).map(({ name, title, description, relevance }) => ({ name, title, description, relevance })),
+        available: scored.filter((t) => t.score > 20).map(({ name, title, relevance }) => ({ name, title, relevance }))
+      };
+      return {
+        contents: [
+          {
+            uri: "vessel://context/recommended-tools",
+            text: JSON.stringify(result, null, 2)
+          }
+        ]
+      };
+    }
+  );
   server.registerTool(
     "vessel_current_tab",
     {
@@ -12543,6 +13945,240 @@ ${steps.join("\n")}`;
       );
     }
   );
+  server.registerTool(
+    "vessel_accept_cookies",
+    {
+      title: "Accept Cookies",
+      description: "Dismiss cookie consent banners (OneTrust, CookieBot, GDPR popups, etc.).",
+      inputSchema: zod.z.object({})
+    },
+    async () => {
+      return withAction(
+        tabManager,
+        runtime,
+        "vessel_accept_cookies",
+        {},
+        async (wc) => {
+          const dismissed = await wc.executeJavaScript(`
+            (function() {
+              var selectors = [
+                '#onetrust-accept-btn-handler',
+                '#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll',
+                '[data-cookiefirst-action="accept"]',
+                '.cookie-consent-accept-all',
+                '#accept-cookies',
+                '.cc-accept',
+                '.cc-btn.cc-allow',
+                '[aria-label="Accept cookies"]',
+                '[aria-label="Accept all cookies"]',
+                '[data-testid="cookie-accept"]',
+              ];
+              var textPatterns = ['accept all', 'accept cookies', 'allow all', 'allow cookies', 'agree', 'got it', 'ok', 'i agree', 'consent'];
+              for (var i = 0; i < selectors.length; i++) {
+                var el = document.querySelector(selectors[i]);
+                if (el && el instanceof HTMLElement) { el.click(); return "Dismissed cookie banner via: " + selectors[i]; }
+              }
+              var buttons = document.querySelectorAll('button, a[role="button"], [type="submit"]');
+              for (var j = 0; j < buttons.length; j++) {
+                var btn = buttons[j];
+                var text = (btn.textContent || '').trim().toLowerCase();
+                for (var k = 0; k < textPatterns.length; k++) {
+                  if (text === textPatterns[k] || text.startsWith(textPatterns[k])) {
+                    btn.click();
+                    return "Dismissed cookie banner via text match: " + text;
+                  }
+                }
+              }
+              return null;
+            })()
+          `);
+          return dismissed || "No cookie consent banner detected. Try vessel_dismiss_popup for other overlays.";
+        }
+      );
+    }
+  );
+  server.registerTool(
+    "vessel_extract_table",
+    {
+      title: "Extract Table",
+      description: "Extract a table from the page as structured JSON rows with headers.",
+      inputSchema: zod.z.object({
+        index: zod.z.number().optional().describe("Element index of the table"),
+        selector: zod.z.string().optional().describe("CSS selector for the table")
+      })
+    },
+    async ({ index, selector: rawSelector }) => {
+      return withAction(
+        tabManager,
+        runtime,
+        "vessel_extract_table",
+        { index, selector: rawSelector },
+        async (wc) => {
+          const sel = rawSelector || (index != null ? await resolveSelector(wc, index) : null);
+          const tableJson = await wc.executeJavaScript(`
+            (function() {
+              var table = ${sel ? `document.querySelector(${JSON.stringify(sel)})` : "document.querySelector('table')"};
+              if (!table) return null;
+              var headers = [];
+              var headerRow = table.querySelector('thead tr') || table.querySelector('tr');
+              if (headerRow) {
+                headerRow.querySelectorAll('th, td').forEach(function(cell) {
+                  headers.push(cell.textContent.trim());
+                });
+              }
+              var rows = [];
+              var bodyRows = table.querySelectorAll('tbody tr');
+              if (bodyRows.length === 0) bodyRows = table.querySelectorAll('tr');
+              bodyRows.forEach(function(tr, idx) {
+                if (idx === 0 && headers.length > 0 && !table.querySelector('thead')) return;
+                var row = {};
+                tr.querySelectorAll('td, th').forEach(function(cell, ci) {
+                  var key = headers[ci] || ("col_" + ci);
+                  row[key] = cell.textContent.trim();
+                });
+                if (Object.keys(row).length > 0) rows.push(row);
+              });
+              return { headers: headers, rows: rows, rowCount: rows.length };
+            })()
+          `);
+          if (!tableJson) return "Error: No table found on the page.";
+          return `Extracted table (${tableJson.rowCount} rows):
+${JSON.stringify(tableJson, null, 2)}`;
+        }
+      );
+    }
+  );
+  server.registerTool(
+    "vessel_scroll_to_element",
+    {
+      title: "Scroll To Element",
+      description: "Scroll a specific element into view by index or selector.",
+      inputSchema: zod.z.object({
+        index: zod.z.number().optional().describe("Element index to scroll to"),
+        selector: zod.z.string().optional().describe("CSS selector to scroll to"),
+        position: zod.z.enum(["center", "top", "bottom"]).optional().describe("Viewport position (default center)")
+      })
+    },
+    async ({ index, selector: rawSelector, position }) => {
+      return withAction(
+        tabManager,
+        runtime,
+        "vessel_scroll_to_element",
+        { index, selector: rawSelector, position },
+        async (wc) => {
+          const sel = rawSelector || (index != null ? await resolveSelector(wc, index) : null);
+          if (!sel) return "Error: Provide an index or selector.";
+          const block = position === "top" ? "start" : position === "bottom" ? "end" : "center";
+          if (sel.startsWith("__vessel_idx:")) {
+            const idx = Number(sel.slice("__vessel_idx:".length));
+            return wc.executeJavaScript(`
+              (function() {
+                var refs = window.__vessel;
+                if (!refs || !refs.interactByIndex) return "Error: __vessel not available";
+                // Use stored ref directly
+                var el = document.querySelector('[data-vessel-idx="${idx}"]');
+                if (!el) return "Error: Element #${idx} not found";
+                el.scrollIntoView({ behavior: "smooth", block: "${block}" });
+                return "Scrolled to element #${idx}";
+              })()
+            `);
+          }
+          if (sel.includes(" >>> ")) {
+            return wc.executeJavaScript(`
+              (function() {
+                var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(sel)});
+                if (!el) return "Error: Shadow DOM element not found";
+                el.scrollIntoView({ behavior: "smooth", block: "${block}" });
+                return "Scrolled to shadow DOM element";
+              })()
+            `);
+          }
+          return wc.executeJavaScript(`
+            (function() {
+              var el = document.querySelector(${JSON.stringify(sel)});
+              if (!el) return "Error: Element not found";
+              el.scrollIntoView({ behavior: "smooth", block: "${block}" });
+              return "Scrolled to element";
+            })()
+          `);
+        }
+      );
+    }
+  );
+  server.registerTool(
+    "vessel_wait_for_navigation",
+    {
+      title: "Wait For Navigation",
+      description: "Wait for the current page to finish loading after a click or form submission.",
+      inputSchema: zod.z.object({
+        timeoutMs: zod.z.number().optional().describe("Max wait in milliseconds (default 10000)")
+      })
+    },
+    async ({ timeoutMs }) => {
+      return withAction(
+        tabManager,
+        runtime,
+        "vessel_wait_for_navigation",
+        { timeoutMs },
+        async (wc) => {
+          const timeout = timeoutMs || 1e4;
+          const beforeUrl = wc.getURL();
+          if (wc.isLoading()) {
+            await new Promise((resolve) => {
+              const timer = setTimeout(resolve, timeout);
+              wc.once("did-stop-loading", () => {
+                clearTimeout(timer);
+                resolve();
+              });
+            });
+          } else {
+            await new Promise((resolve) => {
+              let navigated = false;
+              const timer = setTimeout(() => {
+                if (!navigated) resolve();
+              }, Math.min(timeout, 2e3));
+              wc.once("did-start-loading", () => {
+                navigated = true;
+                clearTimeout(timer);
+                const loadTimer = setTimeout(resolve, timeout);
+                wc.once("did-stop-loading", () => {
+                  clearTimeout(loadTimer);
+                  resolve();
+                });
+              });
+            });
+          }
+          const afterUrl = wc.getURL();
+          const title = wc.getTitle();
+          return afterUrl !== beforeUrl ? `Navigation complete: ${title} (${afterUrl})` : `Page loaded: ${title} (${afterUrl})`;
+        }
+      );
+    }
+  );
+  server.registerTool(
+    "vessel_metrics",
+    {
+      title: "Session Metrics",
+      description: "Show performance metrics: total tool calls, average duration, per-tool breakdown.",
+      inputSchema: zod.z.object({})
+    },
+    async () => {
+      const m = runtime.getMetrics();
+      const lines = [
+        `Session Metrics:`,
+        `  Total actions: ${m.totalActions}`,
+        `  Completed: ${m.completedActions}`,
+        `  Failed: ${m.failedActions}`,
+        `  Average duration: ${m.averageDurationMs}ms`,
+        ``,
+        `Tool breakdown:`
+      ];
+      for (const [name, stats] of Object.entries(m.toolBreakdown)) {
+        lines.push(`  ${name}: ${stats.count} calls, avg ${stats.avgMs}ms${stats.errors > 0 ? `, ${stats.errors} errors` : ""}`);
+      }
+      return asTextResponse(lines.join("\n"));
+    }
+  );
 }
 function waitForLoad(wc, timeout = 1e4) {
   return new Promise((resolve) => {
@@ -12592,6 +14228,13 @@ async function resolveSelector(wc, index, selector) {
     `
   );
   if (typeof authoritativeSelector === "string" && authoritativeSelector) {
+    if (authoritativeSelector.includes(" >>> ")) {
+      const resolves2 = await wc.executeJavaScript(
+        `!!window.__vessel?.resolveShadowSelector?.(${JSON.stringify(authoritativeSelector)})`
+      );
+      if (resolves2) return authoritativeSelector;
+      return `__vessel_idx:${index}`;
+    }
     const resolves = await wc.executeJavaScript(
       `!!document.querySelector(${JSON.stringify(authoritativeSelector)})`
     );
@@ -13091,6 +14734,112 @@ function registerIpcHandlers(windowState, runtime) {
     } catch {
     }
   });
+  electron.ipcMain.handle(Channels.HIGHLIGHT_NAV_COUNT, () => {
+    const tab = tabManager.getActiveTab();
+    if (!tab) return 0;
+    const wc = tab.view.webContents;
+    if (wc.isDestroyed()) return 0;
+    try {
+      return wc.executeJavaScript(
+        `document.querySelectorAll('.__vessel-highlight, .__vessel-highlight-text').length`
+      );
+    } catch {
+      return 0;
+    }
+  });
+  electron.ipcMain.handle(Channels.HIGHLIGHT_NAV_SCROLL, (_, index) => {
+    const tab = tabManager.getActiveTab();
+    if (!tab) return false;
+    const wc = tab.view.webContents;
+    if (wc.isDestroyed()) return false;
+    try {
+      return wc.executeJavaScript(`
+        (function() {
+          var highlights = document.querySelectorAll('.__vessel-highlight, .__vessel-highlight-text');
+          if (${index} < 0 || ${index} >= highlights.length) return false;
+          // Remove focus ring from all highlights
+          highlights.forEach(function(h) { h.style.removeProperty('outline'); h.style.removeProperty('outline-offset'); });
+          var target = highlights[${index}];
+          target.scrollIntoView({ behavior: 'smooth', block: 'center' });
+          // Add focus ring to current highlight
+          target.style.setProperty('outline', '2px solid rgba(255, 255, 255, 0.9)', 'important');
+          target.style.setProperty('outline-offset', '2px', 'important');
+          return true;
+        })()
+      `);
+    } catch {
+      return false;
+    }
+  });
+  electron.ipcMain.handle(Channels.HIGHLIGHT_NAV_REMOVE, (_, index) => {
+    const tab = tabManager.getActiveTab();
+    if (!tab) return false;
+    const wc = tab.view.webContents;
+    if (wc.isDestroyed()) return false;
+    try {
+      return wc.executeJavaScript(`
+        (function() {
+          var highlights = document.querySelectorAll('.__vessel-highlight, .__vessel-highlight-text');
+          if (${index} < 0 || ${index} >= highlights.length) return false;
+          var el = highlights[${index}];
+          // Remove associated label if any
+          document.querySelectorAll('.__vessel-highlight-label[data-vessel-highlight]').forEach(function(b) {
+            if (b.__vesselAnchor === el) b.remove();
+          });
+          // Unwrap text highlights, remove class from element highlights
+          if (el.tagName === 'MARK' && el.classList.contains('__vessel-highlight-text')) {
+            var parent = el.parentNode;
+            while (el.firstChild) parent.insertBefore(el.firstChild, el);
+            parent.removeChild(el);
+            parent.normalize();
+          } else {
+            el.classList.remove('__vessel-highlight');
+            el.style.removeProperty('background');
+            el.style.removeProperty('outline-color');
+            el.style.removeProperty('box-shadow');
+            el.style.removeProperty('outline');
+            el.style.removeProperty('outline-offset');
+          }
+          return true;
+        })()
+      `);
+    } catch {
+      return false;
+    }
+  });
+  electron.ipcMain.handle(Channels.HIGHLIGHT_NAV_CLEAR, () => {
+    const tab = tabManager.getActiveTab();
+    if (!tab) return false;
+    const wc = tab.view.webContents;
+    if (wc.isDestroyed()) return false;
+    try {
+      return wc.executeJavaScript(`
+        (function() {
+          // Remove all labels
+          document.querySelectorAll('.__vessel-highlight-label[data-vessel-highlight]').forEach(function(b) { b.remove(); });
+          // Unwrap text highlights
+          document.querySelectorAll('.__vessel-highlight-text').forEach(function(mark) {
+            var parent = mark.parentNode;
+            while (mark.firstChild) parent.insertBefore(mark.firstChild, mark);
+            parent.removeChild(mark);
+            parent.normalize();
+          });
+          // Remove element highlights
+          document.querySelectorAll('.__vessel-highlight').forEach(function(el) {
+            el.classList.remove('__vessel-highlight');
+            el.style.removeProperty('background');
+            el.style.removeProperty('outline-color');
+            el.style.removeProperty('box-shadow');
+            el.style.removeProperty('outline');
+            el.style.removeProperty('outline-offset');
+          });
+          return true;
+        })()
+      `);
+    } catch {
+      return false;
+    }
+  });
   electron.ipcMain.handle(Channels.DEVTOOLS_PANEL_TOGGLE, () => {
     windowState.uiState.devtoolsPanelOpen = !windowState.uiState.devtoolsPanelOpen;
     layoutViews(windowState);
@@ -13355,6 +15104,7 @@ ${progress}
       mode: "replace"
     });
     const approvalReason = this.getApprovalReason(dangerous);
+    console.log(`[Vessel Runtime] action=${name} dangerous=${dangerous} approvalReason=${approvalReason} mode=${this.state.supervisor.approvalMode}`);
     if (approvalReason) {
       this.publishTranscript({
         source,
@@ -13364,7 +15114,9 @@ ${progress}
         streamId: transcriptStreamId,
         mode: "replace"
       });
+      console.log(`[Vessel Runtime] awaiting approval for ${name}...`);
       const approved = await this.awaitApproval(action, approvalReason);
+      console.log(`[Vessel Runtime] approval result for ${name}: ${approved}`);
       if (!approved) {
         this.publishTranscript({
           source,
@@ -13499,13 +15251,44 @@ ${progress}
     this.emit();
   }
   finishAction(actionId, status, resultSummary, error) {
+    const finishedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const action = this.state.actions.find((a) => a.id === actionId);
+    const durationMs = action ? new Date(finishedAt).getTime() - new Date(action.startedAt).getTime() : void 0;
     this.updateAction(actionId, {
       status,
-      finishedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      finishedAt,
+      durationMs,
       resultSummary,
       error
     });
   }
+  /** Aggregate metrics for all completed actions in this session. */
+  getMetrics() {
+    const completed = this.state.actions.filter((a) => a.status === "completed");
+    const failed = this.state.actions.filter((a) => a.status === "error");
+    const durations = completed.filter((a) => a.durationMs != null).map((a) => a.durationMs);
+    const avgDuration = durations.length > 0 ? durations.reduce((s, d) => s + d, 0) / durations.length : 0;
+    const toolBreakdown = {};
+    for (const action of this.state.actions) {
+      const name = action.name;
+      if (!toolBreakdown[name]) toolBreakdown[name] = { count: 0, totalMs: 0, avgMs: 0, errors: 0 };
+      toolBreakdown[name].count++;
+      if (action.durationMs != null) toolBreakdown[name].totalMs += action.durationMs;
+      if (action.status === "error") toolBreakdown[name].errors++;
+    }
+    for (const entry of Object.values(toolBreakdown)) {
+      entry.avgMs = entry.count > 0 ? Math.round(entry.totalMs / entry.count) : 0;
+    }
+    return {
+      totalActions: this.state.actions.length,
+      completedActions: completed.length,
+      failedActions: failed.length,
+      averageDurationMs: Math.round(avgDuration),
+      toolBreakdown: Object.fromEntries(
+        Object.entries(toolBreakdown).map(([k, v]) => [k, { count: v.count, avgMs: v.avgMs, errors: v.errors }])
+      )
+    };
+  }
   getApprovalReason(dangerous) {
     if (this.state.supervisor.paused) {
       return "Agent execution is paused";