@quanta-intellect/vessel-browser 0.1.141 → 0.1.144

package/out/main/index.js

@@ -2221,6 +2221,19 @@ async function scrollToHighlight(wc, index) {
     })()
   `);
 }
+async function getHighlightTextAtIndex(wc, index) {
+  const safeIndex = Math.floor(Number(index));
+  return wc.executeJavaScript(`
+    (function() {
+      var highlights = document.querySelectorAll(${HIGHLIGHT_SELECTOR});
+      if (${safeIndex} < 0 || ${safeIndex} >= highlights.length) return null;
+      var el = highlights[${safeIndex}];
+      var text = el.getAttribute && el.getAttribute('data-vessel-highlight-text');
+      if (!text && el.textContent) text = el.textContent;
+      return text ? text.trim() : null;
+    })()
+  `);
+}
 async function removeHighlightAtIndex(wc, index) {
   const safeIndex = Math.floor(Number(index));
   return wc.executeJavaScript(`
@@ -8751,7 +8764,24 @@ function recoverNarratedActionToolCalls(text, availableToolNames) {
   }
   return recovered;
 }
-const DOLLAR_PRICE_RE = /\$\s?\d{2,4}(?:[,.]\d{2})?\b/;
+function shouldRetryUnexecutedHighlightCompletion(userMessage, assistantText, successfulToolNames) {
+  const userAskedForHighlights = /\b(?:highlight|highlights|mark|annotate)\b/i.test(
+    userMessage
+  );
+  if (!userAskedForHighlights || successfulToolNames.includes("highlight")) {
+    return false;
+  }
+  const normalizedAssistant = assistantText.toLowerCase();
+  return /\b(?:highlighted|marked|annotated)\b/.test(normalizedAssistant) || /\b(?:green|yellow|red|blue|purple|orange)\s+highlights?\b/.test(
+    normalizedAssistant
+  ) || /\bhighlights?\s+(?:added|shown|applied|visible|on the page)\b/.test(
+    normalizedAssistant
+  );
+}
+function buildHighlightToolCompletionPrompt() {
+  return `The user asked you to highlight items on the page, but no highlight tool call succeeded. Do not claim visual highlights are present until you call the supported highlight tool. Use read_page only if you need current page text, then call highlight with {"text":"exact visible title or passage"} for each item you want to mark. Use an element index only when the latest read_page result gives the exact current index for that same item.`;
+}
+const DOLLAR_PRICE_RE = /\$\s?(?:\d{2,4}|\d{1,3}(?:,\d{3})+)(?:\.\d{2})?\b/;
 const FLIGHT_TASK_RE = /\b(?:flight|flights|airfare|air fare|plane ticket|airline|airport|google flights|pdx|sfo|san francisco|portland)\b/i;
 const SHOPPING_INTENT_RE = /\b(?:cheap|cheapest|price|prices|fare|fares|one[- ]?way|round[- ]?trip|depart|departure|arrive|arrival|from|to)\b/i;
 const FLIGHT_CLAIM_CONTEXT_RE = /\b(?:flight|flights|airline|airlines|departure|arrival|depart|arrive|nonstop|non-stop|stops?|duration|alaska|united|delta|american|southwest|frontier|spirit|jetblue|hawaiian)\b/i;
@@ -8787,6 +8817,106 @@ function buildFlightPriceEvidenceRecoveryPrompt(userMessage, assistantText, late
     `Last unsupported answer: ${assistantText.replace(/\s+/g, " ").trim().slice(0, 500) || "(empty)"}`
   ].join("\n");
 }
+const SEARCH_HISTORY_LIMIT = 4;
+function normalizeSearchToolQuery(name, args) {
+  if (name !== "search" && name !== "web_search") return null;
+  const raw = typeof args.query === "string" ? args.query : typeof args.text === "string" ? args.text : typeof args.term === "string" ? args.term : "";
+  const normalized = raw.replace(/\s+/g, " ").trim().toLowerCase();
+  return normalized || null;
+}
+function buildLatestStateReminder(toolResultPreview) {
+  const text = (toolResultPreview || "").trim();
+  if (!text) return "";
+  const existingReminder = text.match(
+    /\bLatest browser state:\s*URL\s+.+?(?:Trust the latest tool result over the initial page context\.|$)/i
+  )?.[0]?.trim();
+  if (existingReminder) return existingReminder;
+  const stateMatch = text.match(
+    /\[state:\s+url=([^,\]\n]+),\s+title=(?:"([^"]*)"|([^,\]\n]+))/i
+  );
+  if (stateMatch) {
+    const url = stateMatch[1]?.trim();
+    const title = (stateMatch[2] ?? stateMatch[3] ?? "").trim();
+    if (url) {
+      return `Latest browser state: URL ${url}${title ? `, title "${title}"` : ""}. Trust the latest tool result over the initial page context.`;
+    }
+  }
+  const structuredUrl = text.match(/\*\*URL:\*\*\s*([^\n]+)/i)?.[1]?.trim();
+  const structuredTitle = text.match(/\*\*Title:\*\*\s*([^\n]+)/i)?.[1]?.trim();
+  if (structuredUrl) {
+    return `Latest browser state: URL ${structuredUrl}${structuredTitle ? `, title "${structuredTitle}"` : ""}. Trust the latest tool result over the initial page context.`;
+  }
+  const navigatedUrl = text.match(
+    /\b(?:navigated to|went back to|went forward to|searched "[^"]+"(?: \(via search button\))? →)\s+([^\s\n]+)/i
+  )?.[1]?.trim() ?? text.match(
+    /\b(?:web\s+)?searched "[^"]+"[^\n]*?(?:->|→)\s+([^\s\n]+)/i
+  )?.[1]?.trim();
+  const pageTitle = text.match(/\bPage title:\s*([^\n]+)/i)?.[1]?.trim();
+  if (navigatedUrl) {
+    return `Latest browser state: URL ${navigatedUrl}${pageTitle ? `, title "${pageTitle}"` : ""}. Trust the latest tool result over the initial page context.`;
+  }
+  return "";
+}
+function buildRepeatedSearchError(previousTool, previousQuery, latestToolResultPreview, mode) {
+  const stateReminder = buildLatestStateReminder(latestToolResultPreview);
+  const lines = [
+    mode === "drifted" ? `Error: You already performed ${previousTool} successfully for this task.` : `Error: You already searched for "${previousQuery}" successfully with ${previousTool}.`,
+    mode === "drifted" ? `Do not rewrite or broaden the query with another ${previousTool}; use the current search results instead.` : `Do not search the same query again with ${previousTool} or its search/web_search alias; use the current search results instead.`,
+    `For named venues, businesses, organizations, schools, or local places, prefer opening the official site or clearly direct result from the current results page before answering. Do not switch to a site: restricted web_search when an official or direct result is already available.`,
+    `Take the next action from the results you already have: click a result, inspect a specific item, or provide the final answer to the user. Do not call any search tool again as preparation, and do not call read_page as preparation for another search.`
+  ];
+  if (stateReminder) {
+    lines.push(stateReminder);
+  }
+  return lines.join(" ");
+}
+class SearchLoopGuard {
+  recentSuccessfulSearchQueries = [];
+  recentSuccessfulSearchToolByQuery = /* @__PURE__ */ new Map();
+  lastSuccessfulWebSearchQuery = null;
+  isContextResettingTool;
+  constructor(isContextResettingTool) {
+    this.isContextResettingTool = isContextResettingTool;
+  }
+  /**
+   * Check whether a search/web_search call should be suppressed. Returns the
+   * details needed to build the corrective error, or null if the call is OK.
+   */
+  check(toolName, query) {
+    const isRepeatedSearchAcrossTools = query !== null && this.recentSuccessfulSearchQueries.includes(query);
+    const isQueryDriftedWebSearch = toolName === "web_search" && this.lastSuccessfulWebSearchQuery !== null && query !== null && query !== this.lastSuccessfulWebSearchQuery;
+    if (!isRepeatedSearchAcrossTools && !isQueryDriftedWebSearch) return null;
+    const mode = isRepeatedSearchAcrossTools ? "repeated" : "drifted";
+    const previousTool = isRepeatedSearchAcrossTools ? this.recentSuccessfulSearchToolByQuery.get(query ?? "") ?? (toolName === "web_search" ? "search" : "web_search") : "web_search";
+    const previousQuery = isRepeatedSearchAcrossTools ? query ?? "" : this.lastSuccessfulWebSearchQuery ?? "";
+    return { mode, previousTool, previousQuery };
+  }
+  /**
+   * Record a successfully executed tool. Search queries are added to the
+   * recent-history ring buffer, and real-progress tools clear the drift anchor
+   * so a later distinct search is not flagged as drift.
+   */
+  recordSuccess(toolName, query, wasSuccessful) {
+    if (wasSuccessful && this.isContextResettingTool(toolName)) {
+      this.lastSuccessfulWebSearchQuery = null;
+    }
+    if (wasSuccessful && query) {
+      if (!this.recentSuccessfulSearchQueries.includes(query)) {
+        this.recentSuccessfulSearchQueries.push(query);
+        this.recentSuccessfulSearchToolByQuery.set(query, toolName);
+        if (this.recentSuccessfulSearchQueries.length > SEARCH_HISTORY_LIMIT) {
+          const dropped = this.recentSuccessfulSearchQueries.shift();
+          if (dropped) {
+            this.recentSuccessfulSearchToolByQuery.delete(dropped);
+          }
+        }
+      }
+    }
+    if (wasSuccessful && toolName === "web_search" && query) {
+      this.lastSuccessfulWebSearchQuery = query;
+    }
+  }
+}
 const logger$v = createLogger("OpenAIProvider");
 function shouldDebugAgentLoop() {
   const value = process.env.VESSEL_DEBUG_AGENT_LOOP;
@@ -8837,10 +8967,26 @@ function toOpenAIReasoningEffort(effort, providerId, model) {
       return void 0;
   }
 }
