@quanta-intellect/vessel-browser 0.1.61 → 0.1.65

package/out/main/index.js

@@ -14,6 +14,42 @@ const http = require("node:http");
 const os = require("node:os");
 const mcp_js = require("@modelcontextprotocol/sdk/server/mcp.js");
 const streamableHttp_js = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
+function getEnvFlag(name) {
+  const globalProcess = typeof globalThis === "object" && "process" in globalThis ? globalThis.process : void 0;
+  return globalProcess?.env?.[name];
+}
+function isDebugEnabled() {
+  const value = getEnvFlag("VESSEL_DEBUG")?.trim().toLowerCase();
+  return value === "1" || value === "true" || value === "yes" || value === "on";
+}
+function writeLog(level, scope, args) {
+  if (level === "debug" && !isDebugEnabled()) {
+    return;
+  }
+  const prefix = `[Vessel ${scope}]`;
+  switch (level) {
+    case "debug":
+      console.debug(prefix, ...args);
+      return;
+    case "info":
+      console.info(prefix, ...args);
+      return;
+    case "warn":
+      console.warn(prefix, ...args);
+      return;
+    case "error":
+      console.error(prefix, ...args);
+      return;
+  }
+}
+function createLogger(scope) {
+  return {
+    debug: (...args) => writeLog("debug", scope, args),
+    info: (...args) => writeLog("info", scope, args),
+    warn: (...args) => writeLog("warn", scope, args),
+    error: (...args) => writeLog("error", scope, args)
+  };
+}
 const defaults = {
   defaultUrl: "https://start.duckduckgo.com",
   theme: "dark",
@@ -40,6 +76,7 @@ const defaults = {
 };
 const SAVE_DEBOUNCE_MS$5 = 150;
 const CHAT_PROVIDER_SECRET_FILENAME = "vessel-chat-provider-secret";
+const logger$j = createLogger("Settings");
 const SETTABLE_KEYS = new Set(Object.keys(defaults));
 let settings = null;
 let settingsIssues = [];
@@ -185,7 +222,7 @@ function persistNow() {
       getSettingsPath(),
       JSON.stringify(buildPersistedSettings(settings), null, 2)
     )
-  ).catch((err) => console.error("[Vessel] Failed to save settings:", err));
+  ).catch((err) => logger$j.error("Failed to save settings:", err));
 }
 function saveSettings() {
   saveDirty = true;
@@ -289,6 +326,7 @@ function assertPermittedNavigationURL(url) {
 }
 const MAX_CUSTOM_HISTORY = 50;
 const READER_MODE_DATA_URL_PREFIX = "data:text/html;charset=utf-8,";
+const logger$i = createLogger("Tab");
 class Tab {
   id;
   view;
@@ -329,7 +367,7 @@ class Tab {
   guardedLoadURL(url, options) {
     const blockReason = this.getNavigationBlockReason(url);
     if (blockReason) {
-      console.warn(`[Tab] ${blockReason}`);
+      logger$i.warn(blockReason);
       return blockReason;
     }
     void this.view.webContents.loadURL(url, options);
@@ -390,7 +428,7 @@ class Tab {
     wc.setWindowOpenHandler(({ url, disposition }) => {
       const error = this.getNavigationBlockReason(url);
       if (error) {
-        console.warn(`[Tab] ${error}`);
+        logger$i.warn(error);
         return { action: "deny" };
       }
       this.onOpenUrl?.({
@@ -404,7 +442,7 @@ class Tab {
       const error = this.getNavigationBlockReason(url);
       if (!error) return;
       event.preventDefault();
-      console.warn(`[Tab] ${context}: ${error}`);
+      logger$i.warn(`${context}: ${error}`);
     };
     wc.on("will-navigate", (event, url) => {
       blockNavigation(event, url, "Blocked top-level navigation");
@@ -468,8 +506,7 @@ class Tab {
         ::-webkit-scrollbar-thumb { background: rgba(255,255,255,0.12); border-radius: 999px; }
         ::-webkit-scrollbar-thumb:hover { background: rgba(255,255,255,0.22); }
         ::-webkit-scrollbar-corner { background: transparent; }
-      `).catch(() => {
-      });
+      `).catch((err) => logger$i.warn("Failed to inject scrollbar CSS:", err));
     });
     wc.on("page-favicon-updated", (_, favicons) => {
       this._state.favicon = favicons[0] || "";
@@ -491,7 +528,8 @@ class Tab {
         })()`
       ).then((highlightedText) => {
         this.buildContextMenu(wc, params, highlightedText.trim());
-      }).catch(() => {
+      }).catch((err) => {
+        logger$i.warn("Failed to inspect highlighted text for context menu:", err);
         this.buildContextMenu(wc, params, "");
       });
     });
@@ -722,8 +760,7 @@ class Tab {
             document.addEventListener('mouseup', window.__vesselHighlightHandler);
           }
         })()
-      `).catch(() => {
-      });
+      `).catch((err) => logger$i.warn("Failed to inject highlight listener:", err));
     } else {
       void wc.executeJavaScript(`
         (function() {
@@ -734,8 +771,7 @@ class Tab {
             delete window.__vesselHighlightHandler;
           }
         })()
-      `).catch(() => {
-      });
+      `).catch((err) => logger$i.warn("Failed to remove highlight listener:", err));
     }
   }
   get webContentsId() {
@@ -746,6 +782,7 @@ class Tab {
     this.view.webContents.close();
   }
 }
+const logger$h = createLogger("JsonPersistence");
 function canUseSafeStorage() {
   try {
     return electron.safeStorage.isEncryptionAvailable();
@@ -810,9 +847,7 @@ function createDebouncedJsonPersistence({
         data,
         typeof data === "string" ? { encoding: "utf-8", mode: 384 } : { mode: 384 }
       )
-    ).catch(
-      (err) => console.error(`[Vessel] Failed to save ${logLabel}:`, err)
-    );
+    ).catch((err) => logger$h.error(`Failed to save ${logLabel}:`, err));
   };
   const schedule = () => {
     saveDirty2 = true;
@@ -2306,6 +2341,7 @@ function destroyAllSessions() {
   }
   sessions.clear();
 }
+const logger$g = createLogger("TabManager");
 class TabManager {
   tabs = /* @__PURE__ */ new Map();
   order = [];
@@ -2498,8 +2534,9 @@ class TabManager {
       color: h.color
     }));
     if (entries.length > 0) {
-      void highlightBatchOnPage(wc, entries).catch(() => {
-      });
+      void highlightBatchOnPage(wc, entries).catch(
+        (err) => logger$g.warn("Failed to batch highlight:", err)
+      );
     }
   }
   onHighlightCapture(callback) {
@@ -2519,11 +2556,13 @@ class TabManager {
       try {
         const result = await captureSelectionHighlight(wc);
         if (result.success && result.text) {
-          await highlightOnPage(wc, null, result.text, void 0, void 0, "yellow").catch(() => {
-          });
+          await highlightOnPage(wc, null, result.text, void 0, void 0, "yellow").catch(
+            (err) => logger$g.warn("Failed to capture highlight:", err)
+          );
         }
         this.highlightCaptureCallback?.(result);
-      } catch {
+      } catch (err) {
+        logger$g.warn("Failed to capture highlight from page:", err);
         this.highlightCaptureCallback?.({
           success: false,
           message: "Could not capture selection"
@@ -2547,7 +2586,8 @@ class TabManager {
         if (tabUrl === normalized) {
           void this.removeHighlightMarksForText(wc, text);
         }
-      } catch {
+      } catch (err) {
+        logger$g.warn("Failed to remove highlight from matching tab:", err);
       }
     }
     this.highlightCaptureCallback?.({
@@ -2577,11 +2617,13 @@ class TabManager {
               void 0,
               void 0,
               color
-            ).catch(() => {
-            });
+            ).catch(
+              (err) => logger$g.warn("Failed to update highlight color:", err)
+            );
           });
         }
-      } catch {
+      } catch (err) {
+        logger$g.warn("Failed to iterate highlights for color change:", err);
       }
     }
     this.highlightCaptureCallback?.({
@@ -2602,8 +2644,9 @@ class TabManager {
           }
         });
       })()`
-    ).catch(() => {
-    });
+    ).catch(
+      (err) => logger$g.warn("Failed to remove highlight marks:", err)
+    );
   }
   broadcastState() {
     const states = this.getAllStates();
@@ -3685,6 +3728,23 @@ function addIfPresent(target, key, value) {
     target[key] = value;
   }
 }
+function okResult(value) {
+  return {
+    ok: true,
+    ...value ?? {}
+  };
+}
+function errorResult(error, value) {
+  return {
+    ok: false,
+    error,
+    ...value ?? {}
+  };
+}
+function getErrorMessage(error, fallback = "Unknown error") {
+  return error instanceof Error && error.message ? error.message : fallback;
+}
+const logger$f = createLogger("Premium");
 const VERIFICATION_API = process.env.VESSEL_PREMIUM_API || "https://vesselpremium.quantaintellect.com";
 const FREE_TOOL_ITERATION_LIMIT = 50;
 const REVALIDATION_INTERVAL_MS = 24 * 60 * 60 * 1e3;
@@ -3752,22 +3812,18 @@ async function getCheckoutUrl(email) {
     });
     if (!res.ok) {
       const body = await res.text();
-      return { ok: false, error: body || `HTTP ${res.status}` };
+      return errorResult(body || `HTTP ${res.status}`);
     }
     const { url } = await res.json();
-    return { ok: true, url };
+    return okResult({ url });
   } catch (err) {
-    return {
-      ok: false,
-      error: err instanceof Error ? err.message : "Failed to create checkout"
-    };
+    return errorResult(getErrorMessage(err, "Failed to create checkout"));
   }
 }
 async function getPortalUrl() {
-  return {
-    ok: false,
-    error: "Billing portal access is temporarily disabled until authenticated customer access is implemented."
-  };
+  return errorResult(
+    "Billing portal access is temporarily disabled until authenticated customer access is implemented."
+  );
 }
 async function verifySubscription(identifier) {
   const current = loadSettings().premium;
@@ -3782,7 +3838,7 @@ async function verifySubscription(identifier) {
       body: JSON.stringify({ identifier: verificationIdentifier })
     });
     if (!res.ok) {
-      console.warn("[Vessel Premium] Verification API returned", res.status);
+      logger$f.warn("Verification API returned a non-OK status:", res.status);
       return current;
     }
     const data = await res.json();
@@ -3797,14 +3853,14 @@ async function verifySubscription(identifier) {
     setSetting("premium", updated);
     return updated;
   } catch (err) {
-    console.warn("[Vessel Premium] Verification failed:", err);
+    logger$f.warn("Verification failed:", err);
     return current;
   }
 }
 async function requestActivationCode(email) {
   const normalizedEmail = email.trim().toLowerCase();
   if (!normalizedEmail) {
-    return { ok: false, error: "Email is required" };
+    return errorResult("Email is required");
   }
   try {
     const res = await fetch(`${VERIFICATION_API}/activate/start`, {
@@ -3814,38 +3870,29 @@ async function requestActivationCode(email) {
     });
     const data = await res.json().catch(() => ({}));
     if (!res.ok || !data.challengeToken) {
-      return {
-        ok: false,
-        error: data.error || `HTTP ${res.status}`
-      };
+      return errorResult(data.error || `HTTP ${res.status}`);
     }
-    return {
-      ok: true,
+    return okResult({
       email: normalizedEmail,
       challengeToken: data.challengeToken
-    };
+    });
   } catch (err) {
-    return {
-      ok: false,
-      error: err instanceof Error ? err.message : "Failed to send code"
-    };
+    return errorResult(getErrorMessage(err, "Failed to send code"));
   }
 }
 async function verifyActivationCode(email, code, challengeToken) {
   const normalizedEmail = email.trim().toLowerCase();
   const trimmedCode = code.trim();
   if (!normalizedEmail) {
-    return { ok: false, state: getPremiumState(), error: "Email is required" };
+    return errorResult("Email is required", { state: getPremiumState() });
   }
   if (!trimmedCode) {
-    return { ok: false, state: getPremiumState(), error: "Code is required" };
+    return errorResult("Code is required", { state: getPremiumState() });
   }
   if (!challengeToken.trim()) {
-    return {
-      ok: false,
-      state: getPremiumState(),
-      error: "Request a new activation code and try again."
-    };
+    return errorResult("Request a new activation code and try again.", {
+      state: getPremiumState()
+    });
   }
   try {
     const res = await fetch(`${VERIFICATION_API}/activate/verify`, {
@@ -3859,11 +3906,9 @@ async function verifyActivationCode(email, code, challengeToken) {
     });
     const data = await res.json().catch(() => ({}));
     if (!res.ok) {
-      return {
-        ok: false,
-        state: getPremiumState(),
-        error: data.error || `HTTP ${res.status}`
-      };
+      return errorResult(data.error || `HTTP ${res.status}`, {
+        state: getPremiumState()
+      });
     }
     const updated = {
       status: data.status ?? "free",
@@ -3874,13 +3919,11 @@ async function verifyActivationCode(email, code, challengeToken) {
       expiresAt: data.expiresAt || ""
     };
     setSetting("premium", updated);
-    return { ok: isPremiumActiveState(updated), state: updated };
+    return isPremiumActiveState(updated) ? okResult({ state: updated }) : errorResult("Subscription is not active.", { state: updated });
   } catch (err) {
-    return {
-      ok: false,
-      state: getPremiumState(),
-      error: err instanceof Error ? err.message : "Failed to verify code"
-    };
+    return errorResult(getErrorMessage(err, "Failed to verify code"), {
+      state: getPremiumState()
+    });
   }
 }
 let revalidationTimer = null;
@@ -3938,6 +3981,7 @@ let flushTimer = null;
 let sessionStartedAt = null;
 function isEnabled() {
   if (POSTHOG_API_KEY === "YOUR_POSTHOG_KEY_HERE") return false;
+  if (process.env.VESSEL_DEV === "1") return false;
   return loadSettings().telemetryEnabled !== false;
 }
 function trackEvent(event, properties = {}) {
@@ -4199,6 +4243,37 @@ function mapActionButtons(interactiveElements) {
   }
   return buttons;
 }
+function asStructuredObject(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function stringifyStructuredScalar(value) {
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    return trimmed || void 0;
+  }
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return String(value);
+  }
+  return void 0;
+}
+function firstStructuredString(...values) {
+  for (const value of values) {
+    const normalized = stringifyStructuredScalar(value);
+    if (normalized) return normalized;
+  }
+  return void 0;
+}
+function getOfferPrice(offers) {
+  if (Array.isArray(offers)) {
+    for (const offer2 of offers) {
+      const price = getOfferPrice(offer2);
+      if (price) return price;
+    }
+    return void 0;
+  }
+  const offer = asStructuredObject(offers);
+  return firstStructuredString(offer?.price);
+}
 function extractPrimaryEntity(pageType, structuredData, metaTags) {
   if (pageType === "product") {
     const product = structuredData?.find(
@@ -4206,14 +4281,27 @@ function extractPrimaryEntity(pageType, structuredData, metaTags) {
     );
     if (product) {
       const attrs = product.attributes ?? {};
+      const aggregateRating = asStructuredObject(attrs.aggregateRating);
       return {
         type: "Product",
-        nameField: typeof attrs.name === "string" ? attrs.name : void 0,
-        priceField: typeof attrs.price === "string" ? attrs.price : typeof attrs.offers === "object" && attrs.offers !== null ? String(attrs.offers["price"] ?? "") : void 0,
-        imageField: typeof attrs.image === "string" ? attrs.image : Array.isArray(attrs.image) ? String(attrs.image[0]) : void 0,
-        descriptionField: typeof attrs.description === "string" ? attrs.description : void 0,
-        reviewsField: typeof attrs.reviews === "string" ? attrs.reviews : void 0,
-        ratingField: typeof attrs.rating === "string" ? attrs.rating : void 0,
+        nameField: firstStructuredString(attrs.name),
+        priceField: firstStructuredString(attrs.price) ?? getOfferPrice(attrs.offers),
+        imageField: firstStructuredString(
+          attrs.image,
+          Array.isArray(attrs.image) ? attrs.image[0] : void 0
+        ),
+        descriptionField: firstStructuredString(attrs.description),
+        reviewsField: firstStructuredString(
+          attrs.reviews,
+          attrs.reviewCount,
+          aggregateRating?.reviewCount,
+          aggregateRating?.ratingCount
+        ),
+        ratingField: firstStructuredString(
+          attrs.rating,
+          attrs.ratingValue,
+          aggregateRating?.ratingValue
+        ),
         addToCartField: void 0
       };
     }
@@ -4331,6 +4419,7 @@ function inferPageSchema(page) {
     confidence
   };
 }
+const logger$e = createLogger("Extractor");
 const EMPTY_PAGE_CONTENT = {
   title: "",
   content: "",
@@ -5077,7 +5166,8 @@ async function executeScript(webContents, script) {
         timer = setTimeout(() => resolve(null), EXECUTE_SCRIPT_TIMEOUT_MS);
       })
     ]);
-  } catch {
+  } catch (err) {
+    logger$e.warn("Failed to execute page script:", err);
     return null;
   } finally {
     if (timer) {
@@ -5185,7 +5275,8 @@ async function estimateExtractionTimeout(webContents) {
       );
       return EXTRACT_TIMEOUT_BASE_MS + extra;
     }
-  } catch {
+  } catch (err) {
+    logger$e.warn("Failed to estimate extraction timeout, using base timeout:", err);
   }
   return EXTRACT_TIMEOUT_BASE_MS;
 }
@@ -5974,6 +6065,9 @@ function isClickReadLoop(names) {
   }
   return clickReadPairs >= 2;
 }
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
 class AnthropicProvider {
   agentToolProfile = "default";
   client;
@@ -6070,10 +6164,14 @@ class AnthropicProvider {
               }
             } else if (event.type === "content_block_stop" && currentToolUse) {
               try {
+                const input = JSON.parse(currentToolUse.inputJson || "{}");
+                if (!isRecord(input)) {
+                  throw new Error("Tool input must be a JSON object");
+                }
                 toolUseBlocks.push({
                   id: currentToolUse.id,
                   name: currentToolUse.name,
-                  input: JSON.parse(currentToolUse.inputJson || "{}")
+                  input
                 });
               } catch {
                 toolUseBlocks.push({
@@ -6120,7 +6218,7 @@ class AnthropicProvider {
             });
             continue;
           }
-          const argSummary = tb.input.url || tb.input.text || tb.input.direction || "";
+          const argSummary = [tb.input.url, tb.input.text, tb.input.direction].map((v) => typeof v === "string" ? v : "").find((v) => v.length > 0) ?? "";
           onChunk(`
 <<tool:${tb.name}${argSummary ? ":" + argSummary : ""}>>
 `);
@@ -6347,6 +6445,7 @@ const MAX_MCP_NAV_CONTENT_LENGTH = 3e4;
 const MAX_AGENT_DEBUG_CONTENT_LENGTH = 2e4;
 const LLAMA_CPP_MIN_CTX_TOKENS = 16384;
 const LLAMA_CPP_RECOMMENDED_CTX_TOKENS = 32768;
+const logger$d = createLogger("OpenAIProvider");
 function shouldDebugAgentLoop() {
   const value = process.env.VESSEL_DEBUG_AGENT_LOOP;
   return value === "1" || value === "true";
@@ -6753,9 +6852,9 @@ function resolveToolCallName(rawName, args, availableToolNames) {
 function logAgentLoopDebug(payload) {
   if (!shouldDebugAgentLoop()) return;
   try {
-    console.log(`[Vessel agent-debug] ${JSON.stringify(payload)}`);
+    logger$d.info(`[agent-debug] ${JSON.stringify(payload)}`);
   } catch (err) {
-    console.warn("[Vessel agent-debug] Failed to serialize debug payload:", err);
+    logger$d.warn("Failed to serialize debug payload:", err);
   }
 }
 function recoverTextEncodedToolCalls(text, availableToolNames) {
@@ -6775,7 +6874,10 @@ function recoverTextEncodedToolCalls(text, availableToolNames) {
     const argsJson = match[2] ?? "{}";
     let parsedArgs = {};
     try {
-      parsedArgs = JSON.parse(argsJson);
+      const raw = JSON.parse(argsJson);
+      if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+        parsedArgs = raw;
+      }
     } catch {
       continue;
     }
@@ -7172,7 +7274,7 @@ class OpenAICompatProvider {
             }
             continue;
           }
-          const argSummary = args.url || args.query || args.text || args.direction || "";
+          const argSummary = [args.url, args.query, args.text, args.direction].map((v) => typeof v === "string" ? v : "").find((v) => v.length > 0) ?? "";
           onChunk(`
 <<tool:${tc.name}${argSummary ? ":" + argSummary : ""}>>
 `);
@@ -7330,7 +7432,7 @@ async function fetchProviderModels(config) {
   if (normalized.id === "anthropic") {
     const client2 = new Anthropic({ apiKey: normalized.apiKey });
     const page2 = await client2.models.list();
-    return { ok: true, models: page2.data.map((model) => model.id) };
+    return okResult({ models: page2.data.map((model) => model.id) });
   }
   const meta = PROVIDERS[normalized.id];
   const baseURL = normalized.baseUrl || meta?.defaultBaseUrl || "https://api.openai.com/v1";
@@ -7342,9 +7444,10 @@ async function fetchProviderModels(config) {
   const models = page.data.map((model) => model.id);
   const warning = normalized.id === "llama_cpp" ? await probeLlamaCppCtxWarning(baseURL) : void 0;
   return {
-    ok: true,
-    models,
-    ...warning ? { warning } : {}
+    ...okResult({
+      models,
+      ...warning ? { warning } : {}
+    })
   };
 }
 function createProvider(config) {
@@ -7359,6 +7462,7 @@ function createProvider(config) {
   return new OpenAICompatProvider(normalized);
 }
 const require$1 = node_module.createRequire(require("url").pathToFileURL(__filename).href);
+const logger$c = createLogger("DevTrace");
 let cachedFactory;
 function createNoopTraceSession() {
   return {
@@ -7391,7 +7495,7 @@ function loadLocalFactory() {
         return cachedFactory;
       }
     } catch (err) {
-      console.warn("[dev-trace] Failed to load local trace logger:", err);
+      logger$c.warn("Failed to load local trace logger:", err);
     }
   }
   return cachedFactory;
@@ -11126,6 +11230,7 @@ function formatDeadLinkMessage(label, result) {
   const status = result.statusCode ? `HTTP ${result.statusCode}` : "dead link";
   return `Skipped stale link "${label}" because ${destination} returned ${status}. Try a different link or URL instead.`;
 }
+const logger$b = createLogger("Screenshot");
 async function captureScreenshot(wc) {
   for (let attempt = 0; attempt < 3; attempt += 1) {
     await new Promise((resolve) => setTimeout(resolve, 120 * (attempt + 1)));
@@ -11135,13 +11240,21 @@ async function captureScreenshot(wc) {
         const size = image.getSize();
         const base64 = image.toPNG().toString("base64");
         if (base64) {
-          return { ok: true, base64, width: size.width, height: size.height };
+          return okResult({
+            base64,
+            width: size.width,
+            height: size.height
+          });
         }
       }
-    } catch {
+    } catch (err) {
+      logger$b.debug(
+        `capturePage attempt ${attempt + 1} failed; retrying if attempts remain.`,
+        getErrorMessage(err)
+      );
     }
   }
-  return { ok: false, error: "Page image was empty after 3 attempts" };
+  return errorResult("Page image was empty after 3 attempts");
 }
 const SESSION_VERSION = 1;
 function getSessionsDir() {
@@ -11749,6 +11862,33 @@ function formatCompactToolResult(name, result) {
       return limitText(result, 18, 1400);
   }
 }
+function normalizeOptionalString(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed || void 0;
+}
+function normalizeKeyFields(value) {
+  if (!Array.isArray(value)) return void 0;
+  const normalized = value.filter((field) => typeof field === "string").map((field) => field.trim()).filter(Boolean);
+  return normalized.length > 0 ? normalized : void 0;
+}
+function normalizeAgentHints(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const normalized = Object.fromEntries(
+    Object.entries(value).map(([key, hint]) => [key.trim(), normalizeOptionalString(hint)]).filter((entry) => Boolean(entry[0] && entry[1]))
+  );
+  return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
+function normalizeBookmarkMetadata(input) {
+  return {
+    intent: normalizeOptionalString(input.intent),
+    expectedContent: normalizeOptionalString(input.expectedContent),
+    keyFields: normalizeKeyFields(input.keyFields),
+    agentHints: normalizeAgentHints(input.agentHints)
+  };
+}
 const HUGGING_FACE_HUB_HOSTS = /* @__PURE__ */ new Set(["huggingface.co", "www.huggingface.co"]);
 const HUGGING_FACE_MODEL_TASKS = [
   {
@@ -12009,9 +12149,18 @@ function buildHuggingFaceSearchShortcut(currentUrl, rawQuery) {
     appliedFilters
   };
 }
+const logger$a = createLogger("PageActions");
+function getBookmarkMetadataFromArgs(args) {
+  return normalizeBookmarkMetadata({
+    intent: args.intent ?? args.intent,
+    expectedContent: args.expectedContent ?? args.expected_content,
+    keyFields: args.keyFields ?? args.key_fields,
+    agentHints: args.agentHints ?? args.agent_hints
+  });
+}
 const DEFAULT_PAGE_SCRIPT_TIMEOUT_MS = 1500;
 const PAGE_SCRIPT_TIMEOUT = /* @__PURE__ */ Symbol("page-script-timeout");
-async function loadPermittedUrl$1(wc, url) {
+async function loadPermittedUrl(wc, url) {
   assertPermittedNavigationURL(url);
   await wc.loadURL(url);
 }
@@ -12184,7 +12333,9 @@ async function executePageScript(wc, script, options) {
       return PAGE_SCRIPT_TIMEOUT;
     }
     return result;
-  } catch {
+  } catch (err) {
+    const label = options?.label ? ` (${options.label})` : "";
+    logger$a.warn(`Failed to execute page script${label}:`, err);
     return null;
   } finally {
     if (timer) {
@@ -12284,7 +12435,8 @@ async function getPostSearchSummary(wc) {
 Search results snapshot:
 ${truncated}`;
     }
-  } catch {
+  } catch (err) {
+    logger$a.warn("Failed to build post-search summary, falling back to nav summary:", err);
   }
   const fallback = await getPostNavSummary(wc);
   return fallback ? `${fallback}
@@ -12306,11 +12458,12 @@ async function getPostClickNavSummary(wc, toolProfile) {
 Page snapshot after navigation:
 ${truncated}`;
     }