+function openRouterRoutingOptions(providerId) {
+  if (providerId !== "openrouter") return {};
+  return {
+    provider: {
+      require_parameters: true,
+      sort: "latency"
+    }
+  };
+}
+function buildOpenRouterAttributionHeaders() {
+  return {
+    "HTTP-Referer": "https://github.com/unmodeled-tyler/vessel-browser",
+    "X-OpenRouter-Title": "Vessel Browser",
+    "X-OpenRouter-Categories": "personal-agent,general-chat"
+  };
+}
 function followUpReminderForProfile(profile, userMessage, assistantText, latestToolResultPreview) {
   if (profile !== "compact") return null;
   const phaseReminder = buildPhaseReminder(userMessage, assistantText || "");
-  const stateReminder = buildLatestStateReminder(latestToolResultPreview || "");
+  const stateReminder = buildLatestStateReminder(latestToolResultPreview);
   return {
     role: "user",
     content: `[System] Task reminder: Continue working on the user's original request until it is completed: ${userMessage}
@@ -8850,13 +8996,13 @@ ${phaseReminder}` : "")
   };
 }
 function extractSingleGoalDomain(goal) {
-  const matches = goal.toLowerCase().match(/\b(?:https?:\/\/)?(?:www\.)?([a-z0-9-]+\.(?:com|org|net|io|dev|app|ai|co|edu|gov))\b/g);
+  const matches = goal.toLowerCase().match(/\b(?:https?:\/\/)?(?:www\.)?([a-z0-9-]+\.[a-z]{2,})\b/g);
   if (!matches || matches.length !== 1) return null;
   return matches[0].replace(/^https?:\/\//, "").replace(/^www\./, "").toLowerCase();
 }
 function buildCompactRecoveryPrompt(userMessage, assistantText, latestToolResultPreview) {
   const phaseReminder = buildPhaseReminder(userMessage, assistantText);
-  const stateReminder = buildLatestStateReminder(latestToolResultPreview || "");
+  const stateReminder = buildLatestStateReminder(latestToolResultPreview);
   const goalDomain = extractSingleGoalDomain(userMessage);
   const latest = (latestToolResultPreview || "").toLowerCase();
   const assistant = assistantText.toLowerCase();
@@ -8953,30 +9099,18 @@ function buildPhaseReminder(userMessage, assistantText) {
   }
   return "";
 }
-function buildLatestStateReminder(toolResultPreview) {
-  const text = toolResultPreview.trim();
-  if (!text) return "";
-  const stateMatch = text.match(
-    /\[state:\s+url=([^,\]\n]+),\s+title=(?:"([^"]*)"|([^,\]\n]+))/i
-  );
-  if (stateMatch) {
-    const url = stateMatch[1]?.trim();
-    const title = (stateMatch[2] ?? stateMatch[3] ?? "").trim();
-    if (url) {
-      return `Latest browser state: URL ${url}${title ? `, title "${title}"` : ""}. Trust the latest tool result over the initial page context.`;
-    }
-  }
-  const structuredUrl = text.match(/\*\*URL:\*\*\s*([^\n]+)/i)?.[1]?.trim();
-  const structuredTitle = text.match(/\*\*Title:\*\*\s*([^\n]+)/i)?.[1]?.trim();
-  if (structuredUrl) {
-    return `Latest browser state: URL ${structuredUrl}${structuredTitle ? `, title "${structuredTitle}"` : ""}. Trust the latest tool result over the initial page context.`;
-  }
-  const navigatedUrl = text.match(/\b(?:navigated to|went back to|went forward to|searched "[^"]+"(?: \(via search button\))? →)\s+([^\s\n]+)/i)?.[1]?.trim();
-  const pageTitle = text.match(/\bPage title:\s*([^\n]+)/i)?.[1]?.trim();
-  if (navigatedUrl) {
-    return `Latest browser state: URL ${navigatedUrl}${pageTitle ? `, title "${pageTitle}"` : ""}. Trust the latest tool result over the initial page context.`;
-  }
-  return "";
+function isSearchContextResettingTool(name) {
+  return ![
+    "read_page",
+    "current_tab",
+    "list_tabs",
+    "screenshot",
+    "clear_overlays",
+    "accept_cookies",
+    "dismiss_popup",
+    "web_search",
+    "search"
+  ].includes(name);
 }
 function shouldRecoverCompactStall(text, userMessage) {
   const trimmed = text.trim().toLowerCase();
@@ -9061,10 +9195,24 @@ function logAgentLoopDebug(payload) {
   }
 }
 function formatOpenAICompatErrorMessage(providerId, message) {
+  if (providerId === "openrouter" && /(timed out after \d+(?:\.\d+)? seconds|request timed out|returned none after all retries|returned no content|empty response)/i.test(
+    message
+  )) {
+    return [
+      message,
+      "OpenRouter reported an upstream model timeout/no-content failure.",
+      "If this persists, retry or pin a specific low-latency tool-calling model instead of the free router."
+    ].join(" ");
+  }
   if (providerId === "llama_cpp" && /(available context size|context size exceeded|exceeds the available context size|try increasing it)/i.test(
     message
   )) {
-    return `${message} llama.cpp sets context size at server startup, not per request. Vessel's agent prompt plus tool schema is about 6.5k tokens before browsing history, so run llama-server with --ctx-size ${LLAMA_CPP_MIN_CTX_TOKENS} minimum (${LLAMA_CPP_RECOMMENDED_CTX_TOKENS} recommended).`;
+    return [
+      message,
+      "llama.cpp sets context size at server startup, not per request.",
+      `Vessel's agent prompt plus tool schema is about 6.5k tokens before browsing history, so run llama-server with`,
+      `--ctx-size ${LLAMA_CPP_MIN_CTX_TOKENS} minimum (${LLAMA_CPP_RECOMMENDED_CTX_TOKENS} recommended).`
+    ].join(" ");
   }
   return message;
 }
@@ -9083,10 +9231,7 @@ class OpenAICompatProvider {
       apiKey: config.apiKey || "ollama",
       baseURL,
       ...isOpenRouter && {
-        defaultHeaders: {
-          "HTTP-Referer": "https://github.com/unmodeled/vessel-browser",
-          "X-Title": "Vessel"
-        }
+        defaultHeaders: buildOpenRouterAttributionHeaders()
       }
     });
     this.providerId = config.id;
@@ -9113,6 +9258,7 @@ class OpenAICompatProvider {
           max_tokens: 4096,
           stream: true,
           messages,
+          ...openRouterRoutingOptions(this.providerId),
           ...openAIPromptCacheOptions({
             providerId: this.providerId,
             model: this.model,
@@ -9171,9 +9317,12 @@ class OpenAICompatProvider {
       let iterationsUsed = 0;
       let compactRecoveryCount = 0;
       let flightPriceEvidenceRecoveryCount = 0;
+      let highlightCompletionRecoveryCount = 0;
       let compactCorrectionCount = 0;
       const recentCompactToolSignatures = [];
       const recentToolNames = [];
+      const successfulToolNames = [];
+      const searchLoopGuard = new SearchLoopGuard(isSearchContextResettingTool);
       let clickReadLoopNudged = false;
       for (let i = 0; i < maxIterations; i++) {
         iterationsUsed = i + 1;
@@ -9195,6 +9344,7 @@ class OpenAICompatProvider {
             tools: openAITools,
             tool_choice: "auto",
             temperature: agentTemperatureForProfile(this.agentToolProfile),
+            ...openRouterRoutingOptions(this.providerId),
             ...openAIPromptCacheOptions({
               providerId: this.providerId,
               model: this.model,
@@ -9342,6 +9492,19 @@ class OpenAICompatProvider {
             });
             continue;
           }
+          if (highlightCompletionRecoveryCount < 1 && shouldRetryUnexecutedHighlightCompletion(
+            userMessage,
+            textAccum,
+            successfulToolNames
+          )) {
+            highlightCompletionRecoveryCount += 1;
+            if (textAccum.trim()) onChunk("<<erase_prev>>");
+            messages.push({
+              role: "user",
+              content: `[System] ${buildHighlightToolCompletionPrompt()}`
+            });
+            continue;
+          }
           break;
         }
         compactRecoveryCount = 0;
@@ -9394,6 +9557,25 @@ class OpenAICompatProvider {
           args = repairedArgs.args;
           args = coerceToolArgsForExecution(tc.name, args);
           const toolSignature = stableToolSignature(tc.name, args);
+          const searchToolQuery = normalizeSearchToolQuery(tc.name, args);
+          const searchLoopCheck = searchLoopGuard.check(tc.name, searchToolQuery);
+          if (searchLoopCheck) {
+            onChunk(`
+<<tool:${tc.name}:↻ duplicate suppressed>>
+`);
+            messages.push({
+              role: "tool",
+              tool_call_id: tc.id,
+              content: buildRepeatedSearchError(
+                searchLoopCheck.previousTool,
+                searchLoopCheck.previousQuery,
+                latestToolMessage ? String(latestToolMessage.content || "") : null,
+                searchLoopCheck.mode
+              )
+            });
+            compactCorrectionCount += 1;
+            continue;
+          }
           if (this.agentToolProfile === "compact" && tc.name === "click" && isTargetlessClickArgs(args)) {
             onChunk(`
 <<tool:${tc.name}:⚠ missing target>>
@@ -9468,6 +9650,15 @@ class OpenAICompatProvider {
               recentCompactToolSignatures.shift();
             }
           }
+          const toolSucceeded = !/^Error:/i.test(toolContent.trim());
+          if (toolSucceeded) {
+            successfulToolNames.push(tc.name);
+          }
+          searchLoopGuard.recordSuccess(
+            tc.name,
+            searchToolQuery,
+            toolSucceeded
+          );
           recentToolNames.push(tc.name);
           if (recentToolNames.length > 8) recentToolNames.shift();
           if (!clickReadLoopNudged && recentToolNames.length >= 6 && isClickReadLoop(recentToolNames)) {
@@ -9997,59 +10188,13 @@ function previewToolResult(text, maxLength = 800) {
   if (normalized.length <= maxLength) return normalized;
   return `${normalized.slice(0, maxLength)}...`;
 }
-function normalizedSearchToolQuery(name, args) {
-  if (name !== "search" && name !== "web_search") return null;
-  const raw = typeof args.query === "string" ? args.query : typeof args.text === "string" ? args.text : typeof args.term === "string" ? args.term : "";
-  const normalized = raw.replace(/\s+/g, " ").trim().toLowerCase();
-  return normalized || null;
-}
 function hasBlockingOverlaySignal(text) {
   if (!text) return false;
   if (/\bno blocking overlays detected\b/i.test(text)) return false;
   return /\bwarning:\s*blocking overlay detected\b/i.test(text) || /\bblocked-by-overlay\b/i.test(text) || /###\s*immediate blockers\b/i.test(text) || /\bblocking overlays\W+[1-9]\d*\b/i.test(text);
 }
-function buildCodexLatestStateReminder(toolResultPreview) {
-  const text = (toolResultPreview || "").trim();
-  if (!text) return "";
-  const existingReminder = text.match(
-    /\bLatest browser state:\s*URL\s+.+?(?:Trust the latest tool result over the initial page context\.|$)/i
-  )?.[0]?.trim();
-  if (existingReminder) return existingReminder;
-  const stateMatch = text.match(
-    /\[state:\s+url=([^,\]\n]+),\s+title=(?:"([^"]*)"|([^,\]\n]+))/i
-  );
-  if (stateMatch) {
-    const url = stateMatch[1]?.trim();
-    const title = (stateMatch[2] ?? stateMatch[3] ?? "").trim();
-    if (url) {
-      return `Latest browser state: URL ${url}${title ? `, title "${title}"` : ""}. Trust the latest tool result over the initial page context.`;
-    }
-  }
-  const navigatedUrl = text.match(/\b(?:navigated to|went back to|went forward to)\s+([^\s\n]+)/i)?.[1]?.trim() ?? text.match(/\b(?:web\s+)?searched "[^"]+"[^\n]*?(?:->|→)\s+([^\s\n]+)/i)?.[1]?.trim();
-  const pageTitle = text.match(/\bPage title:\s*([^\n]+)/i)?.[1]?.trim();
-  if (navigatedUrl) {
-    return `Latest browser state: URL ${navigatedUrl}${pageTitle ? `, title "${pageTitle}"` : ""}. Trust the latest tool result over the initial page context.`;
-  }
-  return "";
-}
-function buildCodexRepeatedSearchError(previousTool, previousQuery, latestToolResultPreview, mode) {
-  const stateReminder = buildCodexLatestStateReminder(latestToolResultPreview);
-  const header = mode === "drifted" ? `Error: You already performed ${previousTool} successfully for this task.` : `Error: You already searched for "${previousQuery}" successfully with ${previousTool}.`;
-  const lines = [
-    header,
-    mode === "drifted" ? `Do not rewrite or broaden the query with another ${previousTool}. The latest results from your previous ${previousTool} are already in the conversation context.` : `Do not search the same query again with ${previousTool} (or its alias search/web_search). The latest results from your previous ${previousTool} are already in the conversation context.`,
-    // The key change: do NOT suggest read_page as a "recovery" action.
-    // The model was using read_page as a no-op to reset the strike counter
-    // and then issue another web_search. The prior results are sufficient.
-    `Take the next action from the results you already have: click a result link, call inspect_element on a specific item, highlight, or provide the final answer to the user. Do not call any search tool again, and do not call read_page as preparation for another search.`
-  ];
-  if (stateReminder) {
-    lines.push(stateReminder);
-  }
-  return lines.join(" ");
-}
 function buildCodexUnsupportedClearOverlayError(latestToolResultPreview) {
-  const stateReminder = buildCodexLatestStateReminder(latestToolResultPreview);
+  const stateReminder = buildLatestStateReminder(latestToolResultPreview);
   const lines = [
     `Error: No blocking overlay signal is present in the latest browser state.`,
     `Do not call clear_overlays unless read_page or the page context explicitly reports a blocking overlay.`,
@@ -10169,7 +10314,7 @@ function shouldRetryCodexToolLoop(text, hasToolHistory) {
   return false;
 }
 function buildCodexRecoveryInput(userMessage, assistantText, latestToolResultPreview) {
-  const stateReminder = buildCodexLatestStateReminder(latestToolResultPreview);
+  const stateReminder = buildLatestStateReminder(latestToolResultPreview);
   const lines = [
     `[System] The task is still in progress: ${userMessage}`,
     `Do not ask the user what they want next unless the original request is genuinely ambiguous or blocked.`,
@@ -10202,7 +10347,7 @@ function buildCodexFlightPriceEvidenceRecoveryInput(userMessage, assistantText,
   };
 }
 function buildCodexFailedClickRecoveryInput(attemptedTarget, latestToolResultPreview, failedClickCount = 1) {
-  const stateReminder = buildCodexLatestStateReminder(latestToolResultPreview);
+  const stateReminder = buildLatestStateReminder(latestToolResultPreview);
   const lines = [
     `[System] The previous click did not complete${attemptedTarget ? ` for ${attemptedTarget}` : ""}.`,
     `Take the next step yourself: try a different target, refresh the page state with read_page, call inspect_element on the intended element, or answer from the results already visible in the conversation. Do not ask the user to inspect or click the result for you.`
@@ -10421,9 +10566,7 @@ class CodexProvider {
     let clickReadLoopNudged = false;
     let latestToolResultPreview = null;
     let failedClickCountSinceProgress = 0;
-    const recentSuccessfulSearchQueries = [];
-    const recentSuccessfulSearchToolByQuery = /* @__PURE__ */ new Map();
-    let lastSuccessfulWebSearchQuery = null;
+    const searchLoopGuard = new SearchLoopGuard(isRealProgressTool);
     try {
       for (let i = 0; i < maxIterations; i++) {
         iterationsUsed = i + 1;
@@ -10513,30 +10656,29 @@ class CodexProvider {
             prepared.prepared.name,
             prepared.prepared.args
           );
-          const searchToolQuery = normalizedSearchToolQuery(
+          const searchToolQuery = normalizeSearchToolQuery(
             prepared.prepared.name,
             prepared.prepared.args
           );
-          const isRepeatedSearchAcrossTools = searchToolQuery !== null && recentSuccessfulSearchQueries.includes(searchToolQuery);
-          const isQueryDriftedWebSearch = prepared.prepared.name === "web_search" && lastSuccessfulWebSearchQuery !== null && searchToolQuery !== null && searchToolQuery !== lastSuccessfulWebSearchQuery;
+          const searchLoopCheck = searchLoopGuard.check(
+            prepared.prepared.name,
+            searchToolQuery
+          );
           const isUnsupportedClearOverlay = prepared.prepared.name === "clear_overlays" && !hasBlockingOverlaySignal(
             `${systemPrompt}
 ${latestToolResultPreview || ""}`
           );
-          if (isRepeatedSearchAcrossTools || isQueryDriftedWebSearch) {
+          if (searchLoopCheck) {
             onChunk(`
 <<tool:${prepared.prepared.name}:↻ duplicate suppressed>>
 `);
-            const previousTool = isRepeatedSearchAcrossTools ? recentSuccessfulSearchToolByQuery.get(searchToolQuery ?? "") ?? (prepared.prepared.name === "web_search" ? "search" : "web_search") : "web_search";
-            const previousQuery = isRepeatedSearchAcrossTools ? searchToolQuery ?? "" : lastSuccessfulWebSearchQuery ?? "";
-            const mode = isRepeatedSearchAcrossTools ? "repeated" : "drifted";
             const output2 = createCodexToolOutput(
               prepared.prepared.callId,
-              buildCodexRepeatedSearchError(
-                previousTool,
-                previousQuery,
+              buildRepeatedSearchError(
+                searchLoopCheck.previousTool,
+                searchLoopCheck.previousQuery,
                 latestToolResultPreview,
-                mode
+                searchLoopCheck.mode
               )
             );
             currentInput.push(output2);
@@ -10590,30 +10732,15 @@ ${latestToolResultPreview || ""}`
           toolHistoryCount += 1;
           latestToolResultPreview = previewToolResult(output.output);
           const outputText = toolResultTextContent(output.output);
-          if (!looksLikeFailedToolOutput(outputText)) {
-            if (isRealProgressTool(prepared.prepared.name)) {
-              lastSuccessfulWebSearchQuery = null;
-              failedClickCountSinceProgress = 0;
-            }
-          }
-          if (searchToolQuery && !looksLikeFailedToolOutput(outputText) && !recentSuccessfulSearchQueries.includes(searchToolQuery)) {
-            recentSuccessfulSearchQueries.push(searchToolQuery);
-            recentSuccessfulSearchToolByQuery.set(
-              searchToolQuery,
-              prepared.prepared.name
-            );
-            if (recentSuccessfulSearchQueries.length > 4) {
-              const dropped = recentSuccessfulSearchQueries.shift();
-              if (dropped) {
-                recentSuccessfulSearchToolByQuery.delete(dropped);
-              }
-            }
-          }
-          if (prepared.prepared.name === "web_search" && !looksLikeFailedToolOutput(outputText)) {
-            if (searchToolQuery) {
-              lastSuccessfulWebSearchQuery = searchToolQuery;
-            }
+          const toolSucceeded = !looksLikeFailedToolOutput(outputText);
+          if (toolSucceeded && isRealProgressTool(prepared.prepared.name)) {
+            failedClickCountSinceProgress = 0;
           }
+          searchLoopGuard.recordSuccess(
+            prepared.prepared.name,
+            searchToolQuery,
+            toolSucceeded
+          );
           if (prepared.prepared.name === "click" && looksLikeFailedToolOutput(outputText)) {
             failedClickCountSinceProgress += 1;
             currentInput.push(
@@ -11529,13 +11656,15 @@ const TOOL_DEFINITIONS = [
   {
     name: "highlight",
     title: "Highlight Element",
-    description: "Visually highlight an element or text on the page for the user. Use to draw attention to specific content. Highlights persist until cleared.",
+    description: "Visually highlight page content for the user. For named items like story titles, result titles, links, headings, or article passages, prefer text with the exact visible title/text. Use index only when you have a current read_page element index for that exact item. Highlights persist until cleared.",
     inputSchema: {
-      index: zod.z.number().optional().describe("Element index from page content to highlight"),
-      selector: zod.z.string().optional().describe("CSS selector of element to highlight"),
       text: normalizedOptionalStringSchema().describe(
-        "Text to find and highlight on the page (all occurrences)"
+        "Exact visible text/title to find and highlight on the page. Preferred for story titles, result titles, links, headings, and passages."
+      ),
+      index: zod.z.number().optional().describe(
+        "Element index from the latest page content listing. Use only when it identifies the exact item to highlight."
       ),
+      selector: zod.z.string().optional().describe("CSS selector of element to highlight"),
       label: zod.z.string().optional().describe("Annotation label to display near the highlight"),
       durationMs: zod.z.number().optional().describe(
         "Auto-clear after this many milliseconds (omit for permanent)"
@@ -11647,7 +11776,7 @@ const TOOL_DEFINITIONS = [
   {
     name: "web_search",
     title: "Web Search",
-    description: "Search the open web using the configured default search engine. Use this for broad discovery tasks instead of typing into the current page.",
+    description: "Search the open web using the configured default search engine. Use this for broad discovery tasks instead of typing into the current page. For named venues, businesses, organizations, schools, or local places, use web search to find the official/direct result, then click that result; do not use site: queries as a substitute for opening an available official result.",
     inputSchema: {
       query: zod.z.string().describe("Web search query text")
     },
@@ -12568,17 +12697,23 @@ function formatCartSnapshot(page) {
 function isVisibleToUser(el) {
   return el.visible === true && el.inViewport === true && el.obscured !== true && el.blockedByOverlay !== true;
 }
+function elementSearchText(el, extraFields = []) {
+  const fields = [
+    el.text,
+    el.label,
+    el.name,
+    el.placeholder,
+    el.description,
+    el.href,
+    ...extraFields.map((field) => el[field])
+  ];
+  return normalizeComparable(fields.filter(Boolean).join(" "));
+}
+function formatElementOptions(options, maxOptions) {
+  return options?.slice(0, maxOptions).map((o) => typeof o === "string" ? o : o.label || o.value).join("|") ?? "";
+}
 function purchaseActionPriority(el) {
-  const haystack = normalizeComparable(
-    [
-      el.text,
-      el.label,
-      el.name,
-      el.placeholder,
-      el.description,
-      el.href
-    ].filter(Boolean).join(" ")
-  );
+  const haystack = elementSearchText(el);
   if (!haystack) return Number.POSITIVE_INFINITY;
   if (/\badd(?: item)? to (?:cart|bag|basket)\b/.test(haystack)) return 0;
   if (/\b(?:buy now|preorder|pre-order|reserve now|shop now)\b/.test(haystack)) {
@@ -12589,6 +12724,27 @@ function purchaseActionPriority(el) {
   }
   return Number.POSITIVE_INFINITY;
 }
+function dateOrShowtimeControlPriority(el) {
+  const haystack = elementSearchText(el, ["role"]);
+  if (!haystack) return Number.POSITIVE_INFINITY;
+  if (/\b(today|tomorrow|mon(?:day)?|tue(?:s|sday)?|wed(?:nesday)?|thu(?:rs|rsday)?|fri(?:day)?|sat(?:urday)?|sun(?:day)?)\b/.test(
+    haystack
+  )) {
+    return 0;
+  }
+  if (/\b(showtimes?|showings?|screenings?|movie times?|date|calendar)\b/.test(
+    haystack
+  )) {
+    return 1;
+  }
+  if (/\b(ticketing|tickets?|formovietickets|seat selection)\b/.test(haystack)) {
+    return 2;
+  }
+  return Number.POSITIVE_INFINITY;
+}
+function isDateOrShowtimeControl(el) {
+  return Number.isFinite(dateOrShowtimeControlPriority(el));
+}
 function isPurchaseActionElement(el) {
   if (el.type !== "button" && el.type !== "link" && !(el.type === "input" && (el.inputType === "submit" || el.inputType === "button"))) {
     return false;
@@ -12678,20 +12834,34 @@ function formatDialogFocus(page) {
 }
 function formatInteractiveElements(elements) {
   if (elements.length === 0) return "None";
+  const DIALOG_PRIORITY_BONUS = 40;
+  const HIDDEN_VISIBILITY_PENALTY = 100;
+  const OFFSCREEN_PENALTY = 50;
+  const NAVIGATION_CONTEXT_PENALTY = 30;
+  const OBSCURED_PENALTY = 20;
+  const LINK_TYPE_PENALTY = 5;
+  const PURCHASE_BASE_WEIGHT = 25;
+  const PURCHASE_PRIORITY_MULTIPLIER = 5;
+  const DATE_BASE_WEIGHT = 18;
+  const DATE_PRIORITY_MULTIPLIER = 4;
   const sorted = [...elements].sort((a, b) => {
     const scoreEl = (el) => {
       let s = 0;
-      if (el.context === "dialog") s -= 40;
+      if (el.context === "dialog") s -= DIALOG_PRIORITY_BONUS;
       const purchasePriority = purchaseActionPriority(el);
       if (Number.isFinite(purchasePriority)) {
-        s -= 25 - purchasePriority * 5;
+        s -= PURCHASE_BASE_WEIGHT - purchasePriority * PURCHASE_PRIORITY_MULTIPLIER;
+      }
+      const datePriority = dateOrShowtimeControlPriority(el);
+      if (Number.isFinite(datePriority)) {
+        s -= DATE_BASE_WEIGHT - datePriority * DATE_PRIORITY_MULTIPLIER;
       }
-      if (el.visible === false) s += 100;
-      if (el.inViewport === false) s += 50;
+      if (el.visible === false) s += HIDDEN_VISIBILITY_PENALTY;
+      if (el.inViewport === false) s += OFFSCREEN_PENALTY;
       if (el.context === "nav" || el.context === "footer" || el.context === "sidebar")
-        s += 30;
-      if (el.obscured) s += 20;
-      if (el.type === "link") s += 5;
+        s += NAVIGATION_CONTEXT_PENALTY;
+      if (el.obscured) s += OBSCURED_PENALTY;
+      if (el.type === "link") s += LINK_TYPE_PENALTY;
       return s;
     };
     return scoreEl(a) - scoreEl(b);
@@ -12722,9 +12892,8 @@ function formatInteractiveElements(elements) {
       if (summary) parts.push(`${summary.label}="${summary.value}"`);
       appendFieldAffordances(parts, el);
       if (el.options?.length) {
-        parts.push(
-          `options=${el.options.slice(0, 5).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
-        );
+        const maxOptions = isDateOrShowtimeControl(el) ? 10 : 5;
+        parts.push(`options=${formatElementOptions(el.options, maxOptions)}`);
       }
     } else if (el.type === "textarea") {
       parts.push(`[${el.label || "Text Area"}]`);
@@ -12785,8 +12954,9 @@ function formatForms(forms) {
           if (summary) fieldParts.push(`${summary.label}="${summary.value}"`);
           appendFieldAffordances(fieldParts, field);
           if (field.options?.length) {
+            const maxOptions = isDateOrShowtimeControl(field) ? 10 : 5;
             fieldParts.push(
-              `options=${field.options.slice(0, 5).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
+              `options=${formatElementOptions(field.options, maxOptions)}`
             );
           }
         } else if (field.type === "textarea") {
@@ -13051,7 +13221,66 @@ function chooseAgentReadMode(page) {
       return "visible_only";
   }
 }
+const SITE_RESULT_FILTERS = [
+  {
+    hostname: "news.ycombinator.com",
+    listingPaths: [
+      "/",
+      "/news",
+      "/newest",
+      "/front",
+      "/ask",
+      "/show",
+      "/jobs",
+      "/best",
+      "/active",
+      "/classic",
+      "/noobstories"
+    ],
+    utilityPathnames: ["/hide", "/user"],
+    utilityTextPatterns: [
+      /^(hide|past|favorite|unfavorite|flag|unflag|discuss|reply|parent|more)$/,
+      /^\d+\s+(?:comments?|points?)$/
+    ]
+  }
+];
+function matchesSiteFilter(url, filter, baseHostname) {
+  try {
+    const parsed = new URL(url, baseHostname ? `https://${baseHostname}` : void 0);
+    return parsed.hostname === filter.hostname;
+  } catch {
+    return false;
+  }
+}
+function isSiteListingPage(url) {
+  for (const filter of SITE_RESULT_FILTERS) {
+    if (!matchesSiteFilter(url, filter, "")) continue;
+    try {
+      const pathname = new URL(url).pathname.replace(/\/+$/, "") || "/";
+      if (filter.listingPaths?.includes(pathname)) return true;
+    } catch {
+    }
+  }
+  return false;
+}
+function isSiteUtilityLink(element) {
+  if (!element.href) return false;
+  for (const filter of SITE_RESULT_FILTERS) {
+    if (!matchesSiteFilter(element.href, filter, "")) continue;
+    const text = normalizeComparable(element.text || "");
+    for (const pattern of filter.utilityTextPatterns ?? []) {
+      if (pattern.test(text)) return true;
+    }
+    try {
+      const pathname = new URL(element.href).pathname.replace(/\/+$/, "") || "/";
+      if (filter.utilityPathnames?.includes(pathname)) return true;
+    } catch {
+    }
+  }
+  return false;
+}
 function isSearchOrListingPage(page) {
+  if (isSiteListingPage(page.url)) return true;
   const haystack = normalizeComparable(
     [
       page.url,
@@ -13103,7 +13332,7 @@ function getResultCandidates(page) {
   const pageHost = normalizeUrlForMatch(page.url);
   const searchOrListingPage = isSearchOrListingPage(page);
   const scored = page.interactiveElements.filter(
-    (element) => element.type === "link" && element.text?.trim() && element.href
+    (element) => element.type === "link" && element.text?.trim() && element.href && !isSiteUtilityLink(element)
   ).map((element) => {
     const text = element.text?.trim() || "";
     const comparableText = normalizeComparable(text);
@@ -13563,6 +13792,7 @@ function detectPageType(page) {
   if (hasResults && hasSearchInput && listingLike) return "SEARCH_RESULTS";
   if (hasCart) return "SHOPPING";
   if (formCount > 0 && !hasPasswordField) return "FORM";
+  if (isSiteListingPage(page.url)) return "PAGINATED_LIST";
   if (hasPagination && listingLike) return "PAGINATED_LIST";
   if (hasSearchInput && !listingLike) return "SEARCH_READY";
   if (page.content.length > 3e3 && page.interactiveElements.length < 10)
@@ -15111,7 +15341,7 @@ function vesselIsEditableElement(el) {
   if (!(el instanceof HTMLElement)) return false;
   var role = (el.getAttribute("role") || "").toLowerCase();
   return el.isContentEditable ||
-    el.getAttribute("contenteditable") === "true" ||
+    (el.hasAttribute("contenteditable") && el.getAttribute("contenteditable") !== "false") ||
     role === "textbox" ||
     role === "searchbox";
 }
@@ -15120,7 +15350,7 @@ function vesselResolveFillableControl(el) {
   if (!el) return null;
   if (vesselIsNativeField(el) || vesselIsEditableElement(el)) return el;
   if (!(el instanceof Element)) return null;
-  var nested = el.querySelector("input:not([type='hidden']):not([type='submit']):not([type='button']), textarea, select, [contenteditable='true'], [role='textbox'], [role='searchbox']");
+  var nested = el.querySelector("input:not([type='hidden']):not([type='submit']):not([type='button']), textarea, select, [contenteditable]:not([contenteditable='false']), [role='textbox'], [role='searchbox']");
   return nested instanceof HTMLElement ? nested : null;
 }
 
@@ -15138,7 +15368,7 @@ function vesselFindVisibleFillableControl(original) {
 
   var scopes = Array.from(document.querySelectorAll("dialog[open], [role='dialog'], [role='alertdialog'], [aria-modal='true'], [role='listbox'], [role='combobox'][aria-expanded='true']"));
   scopes.push(document.body);
-  var selector = "input:not([type='hidden']):not([type='submit']):not([type='button']), textarea, select, [contenteditable='true'], [role='textbox'], [role='searchbox']";
+  var selector = "input:not([type='hidden']):not([type='submit']):not([type='button']), textarea, select, [contenteditable]:not([contenteditable='false']), [role='textbox'], [role='searchbox']";
   for (var i = 0; i < scopes.length; i += 1) {
     var scope = scopes[i];
     if (!scope || !(scope instanceof Element)) continue;
@@ -15436,7 +15666,7 @@ async function resolveFieldSelector(wc, field) {
           if (!(el instanceof HTMLElement)) return false;
           var role = (el.getAttribute("role") || "").toLowerCase();
           return el.isContentEditable ||
-            el.getAttribute("contenteditable") === "true" ||
+            (el.hasAttribute("contenteditable") && el.getAttribute("contenteditable") !== "false") ||
             role === "textbox" ||
             role === "searchbox" ||
             role === "combobox";
@@ -15476,7 +15706,7 @@ async function resolveFieldSelector(wc, field) {
           return score;
         }
 
-        const candidates = Array.from(document.querySelectorAll("input, textarea, select, [contenteditable='true'], [role='textbox'], [role='searchbox'], [role='combobox']"));
+        const candidates = Array.from(document.querySelectorAll("input, textarea, select, [contenteditable]:not([contenteditable='false']), [role='textbox'], [role='searchbox'], [role='combobox']"));
         let best = null;
         let bestScore = -1;
         for (const el of candidates) {
@@ -17969,7 +18199,7 @@ async function locateImplicitTextTarget(wc) {
           const role = normalize(el.getAttribute("role"));
           if (
             el.isContentEditable ||
-            el.getAttribute("contenteditable") === "true" ||
+            (el.hasAttribute("contenteditable") && el.getAttribute("contenteditable") !== "false") ||
             role === "textbox" ||
             role === "searchbox" ||
             role === "combobox"
@@ -17993,7 +18223,7 @@ async function locateImplicitTextTarget(wc) {
         }
 
         const candidates = Array.from(
-          document.querySelectorAll('input:not([type="hidden"]):not([type="submit"]):not([type="button"]):not([type="image"]), textarea, [contenteditable="true"], [role="textbox"], [role="searchbox"], [role="combobox"]')
+          document.querySelectorAll('input:not([type="hidden"]):not([type="submit"]):not([type="button"]):not([type="image"]), textarea, [contenteditable]:not([contenteditable="false"]), [role="textbox"], [role="searchbox"], [role="combobox"]')
         ).filter((el) => isFillable(el) && isVisible(el));
 
         let best = null;
@@ -19608,9 +19838,11 @@ async function handleHighlight(ctx, args) {
   }
   return highlightOnPage(wc, selector, highlightText, args.label, args.durationMs, highlightColor);
 }
-function handleClearHighlights(ctx) {
+async function handleClearHighlights(ctx) {
   const wc = ctx.tabManager.getActiveTab()?.view.webContents;
   if (!wc) return "Error: No active tab";
+  const url = normalizeUrl$1(wc.getURL());
+  clearHighlightsForUrl(url);
   return clearHighlights(wc);
 }
 function trimText(value) {
@@ -22419,7 +22651,7 @@ function registerPrivateIpcHandlers(state2) {
   });
   ipc.handle(Channels.IS_PRIVATE_MODE, () => true);
   ipc.handle(Channels.OPEN_PRIVATE_WINDOW, () => {
-    createPrivateWindow();
+    return openPrivateWindowSafely();
   });
   ipc.handle(Channels.OPEN_NEW_WINDOW, async () => {
     const { createSecondaryWindow: createSecondaryWindow2 } = await Promise.resolve().then(() => window$1);
@@ -22463,70 +22695,120 @@ function registerPrivateIpcHandlers(state2) {
 function createPrivateWindow() {
   const privateSessionPartition = `private-${crypto$2.randomUUID()}`;
   const privateSession = electron.session.fromPartition(privateSessionPartition);
-  privateSession.setUserAgent(electron.session.defaultSession.getUserAgent());
-  const win = new electron.BaseWindow({
-    width: 1280,
-    height: 800,
-    minWidth: 800,
-    minHeight: 600,
-    frame: false,
-    show: false,
-    backgroundColor: "#1e1a2e",
-    title: "Vessel - Private Browsing"
-  });
-  const chromeView = new electron.WebContentsView({
-    webPreferences: {
-      preload: path$1.join(__dirname, "../preload/index.js"),
-      sandbox: true,
-      contextIsolation: true,
-      nodeIntegration: false
+  let win = null;
+  let tabManager = null;
+  let state2 = null;
+  try {
+    privateSession.setUserAgent(electron.session.defaultSession.getUserAgent());
+    win = new electron.BaseWindow({
+      width: 1280,
+      height: 800,
+      minWidth: 800,
+      minHeight: 600,
+      frame: false,
+      show: false,
+      backgroundColor: "#1e1a2e",
+      title: "Vessel - Private Browsing"
+    });
+    const chromeView = new electron.WebContentsView({
+      webPreferences: {
+        preload: path$1.join(__dirname, "../preload/index.js"),
+        sandbox: true,
+        contextIsolation: true,
+        nodeIntegration: false
+      }
+    });
+    chromeView.setBackgroundColor("#00000000");
+    win.contentView.addChildView(chromeView);
+    tabManager = new TabManager(
+      win,
+      (tabs, activeId) => {
+        sendSafe(chromeView.webContents, Channels.TAB_STATE_UPDATE, tabs, activeId);
+        if (state2) layoutPrivateViews(state2);
+      },
+      { isPrivate: true, sessionPartition: privateSessionPartition }
+    );
+    state2 = {
+      window: win,
+      chromeView,
+      tabManager,
+      session: privateSession,
+      sessionPartition: privateSessionPartition
+    };
+    installAdBlockingForSession(privateSession, tabManager);
+    installDownloadHandlerForSession(privateSession, chromeView);
+    registerPrivateIpcHandlers(state2);
+    win.on("resize", () => {
+      if (state2) layoutPrivateViews(state2);
+    });
+    win.on("show", () => {
+      if (state2) layoutPrivateViews(state2);
+    });
+    win.on("closed", () => {
+      if (!state2) return;
+      privateWindows.delete(state2);
+      tabManager?.destroyAllTabs();
+      void Promise.all([
+        privateSession.clearStorageData(),
+        privateSession.clearCache()
+      ]).catch((error) => {
+        logger$m.warn("Failed to clear private browsing session:", error);
+      });
+    });
+    privateWindows.add(state2);
+    chromeView.webContents.once("dom-ready", () => {
+      try {
+        tabManager?.createTab("about:blank");
+        if (state2) layoutPrivateViews(state2);
+      } catch (error) {
+        logger$m.error("Failed to initialize private browsing tab:", error);
+        try {
+          win?.close();
+        } catch (cleanupError) {
+          logger$m.warn("Failed to close private window after tab init failure:", cleanupError);
+        }
+      }
+    });
+    loadPrivateRenderer(chromeView);
+    win.show();
+    logger$m.info("Private browsing window opened");
+    return state2;
+  } catch (error) {
+    logger$m.error("Failed to create private browsing window:", error);
+    if (state2) {
+      privateWindows.delete(state2);
+    }
+    try {
+      tabManager?.destroyAllTabs();
+    } catch (cleanupError) {
+      logger$m.warn("Failed to clean up private tabs after launch failure:", cleanupError);
+    }
+    try {
+      win?.close();
+    } catch (cleanupError) {
+      logger$m.warn("Failed to close private window after launch failure:", cleanupError);
     }
-  });
-  chromeView.setBackgroundColor("#00000000");
-  win.contentView.addChildView(chromeView);
-  const tabManager = new TabManager(
-    win,
-    (tabs, activeId) => {
-      sendSafe(chromeView.webContents, Channels.TAB_STATE_UPDATE, tabs, activeId);
-      layoutPrivateViews(state2);
-    },
-    { isPrivate: true, sessionPartition: privateSessionPartition }
-  );
-  const state2 = {
-    window: win,
-    chromeView,
-    tabManager,
-    session: privateSession,
-    sessionPartition: privateSessionPartition
-  };
-  installAdBlockingForSession(privateSession, tabManager);
-  installDownloadHandlerForSession(privateSession, chromeView);
-  registerPrivateIpcHandlers(state2);
-  win.on("resize", () => layoutPrivateViews(state2));
-  win.on("show", () => layoutPrivateViews(state2));
-  win.on("closed", () => {
-    privateWindows.delete(state2);
-    tabManager.destroyAllTabs();
     void Promise.all([
       privateSession.clearStorageData(),
       privateSession.clearCache()
-    ]).catch((error) => {
-      logger$m.warn("Failed to clear private browsing session:", error);
+    ]).catch((cleanupError) => {
+      logger$m.warn("Failed to clear failed private browsing session:", cleanupError);
     });
-  });
-  privateWindows.add(state2);
-  chromeView.webContents.once("dom-ready", () => {
-    tabManager.createTab("about:blank");
-    layoutPrivateViews(state2);
-  });
-  loadPrivateRenderer(chromeView);
-  win.show();
-  logger$m.info("Private browsing window opened");
-  return state2;
+    throw error;
+  }
+}
+function openPrivateWindowSafely() {
+  try {
+    createPrivateWindow();
+    return true;
+  } catch {
+    return false;
+  }
 }
 const window$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  createPrivateWindow
+  createPrivateWindow,
+  openPrivateWindowSafely
 }, Symbol.toStringTag, { value: "Module" }));
 const secondaryWindows = /* @__PURE__ */ new Set();
 function layoutSecondaryViews(state2) {
@@ -22644,8 +22926,8 @@ function registerSecondaryIpcHandlers(state2) {
   );
   ipc.handle(Channels.OPEN_NEW_WINDOW, () => createSecondaryWindow());
   ipc.handle(Channels.OPEN_PRIVATE_WINDOW, async () => {
-    const { createPrivateWindow: createPrivateWindow2 } = await Promise.resolve().then(() => window$2);
-    createPrivateWindow2();
+    const { openPrivateWindowSafely: openPrivateWindowSafely2 } = await Promise.resolve().then(() => window$2);
+    return openPrivateWindowSafely2();
   });
   ipc.handle(Channels.IS_PRIVATE_MODE, () => false);
   ipc.handle(Channels.WINDOW_MINIMIZE, () => state2.window.minimize());
@@ -22733,7 +23015,7 @@ function registerTabHandlers(windowState, _sendToRendererViews) {
   const { tabManager, mainWindow } = windowState;
   electron.ipcMain.handle(Channels.OPEN_PRIVATE_WINDOW, (event) => {
     assertTrustedIpcSender(event);
-    createPrivateWindow();
+    return openPrivateWindowSafely();
   });
   electron.ipcMain.handle(Channels.OPEN_NEW_WINDOW, (event) => {
     assertTrustedIpcSender(event);
@@ -22951,10 +23233,11 @@ const SHARED_NAVIGATION_INSTRUCTIONS = [
   "Prefer select_option for dropdowns and submit_form for forms instead of guessing with clicks.",
   "After navigating to a new site, do not call read_page immediately unless you are genuinely stuck. Prefer the site's search box, known navigation patterns, or clicking a visible section first.",
   "For open-web discovery, current facts, prices, flights, news, or search-engine home pages, call web_search(query). Use search(query) only to search within the current site or app.",
+  "For questions about a named venue, business, organization, school, or local place, use search results to find the official site, then open that site and answer from its page. Do not keep rewriting generic web_search queries or switch to site: searches when an official or clearly direct result is available.",
   "For flight price-shopping, include the route, date, and trip type in web_search(query); do not send vague or partial flight queries.",
   "On flight/travel booking pages with visible route, destination, or date fields, use those visible controls before constructing direct Google Flights or travel-search URLs. Direct travel URLs are a fallback only after the visible controls fail or the page is unusable.",
   "On retail and marketplace sites, prefer the site's visible search box, filters, and result pages over direct product URLs.",
-  "For broad discovery tasks, prefer direct sources and site-specific search over generic search engines."
+  "For broad discovery tasks, prefer direct sources over generic search snippets. Use site-specific search only after opening the direct source fails to expose the needed information."
 ];
 const VESSEL_SOURCE_INSTRUCTIONS = [
   "When the user asks about Vessel, Vessel Browser, or Quanta Intellect, use these official sources directly instead of hunting around the open web first: Official page https://quantaintellect.com, GitHub repo https://github.com/unmodeled-tyler/vessel-browser, npm package https://www.npmjs.com/package/@quanta-intellect/vessel-browser.",
@@ -23911,8 +24194,16 @@ function registerHighlightHandlers(windowState, sendToRendererViews) {
     const info = getActiveTabInfo(tabManager);
     if (!info) return false;
     try {
+      const url = normalizeUrl$1(info.wc.getURL());
+      const text = await getHighlightTextAtIndex(info.wc, validatedIndex);
       const removed = await removeHighlightAtIndex(info.wc, validatedIndex);
       if (removed) {
+        if (text) {
+          const persisted = findHighlightByText(url, text);
+          if (persisted) {
+            removeHighlight(persisted.id);
+          }
+        }
         await emitHighlightCount();
       }
       return removed;
@@ -23926,6 +24217,8 @@ function registerHighlightHandlers(windowState, sendToRendererViews) {
     const info = getActiveTabInfo(tabManager);
     if (!info) return false;
     try {
+      const url = normalizeUrl$1(info.wc.getURL());
+      clearHighlightsForUrl(url);
       const cleared = await clearAllHighlightElements(info.wc);
       if (cleared) {
         await emitHighlightCount();