-  } catch {
+  } catch (err) {
+    logger$a.warn("Failed to build post-click navigation summary:", err);
   }
   return "";
 }
-async function scrollPage$1(wc, deltaY) {
+async function scrollPage(wc, deltaY) {
   const getScrollY = async () => {
     const scrollY = await executePageScript(
       wc,
@@ -12354,7 +12507,7 @@ async function scrollPage$1(wc, deltaY) {
     movedY: Math.round(afterY - beforeY)
   };
 }
-async function clickElement$1(wc, selector) {
+async function clickElement(wc, selector) {
   const target = await executePageScript(
     wc,
     `
@@ -12443,7 +12596,7 @@ async function clickElement$1(wc, selector) {
     return "Error: Could not resolve click coordinates";
   }
   if (hiddenWindow) {
-    const activationResult = await activateElement$1(wc, selector);
+    const activationResult = await activateElement(wc, selector);
     if (activationResult.startsWith("Error:")) {
       return activationResult;
     }
@@ -12458,7 +12611,7 @@ async function clickElement$1(wc, selector) {
   await sleep(80);
   return target.obstructed ? "Clicked via pointer events (target may be partially obstructed)" : "Clicked via pointer events";
 }
-async function activateElement$1(wc, selector) {
+async function activateElement(wc, selector) {
   const activated = await executePageScript(
     wc,
     `
@@ -12490,7 +12643,7 @@ async function activateElement$1(wc, selector) {
   }
   return "Activated element via DOM click";
 }
-async function describeElementForClick$1(wc, selector) {
+async function describeElementForClick(wc, selector) {
   const result = await executePageScript(
     wc,
     `
@@ -12799,7 +12952,8 @@ async function restoreLocaleSnapshot(wc, snapshot) {
         return;
       }
     }
-  } catch {
+  } catch (err) {
+    logger$a.warn("Failed to restore locale via history navigation, trying URL reload fallback:", err);
   }
   if (snapshot.url && snapshot.url !== wc.getURL()) {
     try {
@@ -12807,14 +12961,16 @@ async function restoreLocaleSnapshot(wc, snapshot) {
       await wc.loadURL(snapshot.url);
       await waitForLoad(wc, 3e3);
       return;
-    } catch {
+    } catch (err) {
+      logger$a.warn("Failed to restore locale via safe URL load, trying page reload fallback:", err);
     }
   }
   if (snapshot.url) {
     try {
       await wc.reload();
       await waitForLoad(wc, 3e3);
-    } catch {
+    } catch (err) {
+      logger$a.warn("Failed to restore locale via page reload:", err);
     }
   }
 }
@@ -12945,14 +13101,14 @@ Go back to search results to select the next product.`;
   if (!overlayHint) {
     return cartSummary;
   }
-  const dialogActions = await getCartDialogActions$1(wc);
+  const dialogActions = await getCartDialogActions(wc);
   const actionsSuffix = dialogActions ? `
 ${dialogActions}
 Click one of these dialog actions. Do NOT click any other element.` : "";
   return `
 ${overlayHint}${actionsSuffix}${cartSummary}`;
 }
-async function clickResolvedSelector$1(wc, selector) {
+async function clickResolvedSelector(wc, selector) {
   if (selector.startsWith("__vessel_idx:")) {
     const idx = Number(selector.slice("__vessel_idx:".length));
     const beforeUrl2 = wc.getURL();
@@ -12985,10 +13141,10 @@ Go back and select a different product.`;
     await waitForPotentialNavigation(wc, beforeUrl2);
     const afterUrl2 = wc.getURL();
     if (afterUrl2 !== beforeUrl2) return `${result} -> ${afterUrl2}`;
-    let idxOverlay = await detectPostClickOverlay$1(wc);
+    let idxOverlay = await detectPostClickOverlay(wc);
     if (!idxOverlay && idxCartMatch) {
       await sleep(1200);
-      idxOverlay = await detectPostClickOverlay$1(wc);
+      idxOverlay = await detectPostClickOverlay(wc);
     }
     if (idxCartMatch) {
       return `${result}${await buildCartSuccessSuffix(wc, beforeUrl2, idxOverlay)}`;
@@ -12997,7 +13153,7 @@ Go back and select a different product.`;
       const hrefMatch = typeof result === "string" ? result.match(/\nhref: (https?:\/\/\S+)/) : null;
       if (hrefMatch) {
         try {
-          await loadPermittedUrl$1(wc, hrefMatch[1]);
+          await loadPermittedUrl(wc, hrefMatch[1]);
           await waitForLoad(wc, 8e3);
           const hrefUrl = wc.getURL();
           if (hrefUrl !== beforeUrl2) return `${result.split("\n")[0]} -> ${hrefUrl}`;
@@ -13052,10 +13208,10 @@ Go back and select a different product.`;
     await waitForPotentialNavigation(wc, beforeUrl2);
     const afterUrl2 = wc.getURL();
     if (afterUrl2 !== beforeUrl2) return `${result} -> ${afterUrl2}`;
-    let shadowOverlay = await detectPostClickOverlay$1(wc);
+    let shadowOverlay = await detectPostClickOverlay(wc);
     if (!shadowOverlay && shadowCartMatch) {
       await sleep(1200);
-      shadowOverlay = await detectPostClickOverlay$1(wc);
+      shadowOverlay = await detectPostClickOverlay(wc);
     }
     if (shadowCartMatch) {
       return `${result}${await buildCartSuccessSuffix(wc, beforeUrl2, shadowOverlay)}`;
@@ -13064,7 +13220,7 @@ Go back and select a different product.`;
       const hrefMatch = typeof result === "string" ? result.match(/\nhref: (https?:\/\/\S+)/) : null;
       if (hrefMatch) {
         try {
-          await loadPermittedUrl$1(wc, hrefMatch[1]);
+          await loadPermittedUrl(wc, hrefMatch[1]);
           await waitForLoad(wc, 8e3);
           const hrefUrl = wc.getURL();
           if (hrefUrl !== beforeUrl2) return `${result.split("\n")[0]} -> ${hrefUrl}`;
@@ -13077,14 +13233,14 @@ ${shadowOverlay}` : `${result}
 Note: Page did not change after click.`;
   }
   const beforeUrl = wc.getURL();
-  const elInfo = await describeElementForClick$1(wc, selector);
+  const elInfo = await describeElementForClick(wc, selector);
   if ("error" in elInfo) return `Error: ${elInfo.error}`;
   const cartMatch = isAddToCartText(elInfo.text);
   if (cartMatch && isDuplicateCartClick(beforeUrl, elInfo.text)) {
     return `Blocked: "${elInfo.text}" was already clicked on this page. The item is in your cart. Call read_page to see available actions (e.g. View Cart, Continue Shopping).`;
   }
   if (!cartMatch && recentCartClicks.has(beforeUrl)) {
-    const dialogActions = await getCartDialogActions$1(wc);
+    const dialogActions = await getCartDialogActions(wc);
     if (dialogActions) {
       return `Blocked: a cart confirmation dialog is open. Do not click background elements.
 ${dialogActions}
@@ -13107,14 +13263,14 @@ Go back and select a different product.`;
   }
   const tagLabel = elInfo.tag && elInfo.tag !== "a" && elInfo.tag !== "button" ? ` <${elInfo.tag}>` : "";
   const clickText = `Clicked: ${elInfo.text}${tagLabel}`;
-  const clickResult = await clickElement$1(wc, selector);
+  const clickResult = await clickElement(wc, selector);
   if (clickResult.startsWith("Error:")) return clickResult;
   await waitForPotentialNavigation(wc, beforeUrl);
   const afterUrl = wc.getURL();
   if (afterUrl !== beforeUrl) {
     return `${clickText} -> ${afterUrl}`;
   }
-  const overlayHint = await detectPostClickOverlay$1(wc);
+  const overlayHint = await detectPostClickOverlay(wc);
   if (overlayHint) {
     if (cartMatch) {
       return `${clickText} (${clickResult})${await buildCartSuccessSuffix(
@@ -13128,7 +13284,7 @@ ${overlayHint}`;
   }
   if (cartMatch) {
     await sleep(1200);
-    const delayedOverlayHint = await detectPostClickOverlay$1(wc);
+    const delayedOverlayHint = await detectPostClickOverlay(wc);
     if (delayedOverlayHint) {
       return `${clickText} (${clickResult})${await buildCartSuccessSuffix(
         wc,
@@ -13141,7 +13297,7 @@ ${overlayHint}`;
       beforeUrl
     )}`;
   }
-  const activationResult = await activateElement$1(wc, selector);
+  const activationResult = await activateElement(wc, selector);
   if (!activationResult.startsWith("Error:")) {
     await waitForPotentialNavigation(wc, beforeUrl);
     const fallbackUrl = wc.getURL();
@@ -13149,7 +13305,7 @@ ${overlayHint}`;
       return `${clickText} -> ${fallbackUrl} (recovered via DOM activation)`;
     }
   }
-  const postActivationOverlayHint = await detectPostClickOverlay$1(wc);
+  const postActivationOverlayHint = await detectPostClickOverlay(wc);
   if (postActivationOverlayHint) {
     return `${clickText} (${clickResult})
 ${postActivationOverlayHint}`;
@@ -13159,13 +13315,14 @@ ${postActivationOverlayHint}`;
     const validation = await validateLinkDestination(elInfo.href);
     if (validation.status !== "dead") {
       try {
-        await loadPermittedUrl$1(wc, elInfo.href);
+        await loadPermittedUrl(wc, elInfo.href);
         await waitForLoad(wc, 8e3);
         const hrefFallbackUrl = wc.getURL();
         if (hrefFallbackUrl !== beforeUrl) {
           return `${clickText} -> ${hrefFallbackUrl} (recovered via href fallback)`;
         }
-      } catch {
+      } catch (err) {
+        logger$a.warn("Failed href fallback after click, returning generic click result:", err);
       }
     }
   }
@@ -13209,11 +13366,12 @@ async function tryAutoDismissCartDialog(wc) {
       await sleep(500);
       return result;
     }
-  } catch {
+  } catch (err) {
+    logger$a.warn("Failed to auto-dismiss cart dialog, falling back to dialog actions:", err);
   }
   return null;
 }
-async function getCartDialogActions$1(wc) {
+async function getCartDialogActions(wc) {
   const result = await executePageScript(
     wc,
     `
@@ -13258,7 +13416,7 @@ async function getCartDialogActions$1(wc) {
   return `Available dialog actions:
 ${result.actions.join("\n")}`;
 }
-async function detectPostClickOverlay$1(wc) {
+async function detectPostClickOverlay(wc) {
   const result = await executePageScript(
     wc,
     `
@@ -13364,7 +13522,7 @@ async function detectPostClickOverlay$1(wc) {
   const desc = result.label ? ` ("${result.label}")` : "";
   return `A dialog or overlay appeared${desc}. Call read_page to see available actions.`;
 }
-async function dismissPopup$1(wc) {
+async function dismissPopup(wc) {
   const before = await extractContent(wc);
   const initialBlocking = before.overlays.filter(
     (overlay) => overlay.blocksInteraction
@@ -13417,7 +13575,7 @@ async function dismissPopup$1(wc) {
       if (continueResult && continueResult !== PAGE_SCRIPT_TIMEOUT && typeof continueResult === "string" && !continueResult.startsWith("Error")) {
         return `Cart confirmation handled: ${continueResult}. Item was already added to your cart.`;
       }
-      const dialogActions = await getCartDialogActions$1(wc);
+      const dialogActions = await getCartDialogActions(wc);
       return `Cannot dismiss: this is a cart confirmation dialog. Item is in your cart.${dialogActions ? "\n" + dialogActions + "\nClick one of these instead." : " Use read_page to see dialog actions."}`;
     }
   }
@@ -13577,7 +13735,7 @@ async function dismissPopup$1(wc) {
       if (!candidate || typeof candidate !== "object" || typeof candidate.selector !== "string") {
         continue;
       }
-      const result = await clickElement$1(wc, candidate.selector);
+      const result = await clickElement(wc, candidate.selector);
       if (result.startsWith("Error:")) continue;
       await sleep(250);
       const postClickLocale = await getLocaleSnapshot(wc);
@@ -13619,7 +13777,7 @@ function describeOverlayState(page) {
 }
 async function clickOverlayCandidate(wc, action) {
   if (!action?.selector) return null;
-  const result = await clickResolvedSelector$1(wc, action.selector);
+  const result = await clickResolvedSelector(wc, action.selector);
   return `${action.label || action.selector}: ${result}`;
 }
 async function tryDismissConsentIframe(wc) {
@@ -13830,7 +13988,7 @@ Submitted modal: ${submitResult}`;
       }
     }
     if (!actionMessage) {
-      actionMessage = `Fallback popup handling: ${await dismissPopup$1(wc)}`;
+      actionMessage = `Fallback popup handling: ${await dismissPopup(wc)}`;
     }
     steps.push(actionMessage);
     if (overlay.kind === "cookie_consent") {
@@ -14005,7 +14163,7 @@ async function fillFormFields(wc, fields) {
       });
       continue;
     }
-    const result = await setElementValue$1(
+    const result = await setElementValue(
       wc,
       selector,
       String(field.value || "")
@@ -14014,14 +14172,14 @@ async function fillFormFields(wc, fields) {
   }
   return results;
 }
-function getTabByMatch$1(tabManager, match) {
+function getTabByMatch(tabManager, match) {
   if (!match) return null;
   const lowered = match.toLowerCase();
   return tabManager.getAllStates().find(
     (tab) => tab.title.toLowerCase().includes(lowered) || tab.url.toLowerCase().includes(lowered)
   ) || null;
 }
-function isDangerousAction$1(name) {
+function isDangerousAction(name) {
   return [
     "navigate",
     "open_bookmark",
@@ -14032,6 +14190,7 @@ function isDangerousAction$1(name) {
     "press_key",
     "create_tab",
     "switch_tab",
+    "close_tab",
     "restore_checkpoint",
     "load_session",
     "login",
@@ -14040,7 +14199,7 @@ function isDangerousAction$1(name) {
     "paginate"
   ].includes(name);
 }
-async function setElementValue$1(wc, selector, value) {
+async function setElementValue(wc, selector, value) {
   if (selector.startsWith("__vessel_idx:")) {
     const idx = Number(selector.slice("__vessel_idx:".length));
     const result2 = await executePageScript(
@@ -14144,7 +14303,7 @@ async function setElementValue$1(wc, selector, value) {
   );
   return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result || "Error: Could not type into element";
 }
-async function typeKeystroke$1(wc, selector, value) {
+async function typeKeystroke(wc, selector, value) {
   const result = await executePageScript(
     wc,
     `
@@ -14192,7 +14351,7 @@ async function typeKeystroke$1(wc, selector, value) {
   );
   return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result || "Error: Could not type into element";
 }
-async function hoverElement$1(wc, selector) {
+async function hoverElement(wc, selector) {
   const pos = await wc.executeJavaScript(`
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
@@ -14222,7 +14381,7 @@ async function hoverElement$1(wc, selector) {
   const label = typeof pos.label === "string" ? pos.label : "element";
   return `Hovered: ${label}`;
 }
-async function focusElement$1(wc, selector) {
+async function focusElement(wc, selector) {
   return wc.executeJavaScript(`
     (function() {
       const el = document.querySelector(${JSON.stringify(selector)});
@@ -14236,7 +14395,7 @@ async function focusElement$1(wc, selector) {
     })()
   `);
 }
-async function waitForCondition$1(wc, args) {
+async function waitForCondition(wc, args) {
   const timeoutMs = Math.max(250, Number(args.timeoutMs) || 5e3);
   const selector = typeof args.selector === "string" && args.selector.trim() ? args.selector.trim() : "";
   const text = typeof args.text === "string" && args.text.trim() ? args.text.trim() : "";
@@ -14295,8 +14454,8 @@ function findCheckpoint(checkpoints, args) {
   }
   return null;
 }
-function resolveBookmarkFolderTarget$1(args) {
-  const folderId = typeof args.folderId === "string" ? args.folderId.trim() : "";
+function resolveBookmarkFolderTarget(args) {
+  const folderId = typeof args.folderId === "string" ? args.folderId.trim() : typeof args.folder_id === "string" ? args.folder_id.trim() : "";
   if (folderId) {
     if (folderId === UNSORTED_ID) {
       return {
@@ -14310,7 +14469,7 @@ function resolveBookmarkFolderTarget$1(args) {
     }
     return { folderId: folder2.id, folderName: folder2.name };
   }
-  const folderName = typeof args.folderName === "string" && args.folderName.trim() ? args.folderName.trim() : args.archive ? ARCHIVE_FOLDER_NAME : "";
+  const folderName = typeof args.folderName === "string" && args.folderName.trim() ? args.folderName.trim() : typeof args.folder_name === "string" && args.folder_name.trim() ? args.folder_name.trim() : args.archive ? ARCHIVE_FOLDER_NAME : "";
   if (!folderName || folderName.toLowerCase() === "unsorted") {
     return {
       folderId: UNSORTED_ID,
@@ -14321,10 +14480,11 @@ function resolveBookmarkFolderTarget$1(args) {
   if (existing) {
     return { folderId: existing.id, folderName: existing.name };
   }
-  if (args.createFolderIfMissing === false) {
+  const createIfMissing = args.createFolderIfMissing ?? args.create_folder_if_missing;
+  if (createIfMissing === false) {
     return { folderName, error: `Folder "${folderName}" not found` };
   }
-  const folderSummary = typeof args.folderSummary === "string" && args.folderSummary.trim() ? args.folderSummary.trim() : void 0;
+  const folderSummary = typeof args.folderSummary === "string" && args.folderSummary.trim() ? args.folderSummary.trim() : typeof args.folder_summary === "string" && args.folder_summary.trim() ? args.folder_summary.trim() : void 0;
   const { folder } = ensureFolder(folderName, folderSummary);
   return {
     folderId: folder.id,
@@ -14332,27 +14492,27 @@ function resolveBookmarkFolderTarget$1(args) {
     createdFolder: folder.name
   };
 }
-function formatFolderStatus$1(limit = 6) {
+function formatFolderStatus(limit = 6) {
   const folders = listFolderOverviews();
   const summary = folders.slice(0, limit).map((folder) => `${folder.name} (${folder.count})`).join(", ");
   return `Folder status: ${summary}${folders.length > limit ? ", ..." : ""}`;
 }
-function describeFolder$1(folderId) {
+function describeFolder(folderId) {
   if (!folderId || folderId === UNSORTED_ID) {
     return "Unsorted";
   }
   return getFolder(folderId)?.name ?? folderId;
 }
-function composeDuplicateBookmarkResponse$1(args) {
+function composeDuplicateBookmarkResponse(args) {
   return `Bookmark already exists for ${args.url} in "${args.folderName}" (id=${args.bookmarkId}). Retry with onDuplicate="update" to refresh the existing bookmark or onDuplicate="duplicate" to keep both entries.`;
 }
-function composeFolderAwareResponse$1(message, createdFolder) {
+function composeFolderAwareResponse(message, createdFolder) {
   const prefix = createdFolder ? `Created folder "${createdFolder}".
 ` : "";
   return `${prefix}${message}
-${formatFolderStatus$1()}`;
+${formatFolderStatus()}`;
 }
-async function selectOption$1(wc, args) {
+async function selectOption(wc, args) {
   const selector = await resolveSelector(wc, args.index, args.selector);
   if (!selector) return "Error: No select element index or selector provided";
   const result = await executePageScript(
@@ -14388,7 +14548,7 @@ async function selectOption$1(wc, args) {
   );
   return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("select_option") : result || "Error: Could not select option";
 }
-async function submitForm$1(wc, args) {
+async function submitForm(wc, args) {
   const beforeUrl = wc.getURL();
   let selector = await resolveSelector(wc, args.index, args.selector);
   if (!selector) {
@@ -14529,7 +14689,7 @@ async function submitForm$1(wc, args) {
     if (formInfo.params) {
       url.search = formInfo.params;
     }
-    await loadPermittedUrl$1(wc, url.toString());
+    await loadPermittedUrl(wc, url.toString());
     await waitForPotentialNavigation(wc, beforeUrl);
     const afterUrl = wc.getURL();
     return afterUrl !== beforeUrl ? `Submitted form via GET -> ${afterUrl}` : "Submitted form via GET";
@@ -14571,8 +14731,20 @@ async function submitForm$1(wc, args) {
   }
   return "Submitted form";
 }
+async function pressKeyDirect(wc, key, index, selector) {
+  return pressKey(wc, { key, index, selector });
+}
+async function submitFormDirect(wc, index, selector) {
+  return submitForm(wc, { index, selector });
+}
+async function selectOptionDirect(wc, index, selector, label, value) {
+  return selectOption(wc, { index, selector, label, value });
+}
+async function waitForConditionDirect(wc, text, selector, timeoutMs) {
+  return waitForCondition(wc, { text, selector, timeoutMs });
+}
 async function clickElementBySelector(wc, selector) {
-  return clickResolvedSelector$1(wc, selector);
+  return clickResolvedSelector(wc, selector);
 }
 function normalizeSearchQuery(query) {
   return query.replace(/\s+/g, " ").trim();
@@ -14856,7 +15028,7 @@ async function searchPage(wc, args) {
     const shortcut = buildSearchShortcut(wc.getURL(), query);
     if (shortcut) {
       const beforeUrl2 = wc.getURL();
-      await loadPermittedUrl$1(wc, shortcut.url);
+      await loadPermittedUrl(wc, shortcut.url);
       await waitForPotentialNavigation(wc, beforeUrl2, 4e3);
       const afterUrl2 = wc.getURL();
       const applied = shortcut.appliedFilters.length > 0 ? ` (${shortcut.appliedFilters.join(", ")})` : "";
@@ -14874,13 +15046,13 @@ async function searchPage(wc, args) {
   if (!searchInfo?.selector) {
     return 'Error: Could not find a visible search input. Try read_page(mode="visible_only") or provide a selector.';
   }
-  const fillResult = await setElementValue$1(wc, searchInfo.selector, query);
+  const fillResult = await setElementValue(wc, searchInfo.selector, query);
   if (fillResult.startsWith("Error:")) {
     return fillResult;
   }
   await sleep(100);
   const beforeUrl = wc.getURL();
-  const keyResult = await pressKey$1(wc, {
+  const keyResult = await pressKey(wc, {
     key: "Enter",
     selector: searchInfo.selector
   });
@@ -14904,7 +15076,7 @@ async function searchPage(wc, args) {
   }
   return `Searched "${query}" (same page — results may have loaded dynamically)${await getPostSearchSummary(wc)}`;
 }
-async function pressKey$1(wc, args) {
+async function pressKey(wc, args) {
   const key = typeof args.key === "string" ? args.key.trim() : "";
   if (!key) return "Error: No key provided";
   const selector = await resolveSelector(wc, args.index, args.selector);
@@ -15116,9 +15288,8 @@ const KNOWN_TOOLS = /* @__PURE__ */ new Set([
   "metrics",
   "wait_for_navigation"
 ]);
-async function executeAction(name, rawArgs, ctx) {
+async function executeAction(name, args, ctx) {
   name = normalizeToolAlias(name);
-  const args = rawArgs;
   if (!KNOWN_TOOLS.has(name)) {
     for (const known of KNOWN_TOOLS) {
       if (name.startsWith(known) && name.length > known.length) {
@@ -15167,7 +15338,7 @@ async function executeAction(name, rawArgs, ctx) {
     name,
     args,
     tabId,
-    dangerous: isDangerousAction$1(name),
+    dangerous: isDangerousAction(name),
     executor: async () => {
       switch (name) {
         case "screenshot": {
@@ -15215,7 +15386,7 @@ async function executeAction(name, rawArgs, ctx) {
         case "switch_tab": {
           let targetId = typeof args.tabId === "string" ? args.tabId.trim() : "";
           if (!targetId) {
-            targetId = getTabByMatch$1(ctx.tabManager, args.match)?.id || "";
+            targetId = getTabByMatch(ctx.tabManager, args.match)?.id || "";
           }
           if (!targetId) return "Error: No matching tab found";
           ctx.tabManager.switchTab(targetId);
@@ -15309,7 +15480,7 @@ async function executeAction(name, rawArgs, ctx) {
           if (!selector) {
             return "Error: No element index, selector, or visible text provided";
           }
-          return clickResolvedSelector$1(wc, selector);
+          return clickResolvedSelector(wc, selector);
         }
         case "inspect_element": {
           if (!wc) return "Error: No active tab";
@@ -15341,18 +15512,18 @@ async function executeAction(name, rawArgs, ctx) {
           if (!selector) return "Error: No element index or selector provided";
           const mode = typeof args.mode === "string" ? args.mode : "default";
           if (mode === "keystroke") {
-            return typeKeystroke$1(wc, selector, String(args.text || ""));
+            return typeKeystroke(wc, selector, String(args.text || ""));
           }
-          return setElementValue$1(wc, selector, String(args.text || ""));
+          return setElementValue(wc, selector, String(args.text || ""));
         }
         case "select_option": {
           if (!wc) return "Error: No active tab";
-          return selectOption$1(wc, args);
+          return selectOption(wc, args);
         }
         case "submit_form": {
           if (!wc) return "Error: No active tab";
           const beforeUrl = wc.getURL();
-          const result2 = await submitForm$1(wc, args);
+          const result2 = await submitForm(wc, args);
           if (result2.startsWith("Error") || result2.startsWith("Target") || result2.startsWith("No parent") || result2.startsWith("Submit control")) {
             return result2;
           }
@@ -15363,7 +15534,7 @@ async function executeAction(name, rawArgs, ctx) {
         case "press_key": {
           if (!wc) return "Error: No active tab";
           const beforeUrl = wc.getURL();
-          const result2 = await pressKey$1(wc, args);
+          const result2 = await pressKey(wc, args);
           const key = typeof args.key === "string" ? args.key.trim() : "";
           if (key === "Enter") {
             await waitForPotentialNavigation(wc, beforeUrl, 3e3);
@@ -15380,20 +15551,20 @@ async function executeAction(name, rawArgs, ctx) {
           if (!wc) return "Error: No active tab";
           const pixels = coerceOptionalNumber(args.amount) ?? 500;
           const dir = args.direction === "up" ? -pixels : pixels;
-          const result2 = await scrollPage$1(wc, dir);
+          const result2 = await scrollPage(wc, dir);
           return `Scrolled ${args.direction} by ${pixels}px (moved ${Math.abs(result2.movedY)}px, now at y=${Math.round(result2.afterY)})`;
         }
         case "hover": {
           if (!wc) return "Error: No active tab";
           const selector = await resolveSelector(wc, args.index, args.selector);
           if (!selector) return "Error: No element index or selector provided";
-          return hoverElement$1(wc, selector);
+          return hoverElement(wc, selector);
         }
         case "focus": {
           if (!wc) return "Error: No active tab";
           const selector = await resolveSelector(wc, args.index, args.selector);
           if (!selector) return "Error: No element index or selector provided";
-          return focusElement$1(wc, selector);
+          return focusElement(wc, selector);
         }
         case "set_ad_blocking": {
           const enabled = typeof args.enabled === "boolean" ? args.enabled : null;
@@ -15402,7 +15573,7 @@ async function executeAction(name, rawArgs, ctx) {
           }
           let targetId = typeof args.tabId === "string" ? args.tabId.trim() : "";
           if (!targetId) {
-            targetId = getTabByMatch$1(ctx.tabManager, args.match)?.id || "";
+            targetId = getTabByMatch(ctx.tabManager, args.match)?.id || "";
           }
           if (!targetId) {
             targetId = ctx.tabManager.getActiveTabId() || "";
@@ -15421,7 +15592,7 @@ async function executeAction(name, rawArgs, ctx) {
         }
         case "dismiss_popup": {
           if (!wc) return "Error: No active tab";
-          return dismissPopup$1(wc);
+          return dismissPopup(wc);
         }
         case "clear_overlays": {
           if (!wc) return "Error: No active tab";
@@ -15444,7 +15615,8 @@ async function executeAction(name, rawArgs, ctx) {
                 }, 6e3)
               )
             ]);
-          } catch {
+          } catch (err) {
+            logger$a.warn("Failed to extract content for read_page, falling back to lighter recovery:", err);
             content = null;
           }
           if (!content || content.content.length === 0) {
@@ -15460,11 +15632,13 @@ async function executeAction(name, rawArgs, ctx) {
                     extractContent(wc),
                     new Promise((resolve) => setTimeout(() => resolve(null), 3e3))
                   ]);
-                } catch {
+                } catch (err) {
+                  logger$a.warn("Failed to re-extract content after iframe consent dismissal:", err);
                   content = null;
                 }
               }
-            } catch {
+            } catch (err) {
+              logger$a.warn("Failed iframe consent dismissal during read_page recovery:", err);
             }
           }
           if (content && content.content.length > 0) {
@@ -15504,7 +15678,7 @@ ${truncated}`;
         }
         case "wait_for": {
           if (!wc) return "Error: No active tab";
-          return waitForCondition$1(wc, args);
+          return waitForCondition(wc, args);
         }
         case "wait_for_navigation": {
           if (!wc) return "Error: No active tab";
@@ -15647,12 +15821,12 @@ ${truncated}`;
             (folder2) => folder2.name.toLowerCase() === name2.toLowerCase()
           );
           if (existing) {
-            return composeFolderAwareResponse$1(
+            return composeFolderAwareResponse(
               `Folder "${existing.name}" already exists (id=${existing.id})`
             );
           }
           const folder = createFolderWithSummary(name2, summary);
-          return composeFolderAwareResponse$1(
+          return composeFolderAwareResponse(
             `Created folder "${folder.name}" (id=${folder.id})`
           );
         }
@@ -15664,7 +15838,7 @@ ${truncated}`;
             resolvedSelector
           });
           if ("error" in source) return `Error: ${source.error}`;
-          const target = resolveBookmarkFolderTarget$1(args);
+          const target = resolveBookmarkFolderTarget(args);
           if (target.error) return target.error;
           const note = typeof args.note === "string" && args.note.trim() ? args.note.trim() : void 0;
           const onDuplicate = typeof args.onDuplicate === "string" && ["ask", "update", "duplicate"].includes(args.onDuplicate) ? args.onDuplicate : "ask";
@@ -15675,21 +15849,14 @@ ${truncated}`;
             note,
             {
               onDuplicate,
-              extra: {
-                intent: typeof args.intent === "string" && args.intent.trim() ? args.intent.trim() : void 0,
-                expectedContent: typeof args.expectedContent === "string" && args.expectedContent.trim() ? args.expectedContent.trim() : void 0,
-                keyFields: Array.isArray(args.keyFields) ? args.keyFields.filter(
-                  (f) => typeof f === "string"
-                ) : void 0,
-                agentHints: args.agentHints && typeof args.agentHints === "object" ? args.agentHints : void 0
-              }
+              extra: getBookmarkMetadataFromArgs(args)
             }
           );
           if (result2.status === "conflict" && result2.existing) {
-            return composeFolderAwareResponse$1(
-              composeDuplicateBookmarkResponse$1({
+            return composeFolderAwareResponse(
+              composeDuplicateBookmarkResponse({
                 url: source.url,
-                folderName: describeFolder$1(target.folderId),
+                folderName: describeFolder(target.folderId),
                 bookmarkId: result2.existing.id
               }),
               target.createdFolder
@@ -15698,13 +15865,13 @@ ${truncated}`;
           const bookmark = result2.bookmark;
           if (!bookmark) return "Error: Bookmark save failed";
           const verb = result2.status === "updated" ? "Updated" : "Saved";
-          return composeFolderAwareResponse$1(
-            `${verb} "${bookmark.title}" (${bookmark.url}) in "${describeFolder$1(bookmark.folderId)}" (id=${bookmark.id})`,
+          return composeFolderAwareResponse(
+            `${verb} "${bookmark.title}" (${bookmark.url}) in "${describeFolder(bookmark.folderId)}" (id=${bookmark.id})`,
             target.createdFolder
           );
         }
         case "organize_bookmark": {
-          const target = resolveBookmarkFolderTarget$1(args);
+          const target = resolveBookmarkFolderTarget(args);
           if (target.error) return target.error;
           const bookmarkId = typeof args.bookmarkId === "string" ? args.bookmarkId.trim() : "";
           const note = typeof args.note === "string" && args.note.trim() ? args.note.trim() : void 0;
@@ -15723,18 +15890,13 @@ ${truncated}`;
               folderId: target.folderId,
               title: typeof args.title === "string" && args.title.trim() ? args.title.trim() : void 0,
               note,
-              intent: typeof args.intent === "string" && args.intent.trim() ? args.intent.trim() : void 0,
-              expectedContent: typeof args.expectedContent === "string" && args.expectedContent.trim() ? args.expectedContent.trim() : void 0,
-              keyFields: Array.isArray(args.keyFields) ? args.keyFields.filter(
-                (f) => typeof f === "string"
-              ) : void 0,
-              agentHints: args.agentHints && typeof args.agentHints === "object" ? args.agentHints : void 0
+              ...getBookmarkMetadataFromArgs(args)
             });
             if (!updated) {
               return `Bookmark ${existing.id} not found`;
             }
-            return composeFolderAwareResponse$1(
-              `Organized existing bookmark "${updated.title}" into "${describeFolder$1(updated.folderId)}" (id=${updated.id})`,
+            return composeFolderAwareResponse(
+              `Organized existing bookmark "${updated.title}" into "${describeFolder(updated.folderId)}" (id=${updated.id})`,
               target.createdFolder
             );
           }
@@ -15746,25 +15908,18 @@ ${truncated}`;
             note,
             {
               onDuplicate: "update",
-              extra: {
-                intent: typeof args.intent === "string" && args.intent.trim() ? args.intent.trim() : void 0,
-                expectedContent: typeof args.expectedContent === "string" && args.expectedContent.trim() ? args.expectedContent.trim() : void 0,
-                keyFields: Array.isArray(args.keyFields) ? args.keyFields.filter(
-                  (f) => typeof f === "string"
-                ) : void 0,
-                agentHints: args.agentHints && typeof args.agentHints === "object" ? args.agentHints : void 0
-              }
+              extra: getBookmarkMetadataFromArgs(args)
             }
           );
           const bookmark = result2.bookmark;
           if (!bookmark) return "Error: Bookmark save failed";
-          return composeFolderAwareResponse$1(
-            `Saved and organized "${bookmark.title}" (${bookmark.url}) into "${describeFolder$1(bookmark.folderId)}" (id=${bookmark.id})`,
+          return composeFolderAwareResponse(
+            `Saved and organized "${bookmark.title}" (${bookmark.url}) into "${describeFolder(bookmark.folderId)}" (id=${bookmark.id})`,
             target.createdFolder
           );
         }
         case "archive_bookmark": {
-          const target = resolveBookmarkFolderTarget$1({ archive: true });
+          const target = resolveBookmarkFolderTarget({ archive: true });
           if (target.error) return target.error;
           const bookmarkId = typeof args.bookmarkId === "string" ? args.bookmarkId.trim() : "";
           const note = typeof args.note === "string" && args.note.trim() ? args.note.trim() : void 0;
@@ -15787,8 +15942,8 @@ ${truncated}`;
             if (!updated) {
               return `Bookmark ${existing.id} not found`;
             }
-            return composeFolderAwareResponse$1(
-              `Archived bookmark "${updated.title}" into "${describeFolder$1(updated.folderId)}" (id=${updated.id})`,
+            return composeFolderAwareResponse(
+              `Archived bookmark "${updated.title}" into "${describeFolder(updated.folderId)}" (id=${updated.id})`,
               target.createdFolder
             );
           }
@@ -15801,8 +15956,8 @@ ${truncated}`;
             target.folderId,
             note
           );
-          return composeFolderAwareResponse$1(
-            `Saved and archived "${bookmark.title}" (${bookmark.url}) into "${describeFolder$1(bookmark.folderId)}" (id=${bookmark.id})`,
+          return composeFolderAwareResponse(
+            `Saved and archived "${bookmark.title}" (${bookmark.url}) into "${describeFolder(bookmark.folderId)}" (id=${bookmark.id})`,
             target.createdFolder
           );
         }
@@ -15890,7 +16045,8 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
           let page;
           try {
             page = await extractContent(wc);
-          } catch {
+          } catch (err) {
+            logger$a.warn("Failed to extract content for suggest:", err);
             return "Could not read page. Try navigate to a working URL.";
           }
           const suggestions = [];
@@ -15995,7 +16151,7 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
             const firstSel = fillResults.find((item) => item.selector)?.selector ?? null;
             if (firstSel) {
               const beforeUrl = wc.getURL();
-              const submitResult = await submitForm$1(wc, { selector: firstSel });
+              const submitResult = await submitForm(wc, { selector: firstSel });
               await waitForPotentialNavigation(wc, beforeUrl);
               const afterUrl = wc.getURL();
               results.push(
@@ -16043,13 +16199,13 @@ ${results.join("\n")}`;
           );
           if (!passSel)
             return "Error: Could not find password field. Try providing password_selector.";
-          const userResult = await setElementValue$1(
+          const userResult = await setElementValue(
             wc,
             userSel,
             String(args.username || "")
           );
           steps.push(userResult);
-          const passResult = await setElementValue$1(
+          const passResult = await setElementValue(
             wc,
             passSel,
             String(args.password || "")
@@ -16057,7 +16213,7 @@ ${results.join("\n")}`;
           steps.push(passResult);
           const beforeUrl = wc.getURL();
           if (args.submit_selector) {
-            await clickResolvedSelector$1(wc, args.submit_selector);
+            await clickResolvedSelector(wc, args.submit_selector);
           } else {
             const clicked = await executePageScript(
               wc,
@@ -16096,7 +16252,7 @@ ${steps.join("\n")}`;
           if (!wc) return "Error: No active tab";
           const beforeUrl = wc.getURL();
           if (args.selector) {
-            return clickResolvedSelector$1(wc, args.selector);
+            return clickResolvedSelector(wc, args.selector);
           }
           const isNext = args.direction === "next";
           const clicked = await executePageScript(
@@ -17221,6 +17377,7 @@ const ALGORITHM = "aes-256-gcm";
 const IV_LENGTH = 12;
 const AUTH_TAG_LENGTH = 16;
 let cachedEntries = null;
+const logger$9 = createLogger("Vault");
 function getVaultDir() {
   return electron.app.getPath("userData");
 }
@@ -17287,7 +17444,7 @@ function loadVault() {
     cachedEntries = JSON.parse(json);
     return cachedEntries;
   } catch (err) {
-    console.error("[Vessel Vault] Failed to load vault:", err);
+    logger$9.error("Failed to load vault:", err);
     throw new Error(
       "Could not unlock the Agent Credential Vault. Check that OS secret storage is available and that the stored vault key can be decrypted."
     );
@@ -17429,6 +17586,7 @@ async function requestConsent(request) {
 }
 const AUDIT_FILENAME = "vessel-vault-audit.jsonl";
 const MAX_ENTRIES = 1e3;
+const logger$8 = createLogger("VaultAudit");
 function getAuditPath() {
   return path$1.join(electron.app.getPath("userData"), AUDIT_FILENAME);
 }
@@ -17438,7 +17596,7 @@ function appendAuditEntry(entry) {
     fs$1.mkdirSync(path$1.dirname(auditPath), { recursive: true });
     fs$1.appendFileSync(auditPath, JSON.stringify(entry) + "\n");
   } catch (err) {
-    console.error("[Vessel Vault] Failed to write audit log:", err);
+    logger$8.error("Failed to write audit log:", err);
   }
 }
 function readAuditLog(limit = 100) {
@@ -17448,12 +17606,13 @@ function readAuditLog(limit = 100) {
     const lines = fs$1.readFileSync(auditPath, "utf-8").split("\n").filter((l) => l.trim());
     return lines.slice(-Math.min(limit, MAX_ENTRIES)).map((line) => JSON.parse(line)).reverse();
   } catch (err) {
-    console.error("[Vessel Vault] Failed to read audit log:", err);
+    logger$8.error("Failed to read audit log:", err);
     return [];
   }
 }
 let httpServer = null;
 let mcpAuthToken = null;
+const logger$7 = createLogger("MCP");
 const MCP_AUTH_FILENAME = "mcp-auth.json";
 function getMcpAuthFilePath() {
   const configDir = process.env.VESSEL_CONFIG_DIR || path$1.join(
@@ -17489,7 +17648,7 @@ function writeMcpAuthFile(endpoint, token) {
       { mode: 384 }
     );
   } catch (err) {
-    console.warn("[Vessel MCP] Failed to write auth file:", err);
+    logger$7.warn("Failed to write auth file:", err);
   }
 }
 function clearMcpAuthFile() {
@@ -17514,15 +17673,17 @@ function clearMcpAuthFile() {
       { mode: 384 }
     );
   } catch (err) {
-    console.warn("[Vessel MCP] Failed to clear auth file:", err);
+    logger$7.warn("Failed to clear auth file:", err);
   }
 }
 function asTextResponse(text) {
   return { content: [{ type: "text", text }] };
 }
-async function loadPermittedUrl(wc, url) {
-  assertPermittedNavigationURL(url);
-  await wc.loadURL(url);
+function asErrorTextResponse(message) {
+  return asTextResponse(`Error: ${message}`);
+}
+function asNoActiveTabResponse() {
+  return asErrorTextResponse("No active tab");
 }
 function asPromptResponse(text) {
   return {
@@ -17537,6 +17698,9 @@ function asPromptResponse(text) {
     ]
   };
 }
+function isDangerousMcpAction(name) {
+  return name === "close_tab" || isDangerousAction(name);
+}
 function getActiveTabSummary(tabManager) {
   const activeTab = tabManager.getActiveTab();
   const activeTabId = tabManager.getActiveTabId();
@@ -17553,1298 +17717,162 @@ function getActiveTabSummary(tabManager) {
     humanFocused: true
   };
 }
-function formatFolderStatus(limit = 6) {
-  const folders = listFolderOverviews();
-  const visible = folders.slice(0, limit);
-  const summary = visible.map((folder) => `${folder.name} (${folder.count})`).join(", ");
-  return `Folder status: ${summary}${folders.length > limit ? ", ..." : ""}`;
-}
-function describeFolder(folderId) {
-  if (!folderId || folderId === UNSORTED_ID) {
-    return "Unsorted";
+async function getPostActionState(tabManager, name) {
+  const tab = tabManager.getActiveTab();
+  if (!tab) return "";
+  const wc = tab.view.webContents;
+  const navActions = [
+    "navigate",
+    "go_back",
+    "go_forward",
+    "click",
+    "submit_form",
+    "reload",
+    "press_key"
+  ];
+  const interactActions = [
+    "type",
+    "type_text",
+    "select_option",
+    "hover",
+    "focus"
+  ];
+  const tabActions = ["create_tab", "switch_tab", "close_tab"];
+  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(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 (err) {
+      logger$7.warn("Failed to compute post-action state warning:", err);
+    }
+    return `${warning}
+[state: url=${wc.getURL()}, canGoBack=${tab.canGoBack()}, canGoForward=${tab.canGoForward()}, loading=${wc.isLoading()}]`;
   }
-  return getFolder(folderId)?.name ?? folderId;
-}
-function resolveBookmarkFolderTarget(args) {
-  const folderId = typeof args.folder_id === "string" ? args.folder_id.trim() : "";
-  if (folderId) {
-    if (folderId === UNSORTED_ID) {
-      return {
-        folderId: UNSORTED_ID,
-        folderName: "Unsorted"
-      };
-    }
-    const folder2 = getFolder(folderId);
-    if (!folder2) {
-      return { folderName: "Unsorted", error: `Folder ${folderId} not found` };
-    }
-    return { folderId: folder2.id, folderName: folder2.name };
-  }
-  const requestedName = typeof args.folder_name === "string" && args.folder_name.trim() ? args.folder_name.trim() : args.archive ? ARCHIVE_FOLDER_NAME : "";
-  if (!requestedName || requestedName.toLowerCase() === "unsorted") {
-    return {
-      folderId: UNSORTED_ID,
-      folderName: "Unsorted"
-    };
-  }
-  const existing = findFolderByName(requestedName);
-  if (existing) {
-    return { folderId: existing.id, folderName: existing.name };
-  }
-  const createIfMissing = args.create_folder_if_missing !== false;
-  if (!createIfMissing) {
-    return {
-      folderName: requestedName,
-      error: `Folder "${requestedName}" not found`
-    };
-  }
-  const folderSummary = typeof args.folder_summary === "string" && args.folder_summary.trim() ? args.folder_summary.trim() : void 0;
-  const { folder } = ensureFolder(requestedName, folderSummary);
-  return {
-    folderId: folder.id,
-    folderName: folder.name,
-    createdFolder: folder.name
-  };
-}
-function composeFolderAwareResponse(message, createdFolder) {
-  const prefix = createdFolder ? `Created folder "${createdFolder}".
-` : "";
-  return `${prefix}${message}
-${formatFolderStatus()}`;
-}
-function composeDuplicateBookmarkResponse(args) {
-  return `Bookmark already exists for ${args.url} in "${args.folderName}" (id=${args.bookmarkId}). Retry with on_duplicate="update" to refresh the existing bookmark or on_duplicate="duplicate" to keep both entries.`;
-}
-async function scrollPage(wc, deltaY) {
-  const getScrollY = () => wc.executeJavaScript(`
-      (function() {
-        return Math.max(
-          window.scrollY || 0,
-          window.pageYOffset || 0,
-          document.scrollingElement?.scrollTop || 0,
-          document.documentElement?.scrollTop || 0,
-          document.body?.scrollTop || 0,
-        );
-      })()
-    `);
-  const beforeY = await getScrollY();
-  await wc.executeJavaScript(`window.scrollBy(0, ${deltaY})`);
-  await sleep(100);
-  const afterY = await getScrollY();
-  return {
-    beforeY,
-    afterY,
-    movedY: Math.round(afterY - beforeY)
-  };
-}
-async function clickElement(wc, selector) {
-  const target = await wc.executeJavaScript(`
-    (async function() {
-      function matchesTarget(candidate, el) {
-        return !!candidate && (candidate === el || el.contains(candidate) || candidate.contains(el));
-      }
-
-      function samplePoints(rect) {
-        const width = window.innerWidth || document.documentElement?.clientWidth || 0;
-        const height = window.innerHeight || document.documentElement?.clientHeight || 0;
-        const insetX = Math.min(12, rect.width / 4);
-        const insetY = Math.min(12, rect.height / 4);
-        const raw = [
-          [rect.left + rect.width / 2, rect.top + rect.height / 2],
-          [rect.left + insetX, rect.top + insetY],
-          [rect.right - insetX, rect.top + insetY],
-          [rect.left + insetX, rect.bottom - insetY],
-          [rect.right - insetX, rect.bottom - insetY],
-        ];
-        return raw.map(([x, y]) => ({
-          x: Math.min(Math.max(1, x), Math.max(1, width - 1)),
-          y: Math.min(Math.max(1, y), Math.max(1, height - 1)),
-        }));
-      }
-
-      const el = document.querySelector(${JSON.stringify(selector)});
-      if (!el) return { error: "Element not found" };
-
-      if (el instanceof HTMLElement) {
-        el.scrollIntoView({ behavior: "instant", block: "center", inline: "center" });
-      }
-
-      await new Promise((resolve) => {
-        let settled = false;
-        const finish = () => {
-          if (settled) return;
-          settled = true;
-          resolve(undefined);
-        };
-        if (
-          typeof requestAnimationFrame === "function" &&
-          document.visibilityState === "visible"
-        ) {
-          requestAnimationFrame(() => finish());
-        }
-        setTimeout(finish, 32);
-      });
-
-      const rect = el.getBoundingClientRect();
-      if (rect.width <= 0 || rect.height <= 0) {
-        return { error: "Element is not visible. It may be inside a collapsed, lazy-loaded, or virtual-scroll section. Scroll toward it (scroll or scroll_to_element) then call read_page to refresh visible elements before clicking again." };
-      }
-
-      const points = samplePoints(rect);
-      const hit = points.find((point) => matchesTarget(document.elementFromPoint(point.x, point.y), el));
-      const chosen = hit || points[0];
-      const top = document.elementFromPoint(chosen.x, chosen.y);
-
-      return {
-        x: Math.round(chosen.x),
-        y: Math.round(chosen.y),
-        obstructed: !matchesTarget(top, el),
-        hiddenWindow: document.visibilityState !== "visible",
-      };
-    })()
-  `);
-  if (!target || typeof target !== "object") {
-    return "Error: Could not resolve click target";
-  }
-  if ("error" in target && typeof target.error === "string") {
-    return `Error: ${target.error}`;
-  }
-  const x = typeof target.x === "number" ? target.x : null;
-  const y = typeof target.y === "number" ? target.y : null;
-  const hiddenWindow = target.hiddenWindow === true;
-  if (x == null || y == null) {
-    return "Error: Could not resolve click coordinates";
-  }
-  if (hiddenWindow) {
-    const activationResult = await activateElement(wc, selector);
-    if (activationResult.startsWith("Error:")) {
-      return activationResult;
-    }
-    await sleep(80);
-    return "Clicked via DOM activation";
-  }
-  wc.sendInputEvent({ type: "mouseMove", x, y });
-  await sleep(16);
-  wc.sendInputEvent({ type: "mouseDown", x, y, button: "left", clickCount: 1 });
-  await sleep(24);
-  wc.sendInputEvent({ type: "mouseUp", x, y, button: "left", clickCount: 1 });
-  await sleep(80);
-  return target.obstructed ? "Clicked via pointer events (target may be partially obstructed)" : "Clicked via pointer events";
-}
-async function activateElement(wc, selector) {
-  const activated = await wc.executeJavaScript(`
-    (function() {
-      const el = document.querySelector(${JSON.stringify(selector)});
-      if (!el) return { error: "Element not found" };
-      if (el instanceof HTMLElement) {
-        el.focus({ preventScroll: true });
-      }
-      if (typeof el.click === "function") {
-        el.click();
-        return { ok: true };
-      }
-      return { error: "Element is not clickable" };
-    })()
-  `);
-  if (!activated || typeof activated !== "object") {
-    return "Error: Could not activate element";
-  }
-  if ("error" in activated && typeof activated.error === "string") {
-    return `Error: ${activated.error}`;
-  }
-  return "Activated element via DOM click";
-}
-async function describeElementForClick(wc, selector) {
-  const result = await wc.executeJavaScript(`
-    (function() {
-      const el = document.querySelector(${JSON.stringify(selector)});
-      if (!el) return { error: "Element not found" };
-      const anchor = el instanceof HTMLAnchorElement ? el : el.closest("a[href]");
-      const text = (el.textContent || el.tagName || "Element").trim().slice(0, 100);
-      return {
-        text: text || "Element",
-        href: anchor instanceof HTMLAnchorElement ? anchor.href : undefined,
-      };
-    })()
-  `);
-  if (!result || typeof result !== "object") {
-    return { error: "Element not found" };
-  }
-  if ("error" in result && typeof result.error === "string") {
-    return { error: result.error };
-  }
-  return {
-    text: "text" in result && typeof result.text === "string" ? result.text : "Element",
-    href: "href" in result && typeof result.href === "string" ? result.href : void 0
-  };
-}
-async function clickResolvedSelector(wc, selector) {
-  if (selector.startsWith("__vessel_idx:")) {
-    const idx = Number(selector.slice("__vessel_idx:".length));
-    const beforeUrl2 = wc.getURL();
-    const idxLabel = await wc.executeJavaScript(
-      `window.__vessel?.getElementText?.(${idx}) || ""`
-    );
-    if (typeof idxLabel === "string" && isAddToCartText(idxLabel) && isDuplicateCartClick(beforeUrl2, idxLabel)) {
-      return `Blocked: "${idxLabel}" was already clicked on this page. The item is in your cart. Call read_page to see available actions (e.g. View Cart, Continue Shopping).`;
-    }
-    const result = await wc.executeJavaScript(
-      `window.__vessel?.interactByIndex?.(${idx}, "click") || "Error: interactByIndex not available"`
-    );
-    if (typeof result === "string" && result.startsWith("Error")) return result;
-    if (typeof idxLabel === "string" && isAddToCartText(idxLabel)) {
-      recordCartClick(beforeUrl2, idxLabel);
-    }
-    await waitForPotentialNavigation$1(wc, beforeUrl2);
-    const afterUrl2 = wc.getURL();
-    if (afterUrl2 !== beforeUrl2) return `${result} -> ${afterUrl2}`;
-    let overlayHint2 = await detectPostClickOverlay(wc);
-    if (!overlayHint2 && typeof idxLabel === "string" && isAddToCartText(idxLabel)) {
-      await sleep(1200);
-      overlayHint2 = await detectPostClickOverlay(wc);
-    }
-    if (!overlayHint2) {
-      const hrefMatch = typeof result === "string" ? result.match(/\nhref: (https?:\/\/\S+)/) : null;
-      if (hrefMatch) {
-        try {
-          await loadPermittedUrl(wc, hrefMatch[1]);
-          await waitForLoad(wc, 8e3);
-          const hrefUrl = wc.getURL();
-          if (hrefUrl !== beforeUrl2) return `${result.split("\n")[0]} -> ${hrefUrl}`;
-        } catch {
-        }
-      }
-      return result;
-    }
-    const dialogActions = typeof idxLabel === "string" && isAddToCartText(idxLabel) ? await getCartDialogActions(wc) : null;
-    const actionsSuffix = dialogActions ? `
-${dialogActions}
-Click one of these dialog actions. Do NOT click any other element.` : "";
-    return `${result}
-${overlayHint2}${actionsSuffix}`;
-  }
-  if (selector.includes(" >>> ")) {
-    const beforeUrl2 = wc.getURL();
-    const shadowLabel = await wc.executeJavaScript(`
-      (function() {
-        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
-        return el ? (el.getAttribute("aria-label") || el.textContent?.trim().slice(0, 60) || "") : "";
-      })()
-    `);
-    if (typeof shadowLabel === "string" && isAddToCartText(shadowLabel) && isDuplicateCartClick(beforeUrl2, shadowLabel)) {
-      return `Blocked: "${shadowLabel}" was already clicked on this page. The item is in your cart. Call read_page to see available actions (e.g. View Cart, Continue Shopping).`;
-    }
-    const result = await wc.executeJavaScript(`
-      (function() {
-        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
-        if (!el || !document.contains(el)) return "Error[stale-index]: Shadow DOM element not found — call read_page to refresh.";
-        if (el instanceof HTMLElement) { el.focus(); el.click(); }
-        var anchor = el instanceof HTMLAnchorElement ? el : el.closest('a[href]');
-        var href = anchor instanceof HTMLAnchorElement ? anchor.href : null;
-        return "Clicked: " + (el.getAttribute("aria-label") || el.textContent?.trim().slice(0, 60) || el.tagName.toLowerCase()) + (href ? "\\nhref: " + href : "");
-      })()
-    `);
-    if (typeof result === "string" && result.startsWith("Error")) return result;
-    if (typeof shadowLabel === "string" && isAddToCartText(shadowLabel)) {
-      recordCartClick(beforeUrl2, shadowLabel);
-    }
-    await waitForPotentialNavigation$1(wc, beforeUrl2);
-    const afterUrl2 = wc.getURL();
-    if (afterUrl2 !== beforeUrl2) return `${result} -> ${afterUrl2}`;
-    let overlayHint2 = await detectPostClickOverlay(wc);
-    if (!overlayHint2 && typeof shadowLabel === "string" && isAddToCartText(shadowLabel)) {
-      await sleep(1200);
-      overlayHint2 = await detectPostClickOverlay(wc);
-    }
-    if (!overlayHint2) {
-      const hrefMatch = typeof result === "string" ? result.match(/\nhref: (https?:\/\/\S+)/) : null;
-      if (hrefMatch) {
-        try {
-          await loadPermittedUrl(wc, hrefMatch[1]);
-          await waitForLoad(wc, 8e3);
-          const hrefUrl = wc.getURL();
-          if (hrefUrl !== beforeUrl2) return `${result.split("\n")[0]} -> ${hrefUrl}`;
-        } catch {
-        }
-      }
-      return result;
-    }
-    const dialogActions2 = typeof shadowLabel === "string" && isAddToCartText(shadowLabel) ? await getCartDialogActions(wc) : null;
-    const actionsSuffix2 = dialogActions2 ? `
-${dialogActions2}
-Click one of these dialog actions. Do NOT click any other element.` : "";
-    return `${result}
-${overlayHint2}${actionsSuffix2}`;
-  }
-  const beforeUrl = wc.getURL();
-  const elInfo = await describeElementForClick(wc, selector);
-  if ("error" in elInfo) return `Error: ${elInfo.error}`;
-  const cartMatch = isAddToCartText(elInfo.text);
-  if (cartMatch && isDuplicateCartClick(beforeUrl, elInfo.text)) {
-    return `Blocked: "${elInfo.text}" was already clicked on this page. The item is in your cart. Call read_page to see available actions (e.g. View Cart, Continue Shopping).`;
-  }
-  if (!cartMatch) {
-    const dialogActions = await getCartDialogActions(wc);
-    if (dialogActions) {
-      return `Blocked: a cart confirmation dialog is open. Do not click background elements.
-${dialogActions}
-Click one of these dialog actions instead.`;
-    }
-  }
-  if (elInfo.href) {
-    const validation = await validateLinkDestination(elInfo.href);
-    if (validation.status === "dead") {
-      return formatDeadLinkMessage(elInfo.text, validation);
-    }
-  }
-  if (cartMatch) {
-    recordCartClick(beforeUrl, elInfo.text);
-  }
-  const clickText = `Clicked: ${elInfo.text}`;
-  const clickResult = await clickElement(wc, selector);
-  if (clickResult.startsWith("Error:")) return clickResult;
-  await waitForPotentialNavigation$1(wc, beforeUrl);
-  const afterUrl = wc.getURL();
-  if (afterUrl !== beforeUrl) {
-    return `${clickText} -> ${afterUrl}`;
-  }
-  const overlayHint = await detectPostClickOverlay(wc);
-  if (overlayHint) {
-    const dialogActions = cartMatch ? await getCartDialogActions(wc) : null;
-    const actionsSuffix = dialogActions ? `
-${dialogActions}
-Click one of these dialog actions. Do NOT click any other element.` : "";
-    return `${clickText} (${clickResult})
-${overlayHint}${actionsSuffix}`;
-  }
-  if (cartMatch) {
-    await sleep(1200);
-    const delayedOverlayHint = await detectPostClickOverlay(wc);
-    if (delayedOverlayHint) {
-      const dialogActions = await getCartDialogActions(wc);
-      const actionsSuffix = dialogActions ? `
-${dialogActions}
-Click one of these dialog actions. Do NOT click any other element.` : "";
-      return `${clickText} (${clickResult})
-${delayedOverlayHint}${actionsSuffix}`;
-    }
-    return `${clickText} (${clickResult})`;
-  }
-  const activationResult = await activateElement(wc, selector);
-  if (!activationResult.startsWith("Error:")) {
-    await waitForPotentialNavigation$1(wc, beforeUrl);
-    const fallbackUrl = wc.getURL();
-    if (fallbackUrl !== beforeUrl) {
-      return `${clickText} -> ${fallbackUrl} (recovered via DOM activation)`;
-    }
-  }
-  const postActivationOverlayHint = await detectPostClickOverlay(wc);
-  if (postActivationOverlayHint) {
-    return `${clickText} (${clickResult})
-${postActivationOverlayHint}`;
-  }
-  return `${clickText} (${clickResult})`;
-}
-async function getCartDialogActions(wc) {
-  const result = await wc.executeJavaScript(`
-    (function() {
-      function isVisible(el) {
-        if (!(el instanceof HTMLElement)) return false;
-        const style = getComputedStyle(el);
-        if (style.display === "none" || style.visibility === "hidden") return false;
-        const rect = el.getBoundingClientRect();
-        return rect.width >= 20 && rect.height >= 10;
-      }
-
-      function findDialogRoot() {
-        const selectors = [
-          '[data-test="basket-flyout"]',
-          '[role="dialog"]',
-          'dialog[open]',
-          '[role="alertdialog"]',
-          '[aria-modal="true"]',
-        ];
-        for (const selector of selectors) {
-          const nodes = document.querySelectorAll(selector);
-          for (const node of nodes) {
-            if (!(node instanceof HTMLElement) || !isVisible(node)) continue;
-            const text = (node.textContent || "").slice(0, 800).toLowerCase();
-            const cartSignals = [
-              "added to cart", "added to bag", "added to basket",
-              "item added", "your basket", "your cart", "your bag",
-              "view basket", "view cart", "continue shopping",
-            ];
-            if (cartSignals.some((signal) => text.includes(signal))) {
-              return node;
-            }
-          }
-        }
-        return null;
-      }
-
-      const dialog = findDialogRoot();
-      if (!dialog) return { found: false, actions: [] };
-
-      const actions = [];
-      dialog.querySelectorAll('button, a[href], [role="button"]').forEach((el) => {
-        if (!(el instanceof HTMLElement) || !isVisible(el)) return;
-        const label = (el.getAttribute("aria-label") || el.textContent || "").trim().slice(0, 80);
-        if (!label || label.length < 2) return;
-        const href = el.getAttribute("href") || "";
-        const selector = el.id ? "#" + el.id
-          : el.getAttribute("data-test") ? '[data-test="' + el.getAttribute("data-test") + '"]'
-          : el.getAttribute("aria-label") ? '[aria-label="' + el.getAttribute("aria-label") + '"]'
-          : null;
-        if (selector) {
-          actions.push({ label: label, href: href, selector: selector });
-        }
-      });
-
-      return {
-        found: true,
-        actions: actions.map((action) =>
-          '- "' + action.label + '"' +
-          (action.href ? ' -> ' + action.href : "") +
-          (action.selector ? ' (selector: ' + action.selector + ')' : "")
-        ),
-      };
-    })()
-  `);
-  if (!result || typeof result !== "object" || !("found" in result) || !result.found) {
-    return null;
-  }
-  if (!("actions" in result) || !Array.isArray(result.actions) || result.actions.length === 0) {
-    return null;
-  }
-  return `Available dialog actions:
-${result.actions.join("\n")}`;
-}
-async function detectPostClickOverlay(wc) {
-  const result = await wc.executeJavaScript(`
-    (function() {
-      var vw = window.innerWidth || document.documentElement.clientWidth;
-      var vh = window.innerHeight || document.documentElement.clientHeight;
-      var vpArea = Math.max(1, vw * vh);
-
-      function isVisible(el) {
-        if (!(el instanceof HTMLElement)) return false;
-        var style = getComputedStyle(el);
-        if (style.display === "none" || style.visibility === "hidden") return false;
-        return el.getBoundingClientRect().width > 0;
-      }
-
-      function hasFixedAncestor(el) {
-        var current = el.parentElement;
-        while (current && current !== document.body) {
-          var position = getComputedStyle(current).position;
-          if (position === "fixed" || position === "sticky") return true;
-          current = current.parentElement;
-        }
-        return false;
-      }
-
-      function effectiveZ(el) {
-        var current = el;
-        while (current && current !== document.body) {
-          var z = parseInt(getComputedStyle(current).zIndex, 10);
-          if (z > 0) return z;
-          current = current.parentElement;
-        }
-        return 0;
-      }
-
-      function touchesViewportEdge(rect) {
-        return rect.left <= 24 || rect.top <= 24 ||
-          rect.right >= vw - 24 || rect.bottom >= vh - 24;
-      }
-
-      var cartPhrases = [
-        "added to cart", "added to bag", "added to basket",
-        "added to your cart", "added to your bag", "added to your basket",
-      ];
-      var cartActions = [
-        "view cart", "go to cart", "view basket", "go to basket",
-        "continue shopping", "keep shopping", "checkout",
-      ];
-
-      var selectors = 'dialog[open], [role="dialog"], [role="alertdialog"], [aria-modal="true"], [data-test="basket-flyout"]';
-      var candidates = document.querySelectorAll(selectors);
-      var hit = null;
-      for (var i = 0; i < candidates.length; i++) {
-        if (isVisible(candidates[i])) {
-          hit = candidates[i];
-          break;
-        }
-      }
-
-      if (!hit) {
-        var elements = document.querySelectorAll("*");
-        for (var j = 0; j < elements.length; j++) {
-          var el = elements[j];
-          if (!(el instanceof HTMLElement) || !isVisible(el)) continue;
-          var style = getComputedStyle(el);
-          var position = style.position;
-          var isFixed = position === "fixed" || position === "sticky";
-          var isAbsolute = position === "absolute";
-          if (!isFixed && !isAbsolute) continue;
-          if (isAbsolute && !hasFixedAncestor(el)) continue;
-          if (effectiveZ(el) < 5) continue;
-          var rect = el.getBoundingClientRect();
-          var areaRatio = (rect.width * rect.height) / vpArea;
-          if (rect.width >= 160 && rect.height >= 100 && areaRatio >= 0.05 && touchesViewportEdge(rect)) {
-            hit = el;
-            break;
-          }
-        }
-      }
-
-      if (!hit) return { found: false, label: "", cartLike: false };
-      var text = (hit.textContent || "").slice(0, 800).toLowerCase();
-      var cartLike = cartPhrases.concat(cartActions).some(function(signal) {
-        return text.indexOf(signal) !== -1;
-      });
-      var heading = hit.querySelector("h1,h2,h3,h4");
-      var label = (hit.getAttribute("aria-label") || (heading && heading.textContent) || "").trim().slice(0, 80);
-      return { found: true, label: label, cartLike: cartLike };
-    })()
-  `);
-  if (!result || typeof result !== "object" || !("found" in result) || !result.found) {
-    return null;
-  }
-  const label = typeof result.label === "string" && result.label ? ` ("${result.label}")` : "";
-  if ("cartLike" in result && result.cartLike) {
-    return `A cart confirmation dialog appeared${label}. Call read_page to see available actions — do not click Add to Cart again.`;
-  }
-  return `A dialog or overlay appeared${label}. Call read_page to see available actions.`;
-}
-async function dismissPopup(wc) {
-  const before = await extractContent(wc);
-  const initialBlocking = before.overlays.filter(
-    (overlay) => overlay.blocksInteraction
-  ).length;
-  if (initialBlocking > 0) {
-    const overlayText = before.overlays.map(
-      (o) => [o.label, o.text].filter(Boolean).join(" ")
-    ).join(" ").toLowerCase();
-    const cartSignals = [
-      "added to cart",
-      "added to bag",
-      "added to basket",
-      "item added",
-      "items in your basket",
-      "items in your cart",
-      "items in your bag",
-      "your basket",
-      "your cart",
-      "your bag",
-      "view basket",
-      "view cart",
-      "continue shopping"
-    ];
-    if (cartSignals.some((s) => overlayText.includes(s))) {
-      const continueResult = await wc.executeJavaScript(`
-        (function() {
-          var dialog = document.querySelector('[role="dialog"], dialog[open], [role="alertdialog"], [aria-modal="true"]');
-          if (!dialog) return "Error: dialog not found";
-          var buttons = dialog.querySelectorAll('button, a[href], [role="button"]');
-          var continueBtn = null;
-          var viewCartBtn = null;
-          for (var i = 0; i < buttons.length; i++) {
-            var label = (buttons[i].getAttribute('aria-label') || buttons[i].textContent || '').trim().toLowerCase();
-            if (/continue shopping|keep shopping/.test(label)) { continueBtn = buttons[i]; break; }
-            if (/view (basket|cart|bag)|checkout/.test(label) && !viewCartBtn) { viewCartBtn = buttons[i]; }
-          }
-          var target = continueBtn || viewCartBtn;
-          if (!target) return "Error: no dialog action found";
-          var actionLabel = (target.getAttribute('aria-label') || target.textContent || '').trim();
-          if (target.tagName === 'A' && target.href) {
-            window.location.href = target.href;
-            return "Clicked: " + actionLabel + " -> " + target.href;
-          }
-          target.click();
-          return "Clicked: " + actionLabel;
-        })()
-      `);
-      if (typeof continueResult === "string" && !continueResult.startsWith("Error")) {
-        return `Cart confirmation handled: ${continueResult}. Item was already added to your cart.`;
-      }
-      return "Cannot dismiss: this is a cart confirmation dialog. Item is in your cart. Use read_page to see dialog actions (e.g. View Basket, Continue Shopping) and click one of them instead.";
-    }
-  }
-  const initialDormant = before.dormantOverlays.length;
-  const candidates = await wc.executeJavaScript(`
-    (function() {
-      function text(value) {
-        const trimmed = value == null ? "" : String(value).trim();
-        return trimmed || "";
-      }
-
-      ${selectorHelpersJS(["data-testid", "data-test", "aria-label", "name", "title"])}
-
-      function isVisible(el) {
-        if (!(el instanceof HTMLElement)) return true;
-        const style = window.getComputedStyle(el);
-        if (style.display === "none" || style.visibility === "hidden" || style.opacity === "0") {
-          return false;
-        }
-        if (el.hasAttribute("hidden") || el.getAttribute("aria-hidden") === "true") {
-          return false;
-        }
-        const rect = el.getBoundingClientRect();
-        return rect.width > 0 && rect.height > 0;
-      }
-
-      function overlayRoots() {
-        const nodes = [];
-        document.querySelectorAll("dialog, [role='dialog'], [role='alertdialog'], [aria-modal='true']").forEach((el) => {
-          if (isVisible(el)) nodes.push(el);
-        });
-        // Detect known consent manager containers
-        document.querySelectorAll("#onetrust-consent-sdk, #onetrust-banner-sdk, [id*='onetrust'], [class*='onetrust'], #CybotCookiebotDialog, #truste-consent-track, [id*='cookie-banner'], [id*='consent-banner'], [class*='cookie-consent'], [class*='consent-banner'], [id*='gdpr'], [class*='gdpr']").forEach((el) => {
-          if (el instanceof HTMLElement && isVisible(el)) nodes.push(el);
-        });
-        document.querySelectorAll("body *").forEach((el) => {
-          if (!(el instanceof HTMLElement) || !isVisible(el)) return;
-          const style = window.getComputedStyle(el);
-          const rect = el.getBoundingClientRect();
-          const zIndex = Number.parseInt(style.zIndex, 10);
-          const coversCenter =
-            rect.left <= (window.innerWidth || 0) / 2 &&
-            rect.right >= (window.innerWidth || 0) / 2 &&
-            rect.top <= (window.innerHeight || 0) / 2 &&
-            rect.bottom >= (window.innerHeight || 0) / 2;
-          if (
-            (style.position === "fixed" || style.position === "sticky") &&
-            Number.isFinite(zIndex) &&
-            zIndex >= 10 &&
-            coversCenter
-          ) {
-            nodes.push(el);
-          }
-        });
-        return Array.from(new Set(nodes));
-      }
-
-      function scoreCandidate(el, rooted) {
-        const label = text(
-          el.getAttribute("aria-label") ||
-            el.getAttribute("title") ||
-            el.textContent ||
-            el.getAttribute("value"),
-        ).toLowerCase();
-        const classText = text(typeof el.className === "string" ? el.className : "").toLowerCase();
-        const idText = text(el.id).toLowerCase();
-        const combined = classText + " " + idText;
-        let score = rooted ? 30 : 0;
-        if (/^x$|^×$/.test(label)) score += 120;
-        if (/no thanks|no, thanks|not now|maybe later|dismiss|close|skip|cancel|continue without|no thank you|reject|decline/.test(label)) score += 100;
-        if (/close|dismiss|modal-close|overlay-close/.test(combined)) score += 90;
-        if (/onetrust-close|onetrust-reject|cookie.*close|consent.*close|cookie.*reject|consent.*reject/.test(combined)) score += 110;
-        if (/onetrust-accept|cookie.*accept|consent.*accept/.test(combined)) score += 80;
-        if (el.getAttribute("aria-label")) score += 20;
-        if (/accept|continue|submit|sign up|subscribe|join|start|next/.test(label) && !/cookie|consent|onetrust/.test(combined)) score -= 80;
-        const rect = el.getBoundingClientRect();
-        if (rect.top < 120) score += 10;
-        if (rect.right > (window.innerWidth || 0) - 120) score += 15;
-        return score;
-      }
-
-      const selector = "button, [role='button'], a[href], input[type='button'], input[type='submit'], [aria-label], [title]";
-      const results = [];
-      const roots = overlayRoots();
-
-      function collect(container, rooted) {
-        container.querySelectorAll(selector).forEach((el) => {
-          if (!(el instanceof HTMLElement) || !isVisible(el)) return;
-          const candidateSelector = selectorFor(el);
-          if (!candidateSelector) return;
-          var label = text(
-            el.getAttribute("aria-label") ||
-              el.getAttribute("title") ||
-              el.textContent ||
-              el.getAttribute("value"),
-          );
-          if (!label) {
-            var idLower = (el.id || "").toLowerCase();
-            var classLower = (typeof el.className === "string" ? el.className : "").toLowerCase();
-            var combined = idLower + " " + classLower;
-            if (/onetrust|consent|cookie|banner|gdpr|trustarc|cookiebot/.test(combined)) {
-              label = idLower.includes("accept") ? "Accept cookies"
-                : idLower.includes("reject") ? "Reject cookies"
-                : idLower.includes("close") || classLower.includes("close") ? "Close"
-                : "Consent button";
-            } else {
-              return;
-            }
-          }
-          results.push({
-            selector: candidateSelector,
-            label: label.slice(0, 120),
-            score: scoreCandidate(el, rooted),
-          });
-        });
-      }
-
-      roots.forEach((root) => collect(root, true));
-      if (results.length === 0) {
-        collect(document, false);
-      }
-
-      const seen = new Set();
-      return results
-        .filter((candidate) => {
-          if (seen.has(candidate.selector)) return false;
-          seen.add(candidate.selector);
-          return candidate.score > 0;
-        })
-        .sort((a, b) => b.score - a.score)
-        .slice(0, 8);
-    })()
-  `);
-  if (Array.isArray(candidates)) {
-    for (const candidate of candidates) {
-      if (!candidate || typeof candidate !== "object" || typeof candidate.selector !== "string") {
-        continue;
-      }
-      const result = await clickElement(wc, candidate.selector);
-      if (result.startsWith("Error:")) continue;
-      await sleep(250);
-      const after = await extractContent(wc);
-      const blocking = after.overlays.filter(
-        (overlay) => overlay.blocksInteraction
-      ).length;
-      if (blocking < initialBlocking || initialBlocking > 0 && blocking === 0) {
-        const label = typeof candidate.label === "string" && candidate.label ? candidate.label : "popup control";
-        return `Dismissed popup using "${label}"`;
-      }
-    }
-  }
-  wc.sendInputEvent({ type: "keyDown", keyCode: "Escape" });
-  await sleep(16);
-  wc.sendInputEvent({ type: "keyUp", keyCode: "Escape" });
-  await sleep(200);
-  const afterEscape = await extractContent(wc);
-  const escapeBlocking = afterEscape.overlays.filter(
-    (overlay) => overlay.blocksInteraction
-  ).length;
-  if (escapeBlocking < initialBlocking || initialBlocking > 0 && escapeBlocking === 0) {
-    return "Dismissed popup with Escape";
-  }
-  return initialBlocking > 0 ? "Could not dismiss the blocking popup automatically" : initialDormant > 0 ? `No active blocking popup detected. Found ${initialDormant} dormant consent/modal surface(s) in the DOM, likely geo-gated or inactive in this session.` : "No blocking popup detected";
-}
-function isDangerousAction(name) {
-  return [
-    "navigate",
-    "click",
-    "type",
-    "select_option",
-    "submit_form",
-    "press_key",
-    "create_tab",
-    "switch_tab",
-    "close_tab",
-    "restore_checkpoint",
-    "login",
-    "fill_form",
-    "search",
-    "paginate"
-  ].includes(name);
-}
-function getTabByMatch(tabManager, match) {
-  const lowered = match.toLowerCase();
-  return tabManager.getAllStates().find(
-    (tab) => tab.title.toLowerCase().includes(lowered) || tab.url.toLowerCase().includes(lowered)
-  ) || null;
-}
-async function getPostActionState(tabManager, name) {
-  const tab = tabManager.getActiveTab();
-  if (!tab) return "";
-  const wc = tab.view.webContents;
-  const navActions = [
-    "navigate",
-    "go_back",
-    "go_forward",
-    "click",
-    "submit_form",
-    "reload",
-    "press_key"
-  ];
-  const interactActions = [
-    "type",
-    "type_text",
-    "select_option",
-    "hover",
-    "focus"
-  ];
-  const tabActions = ["create_tab", "switch_tab", "close_tab"];
-  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(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 {
-    }
-    return `${warning}
-[state: url=${wc.getURL()}, canGoBack=${tab.canGoBack()}, canGoForward=${tab.canGoForward()}, loading=${wc.isLoading()}]`;
-  }
-  if (interactActions.includes(name)) {
-    return `
-[state: url=${wc.getURL()}, title=${JSON.stringify(wc.getTitle() || "")}, tabId=${tabManager.getActiveTabId()}]`;
-  }
-  if (tabActions.includes(name)) {
-    const activeId = tabManager.getActiveTabId();
-    const active = getActiveTabSummary(tabManager);
-    const count = tabManager.getAllStates().length;
-    return `
-[state: activeTab=${activeId}, title=${JSON.stringify(active?.title ?? "")}, url=${active?.url ?? ""}, totalTabs=${count}]`;
-  }
-  return "";
-}
-async function withAction(runtime2, tabManager, name, args, executor) {
-  try {
-    const result = await runtime2.runControlledAction({
-      source: "mcp",
-      name,
-      args,
-      tabId: tabManager.getActiveTabId(),
-      dangerous: isDangerousAction(name),
-      executor
-    });
-    const stateInfo = await getPostActionState(tabManager, name);
-    const flowCtx = runtime2.getFlowContext();
-    return asTextResponse(result + stateInfo + flowCtx);
-  } catch (error) {
-    return asTextResponse(
-      `Error: ${error instanceof Error ? error.message : "Unknown error"}`
-    );
-  }
-}
-async function setElementValue(wc, selector, value) {
-  if (selector.startsWith("__vessel_idx:")) {
-    const idx = Number(selector.slice("__vessel_idx:".length));
-    return wc.executeJavaScript(
-      `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)});
-      if (!el) return 'Error[stale-index]: Element not found — the page may have changed. Call read_page to refresh.';
-      if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement)) {
-        return 'Error[not-input]: Element is not a text input';
-      }
-      if (el.disabled || el.getAttribute('aria-disabled') === 'true') {
-        return 'Error[disabled]: Input is disabled';
-      }
-      const prototype = el instanceof HTMLTextAreaElement
-        ? HTMLTextAreaElement.prototype
-        : HTMLInputElement.prototype;
-      const descriptor = Object.getOwnPropertyDescriptor(prototype, 'value');
-      if (descriptor && descriptor.set) {
-        descriptor.set.call(el, ${JSON.stringify(value)});
-      } else {
-        el.value = ${JSON.stringify(value)};
-      }
-      el.focus();
-      el.dispatchEvent(new InputEvent('input', {
-        bubbles: true,
-        cancelable: true,
-        data: ${JSON.stringify(value)},
-        inputType: 'insertText',
-      }));
-      el.dispatchEvent(new Event('change', { bubbles: true }));
-      return 'Typed into: ' +
-        (el.getAttribute('aria-label') || el.placeholder || el.name || 'input') +
-        ' = ' + (el.type === 'password' ? '[hidden]' : String(el.value).slice(0, 80));
-    })()
-  `);
-}
-async function typeKeystroke(wc, selector, value) {
-  return wc.executeJavaScript(`
-    (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.';
-      if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement)) {
-        return 'Error[not-input]: Element is not a text input';
-      }
-      if (el.disabled || el.getAttribute('aria-disabled') === 'true') {
-        return 'Error[disabled]: Input is disabled';
-      }
-      el.focus();
-      const prototype = el instanceof HTMLTextAreaElement
-        ? HTMLTextAreaElement.prototype : HTMLInputElement.prototype;
-      const descriptor = Object.getOwnPropertyDescriptor(prototype, 'value');
-      if (descriptor && descriptor.set) {
-        descriptor.set.call(el, '');
-      } else {
-        el.value = '';
-      }
-      el.dispatchEvent(new InputEvent('input', { bubbles: true, cancelable: true, data: '', inputType: 'deleteContentBackward' }));
-      const chars = ${JSON.stringify(value)}.split('');
-      for (const ch of chars) {
-        el.dispatchEvent(new KeyboardEvent('keydown', { key: ch, bubbles: true, cancelable: true }));
-        el.dispatchEvent(new KeyboardEvent('keypress', { key: ch, bubbles: true, cancelable: true }));
-        if (descriptor && descriptor.set) {
-          descriptor.set.call(el, el.value + ch);
-        } else {
-          el.value += ch;
-        }
-        el.dispatchEvent(new InputEvent('input', { bubbles: true, cancelable: true, data: ch, inputType: 'insertText' }));
-        el.dispatchEvent(new KeyboardEvent('keyup', { key: ch, bubbles: true, cancelable: true }));
-      }
-      el.dispatchEvent(new Event('change', { bubbles: true }));
-      return 'Typed into: ' +
-        (el.getAttribute('aria-label') || el.placeholder || el.name || 'input') +
-        ' = ' + (el.type === 'password' ? '[hidden]' : String(el.value).slice(0, 80));
-    })()
-  `);
-}
-async function hoverElement(wc, selector) {
-  const pos = await wc.executeJavaScript(`
-    (function() {
-      const el = document.querySelector(${JSON.stringify(selector)});
-      if (!el) return { error: 'Error[stale-index]: Element not found — the page may have changed. Call read_page to refresh.' };
-      if (el instanceof HTMLElement) {
-        el.scrollIntoView({ behavior: 'instant', block: 'center', inline: 'center' });
-      }
-      const rect = el.getBoundingClientRect();
-      if (rect.width <= 0 || rect.height <= 0) return { error: 'Error[hidden]: Element has no visible area. It may be inside a collapsed, lazy-loaded, or virtual-scroll section. Scroll toward it then call read_page to refresh visible elements.' };
-      el.dispatchEvent(new MouseEvent('mouseover', { bubbles: true, cancelable: true }));
-      el.dispatchEvent(new MouseEvent('mouseenter', { bubbles: false }));
-      const label = (el.textContent || el.tagName || 'Element').trim().slice(0, 80);
-      return {
-        x: Math.round(rect.left + rect.width / 2),
-        y: Math.round(rect.top + rect.height / 2),
-        label: label,
-      };
-    })()
-  `);
-  if (!pos || typeof pos !== "object") return "Error: Could not hover element";
-  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";
-  wc.sendInputEvent({ type: "mouseMove", x, y });
-  const label = typeof pos.label === "string" ? pos.label : "element";
-  return `Hovered: ${label}`;
-}
-async function focusElement(wc, selector) {
-  return wc.executeJavaScript(`
-    (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.';
-      if (!(el instanceof HTMLElement)) return 'Error[not-interactive]: Element is not focusable';
-      if (el.hasAttribute('disabled') || el.getAttribute('aria-disabled') === 'true') {
-        return 'Error[disabled]: Element is disabled';
-      }
-      el.focus({ preventScroll: false });
-      return 'Focused: ' + (el.getAttribute('aria-label') || el.textContent?.trim().slice(0, 60) || el.tagName.toLowerCase());
-    })()
-  `);
-}
-async function selectOption(wc, index, selector, label, value) {
-  const resolvedSelector = await resolveSelector(wc, index, selector);
-  if (!resolvedSelector)
-    return "Error: No select element index or selector provided";
-  return wc.executeJavaScript(`
-    (function() {
-      const el = document.querySelector(${JSON.stringify(resolvedSelector)});
-      if (!(el instanceof HTMLSelectElement)) {
-        return 'Element is not a select dropdown';
-      }
-      if (el.disabled || el.getAttribute('aria-disabled') === 'true') {
-        return 'Select is disabled';
-      }
-      const requestedLabel = ${JSON.stringify(label || "")}.trim().toLowerCase();
-      const requestedValue = ${JSON.stringify(value || "")}.trim();
-      const option = Array.from(el.options).find((item) => {
-        const optionLabel = (item.textContent || '').trim().toLowerCase();
-        return (requestedLabel && optionLabel === requestedLabel) ||
-          (requestedValue && item.value === requestedValue);
-      });
-      if (!option) return 'Option not found';
-      el.value = option.value;
-      el.dispatchEvent(new Event('input', { bubbles: true }));
-      el.dispatchEvent(new Event('change', { bubbles: true }));
-      return 'Selected: ' + ((option.textContent || option.value).trim().slice(0, 100));
-    })()
-  `);
-}
-async function submitForm(wc, index, selector) {
-  const beforeUrl = wc.getURL();
-  let resolvedSelector = await resolveSelector(wc, index, selector);
-  if (!resolvedSelector) {
-    resolvedSelector = await wc.executeJavaScript(`
-      (function() {
-        var forms = document.querySelectorAll('form');
-        for (var i = 0; i < forms.length; i++) {
-          var f = forms[i];
-          var rect = f.getBoundingClientRect();
-          if (rect.width > 0 && rect.height > 0) return 'form';
-        }
-        return forms.length > 0 ? 'form' : null;
-      })()
-    `);
-    if (!resolvedSelector) return "Error: No form found on the page";
-  }
-  const formInfo = await wc.executeJavaScript(`
-    (function() {
-      const target = document.querySelector(${JSON.stringify(resolvedSelector)});
-      if (!target) return { error: 'Target not found' };
-      // Find the form: nested, or linked via form="id" attribute
-      var form = target instanceof HTMLFormElement ? target : target.closest('form');
-      if (!form) {
-        const formId = target.getAttribute('form');
-        if (formId) {
-          const linked = document.getElementById(formId);
-          if (linked instanceof HTMLFormElement) form = linked;
-        }
-      }
-      if (!form) return { error: 'No parent form found' };
-      function isSubmitControl(el) {
-        return (
-          (el instanceof HTMLButtonElement &&
-            ((el.getAttribute('type') || '').trim().toLowerCase() === '' ||
-              el.type === 'submit')) ||
-          (el instanceof HTMLInputElement &&
-            (el.type === 'submit' || el.type === 'image'))
-        );
-      }
-      const submitter = isSubmitControl(target)
-        ? target
-        : Array.from(document.querySelectorAll('button, input[type="submit"], input[type="image"]')).find(
-            (candidate) => isSubmitControl(candidate) && candidate.form === form,
-          );
-      if (
-        submitter instanceof HTMLElement &&
-        (submitter.hasAttribute('disabled') ||
-          submitter.getAttribute('aria-disabled') === 'true')
-      ) {
-        return { error: 'Submit control is disabled' };
-      }
-      // Collect form data and determine method
-      const submitterActionAttr =
-        (submitter instanceof HTMLButtonElement ||
-          submitter instanceof HTMLInputElement
-          ? submitter.getAttribute('formaction')?.trim()
-          : '') || '';
-      const action = submitterActionAttr
-        ? new URL(submitterActionAttr, document.baseURI).toString()
-        : form.action || window.location.href;
-      const submitterMethodAttr =
-        (submitter instanceof HTMLButtonElement ||
-          submitter instanceof HTMLInputElement
-          ? submitter.getAttribute('formmethod')?.trim()
-          : '') || '';
-      const method = (
-        submitterMethodAttr ||
-        form.getAttribute('method') ||
-        form.method ||
-        'GET'
-      ).toUpperCase();
-      let fd;
-      try {
-        fd = submitter instanceof HTMLElement
-          ? new FormData(form, submitter)
-          : new FormData(form);
-      } catch {
-        fd = new FormData(form);
-      }
-      const params = new URLSearchParams();
-      for (const [k, v] of fd.entries()) {
-        if (typeof v === 'string') params.append(k, v);
-      }
-      // Use requestSubmit to fire JS submit handlers for all methods
-      if (typeof form.requestSubmit === 'function') {
-        try {
-          if (
-            submitter instanceof HTMLButtonElement ||
-            submitter instanceof HTMLInputElement
-          ) {
-            form.requestSubmit(submitter);
-          } else {
-            form.requestSubmit();
-          }
-        } catch {
-          form.requestSubmit();
-        }
-        return { submitted: true, method };
-      }
-      if (submitter instanceof HTMLElement && typeof submitter.click === 'function') {
-        submitter.click();
-        return { submitted: true, method };
-      }
-      // Last resort: form.submit() bypasses JS handlers but at least submits
-      if (method === 'GET') {
-        return { action, method, params: params.toString(), found: true };
-      }
-      form.submit();
-      return { submitted: true, method };
-    })()
-  `);
-  if (formInfo.error) return formInfo.error;
-  if (formInfo.found && formInfo.method === "GET") {
-    const url = new URL(formInfo.action);
-    if (formInfo.params) {
-      url.search = formInfo.params;
-    }
-    await loadPermittedUrl(wc, url.toString());
-    await waitForPotentialNavigation$1(wc, beforeUrl);
-    const afterUrl = wc.getURL();
-    return afterUrl !== beforeUrl ? `Submitted form via GET -> ${afterUrl}` : "Submitted form via GET";
+  if (interactActions.includes(name)) {
+    return `
+[state: url=${wc.getURL()}, title=${JSON.stringify(wc.getTitle() || "")}, tabId=${tabManager.getActiveTabId()}]`;
   }
-  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 (tabActions.includes(name)) {
+    const activeId = tabManager.getActiveTabId();
+    const active = getActiveTabSummary(tabManager);
+    const count = tabManager.getAllStates().length;
+    return `
+[state: activeTab=${activeId}, title=${JSON.stringify(active?.title ?? "")}, url=${active?.url ?? ""}, totalTabs=${count}]`;
   }
-  return "Submitted form";
+  return "";
 }
-async function pressKey(wc, key, index, selector) {
-  const resolvedSelector = await resolveSelector(wc, index, selector);
-  return wc.executeJavaScript(`
-    (function() {
-      const key = ${JSON.stringify(key)};
-      const selector = ${JSON.stringify(resolvedSelector)};
-      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') {
-        if (tag === 'BUTTON' || (tag === 'INPUT' && (type === 'submit' || type === 'button'))) {
-          target.click();
-        } else if (tag === 'INPUT' || tag === 'TEXTAREA') {
-          const form = target.closest('form');
-          if (form) {
-            if (typeof form.requestSubmit === 'function') {
-              form.requestSubmit();
-            } else {
-              const submitBtn = form.querySelector('[type="submit"]');
-              if (submitBtn) submitBtn.click();
-              else form.submit();
-            }
-          }
-        }
-      }
-      target.dispatchEvent(new KeyboardEvent('keyup', eventInit));
-      return 'Pressed key: ' + key;
-    })()
-  `);
+async function withAction(runtime2, tabManager, name, args, executor) {
+  try {
+    const result = await runtime2.runControlledAction({
+      source: "mcp",
+      name,
+      args,
+      tabId: tabManager.getActiveTabId(),
+      dangerous: isDangerousMcpAction(name),
+      executor
+    });
+    const stateInfo = await getPostActionState(tabManager, name);
+    const flowCtx = runtime2.getFlowContext();
+    return asTextResponse(result + stateInfo + flowCtx);
+  } catch (error) {
+    return asErrorTextResponse(getErrorMessage(error));
+  }
 }
-async function waitForCondition(wc, text, selector, timeoutMs) {
+async function waitForConditionMcp(wc, text, selector, timeoutMs) {
   const effectiveTimeout = Math.max(250, timeoutMs || 5e3);
   const expectedText = (text || "").trim();
   const expectedSelector = (selector || "").trim();
-  if (!expectedText && !expectedSelector) {
+  const startedAt = Date.now();
+  const result = await waitForConditionDirect(
+    wc,
+    expectedText,
+    expectedSelector,
+    effectiveTimeout
+  );
+  const elapsedMs = Date.now() - startedAt;
+  if (result === "Error: wait_for requires text or selector") {
     return JSON.stringify({
       matched: false,
       error: "wait_for requires text or selector"
     });
   }
-  if (wc.isLoading()) {
-    await waitForLoad(wc, Math.min(effectiveTimeout, 5e3));
+  if (result.startsWith("Error: Invalid selector ")) {
+    return JSON.stringify({
+      matched: false,
+      error: result.slice("Error: ".length)
+    });
   }
-  const startedAt = Date.now();
-  while (Date.now() - startedAt < effectiveTimeout) {
-    const result = await wc.executeJavaScript(`
+  if (result.startsWith("Error: Page is still busy; wait_for timed out")) {
+    return JSON.stringify({
+      matched: false,
+      error: result.slice("Error: ".length),
+      elapsed_ms: elapsedMs,
+      timeout_ms: effectiveTimeout
+    });
+  }
+  if (expectedSelector && result === `Matched selector ${expectedSelector}`) {
+    return JSON.stringify({
+      matched: true,
+      type: "selector",
+      value: expectedSelector,
+      elapsed_ms: elapsedMs
+    });
+  }
+  const matchedTextPrefix = 'Matched text "';
+  if (result.startsWith(matchedTextPrefix) && result.endsWith('"')) {
+    return JSON.stringify({
+      matched: true,
+      type: "text",
+      value: result.slice(matchedTextPrefix.length, -1),
+      elapsed_ms: elapsedMs
+    });
+  }
+  const timeoutPayload = {
+    matched: false,
+    type: expectedSelector ? "selector" : "text",
+    value: expectedSelector || expectedText.slice(0, 80),
+    elapsed_ms: elapsedMs,
+    timeout_ms: effectiveTimeout
+  };
+  if (expectedSelector) {
+    const diagnostic = await wc.executeJavaScript(`
       (function() {
-        var selector = ${JSON.stringify(expectedSelector)};
-        var text = ${JSON.stringify(expectedText)};
-        if (selector) {
-          try {
-            if (document.querySelector(selector)) return 'selector';
-          } catch (e) {
-            return 'invalid_selector:' + e.message;
-          }
+        try {
+          var count = document.querySelectorAll(${JSON.stringify(expectedSelector)}).length;
+          return count > 0 ? 'found ' + count + ' after timeout' : 'not found (page has ' + document.querySelectorAll('*').length + ' elements)';
+        } catch (e) {
+          return 'selector error: ' + e.message;
         }
-        if (text && document.body && document.body.innerText && document.body.innerText.includes(text)) return 'text';
-        return '';
       })()
-    `);
-    const elapsedMs2 = Date.now() - startedAt;
-    if (result === "selector") {
-      return JSON.stringify({
-        matched: true,
-        type: "selector",
-        value: expectedSelector,
-        elapsed_ms: elapsedMs2
-      });
-    }
-    if (result === "text") {
-      return JSON.stringify({
-        matched: true,
-        type: "text",
-        value: expectedText.slice(0, 80),
-        elapsed_ms: elapsedMs2
-      });
-    }
-    if (typeof result === "string" && result.startsWith("invalid_selector:")) {
-      return JSON.stringify({
-        matched: false,
-        error: `Invalid selector "${expectedSelector}" — ${result.slice(17)}`
-      });
+    `).catch((err) => {
+      logger$7.warn("Failed to gather wait_for timeout diagnostic:", err);
+      return null;
+    });
+    if (typeof diagnostic === "string" && diagnostic.trim()) {
+      timeoutPayload.diagnostic = diagnostic;
     }
-    await new Promise((resolve) => setTimeout(resolve, 150));
   }
-  const elapsedMs = Date.now() - startedAt;
-  const diagnostic = expectedSelector ? await wc.executeJavaScript(`
-        (function() {
-          try {
-            var count = document.querySelectorAll(${JSON.stringify(expectedSelector)}).length;
-            return count > 0 ? 'found ' + count + ' after timeout' : 'not found (page has ' + document.querySelectorAll('*').length + ' elements)';
-          } catch (e) { return 'selector error: ' + e.message; }
-        })()
-      `) : null;
-  return JSON.stringify({
-    matched: false,
-    type: expectedSelector ? "selector" : "text",
-    value: expectedSelector ? expectedSelector : expectedText.slice(0, 80),
-    elapsed_ms: elapsedMs,
-    timeout_ms: effectiveTimeout,
-    ...diagnostic ? { diagnostic } : {}
-  });
+  return JSON.stringify(timeoutPayload);
 }
 function registerTools(server, tabManager, runtime2) {
   server.registerPrompt(
@@ -18923,7 +17951,8 @@ function registerTools(server, tabManager, runtime2) {
           pageTitle = wc.getTitle();
           const page = await extractContent(wc);
           pageType = detectPageType(page);
-        } catch {
+        } catch (err) {
+          logger$7.warn("Failed to detect page type for tool scoring, falling back to GENERAL:", err);
         }
       }
       const scored = TOOL_DEFINITIONS.map((def) => {
@@ -18975,7 +18004,7 @@ function registerTools(server, tabManager, runtime2) {
     },
     async () => {
       const activeTab = getActiveTabSummary(tabManager);
-      if (!activeTab) return asTextResponse("Error: No active tab");
+      if (!activeTab) return asNoActiveTabResponse();
       return asTextResponse(JSON.stringify(activeTab, null, 2));
     }
   );
@@ -19084,7 +18113,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ mode }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       try {
         const pageContent = await extractContent(tab.view.webContents);
         const effectiveMode = mode || "full";
@@ -19116,7 +18145,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ mode }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       try {
         const pageContent = await extractContent(tab.view.webContents);
         const effectiveMode = mode || "full";
@@ -19165,7 +18194,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ url, postBody }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       const preCheck = await validateLinkDestination(url);
       if (preCheck.status === "dead") {
         return asTextResponse(
@@ -19207,7 +18236,7 @@ ${buildScopedContext(pageContent, mode)}`;
     async ({ enabled, tabId, match, reload }) => {
       const activeTab = tabManager.getActiveTab();
       if (!activeTab && !tabId && !match) {
-        return asTextResponse("Error: No active tab");
+        return asNoActiveTabResponse();
       }
       return withAction(
         runtime2,
@@ -19250,7 +18279,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ type }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       try {
         const pageContent = await extractContent(tab.view.webContents);
         const requestedType = typeof type === "string" && type.trim() ? type.trim().toLowerCase() : "";
@@ -19298,7 +18327,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(runtime2, tabManager, "go_back", {}, async () => {
         if (!tab.canGoBack()) {
           return "No previous page in history";
@@ -19319,7 +18348,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(runtime2, tabManager, "go_forward", {}, async () => {
         if (!tab.canGoForward()) {
           return "No forward page in history";
@@ -19340,7 +18369,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(runtime2, tabManager, "reload", {}, async () => {
         tabManager.reloadTab(tabManager.getActiveTabId());
         await waitForLoad(tab.view.webContents);
@@ -19360,7 +18389,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19389,7 +18418,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19418,7 +18447,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19447,11 +18476,11 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       const wc = tab.view.webContents;
       const resolvedSelector = await resolveSelector(wc, index, selector);
       if (!resolvedSelector) {
-        return asTextResponse("Error: No index or selector provided");
+        return asErrorTextResponse("No index or selector provided");
       }
       const result = await wc.executeJavaScript(`
         (function() {
@@ -19501,7 +18530,7 @@ ${buildScopedContext(pageContent, mode)}`;
         );
       }
       if ("error" in result && typeof result.error === "string") {
-        return asTextResponse(`Error: ${result.error}`);
+        return asErrorTextResponse(result.error);
       }
       const parts = [`<${result.tag}>`];
       if ("role" in result && typeof result.role === "string" && result.role.trim()) {
@@ -19532,7 +18561,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector, text, mode }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19571,7 +18600,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector, text, mode }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19608,13 +18637,13 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector, label, value }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
         "select_option",
         { index, selector, label, value },
-        async () => selectOption(tab.view.webContents, index, selector, label, value)
+        async () => selectOptionDirect(tab.view.webContents, index, selector, label, value)
       );
     }
   );
@@ -19630,23 +18659,13 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ index, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
         "submit_form",
         { index, selector },
-        async () => {
-          const wc = tab.view.webContents;
-          const beforeUrl = wc.getURL();
-          const result = await submitForm(wc, index, selector);
-          if (result.startsWith("Error") || result.startsWith("Target") || result.startsWith("No parent") || result.startsWith("Submit control")) {
-            return result;
-          }
-          await waitForPotentialNavigation$1(wc, beforeUrl);
-          const afterUrl = wc.getURL();
-          return afterUrl !== beforeUrl ? `${result} -> ${afterUrl}` : result;
-        }
+        async () => submitFormDirect(tab.view.webContents, index, selector)
       );
     }
   );
@@ -19663,7 +18682,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ key, index, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19672,7 +18691,7 @@ ${buildScopedContext(pageContent, mode)}`;
         async () => {
           const wc = tab.view.webContents;
           const beforeUrl = wc.getURL();
-          const result = await pressKey(wc, key, index, selector);
+          const result = await pressKeyDirect(wc, key, index, selector);
           if (key === "Enter") {
             await waitForPotentialNavigation$1(wc, beforeUrl, 3e3);
             const afterUrl = wc.getURL();
@@ -19699,7 +18718,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ direction, amount }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19722,7 +18741,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19745,7 +18764,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ strategy }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -19771,13 +18790,13 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async ({ text, selector, timeoutMs }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
         "wait_for",
         { text, selector, timeoutMs },
-        async () => waitForCondition(tab.view.webContents, text, selector, timeoutMs)
+        async () => waitForConditionMcp(tab.view.webContents, text, selector, timeoutMs)
       );
     }
   );
@@ -19958,7 +18977,7 @@ ${buildScopedContext(pageContent, mode)}`;
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       try {
         const bounds = tab.view.getBounds();
         if (bounds.width <= 0 || bounds.height <= 0) {
@@ -20027,7 +19046,7 @@ To analyze visually, call vision_analyze with image_url="${screenshotPath}"`
     },
     async ({ index, selector, text, label, durationMs, persist, color }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       const normalizedText = normalizeLooseString(text);
       return withAction(
         runtime2,
@@ -20077,7 +19096,7 @@ To analyze visually, call vision_analyze with image_url="${screenshotPath}"`
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -20216,8 +19235,9 @@ ${JSON.stringify(otherHighlights, null, 2)}`
             h.label,
             void 0,
             h.color
-          ).catch(() => {
-          });
+          ).catch(
+            (err) => logger$7.warn("Failed to restore highlight after removal:", err)
+          );
         }
       }
       return asTextResponse(`Removed highlight ${id}`);
@@ -20281,7 +19301,15 @@ ${JSON.stringify(otherHighlights, null, 2)}`
         note: zod.z.string().optional().describe("Optional note about why this was bookmarked"),
         on_duplicate: zod.z.enum(["ask", "update", "duplicate"]).optional().describe(
           'How to handle an existing bookmark with the same URL in the same folder: "ask" (default), "update", or "duplicate"'
-        )
+        ),
+        intent: zod.z.string().optional().describe(
+          "Human-readable description of what this bookmark is for"
+        ),
+        expected_content: zod.z.string().optional().describe(
+          "Brief description of the content the agent should expect to find here"
+        ),
+        key_fields: zod.z.array(zod.z.string()).optional().describe("Important form field names for this page"),
+        agent_hints: zod.z.record(zod.z.string(), zod.z.string()).optional().describe("Arbitrary key-value hints for the agent")
       }
     },
     async ({
@@ -20294,7 +19322,11 @@ ${JSON.stringify(otherHighlights, null, 2)}`
       folder_summary,
       create_folder_if_missing,
       note,
-      on_duplicate
+      on_duplicate,
+      intent,
+      expected_content,
+      key_fields,
+      agent_hints
     }) => {
       return withAction(
         runtime2,
@@ -20309,7 +19341,11 @@ ${JSON.stringify(otherHighlights, null, 2)}`
           folder_name,
           folder_summary,
           create_folder_if_missing,
-          note
+          note,
+          intent,
+          expected_content,
+          key_fields,
+          agent_hints
         },
         async () => {
           const currentTab = tabManager.getActiveTab();
@@ -20339,7 +19375,15 @@ ${JSON.stringify(otherHighlights, null, 2)}`
             source.title,
             target.folderId,
             note,
-            { onDuplicate: on_duplicate ?? "ask" }
+            {
+              onDuplicate: on_duplicate ?? "ask",
+              extra: getBookmarkMetadataFromArgs({
+                intent,
+                expected_content,
+                key_fields,
+                agent_hints
+              })
+            }
           );
           if (result.status === "conflict" && result.existing) {
             return composeFolderAwareResponse(
@@ -20436,7 +19480,11 @@ ${JSON.stringify(otherHighlights, null, 2)}`
         folder_summary: zod.z.string().optional().describe("Optional summary used if a new folder is created"),
         create_folder_if_missing: zod.z.boolean().optional().describe("Create folder_name automatically when it does not exist"),
         note: zod.z.string().optional().describe("Optional note to attach or update on the bookmark"),
-        archive: zod.z.boolean().optional().describe('If true, organize into the default "Archive" folder')
+        archive: zod.z.boolean().optional().describe('If true, organize into the default "Archive" folder'),
+        intent: zod.z.string().optional().describe("Human-readable description of what this bookmark is for"),
+        expected_content: zod.z.string().optional().describe("Brief description of content the agent should expect"),
+        key_fields: zod.z.array(zod.z.string()).optional().describe("Important form field names for this page"),
+        agent_hints: zod.z.record(zod.z.string(), zod.z.string()).optional().describe("Arbitrary key-value hints for the agent")
       }
     },
     async (args) => {
@@ -20472,7 +19520,8 @@ ${JSON.stringify(otherHighlights, null, 2)}`
             const updated = updateBookmark(existing.id, {
               folderId: target.folderId,
               title: typeof args.title === "string" && args.title.trim() ? args.title.trim() : void 0,
-              note
+              note,
+              ...getBookmarkMetadataFromArgs(args)
             });
             if (!updated) {
               return `Bookmark ${existing.id} not found`;
@@ -20483,12 +19532,18 @@ ${JSON.stringify(otherHighlights, null, 2)}`
             );
           }
           if ("error" in source) return `Error: ${source.error}`;
-          const bookmark = saveBookmark(
+          const result = saveBookmarkWithPolicy(
             source.url,
             source.title,
             target.folderId,
-            note
+            note,
+            {
+              onDuplicate: "update",
+              extra: getBookmarkMetadataFromArgs(args)
+            }
           );
+          const bookmark = result.bookmark;
+          if (!bookmark) return "Error: Bookmark save failed";
           return composeFolderAwareResponse(
             `Saved and organized "${bookmark.title}" (${bookmark.url}) into "${describeFolder(bookmark.folderId)}" (id=${bookmark.id})`,
             target.createdFolder
@@ -20867,7 +19922,7 @@ ${JSON.stringify(otherHighlights, null, 2)}`
     },
     async ({ title, folder, summary, note, tags }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21011,7 +20066,8 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
       let page;
       try {
         page = await extractContent(wc);
-      } catch {
+      } catch (err) {
+        logger$7.warn("Failed to extract page while generating suggestions:", err);
         return asTextResponse(
           "Could not read page. Try navigate to a working URL."
         );
@@ -21118,7 +20174,7 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
     },
     async ({ fields, submit }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21132,7 +20188,7 @@ ${flow.steps.map((s, i) => `  ${i === 0 ? "→" : " "} ${s.label}`).join("\n")}`
             const firstSel = fillResults.find((item) => item.selector)?.selector ?? null;
             if (firstSel) {
               const beforeUrl = wc.getURL();
-              const submitResult = await submitForm(wc, void 0, firstSel);
+              const submitResult = await submitFormDirect(wc, void 0, firstSel);
               await waitForPotentialNavigation$1(wc, beforeUrl);
               const afterUrl = wc.getURL();
               results.push(
@@ -21175,7 +20231,7 @@ ${results.join("\n")}`;
       submit_selector
     }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21249,7 +20305,7 @@ ${steps.join("\n")}`;
     },
     async ({ query, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       const qLower = query.toLowerCase().trim();
       const buttonLabels = [
         "add to cart",
@@ -21334,7 +20390,7 @@ ${steps.join("\n")}`;
     },
     async ({ direction, selector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21385,7 +20441,7 @@ ${steps.join("\n")}`;
     },
     async () => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21443,7 +20499,7 @@ ${steps.join("\n")}`;
     },
     async ({ index, selector: rawSelector }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21498,7 +20554,7 @@ ${JSON.stringify(tableJson, null, 2)}`;
     },
     async ({ index, selector: rawSelector, position }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21556,7 +20612,7 @@ ${JSON.stringify(tableJson, null, 2)}`;
     },
     async ({ timeoutMs }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       return withAction(
         runtime2,
         tabManager,
@@ -21616,11 +20672,12 @@ ${JSON.stringify(tableJson, null, 2)}`;
       let targetDomain = domain;
       if (!targetDomain) {
         const tab = tabManager.getActiveTab();
-        if (!tab) return asTextResponse("Error: No active tab and no domain specified");
+        if (!tab) return asErrorTextResponse("No active tab and no domain specified");
         try {
           targetDomain = new URL(tab.state.url).hostname;
-        } catch {
-          return asTextResponse("Error: Could not parse active tab URL");
+        } catch (err) {
+          logger$7.warn("Failed to parse active tab URL for vault_status:", err);
+          return asErrorTextResponse("Could not parse active tab URL");
         }
       }
       const matches = findEntriesForDomain(
@@ -21679,13 +20736,14 @@ Use vault_login to fill the login form. Credentials are filled directly — you
       submit_index
     }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       const wc = tab.view.webContents;
       let hostname;
       try {
         hostname = new URL(tab.state.url).hostname;
-      } catch {
-        return asTextResponse("Error: Could not parse active tab URL");
+      } catch (err) {
+        logger$7.warn("Failed to parse active tab URL for vault_login:", err);
+        return asErrorTextResponse("Could not parse active tab URL");
       }
       const matches = findEntriesForDomain(`https://${hostname}`);
       if (matches.length === 0) {
@@ -21721,7 +20779,7 @@ Use vault_login to fill the login form. Credentials are filled directly — you
       }
       const creds = getCredential(match.id);
       if (!creds) {
-        return asTextResponse("Error: Credential not found in vault");
+        return asErrorTextResponse("Credential not found in vault");
       }
       const results = [];
       if (username_index != null) {
@@ -21772,13 +20830,14 @@ Use vault_login to fill the login form. Credentials are filled directly — you
     },
     async ({ credential_label, code_index, submit_after, submit_index }) => {
       const tab = tabManager.getActiveTab();
-      if (!tab) return asTextResponse("Error: No active tab");
+      if (!tab) return asNoActiveTabResponse();
       const wc = tab.view.webContents;
       let hostname;
       try {
         hostname = new URL(tab.state.url).hostname;
-      } catch {
-        return asTextResponse("Error: Could not parse active tab URL");
+      } catch (err) {
+        logger$7.warn("Failed to parse active tab URL for vault_totp:", err);
+        return asErrorTextResponse("Could not parse active tab URL");
       }
       const matches = findEntriesForDomain(`https://${hostname}`);
       const match = credential_label ? matches.find(
@@ -21949,7 +21008,7 @@ function startMcpServer(tabManager, runtime2, port) {
         await mcpServer.connect(transport);
         await transport.handleRequest(req, res);
       } catch (error) {
-        console.error("[Vessel MCP] Error handling request:", error);
+        logger$7.error("Error handling request:", error);
         if (!res.headersSent) {
           res.writeHead(500, { "Content-Type": "application/json" });
           res.end(
@@ -21968,7 +21027,7 @@ function startMcpServer(tabManager, runtime2, port) {
     };
     server.once("error", (error) => {
       const message = error.code === "EADDRINUSE" ? `Port ${port} is already in use. MCP server not started.` : error.message;
-      console.error("[Vessel MCP] Server error:", error);
+      logger$7.error("Server error:", error);
       clearMcpAuthFile();
       setMcpHealth({
         configuredPort: port,
@@ -21980,14 +21039,12 @@ function startMcpServer(tabManager, runtime2, port) {
       if (httpServer === server) {
         httpServer = null;
       }
-      finish({
-        ok: false,
+      finish(errorResult(message, {
         configuredPort: port,
         activePort: null,
         endpoint: null,
-        authToken: null,
-        error: message
-      });
+        authToken: null
+      }));
     });
     server.listen(port, "127.0.0.1", () => {
       httpServer = server;
@@ -22002,7 +21059,7 @@ function startMcpServer(tabManager, runtime2, port) {
         message: `MCP server listening on ${endpoint}.`
       });
       if (process.env.VESSEL_DEBUG_MCP === "1" || process.env.VESSEL_DEBUG_MCP === "true") {
-        console.log(`[Vessel MCP] Server listening on ${endpoint} (auth enabled)`);
+        logger$7.info(`Server listening on ${endpoint} (auth enabled)`);
       }
       if (mcpAuthToken) {
         writeMcpAuthFile(endpoint, mcpAuthToken);
@@ -22041,7 +21098,7 @@ function stopMcpServer() {
         message: "MCP server is stopped."
       });
       if (process.env.VESSEL_DEBUG_MCP === "1" || process.env.VESSEL_DEBUG_MCP === "true") {
-        console.log("[Vessel MCP] Server stopped");
+        logger$7.info("Server stopped");
       }
       resolve();
     });
@@ -22062,6 +21119,7 @@ const KIT_ID_UNSAFE_CHAR_PATTERN = /[\/\\\0]/;
 function isSafeAutomationKitId(id) {
   return id.length > 0 && !KIT_ID_UNSAFE_CHAR_PATTERN.test(id);
 }
+const logger$6 = createLogger("KitRegistry");
 function getUserKitsDir() {
   return path$1.join(electron.app.getPath("userData"), "kits");
 }
@@ -22099,10 +21157,10 @@ function getInstalledKits() {
       if (isValidKit(parsed)) {
         kits.push(parsed);
       } else {
-        console.warn(`[kit-registry] Skipping invalid kit file: ${file}`);
+        logger$6.warn(`Skipping invalid kit file: ${file}`);
       }
-    } catch {
-      console.warn(`[kit-registry] Failed to read kit file: ${file}`);
+    } catch (err) {
+      logger$6.warn(`Failed to read kit file: ${file}`, err);
     }
   }
   return kits;
@@ -22114,69 +21172,67 @@ async function installKitFromFile() {
     properties: ["openFile"]
   });
   if (canceled || filePaths.length === 0) {
-    return { ok: false, error: "canceled" };
+    return errorResult("canceled");
   }
   let raw;
   try {
     raw = fs$1.readFileSync(filePaths[0], "utf-8");
   } catch {
-    return { ok: false, error: "Could not read the selected file." };
+    return errorResult("Could not read the selected file.");
   }
   let parsed;
   try {
     parsed = JSON.parse(raw);
   } catch {
-    return { ok: false, error: "File is not valid JSON." };
+    return errorResult("File is not valid JSON.");
   }
   if (!isValidKit(parsed)) {
-    return {
-      ok: false,
-      error: "File is not a valid automation kit. Required fields: id, name, description, icon, inputs, promptTemplate."
-    };
+    return errorResult(
+      "File is not a valid automation kit. Required fields: id, name, description, icon, inputs, promptTemplate."
+    );
   }
   if (BUNDLED_KIT_IDS.has(parsed.id)) {
-    return {
-      ok: false,
-      error: `Kit id "${parsed.id}" conflicts with a built-in kit and cannot be overwritten.`
-    };
+    return errorResult(
+      `Kit id "${parsed.id}" conflicts with a built-in kit and cannot be overwritten.`
+    );
   }
   ensureKitsDir();
   const dest = getKitFilePath(parsed.id);
   if (!dest) {
-    return { ok: false, error: "Kit id contains unsupported characters." };
+    return errorResult("Kit id contains unsupported characters.");
   }
   try {
     fs$1.writeFileSync(dest, JSON.stringify(parsed, null, 2), "utf-8");
   } catch {
-    return { ok: false, error: "Failed to save the kit file." };
+    return errorResult("Failed to save the kit file.");
   }
-  return { ok: true, kit: parsed };
+  return okResult({ kit: parsed });
 }
 function uninstallKit(id, scheduledKitIds) {
   if (BUNDLED_KIT_IDS.has(id)) {
-    return { ok: false, error: "Built-in kits cannot be removed." };
+    return errorResult("Built-in kits cannot be removed.");
   }
   if (scheduledKitIds?.has(id)) {
-    return {
-      ok: false,
-      error: "This kit has active scheduled jobs. Delete or reassign them first."
-    };
+    return errorResult(
+      "This kit has active scheduled jobs. Delete or reassign them first."
+    );
   }
   ensureKitsDir();
   const target = getKitFilePath(id);
   if (!target) {
-    return { ok: false, error: "Kit id contains unsupported characters." };
+    return errorResult("Kit id contains unsupported characters.");
   }
   if (!fs$1.existsSync(target)) {
-    return { ok: false, error: "Kit not found." };
+    return errorResult("Kit not found.");
   }
   try {
     fs$1.unlinkSync(target);
-    return { ok: true };
+    return okResult();
   } catch {
-    return { ok: false, error: "Failed to remove the kit file." };
+    return errorResult("Failed to remove the kit file.");
   }
 }
+const logger$5 = createLogger("Scheduler");
 let jobs = [];
 let removeIdleListener = null;
 let broadcastFn = null;
@@ -22201,7 +21257,7 @@ function saveJobs() {
   try {
     fs$1.writeFileSync(getJobsPath(), JSON.stringify(jobs, null, 2), "utf-8");
   } catch (err) {
-    console.warn("[scheduler] Failed to save jobs:", err);
+    logger$5.warn("Failed to save jobs:", err);
   }
 }
 function normalizeJob(job, now = /* @__PURE__ */ new Date()) {
@@ -22323,7 +21379,7 @@ async function fireJob(job, windowState, runtime2) {
   };
   startActivity();
   if (!settings2.chatProvider) {
-    console.warn(`[scheduler] Job "${job.kitName}" skipped — no chat provider configured`);
+    logger$5.warn(`Job "${job.kitName}" skipped — no chat provider configured`);
     appendActivity(
       "Chat provider not configured. Open Settings (Ctrl+,) to choose a provider."
     );
@@ -22331,7 +21387,7 @@ async function fireJob(job, windowState, runtime2) {
     return;
   }
   if (process.env.VESSEL_DEBUG_SCHEDULER === "1" || process.env.VESSEL_DEBUG_SCHEDULER === "true") {
-    console.log(`[scheduler] Firing scheduled job: ${job.kitName} (${job.id})`);
+    logger$5.info(`Firing scheduled job: ${job.kitName} (${job.id})`);
   }
   try {
     const provider = createProvider(settings2.chatProvider);
@@ -22384,7 +21440,7 @@ function tick(windowState, runtime2) {
     saveJobs();
     broadcastFn?.(Channels.SCHEDULE_JOBS_UPDATE, jobs);
     void fireJob(job, windowState, runtime2).catch((err) => {
-      console.warn("[scheduler] Unexpected error firing job:", err);
+      logger$5.warn("Unexpected error firing job:", err);
     }).finally(fireNext);
   };
   fireNext();
@@ -22942,6 +21998,7 @@ function registerWindowControlHandlers(mainWindow) {
   });
 }
 let activeChatProvider = null;
+const logger$4 = createLogger("IPC");
 const VALID_APPROVAL_MODES = ["auto", "confirm-dangerous", "manual"];
 function registerIpcHandlers(windowState, runtime2) {
   const { tabManager, chromeView, sidebarView, devtoolsPanelView, mainWindow } = windowState;
@@ -23018,7 +22075,8 @@ function registerIpcHandlers(windowState, runtime2) {
       let parsed;
       try {
         parsed = new URL(rawUrl);
-      } catch {
+      } catch (err) {
+        logger$4.warn("Failed to parse premium checkout URL while watching checkout tab:", err);
         return;
       }
       if (parsed.origin !== premiumApiOrigin) return;
@@ -23075,7 +22133,8 @@ function registerIpcHandlers(windowState, runtime2) {
     if (wc.isDestroyed()) return 0;
     try {
       return await getHighlightCount(wc) ?? 0;
-    } catch {
+    } catch (err) {
+      logger$4.warn("Failed to get active highlight count:", err);
       return 0;
     }
   };
@@ -23183,13 +22242,13 @@ function registerIpcHandlers(windowState, runtime2) {
   electron.ipcMain.handle(Channels.AI_FETCH_MODELS, async (_, config) => {
     try {
       if (!config || typeof config !== "object" || !("id" in config)) {
-        return { ok: false, models: [], error: "Invalid provider configuration" };
+        return errorResult("Invalid provider configuration", { models: [] });
       }
       return await fetchProviderModels(
         config
       );
     } catch (err) {
-      return { ok: false, models: [], error: err instanceof Error ? err.message : "Unknown error" };
+      return errorResult(getErrorMessage(err), { models: [] });
     }
   });
   electron.ipcMain.handle(Channels.CONTENT_EXTRACT, async () => {
@@ -23344,14 +22403,21 @@ function registerIpcHandlers(windowState, runtime2) {
     Channels.BOOKMARK_SAVE,
     (_, url, title, folderId, note, intent, expectedContent, keyFields, agentHints) => {
       trackBookmarkAction("save");
-      return saveBookmarkWithPolicy(url, title, folderId, note, {
+      const result = saveBookmarkWithPolicy(url, title, folderId, note, {
+        onDuplicate: "update",
         extra: {
-          intent: intent?.trim() || void 0,
-          expectedContent: expectedContent?.trim() || void 0,
-          keyFields,
-          agentHints
+          ...normalizeBookmarkMetadata({
+            intent,
+            expectedContent,
+            keyFields,
+            agentHints
+          })
         }
       });
+      if (!result.bookmark) {
+        throw new Error("Bookmark save failed");
+      }
+      return result.bookmark;
     }
   );
   electron.ipcMain.handle(Channels.BOOKMARK_REMOVE, (_, id) => {
@@ -23377,12 +22443,14 @@ function registerIpcHandlers(windowState, runtime2) {
       const wc = activeTab.view.webContents;
       const result = await captureSelectionHighlight(wc);
       if (result.success && result.text) {
-        await highlightOnPage(wc, null, result.text, void 0, void 0, "yellow").catch(() => {
-        });
+        await highlightOnPage(wc, null, result.text, void 0, void 0, "yellow").catch(
+          (err) => logger$4.warn("Failed to highlight captured selection:", err)
+        );
         await emitHighlightCount();
       }
       return result;
-    } catch {
+    } catch (err) {
+      logger$4.warn("Failed to capture highlight from active tab:", err);
       return { success: false, message: "Could not capture selection" };
     }
   });
@@ -23406,7 +22474,8 @@ function registerIpcHandlers(windowState, runtime2) {
           chromeView.webContents.send(Channels.HIGHLIGHT_CAPTURE_RESULT, result);
         }
       });
-    } catch {
+    } catch (err) {
+      logger$4.warn("Failed to persist auto-highlight selection:", err);
     }
   });
   electron.ipcMain.handle(Channels.HIGHLIGHT_NAV_COUNT, () => {
@@ -23419,7 +22488,8 @@ function registerIpcHandlers(windowState, runtime2) {
     if (wc.isDestroyed()) return false;
     try {
       return scrollToHighlight(wc, index);
-    } catch {
+    } catch (err) {
+      logger$4.warn("Failed to scroll to highlight:", err);
       return false;
     }
   });
@@ -23434,7 +22504,8 @@ function registerIpcHandlers(windowState, runtime2) {
         await emitHighlightCount();
       }
       return removed;
-    } catch {
+    } catch (err) {
+      logger$4.warn("Failed to remove highlight at index:", err);
       return false;
     }
   });
@@ -23449,7 +22520,8 @@ function registerIpcHandlers(windowState, runtime2) {
         await emitHighlightCount();
       }
       return cleared;
-    } catch {
+    } catch (err) {
+      logger$4.warn("Failed to clear highlight elements:", err);
       return false;
     }
   });
@@ -23533,7 +22605,7 @@ function registerIpcHandlers(windowState, runtime2) {
   electron.ipcMain.handle(Channels.PREMIUM_ACTIVATION_START, async (_, email) => {
     assertString(email, "email");
     if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email.trim())) {
-      return { ok: false, error: "Invalid email format" };
+      return errorResult("Invalid email format");
     }
     trackPremiumFunnel("activation_attempted");
     const result = await requestActivationCode(email);
@@ -23549,11 +22621,9 @@ function registerIpcHandlers(windowState, runtime2) {
       assertString(code, "code");
       assertString(challengeToken, "challengeToken");
       if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email.trim())) {
-        return {
-          ok: false,
-          state: getPremiumState(),
-          error: "Invalid email format"
-        };
+        return errorResult("Invalid email format", {
+          state: getPremiumState()
+        });
       }
       trackPremiumFunnel("activation_attempted");
       const result = await verifyActivationCode(email, code, challengeToken);
@@ -23988,6 +23058,7 @@ ${lines.join("\n")}
 }
 const MAX_TRANSCRIPT_TEXT_LENGTH = 8e3;
 const PERSIST_DEBOUNCE_MS = 500;
+const logger$3 = createLogger("Runtime");
 function clone(value) {
   return JSON.parse(JSON.stringify(value));
 }
@@ -24377,9 +23448,7 @@ ${progress}
         JSON.stringify(persisted, null, 2),
         "utf-8"
       )
-    ).catch(
-      (err) => console.error("[Vessel] Failed to persist runtime state:", err)
-    );
+    ).catch((err) => logger$3.error("Failed to persist runtime state:", err));
   }
   schedulePersist() {
     this.persistDirty = true;
@@ -24644,6 +23713,7 @@ function installDownloadHandler(chromeView) {
     });
   });
 }
+const logger$2 = createLogger("Shortcuts");
 function registerHighlightShortcut(mainWindow, tabManager) {
   const register = () => {
     electron.globalShortcut.unregister("CommandOrControl+H");
@@ -24653,7 +23723,7 @@ function registerHighlightShortcut(mainWindow, tabManager) {
       tabManager.captureHighlightFromActiveTab();
     });
     if (!success) {
-      console.warn("[Vessel] Failed to register Ctrl+H shortcut");
+      logger$2.warn("Failed to register Ctrl+H shortcut");
     }
   };
   register();
@@ -24722,6 +23792,7 @@ function loadRenderers(chromeView, sidebarView, devtoolsPanelView) {
     });
   }
 }
+const logger$1 = createLogger("Splash");
 function findIconBase64() {
   const candidates = [
     path$1.join(process.resourcesPath, "vessel-icon.png"),
@@ -24884,7 +23955,7 @@ function createSplashWindow() {
     fs$1.writeFileSync(tmpPath, html, "utf-8");
     void splash.loadFile(tmpPath);
   } catch (err) {
-    console.warn("[splash] Failed to write temp HTML, using fallback:", err);
+    logger$1.warn("Failed to write temp HTML, using fallback:", err);
     void splash.loadFile(path$1.join(__dirname, "../../resources/vessel-icon.png"));
   }
   return splash;
@@ -24894,6 +23965,7 @@ function closeSplash(splash, delayMs = 0) {
     if (!splash.isDestroyed()) splash.close();
   }, delayMs);
 }
+const logger = createLogger("Bootstrap");
 let runtime = null;
 function checkWritableUserData(userDataPath) {
   const issues = [];
@@ -25013,7 +24085,7 @@ async function bootstrap() {
   };
   let didInitializeChromeRenderer = false;
   const splashTimeout = setTimeout(() => {
-    console.warn("[bootstrap] Renderer did not finish loading before splash timeout");
+    logger.warn("Renderer did not finish loading before splash timeout");
     revealMainWindow();
   }, 8e3);
   const { chromeView, sidebarView, devtoolsPanelView, tabManager } = windowState;
@@ -25064,8 +24136,8 @@ async function bootstrap() {
     "did-fail-load",
     (_event, errorCode, errorDescription, validatedURL, isMainFrame) => {
       if (!isMainFrame) return;
-      console.error(
-        "[bootstrap] Chrome renderer failed to load:",
+      logger.error(
+        "Chrome renderer failed to load:",
         errorCode,
         errorDescription,
         validatedURL
@@ -25076,21 +24148,21 @@ async function bootstrap() {
   );
   loadRenderers(chromeView, sidebarView, devtoolsPanelView);
   startMcpServer(tabManager, runtime, settings2.mcpPort).catch((err) => {
-    console.error("[bootstrap] MCP server failed to start:", err);
+    logger.error("MCP server failed to start:", err);
   });
 }
 process.on("uncaughtException", (error) => {
-  console.error("[Vessel] Uncaught exception:", error.message, error.stack);
+  logger.error("Uncaught exception:", error.message, error.stack);
   electron.app.quit();
 });
 process.on("unhandledRejection", (reason) => {
-  console.error(
-    "[Vessel] Unhandled rejection:",
+  logger.error(
+    "Unhandled rejection:",
     reason instanceof Error ? reason.message : reason
   );
 });
 electron.app.whenReady().then(bootstrap).catch((error) => {
-  console.error("[Vessel] Failed to bootstrap application:", error);
+  logger.error("Failed to bootstrap application:", error);
   electron.app.quit();
 });
 electron.app.on("window-all-closed", () => {