@quanta-intellect/vessel-browser 0.1.140 → 0.1.143

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(`
@@ -5589,15 +5602,12 @@ const DEFAULT_SELECTOR_ATTRIBUTES = [
 ];
 function selectorHelpersJS(attributes = DEFAULT_SELECTOR_ATTRIBUTES) {
   const attrsExpr = JSON.stringify(attributes);
-  const q = '"';
-  const bs = "\\";
-  const escQ = bs + q;
   return [
     "function __escapeSelectorValue(value) {",
     '  if (typeof CSS !== "undefined" && typeof CSS.escape === "function") {',
     "    return CSS.escape(value);",
     "  }",
-    `  return String(value).replace(/[${q}${bs}${bs}]/g, ${q}${bs}${bs}$&${q});`,
+    '  return String(value).replace(/["\\\\]/g, "\\\\$&");',
     "}",
     "",
     "function __uniqueSelector(candidate) {",
@@ -5613,7 +5623,7 @@ function selectorHelpersJS(attributes = DEFAULT_SELECTOR_ATTRIBUTES) {
     '  var value = (el.getAttribute && el.getAttribute(attribute)) || "";',
     "  value = String(value).trim();",
     "  if (!value) return null;",
-    `  var candidate = el.tagName.toLowerCase() + ${q}[${q} + attribute + ${q}=${escQ}${q} + __escapeSelectorValue(value) + ${escQ}]${q};`,
+    '  var candidate = el.tagName.toLowerCase() + "[" + attribute + "=\\"" + __escapeSelectorValue(value) + "\\"]";',
     "  return __uniqueSelector(candidate);",
     "}",
     "",
@@ -8754,6 +8764,59 @@ function recoverNarratedActionToolCalls(text, availableToolNames) {
   }
   return recovered;
 }
+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;
+const FLIGHT_RESULT_CONTEXT_RE = /\b(?:best departing flights|departing flights|returning flights|flight results|google flights|airline|airlines|duration|nonstop|non-stop|stops?|departure|arrival|depart|arrive|price|fare|fares|alaska|united|delta|american|southwest|frontier|spirit|jetblue|hawaiian)\b/i;
+const EMPTY_FORM_CONTEXT_RE = /\b(?:where to\?|search airports or cities|destination|from\?|departure date|calendar|google flights)\b/i;
+const TOOL_FAILURE_RE = /\b(?:error|failed|type-not-applied|did not type|could not type|not applied|unsupported|invalid args)\b/i;
+function normalizeEvidenceText(text) {
+  return (text || "").replace(/\s+/g, " ").trim();
+}
+function looksLikeFlightShoppingTask(userMessage) {
+  return FLIGHT_TASK_RE.test(userMessage) && SHOPPING_INTENT_RE.test(userMessage);
+}
+function answerIncludesFlightPriceClaims(assistantText) {
+  return DOLLAR_PRICE_RE.test(assistantText) && FLIGHT_CLAIM_CONTEXT_RE.test(assistantText);
+}
+function toolResultHasFlightPriceEvidence(latestToolResultPreview) {
+  const text = normalizeEvidenceText(latestToolResultPreview);
+  if (!text) return false;
+  if (TOOL_FAILURE_RE.test(text) && !DOLLAR_PRICE_RE.test(text)) return false;
+  return DOLLAR_PRICE_RE.test(text) && FLIGHT_RESULT_CONTEXT_RE.test(text);
+}
+function shouldBlockUnsupportedFlightPriceAnswer(userMessage, assistantText, latestToolResultPreview) {
+  return looksLikeFlightShoppingTask(userMessage) && answerIncludesFlightPriceClaims(assistantText) && !toolResultHasFlightPriceEvidence(latestToolResultPreview);
+}
+function buildFlightPriceEvidenceRecoveryPrompt(userMessage, assistantText, latestToolResultPreview) {
+  const latest = normalizeEvidenceText(latestToolResultPreview);
+  const maybeFormState = latest && EMPTY_FORM_CONTEXT_RE.test(latest) ? " The latest page state still looks like a flight search form, so verify the destination, route, and date before reading results." : "";
+  return [
+    `The user asked for live flight prices: ${userMessage}`,
+    `Your last answer included specific flight prices, but the latest browser/tool evidence does not show visible flight-result rows with prices.`,
+    `Erase that answer and continue with browser tools until the current page evidence shows the route/date and visible priced flight results.${maybeFormState}`,
+    `Do not report airline names, times, or prices unless they are visible in the latest browser/page evidence.`,
+    `Last unsupported answer: ${assistantText.replace(/\s+/g, " ").trim().slice(0, 500) || "(empty)"}`
+  ].join("\n");
+}
 const logger$v = createLogger("OpenAIProvider");
 function shouldDebugAgentLoop() {
   const value = process.env.VESSEL_DEBUG_AGENT_LOOP;
@@ -8804,6 +8867,22 @@ 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 || "");
@@ -8945,6 +9024,37 @@ function buildLatestStateReminder(toolResultPreview) {
   }
   return "";
 }
+function normalizedSearchToolQuery$1(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 isOpenAIRealProgressToolForSearch(name) {
+  return ![
+    "read_page",
+    "current_tab",
+    "list_tabs",
+    "screenshot",
+    "clear_overlays",
+    "accept_cookies",
+    "dismiss_popup",
+    "web_search",
+    "search"
+  ].includes(name);
+}
+function buildOpenAIRepeatedSearchError(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. Next action: click a result, inspect a specific result, or answer from the result you already opened. Do not call any search tool again as preparation.`
+  ];
+  if (stateReminder) {
+    lines.push(stateReminder);
+  }
+  return lines.join(" ");
+}
 function shouldRecoverCompactStall(text, userMessage) {
   const trimmed = text.trim().toLowerCase();
   if (!trimmed) return true;
@@ -9028,6 +9138,11 @@ function logAgentLoopDebug(payload) {
   }
 }
 function formatOpenAICompatErrorMessage(providerId, message) {
+  if (providerId === "openrouter" && /(timed out after \d+(?:\.\d+)? seconds|request timed out|returned none after all retries|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.`;
+  }
   if (providerId === "llama_cpp" && /(available context size|context size exceeded|exceeds the available context size|try increasing it)/i.test(
     message
   )) {
@@ -9050,10 +9165,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;
@@ -9080,6 +9192,7 @@ class OpenAICompatProvider {
           max_tokens: 4096,
           stream: true,
           messages,
+          ...openRouterRoutingOptions(this.providerId),
           ...openAIPromptCacheOptions({
             providerId: this.providerId,
             model: this.model,
@@ -9137,9 +9250,15 @@ class OpenAICompatProvider {
       const maxIterations = getEffectiveMaxIterations();
       let iterationsUsed = 0;
       let compactRecoveryCount = 0;
+      let flightPriceEvidenceRecoveryCount = 0;
+      let highlightCompletionRecoveryCount = 0;
       let compactCorrectionCount = 0;
       const recentCompactToolSignatures = [];
       const recentToolNames = [];
+      const successfulToolNames = [];
+      const recentSuccessfulSearchQueries = [];
+      const recentSuccessfulSearchToolByQuery = /* @__PURE__ */ new Map();
+      let lastSuccessfulWebSearchQuery = null;
       let clickReadLoopNudged = false;
       for (let i = 0; i < maxIterations; i++) {
         iterationsUsed = i + 1;
@@ -9161,6 +9280,7 @@ class OpenAICompatProvider {
             tools: openAITools,
             tool_choice: "auto",
             temperature: agentTemperatureForProfile(this.agentToolProfile),
+            ...openRouterRoutingOptions(this.providerId),
             ...openAIPromptCacheOptions({
               providerId: this.providerId,
               model: this.model,
@@ -9273,6 +9393,24 @@ class OpenAICompatProvider {
         };
         messages.push(assistantMsg);
         if (toolCalls.length === 0) {
+          const latestToolResultContent = latestToolMessage ? String(latestToolMessage.content || "") : null;
+          if (flightPriceEvidenceRecoveryCount < 2 && shouldBlockUnsupportedFlightPriceAnswer(
+            userMessage,
+            textAccum,
+            latestToolResultContent
+          )) {
+            flightPriceEvidenceRecoveryCount += 1;
+            if (textAccum.trim()) onChunk("<<erase_prev>>");
+            messages.push({
+              role: "user",
+              content: `[System] ${buildFlightPriceEvidenceRecoveryPrompt(
+                userMessage,
+                textAccum,
+                latestToolResultContent
+              )}`
+            });
+            continue;
+          }
           if (compactRecoveryCount < 2 && shouldRetryCompactToolLoop(
             this.agentToolProfile,
             textAccum,
@@ -9285,14 +9423,28 @@ class OpenAICompatProvider {
               content: `[System] ${buildCompactRecoveryPrompt(
                 userMessage,
                 textAccum,
-                latestToolMessage ? String(latestToolMessage.content || "") : null
+                latestToolResultContent
               )}`
             });
             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;
+        flightPriceEvidenceRecoveryCount = 0;
         const iterationToolResultPreviews = [];
         for (const tc of toolCalls) {
           if (!availableToolNames.has(tc.name)) {
@@ -9341,6 +9493,29 @@ class OpenAICompatProvider {
           args = repairedArgs.args;
           args = coerceToolArgsForExecution(tc.name, args);
           const toolSignature = stableToolSignature(tc.name, args);
+          const searchToolQuery = normalizedSearchToolQuery$1(tc.name, args);
+          const isRepeatedSearchAcrossTools = searchToolQuery !== null && recentSuccessfulSearchQueries.includes(searchToolQuery);
+          const isQueryDriftedWebSearch = tc.name === "web_search" && lastSuccessfulWebSearchQuery !== null && searchToolQuery !== null && searchToolQuery !== lastSuccessfulWebSearchQuery;
+          if (isRepeatedSearchAcrossTools || isQueryDriftedWebSearch) {
+            onChunk(`
+<<tool:${tc.name}:↻ duplicate suppressed>>
+`);
+            const previousTool = isRepeatedSearchAcrossTools ? recentSuccessfulSearchToolByQuery.get(searchToolQuery ?? "") ?? (tc.name === "web_search" ? "search" : "web_search") : "web_search";
+            const previousQuery = isRepeatedSearchAcrossTools ? searchToolQuery ?? "" : lastSuccessfulWebSearchQuery ?? "";
+            const mode = isRepeatedSearchAcrossTools ? "repeated" : "drifted";
+            messages.push({
+              role: "tool",
+              tool_call_id: tc.id,
+              content: buildOpenAIRepeatedSearchError(
+                previousTool,
+                previousQuery,
+                latestToolMessage ? String(latestToolMessage.content || "") : null,
+                mode
+              )
+            });
+            compactCorrectionCount += 1;
+            continue;
+          }
           if (this.agentToolProfile === "compact" && tc.name === "click" && isTargetlessClickArgs(args)) {
             onChunk(`
 <<tool:${tc.name}:⚠ missing target>>
@@ -9415,6 +9590,25 @@ class OpenAICompatProvider {
               recentCompactToolSignatures.shift();
             }
           }
+          if (!/^Error:/i.test(toolContent.trim())) {
+            successfulToolNames.push(tc.name);
+            if (isOpenAIRealProgressToolForSearch(tc.name)) {
+              lastSuccessfulWebSearchQuery = null;
+            }
+            if (searchToolQuery && !recentSuccessfulSearchQueries.includes(searchToolQuery)) {
+              recentSuccessfulSearchQueries.push(searchToolQuery);
+              recentSuccessfulSearchToolByQuery.set(searchToolQuery, tc.name);
+              if (recentSuccessfulSearchQueries.length > 4) {
+                const dropped = recentSuccessfulSearchQueries.shift();
+                if (dropped) {
+                  recentSuccessfulSearchToolByQuery.delete(dropped);
+                }
+              }
+            }
+            if (tc.name === "web_search" && searchToolQuery) {
+              lastSuccessfulWebSearchQuery = searchToolQuery;
+            }
+          }
           recentToolNames.push(tc.name);
           if (recentToolNames.length > 8) recentToolNames.shift();
           if (!clickReadLoopNudged && recentToolNames.length >= 6 && isClickReadLoop(recentToolNames)) {
@@ -9837,10 +10031,17 @@ function summarizeToolArg(args) {
   const index = typeof args.index === "number" ? `#${args.index}` : typeof args.index === "string" && args.index.trim() ? `#${args.index.trim()}` : "";
   return [args.url, args.query, args.text, args.selector, index, args.direction].map((value) => typeof value === "string" ? value : "").find((value) => value.length > 0) ?? "";
 }
+function normalizeCodexText(text) {
+  return text.trim().toLowerCase().replace(/[‘’]/g, "'").replace(/[“”]/g, '"');
+}
 function looksLikeFailedToolOutput(output) {
-  const normalized = output.trim().toLowerCase();
+  const normalized = normalizeCodexText(output);
   return normalized.startsWith("error") || normalized.startsWith("warning") || normalized.startsWith("target") || normalized.startsWith("no active tab") || normalized.includes("same page — results may have loaded dynamically") || normalized.includes("could not ") || normalized.includes("did not ");
 }
+function looksLikeTravelFareContext(text) {
+  const normalized = normalizeCodexText(text);
+  return /\b(?:flight|flights|fare|fares|airline|airlines|one-way|roundtrip|nonstop|layover|departure|arrival)\b/.test(normalized) || /\b(?:pdx|sfo|oak|sjc)\b/.test(normalized) || /\$[\d,]+/.test(normalized);
+}
 function emitCodexToolChunk(onChunk, name, args, output) {
   const summary = summarizeToolArg(args);
   const argSummary = looksLikeFailedToolOutput(output) ? ["⚠ failed", summary].filter(Boolean).join(" ") : summary;
@@ -10056,7 +10257,7 @@ const REAL_PROGRESS_TOOLS = /* @__PURE__ */ new Set([
 ]);
 function shouldRetryCodexToolLoop(text, hasToolHistory) {
   if (!hasToolHistory) return false;
-  const trimmed = text.trim().toLowerCase();
+  const trimmed = normalizeCodexText(text);
   if (!trimmed) return true;
   if (trimmed.length <= 160 && trimmed.includes("?")) return true;
   const askingUserForDirection = [
@@ -10072,6 +10273,26 @@ function shouldRetryCodexToolLoop(text, hasToolHistory) {
   if (askingUserForDirection.some((signal) => trimmed.includes(signal))) {
     return true;
   }
+  const askingUserToContinue = [
+    "please let me",
+    "let me inspect",
+    "let me click",
+    "need to continue from",
+    "i need to continue",
+    "allow me to",
+    "can't access or reuse",
+    "cant access or reuse",
+    "can't access",
+    "cant access",
+    "visible context",
+    "surface it",
+    "send me the current",
+    "send me the results",
+    "send me the pricing"
+  ];
+  if (askingUserToContinue.some((signal) => trimmed.includes(signal))) {
+    return true;
+  }
   const cannotProceed = [
     "i cannot",
     "i can't",
@@ -10105,12 +10326,39 @@ function buildCodexRecoveryInput(userMessage, assistantText, latestToolResultPre
     content: [{ type: "input_text", text: lines.join("\n") }]
   };
 }
-function buildCodexFailedClickRecoveryInput(attemptedTarget, latestToolResultPreview) {
+function buildCodexFlightPriceEvidenceRecoveryInput(userMessage, assistantText, latestToolResultPreview) {
+  return {
+    type: "message",
+    role: "user",
+    content: [
+      {
+        type: "input_text",
+        text: `[System] ${buildFlightPriceEvidenceRecoveryPrompt(
+          userMessage,
+          assistantText,
+          latestToolResultPreview
+        )}`
+      }
+    ]
+  };
+}
+function buildCodexFailedClickRecoveryInput(attemptedTarget, latestToolResultPreview, failedClickCount = 1) {
   const stateReminder = buildCodexLatestStateReminder(latestToolResultPreview);
   const lines = [
     `[System] The previous click did not complete${attemptedTarget ? ` for ${attemptedTarget}` : ""}.`,
-    `Take the next step: try a different target, refresh the page state with read_page, or call inspect_element on the intended element to verify its index and selector.`
+    `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.`
   ];
+  if (failedClickCount >= 2) {
+    lines.push(
+      `You have already had multiple failed clicks without making page progress. Do not keep clicking similar search result titles. Use the latest read_page/search result text to answer, or inspect a specific indexed result/control only if essential.`
+    );
+  }
+  if (looksLikeTravelFareContext(`${attemptedTarget}
+${latestToolResultPreview || ""}`)) {
+    lines.push(
+      `For flight-price tasks, visible fare snippets are enough to compare candidates. If the results show prices, stops, airlines, or route names, report the cheapest visible option with caveats instead of trying to open every aggregator result.`
+    );
+  }
   if (stateReminder) {
     lines.push(stateReminder);
   }
@@ -10307,11 +10555,13 @@ class CodexProvider {
     let turnState = null;
     let toolHistoryCount = 0;
     let recoveryCount = 0;
+    let flightPriceEvidenceRecoveryCount = 0;
     let correctionCount = 0;
     const recentToolSignatures = [];
     const recentToolNames = [];
     let clickReadLoopNudged = false;
     let latestToolResultPreview = null;
+    let failedClickCountSinceProgress = 0;
     const recentSuccessfulSearchQueries = [];
     const recentSuccessfulSearchToolByQuery = /* @__PURE__ */ new Map();
     let lastSuccessfulWebSearchQuery = null;
@@ -10351,6 +10601,22 @@ class CodexProvider {
           }
         }
         if (functionCalls.length === 0) {
+          if (flightPriceEvidenceRecoveryCount < 2 && shouldBlockUnsupportedFlightPriceAnswer(
+            userMessage,
+            result.text,
+            latestToolResultPreview
+          )) {
+            flightPriceEvidenceRecoveryCount += 1;
+            if (result.text.trim()) onChunk("<<erase_prev>>");
+            currentInput = [
+              buildCodexFlightPriceEvidenceRecoveryInput(
+                userMessage,
+                result.text,
+                latestToolResultPreview
+              )
+            ];
+            continue;
+          }
           if (recoveryCount < 1 && shouldRetryCodexToolLoop(result.text, toolHistoryCount > 0)) {
             recoveryCount += 1;
             if (result.text.trim()) onChunk("<<erase_prev>>");
@@ -10366,6 +10632,7 @@ class CodexProvider {
           break;
         }
         recoveryCount = 0;
+        flightPriceEvidenceRecoveryCount = 0;
         currentInput = [];
         for (const fc of functionCalls) {
           const functionCallInput = createCodexFunctionCallInput(fc);
@@ -10467,6 +10734,7 @@ ${latestToolResultPreview || ""}`
           if (!looksLikeFailedToolOutput(outputText)) {
             if (isRealProgressTool(prepared.prepared.name)) {
               lastSuccessfulWebSearchQuery = null;
+              failedClickCountSinceProgress = 0;
             }
           }
           if (searchToolQuery && !looksLikeFailedToolOutput(outputText) && !recentSuccessfulSearchQueries.includes(searchToolQuery)) {
@@ -10488,10 +10756,12 @@ ${latestToolResultPreview || ""}`
             }
           }
           if (prepared.prepared.name === "click" && looksLikeFailedToolOutput(outputText)) {
+            failedClickCountSinceProgress += 1;
             currentInput.push(
               buildCodexFailedClickRecoveryInput(
                 summarizeToolArg(prepared.prepared.args),
-                latestToolResultPreview
+                latestToolResultPreview,
+                failedClickCountSinceProgress
               )
             );
           }
@@ -11400,13 +11670,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)"
@@ -11518,7 +11790,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")
     },
@@ -12195,6 +12467,12 @@ function formatElementMeta(el) {
   if (el.checked !== void 0) {
     meta.push(el.checked ? "checked" : "unchecked");
   }
+  if (el.focused) {
+    meta.push("focused");
+  }
+  if (el.hasValue && !shouldRenderFieldValue(el)) {
+    meta.push("has-value");
+  }
   if (el.ariaExpanded !== void 0) {
     meta.push(`expanded=${el.ariaExpanded}`);
   }
@@ -12256,6 +12534,49 @@ function summarizeElementValue(el) {
   }
   return null;
 }
+function isTextEntryControl$1(el) {
+  if (el.disabled) return false;
+  if (el.type !== "input" && el.type !== "textarea") return false;
+  const inputType = (el.inputType || "text").toLowerCase();
+  return ![
+    "button",
+    "checkbox",
+    "file",
+    "hidden",
+    "image",
+    "radio",
+    "reset",
+    "submit"
+  ].includes(inputType);
+}
+function hasRenderedValue(el) {
+  return Boolean(summarizeElementValue(el));
+}
+function hasAnyFieldValue(el) {
+  return el.hasValue === true || typeof el.value === "string" && el.value.trim().length > 0;
+}
+function formatFillHint(el) {
+  if (el.index == null || el.disabled) return null;
+  if (el.focused && isTextEntryControl$1(el)) {
+    return `cursor is here; type_text(text="...") or type_text(index=${el.index})`;
+  }
+  if (hasAnyFieldValue(el) && isTextEntryControl$1(el)) {
+    return `already has value; use type_text(index=${el.index}) only to change it`;
+  }
+  if (isTextEntryControl$1(el)) return `use type_text(index=${el.index})`;
+  if (el.type === "select") return `use select_option(index=${el.index})`;
+  return null;
+}
+function appendFieldAffordances(parts, el) {
+  if (isTextEntryControl$1(el)) {
+    parts.push("fillable");
+    if (!hasAnyFieldValue(el)) parts.push("empty");
+  } else if (el.type === "select") {
+    if (!hasRenderedValue(el) && !hasAnyFieldValue(el)) parts.push("not-selected");
+  }
+  const hint = formatFillHint(el);
+  if (hint) parts.push(hint);
+}
 function isQuantityLike(el) {
   const text = [
     el.label,
@@ -12411,6 +12732,37 @@ function purchaseActionPriority(el) {
   }
   return Number.POSITIVE_INFINITY;
 }
+function dateOrShowtimeControlPriority(el) {
+  const haystack = normalizeComparable(
+    [
+      el.text,
+      el.label,
+      el.name,
+      el.placeholder,
+      el.description,
+      el.href,
+      el.role
+    ].filter(Boolean).join(" ")
+  );
+  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;
@@ -12508,6 +12860,10 @@ function formatInteractiveElements(elements) {
       if (Number.isFinite(purchasePriority)) {
         s -= 25 - purchasePriority * 5;
       }
+      const datePriority = dateOrShowtimeControlPriority(el);
+      if (Number.isFinite(datePriority)) {
+        s -= 18 - datePriority * 4;
+      }
       if (el.visible === false) s += 100;
       if (el.inViewport === false) s += 50;
       if (el.context === "nav" || el.context === "footer" || el.context === "sidebar")
@@ -12535,15 +12891,18 @@ function formatInteractiveElements(elements) {
       parts.push("input");
       const summary = summarizeElementValue(el);
       if (summary) parts.push(`${summary.label}="${summary.value}"`);
+      if (!isQuantityLike(el)) appendFieldAffordances(parts, el);
       if (el.required) parts.push("(required)");
     } else if (el.type === "select") {
       parts.push(`[${el.label || "Select"}]`);
       parts.push("dropdown");
       const summary = summarizeElementValue(el);
       if (summary) parts.push(`${summary.label}="${summary.value}"`);
+      appendFieldAffordances(parts, el);
       if (el.options?.length) {
+        const maxOptions = isDateOrShowtimeControl(el) ? 10 : 5;
         parts.push(
-          `options=${el.options.slice(0, 5).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
+          `options=${el.options.slice(0, maxOptions).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
         );
       }
     } else if (el.type === "textarea") {
@@ -12551,6 +12910,7 @@ function formatInteractiveElements(elements) {
       parts.push("textarea");
       const summary = summarizeElementValue(el);
       if (summary) parts.push(`${summary.label}="${summary.value}"`);
+      appendFieldAffordances(parts, el);
     }
     const meta = formatElementMeta(el);
     if (meta.length > 0) parts.push(`(${meta.join(", ")})`);
@@ -12595,15 +12955,18 @@ function formatForms(forms) {
           fieldParts.push(field.inputType || "text");
           const summary = summarizeElementValue(field);
           if (summary) fieldParts.push(`${summary.label}="${summary.value}"`);
+          if (!isQuantityLike(field)) appendFieldAffordances(fieldParts, field);
           if (field.required) fieldParts.push("(required)");
         } else if (field.type === "select") {
           fieldParts.push(`[${field.label || "Select"}]`);
           fieldParts.push("dropdown");
           const summary = summarizeElementValue(field);
           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=${field.options.slice(0, maxOptions).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
             );
           }
         } else if (field.type === "textarea") {
@@ -12611,6 +12974,7 @@ function formatForms(forms) {
           fieldParts.push("textarea");
           const summary = summarizeElementValue(field);
           if (summary) fieldParts.push(`${summary.label}="${summary.value}"`);
+          appendFieldAffordances(fieldParts, field);
         }
         const meta = formatElementMeta(field);
         if (meta.length > 0) fieldParts.push(`(${meta.join(", ")})`);
@@ -12868,6 +13232,7 @@ function chooseAgentReadMode(page) {
   }
 }
 function isSearchOrListingPage(page) {
+  if (isHackerNewsListingPage(page.url)) return true;
   const haystack = normalizeComparable(
     [
       page.url,
@@ -12880,6 +13245,48 @@ function isSearchOrListingPage(page) {
     haystack
   );
 }
+function isHackerNewsListingPage(url) {
+  try {
+    const parsed = new URL(url);
+    if (parsed.hostname !== "news.ycombinator.com") return false;
+    const pathname = parsed.pathname.replace(/\/+$/, "") || "/";
+    return [
+      "/",
+      "/news",
+      "/newest",
+      "/front",
+      "/ask",
+      "/show",
+      "/jobs",
+      "/best",
+      "/active",
+      "/classic",
+      "/noobstories"
+    ].includes(pathname);
+  } catch {
+    return false;
+  }
+}
+function isHackerNewsUtilityLink(element) {
+  if (!element.href) return false;
+  let url;
+  try {
+    url = new URL(element.href);
+  } catch {
+    return false;
+  }
+  if (url.hostname !== "news.ycombinator.com") return false;
+  const text = normalizeComparable(element.text || "");
+  const pathname = url.pathname.replace(/\/+$/, "") || "/";
+  if (/^(hide|past|favorite|unfavorite|flag|unflag|discuss|reply|parent|more)$/.test(
+    text
+  )) {
+    return true;
+  }
+  if (/^\d+\s+(?:comments?|points?)$/.test(text)) return true;
+  if (pathname === "/hide" || pathname === "/user") return true;
+  return pathname === "/item" && /^(?:discuss|\d+\s+comments?)$/.test(text);
+}
 function collectJsonLdEntityItems(input, results = []) {
   if (!input) return results;
   if (Array.isArray(input)) {
@@ -12919,7 +13326,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 && !isHackerNewsUtilityLink(element)
   ).map((element) => {
     const text = element.text?.trim() || "";
     const comparableText = normalizeComparable(text);
@@ -13221,6 +13628,7 @@ function buildScopedContext(page, mode) {
       const cartSnapshot = formatCartSnapshot(visiblePage);
       const visibleForms = visiblePage.forms;
       const dialogFocus = formatDialogFocus(page);
+      const flightBookingFormHint = getFlightBookingFormHint(page);
       const sections = [];
       sections.push(`**URL:** ${page.url}`);
       sections.push(`**Title:** ${page.title}`);
@@ -13242,6 +13650,11 @@ function buildScopedContext(page, mode) {
         sections.push(formatPageIssues(page.pageIssues ?? []));
         sections.push("");
       }
+      if (flightBookingFormHint) {
+        sections.push("### Flight Booking Hint");
+        sections.push(flightBookingFormHint);
+        sections.push("");
+      }
       if (page.overlays.length > 0) {
         sections.push("### Active Overlays");
         sections.push(formatOverlays(page));
@@ -13373,15 +13786,48 @@ function detectPageType(page) {
   if (hasResults && hasSearchInput && listingLike) return "SEARCH_RESULTS";
   if (hasCart) return "SHOPPING";
   if (formCount > 0 && !hasPasswordField) return "FORM";
+  if (isHackerNewsListingPage(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)
     return "ARTICLE";
   return "GENERAL";
 }
+function isFlightBookingPage(page) {
+  const pageText = [
+    page.url,
+    page.title,
+    page.excerpt,
+    page.headings.map((heading) => heading.text).join(" ")
+  ].filter(Boolean).join(" ").toLowerCase();
+  if (/google\.com\/travel\/flights|google flights/.test(pageText)) {
+    return true;
+  }
+  const controlsText = [
+    ...page.interactiveElements,
+    ...page.forms.flatMap((form) => form.fields)
+  ].map(
+    (el) => [el.label, el.placeholder, el.name, el.text, el.role, el.inputType].filter(Boolean).join(" ")
+  ).join(" ").toLowerCase();
+  const hasRouteControls = /\b(?:where from|where to|origin|destination|from|to)\b/.test(
+    controlsText
+  );
+  const hasDateControls = /\b(?:departure|depart|return|date)\b/.test(
+    controlsText
+  );
+  const hasFlightLanguage = /\b(?:flight|flights|airfare|airline)\b/.test(
+    `${pageText} ${controlsText}`
+  );
+  return hasFlightLanguage && hasRouteControls && hasDateControls;
+}
+function getFlightBookingFormHint(page) {
+  if (!isFlightBookingPage(page)) return null;
+  return "Flight booking form: use the visible route, destination, and date controls with type_text/select_option/click/submit_form before constructing direct Google Flights or travel-search URLs. Direct travel URLs are a fallback only after visible controls fail or the page is unusable.";
+}
 function analyzePageIntent(page) {
   const hints = [];
   const pageType = detectPageType(page);
+  const flightBookingFormHint = getFlightBookingFormHint(page);
   const hasPagination = page.interactiveElements.some(
     (el) => (el.text || "").toLowerCase() === "next" || el.text === "›" || el.text === "»" || (el.label || "").toLowerCase().includes("next page")
   );
@@ -13409,6 +13855,7 @@ function analyzePageIntent(page) {
       hints.push(
         "Treat the visible site search box as the primary navigation control before jumping to direct URLs."
       );
+      if (flightBookingFormHint) hints.push(flightBookingFormHint);
       break;
     case "SEARCH_RESULTS":
       hints.push("Page type: SEARCH RESULTS");
@@ -13429,6 +13876,7 @@ function analyzePageIntent(page) {
         `Page type: FORM (${formCount} form${formCount > 1 ? "s" : ""}, ${totalFields} fields)`
       );
       hints.push("Suggested: vessel_fill_form → fill all fields in one call");
+      if (flightBookingFormHint) hints.push(flightBookingFormHint);
       break;
     }
     case "PAGINATED_LIST":
@@ -13440,7 +13888,10 @@ function analyzePageIntent(page) {
       hints.push("Suggested: vessel_extract_content for readable text");
       break;
   }
-  if (hints.length === 0) return "";
+  if (hints.length === 0 && !flightBookingFormHint) return "";
+  if (flightBookingFormHint && pageType !== "SEARCH_READY" && pageType !== "FORM") {
+    hints.push(flightBookingFormHint);
+  }
   return `### Page Intent (Speedee)
 ${hints.join("\n")}`;
 }
@@ -13712,11 +14163,45 @@ function elementLabel(element) {
     96
   ) || "Element";
 }
+function isTextEntryControl(element) {
+  if (element.disabled) return false;
+  if (element.type !== "input" && element.type !== "textarea") return false;
+  const inputType = (element.inputType || "text").toLowerCase();
+  return ![
+    "button",
+    "checkbox",
+    "file",
+    "hidden",
+    "image",
+    "radio",
+    "reset",
+    "submit"
+  ].includes(inputType);
+}
+function formatFieldAffordance(element) {
+  if (element.index == null || element.disabled) return "";
+  const hasValue = element.hasValue === true || typeof element.value === "string" && element.value.trim();
+  const empty = hasValue ? "" : "; empty";
+  if (isTextEntryControl(element)) {
+    if (element.focused) {
+      return `${empty}; focused; type_text(text="...") targets this`;
+    }
+    if (hasValue) {
+      return `; has value; type_text(index=${element.index}) changes it`;
+    }
+    return `${empty}; use type_text(index=${element.index})`;
+  }
+  if (element.type === "select") {
+    return `; use select_option(index=${element.index})`;
+  }
+  return "";
+}
 function formatElement(element) {
   const prefix = element.index != null ? `[#${element.index}] ` : "";
   const kind = element.type === "input" ? `${element.inputType || "text"} input` : element.type === "select" ? "select" : element.type;
   const href = element.type === "link" && element.href ? ` -> ${element.href}` : "";
-  return `${prefix}${elementLabel(element)} (${kind})${href}`;
+  const affordance = formatFieldAffordance(element);
+  return `${prefix}${elementLabel(element)} (${kind}${affordance})${href}`;
 }
 function uniqueElements(elements) {
   const seen = /* @__PURE__ */ new Set();
@@ -14676,6 +15161,26 @@ function buildDefaultEngineShortcut(rawQuery) {
     appliedFilters: []
   };
 }
+function looksLikeFlightSearchText(text) {
+  const lower = text.toLowerCase();
+  return /\b(flight|flights|airfare|air fare|plane ticket|plane tickets)\b/.test(
+    lower
+  ) || /\b(one-way|one way|roundtrip|round trip)\b/.test(lower) && /\b(to|from)\b/.test(lower);
+}
+function buildFlightSearchShortcut(rawQuery, taskGoal) {
+  const goalQuery = normalizeSearchQuery(taskGoal || "");
+  const toolQuery = normalizeSearchQuery(rawQuery);
+  const combined = normalizeSearchQuery(`${goalQuery} ${toolQuery}`);
+  if (!looksLikeFlightSearchText(combined)) return null;
+  const searchQuery = looksLikeFlightSearchText(goalQuery) ? goalQuery : toolQuery;
+  if (!searchQuery) return null;
+  return {
+    url: `https://www.google.com/travel/flights?q=${encodeURIComponent(searchQuery)}`,
+    source: "Google Flights",
+    section: "flight search",
+    appliedFilters: []
+  };
+}
 function buildSearchEngineLandingShortcut(currentUrl, rawQuery) {
   let url;
   try {
@@ -14794,6 +15299,304 @@ function describeFillField(field) {
   if (field.placeholder) return `placeholder=${field.placeholder}`;
   return "field";
 }
+const FILLABLE_CONTROL_HELPERS = `
+function vesselText(value) {
+  return value == null ? "" : String(value).trim();
+}
+
+function vesselControlLabel(el, original) {
+  var source = el || original;
+  return vesselText(source && source.getAttribute && source.getAttribute("aria-label")) ||
+    vesselText(source && source.getAttribute && source.getAttribute("placeholder")) ||
+    vesselText(source && source.getAttribute && source.getAttribute("name")) ||
+    vesselText(original && original.getAttribute && original.getAttribute("aria-label")) ||
+    vesselText(original && original.textContent).slice(0, 80) ||
+    "input";
+}
+
+function vesselIsVisible(el) {
+  if (!(el instanceof HTMLElement)) return false;
+  var 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;
+  var rect = el.getBoundingClientRect();
+  return rect.width > 0 && rect.height > 0;
+}
+
+function vesselIsDisabled(el) {
+  return !!(el && (el.disabled || el.hasAttribute("disabled") || el.getAttribute("aria-disabled") === "true"));
+}
+
+function vesselIsNativeField(el) {
+  return el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement;
+}
+
+function vesselIsEditableElement(el) {
+  if (!(el instanceof HTMLElement)) return false;
+  var role = (el.getAttribute("role") || "").toLowerCase();
+  return el.isContentEditable ||
+    (el.hasAttribute("contenteditable") && el.getAttribute("contenteditable") !== "false") ||
+    role === "textbox" ||
+    role === "searchbox";
+}
+
+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]:not([contenteditable='false']), [role='textbox'], [role='searchbox']");
+  return nested instanceof HTMLElement ? nested : null;
+}
+
+function vesselIsTextEntryActivator(el) {
+  if (!(el instanceof HTMLElement)) return false;
+  var role = (el.getAttribute("role") || "").toLowerCase();
+  return role === "combobox" ||
+    el.getAttribute("aria-haspopup") === "listbox" ||
+    !!el.getAttribute("aria-controls");
+}
+
+function vesselFindVisibleFillableControl(original) {
+  var active = vesselResolveFillableControl(document.activeElement);
+  if (active && vesselIsVisible(active) && !vesselIsDisabled(active)) return active;
+
+  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]: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;
+    var candidates = Array.from(scope.querySelectorAll(selector));
+    for (var j = 0; j < candidates.length; j += 1) {
+      var candidate = vesselResolveFillableControl(candidates[j]);
+      if (candidate && candidate !== original && vesselIsVisible(candidate) && !vesselIsDisabled(candidate)) {
+        return candidate;
+      }
+    }
+  }
+  return null;
+}
+
+async function vesselFindFillTarget(original) {
+  var direct = vesselResolveFillableControl(original);
+  if (direct && !vesselIsDisabled(direct)) return { el: direct, activated: false };
+
+  if (vesselIsTextEntryActivator(original)) {
+    original.scrollIntoView({ behavior: "instant", block: "center", inline: "center" });
+    original.focus();
+    original.click();
+    await new Promise(function(resolve) { setTimeout(resolve, 180); });
+    var opened = vesselFindVisibleFillableControl(original);
+    if (opened) return { el: opened, activated: true };
+  }
+
+  return null;
+}
+
+function vesselSetNativeValue(el, value) {
+  var proto = el instanceof HTMLTextAreaElement
+    ? HTMLTextAreaElement.prototype
+    : el instanceof HTMLSelectElement
+      ? HTMLSelectElement.prototype
+      : HTMLInputElement.prototype;
+  var desc = Object.getOwnPropertyDescriptor(proto, "value");
+  if (desc && desc.set) {
+    desc.set.call(el, value);
+  } else {
+    el.value = value;
+  }
+}
+
+function vesselDispatchTextEvents(el, value) {
+  try {
+    el.dispatchEvent(new InputEvent("beforeinput", {
+      bubbles: true,
+      cancelable: true,
+      data: value,
+      inputType: "insertText",
+    }));
+  } catch {}
+  try {
+    el.dispatchEvent(new InputEvent("input", {
+      bubbles: true,
+      cancelable: true,
+      data: value,
+      inputType: "insertText",
+    }));
+  } catch {
+    el.dispatchEvent(new Event("input", { bubbles: true }));
+  }
+  el.dispatchEvent(new Event("change", { bubbles: true }));
+}
+
+function vesselReadFillableControlValue(el) {
+  if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement) {
+    return el.value || "";
+  }
+  return el.textContent || "";
+}
+
+function vesselValueWasApplied(el, value) {
+  var actual = vesselReadFillableControlValue(el);
+  if (!value) return !actual;
+  return actual === value || actual.toLowerCase().indexOf(value.toLowerCase()) >= 0;
+}
+
+async function vesselSetFillableControlValue(original, value) {
+  var target = await vesselFindFillTarget(original);
+  if (!target || !target.el) {
+    return "Error[not-input]: Element is not text-editable. Click it first, then type into the opened text field.";
+  }
+  var el = target.el;
+  if (vesselIsDisabled(el)) return "Error[disabled]: Input is disabled";
+
+  if (el instanceof HTMLSelectElement) {
+    var requested = value.trim().toLowerCase();
+    var option = Array.from(el.options).find(function(item) {
+      return item.value.trim().toLowerCase() === requested ||
+        (item.textContent || "").trim().toLowerCase() === requested;
+    });
+    if (!option) return "Error[option-not-found]: Option not found";
+    el.value = option.value;
+    el.focus();
+    el.dispatchEvent(new Event("input", { bubbles: true }));
+    el.dispatchEvent(new Event("change", { bubbles: true }));
+    return "Selected: " + ((option.textContent || option.value).trim().slice(0, 100));
+  }
+
+  el.focus();
+  if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) {
+    vesselSetNativeValue(el, value);
+  } else {
+    el.textContent = value;
+  }
+  vesselDispatchTextEvents(el, value);
+  await new Promise(function(resolve) { setTimeout(resolve, 80); });
+  if (!vesselValueWasApplied(el, value)) {
+    return "Error[type-not-applied]: The page did not keep the typed text. Retry with type_text(index=..., text=..., mode=\\"keystroke\\") or click the focused text box and type again.";
+  }
+
+  var label = vesselControlLabel(el, original);
+  var displayValue = el instanceof HTMLInputElement && el.type === "password"
+    ? "[hidden]"
+    : value.slice(0, 80);
+  return "Typed into: " + label + " = " + displayValue + (target.activated ? " (opened field)" : "");
+}
+
+async function vesselTypeFillableControlKeystrokes(original, value) {
+  var target = await vesselFindFillTarget(original);
+  if (!target || !target.el) {
+    return "Error[not-input]: Element is not text-editable. Click it first, then type into the opened text field.";
+  }
+  var el = target.el;
+  if (vesselIsDisabled(el)) return "Error[disabled]: Input is disabled";
+  if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || vesselIsEditableElement(el))) {
+    return "Error[not-input]: Element is not a text input";
+  }
+
+  el.focus();
+  if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) {
+    vesselSetNativeValue(el, "");
+  } else {
+    el.textContent = "";
+  }
+  vesselDispatchTextEvents(el, "");
+
+  var chars = value.split("");
+  for (var i = 0; i < chars.length; i += 1) {
+    var ch = chars[i];
+    el.dispatchEvent(new KeyboardEvent("keydown", { key: ch, bubbles: true, cancelable: true }));
+    el.dispatchEvent(new KeyboardEvent("keypress", { key: ch, bubbles: true, cancelable: true }));
+    if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) {
+      vesselSetNativeValue(el, el.value + ch);
+    } else {
+      el.textContent = (el.textContent || "") + 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 }));
+  await new Promise(function(resolve) { setTimeout(resolve, 80); });
+  if (!vesselValueWasApplied(el, value)) {
+    return "Error[type-not-applied]: The page did not keep the typed text after keystrokes. Click the text box again or use press_key for the active field.";
+  }
+  return "Typed into: " + vesselControlLabel(el, original) + " = " + value.slice(0, 80) + (target.activated ? " (opened field)" : "");
+}
+`;
+function shouldRetryWithNativeTyping(result) {
+  return typeof result === "string" && result.startsWith("Error[type-not-applied]");
+}
+async function typeTextWithNativeInput(wc, selector, value) {
+  const focusResult = await executePageScript(
+    wc,
+    `
+    (async function() {
+      ${FILLABLE_CONTROL_HELPERS}
+      const el = ${selector.includes(" >>> ") ? `window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)})` : `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.' };
+      const target = await vesselFindFillTarget(el);
+      if (!target || !target.el) {
+        return { error: "Error[not-input]: Element is not text-editable. Click it first, then type into the opened text field." };
+      }
+      target.el.focus();
+      return { label: vesselControlLabel(target.el, el) };
+    })()
+  `,
+    {
+      timeoutMs: 2500,
+      label: "prepare native typing"
+    }
+  );
+  if (focusResult === PAGE_SCRIPT_TIMEOUT) return pageBusyError("type_text");
+  if (!focusResult || typeof focusResult !== "object") {
+    return "Error: Could not prepare native typing";
+  }
+  if (typeof focusResult.error === "string") return focusResult.error;
+  wc.focus();
+  const selectModifier = process.platform === "darwin" ? "meta" : "control";
+  wc.sendInputEvent({ type: "keyDown", keyCode: "A", modifiers: [selectModifier] });
+  await sleep(8);
+  wc.sendInputEvent({ type: "keyUp", keyCode: "A", modifiers: [selectModifier] });
+  await sleep(8);
+  wc.sendInputEvent({ type: "keyDown", keyCode: "Backspace" });
+  await sleep(4);
+  wc.sendInputEvent({ type: "keyUp", keyCode: "Backspace" });
+  for (const char of value) {
+    wc.sendInputEvent({ type: "keyDown", keyCode: char });
+    wc.sendInputEvent({ type: "char", keyCode: char });
+    wc.sendInputEvent({ type: "keyUp", keyCode: char });
+    await sleep(2);
+  }
+  await sleep(120);
+  const verify = await executePageScript(
+    wc,
+    `
+    (function() {
+      ${FILLABLE_CONTROL_HELPERS}
+      const active = vesselResolveFillableControl(document.activeElement);
+      if (!active) return { ok: false, actual: "" };
+      const actual = vesselReadFillableControlValue(active);
+      return { ok: vesselValueWasApplied(active, ${JSON.stringify(value)}), actual: actual.slice(0, 80) };
+    })()
+  `,
+    {
+      timeoutMs: 1500,
+      label: "verify native typing"
+    }
+  );
+  if (verify === PAGE_SCRIPT_TIMEOUT) return pageBusyError("type_text");
+  if (!verify || verify.ok !== true) {
+    const actual = verify && typeof verify.actual === "string" && verify.actual ? ` Current field text: "${verify.actual}".` : "";
+    return `Error[type-not-applied]: The page did not accept the typed text.${actual} Click the field again or use a different indexed text box.`;
+  }
+  const label = typeof focusResult.label === "string" && focusResult.label ? focusResult.label : "input";
+  return `Typed into: ${label} = ${value.slice(0, 80)} (native input)`;
+}
 async function resolveFieldSelector(wc, field) {
   const directSelector = await resolveSelector(wc, field.index, field.selector);
   if (directSelector) return directSelector;
@@ -14849,8 +15652,22 @@ async function resolveFieldSelector(wc, field) {
           return normalize(parts.join(" "));
         }
 
+        function isNativeField(el) {
+          return el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement;
+        }
+
+        function isCustomTextField(el) {
+          if (!(el instanceof HTMLElement)) return false;
+          var role = (el.getAttribute("role") || "").toLowerCase();
+          return el.isContentEditable ||
+            (el.hasAttribute("contenteditable") && el.getAttribute("contenteditable") !== "false") ||
+            role === "textbox" ||
+            role === "searchbox" ||
+            role === "combobox";
+        }
+
         function scoreField(el) {
-          if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement)) {
+          if (!isNativeField(el) && !isCustomTextField(el)) {
             return -1;
           }
           if (!isVisible(el) || el.disabled || el.getAttribute("aria-disabled") === "true") {
@@ -14879,10 +15696,11 @@ async function resolveFieldSelector(wc, field) {
 
           if (score === 0) return -1;
           if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) score += 5;
+          if (isCustomTextField(el)) score += 3;
           return score;
         }
 
-        const candidates = Array.from(document.querySelectorAll("input, textarea, select"));
+        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) {
@@ -14932,136 +15750,73 @@ async function setElementValue(wc, selector, value) {
     const result2 = await executePageScript(
       wc,
       `
-      (function() {
+      (async function() {
+        ${FILLABLE_CONTROL_HELPERS}
         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 || el instanceof HTMLSelectElement)) return "Error[not-input]: Element is not a fillable input";
-        if (el.disabled || el.getAttribute("aria-disabled") === "true") return "Error[disabled]: Input is disabled";
-        if (el instanceof HTMLSelectElement) {
-          var requested = ${JSON.stringify(value)}.trim().toLowerCase();
-          var option = Array.from(el.options).find(function(item) {
-            return item.value.trim().toLowerCase() === requested ||
-              (item.textContent || "").trim().toLowerCase() === requested;
-          });
-          if (!option) return "Error[option-not-found]: Option not found";
-          el.value = option.value;
-          el.focus();
-          el.dispatchEvent(new Event("input", { bubbles: true }));
-          el.dispatchEvent(new Event("change", { bubbles: true }));
-          return "Selected: " + ((option.textContent || option.value).trim().slice(0, 100));
-        }
-        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 vesselSetFillableControlValue(el, ${JSON.stringify(value)});
       })()
     `,
       {
         label: "type text in shadow input"
       }
     );
-    return result2 === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result2 || "Error: Could not type into element";
+    if (result2 === PAGE_SCRIPT_TIMEOUT) return pageBusyError("type_text");
+    if (shouldRetryWithNativeTyping(result2)) {
+      return typeTextWithNativeInput(wc, selector, value);
+    }
+    return result2 || "Error: Could not type into element";
   }
   const result = await executePageScript(
     wc,
     `
-    (function() {
+    (async function() {
+      ${FILLABLE_CONTROL_HELPERS}
       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 || el instanceof HTMLSelectElement)) {
-        return 'Error[not-input]: Element is not a fillable input';
-      }
-      if (el.disabled || el.getAttribute('aria-disabled') === 'true') {
-        return 'Error[disabled]: Input is disabled';
-      }
-
-      if (el instanceof HTMLSelectElement) {
-        const requested = ${JSON.stringify(value)}.trim().toLowerCase();
-        const option = Array.from(el.options).find((item) => {
-          const label = (item.textContent || '').trim().toLowerCase();
-          return label === requested || item.value.trim().toLowerCase() === requested;
-        });
-        if (!option) {
-          return 'Error[option-not-found]: Option not found';
-        }
-        el.value = option.value;
-        el.focus();
-        el.dispatchEvent(new Event('input', { bubbles: true }));
-        el.dispatchEvent(new Event('change', { bubbles: true }));
-        return 'Selected: ' + ((option.textContent || option.value).trim().slice(0, 100));
-      }
-
-      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));
+      return vesselSetFillableControlValue(el, ${JSON.stringify(value)});
     })()
   `,
     {
       label: "type text"
     }
   );
-  return result === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result || "Error: Could not type into element";
+  if (result === PAGE_SCRIPT_TIMEOUT) return pageBusyError("type_text");
+  if (shouldRetryWithNativeTyping(result)) {
+    return typeTextWithNativeInput(wc, selector, value);
+  }
+  return result || "Error: Could not type into element";
 }
 async function typeKeystroke(wc, selector, value) {
+  if (selector.startsWith("__vessel_idx:")) {
+    return setElementValue(wc, selector, value);
+  }
+  if (selector.includes(" >>> ")) {
+    const result2 = await executePageScript(
+      wc,
+      `
+      (async function() {
+        ${FILLABLE_CONTROL_HELPERS}
+        var el = window.__vessel?.resolveShadowSelector?.(${JSON.stringify(selector)});
+        if (!el) return "Error[stale-index]: Shadow DOM element not found — call read_page to refresh.";
+        return vesselTypeFillableControlKeystrokes(el, ${JSON.stringify(value)});
+      })()
+    `,
+      {
+        timeoutMs: 2500,
+        label: "type keystrokes in shadow input"
+      }
+    );
+    return result2 === PAGE_SCRIPT_TIMEOUT ? pageBusyError("type_text") : result2 || "Error: Could not type into element";
+  }
   const result = await executePageScript(
     wc,
     `
     (async function() {
+      ${FILLABLE_CONTROL_HELPERS}
       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));
+      return vesselTypeFillableControlKeystrokes(el, ${JSON.stringify(value)});
     })()
   `,
     {
@@ -17427,8 +18182,25 @@ async function locateImplicitTextTarget(wc) {
         }
 
         function isFillable(el) {
+          if (!(el instanceof HTMLElement)) return false;
+          if (
+            el.getAttribute("aria-disabled") === "true" ||
+            (el instanceof HTMLInputElement && (el.disabled || el.readOnly)) ||
+            (el instanceof HTMLTextAreaElement && (el.disabled || el.readOnly))
+          ) {
+            return false;
+          }
+          const role = normalize(el.getAttribute("role"));
+          if (
+            el.isContentEditable ||
+            (el.hasAttribute("contenteditable") && el.getAttribute("contenteditable") !== "false") ||
+            role === "textbox" ||
+            role === "searchbox" ||
+            role === "combobox"
+          ) {
+            return true;
+          }
           if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement)) return false;
-          if (el.disabled || el.readOnly || el.getAttribute("aria-disabled") === "true") return false;
           const type = el instanceof HTMLTextAreaElement ? "text" : normalize(el.getAttribute("type") || el.type || "text");
           return ["", "search", "text", "email", "url", "tel", "number", "password"].includes(type);
         }
@@ -17445,7 +18217,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')
+          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;
@@ -17697,7 +18469,8 @@ async function handleWebSearch(ctx, tabId, args) {
   if (!tab || !tabId) return "Error: No active tab";
   const query = String(args.query || "").trim();
   if (!query) return "Error: No web search query provided.";
-  const shortcut = buildDefaultEngineShortcut(query);
+  const taskGoal = ctx.runtime.getState().taskTracker?.goal;
+  const shortcut = buildFlightSearchShortcut(query, taskGoal) ?? buildDefaultEngineShortcut(query);
   if (!shortcut) {
     return "Error: No default search engine is configured. Navigate to a search engine or set a default search engine first.";
   }
@@ -19059,9 +19832,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) {
@@ -21870,7 +22645,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);
@@ -21914,70 +22689,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) {
@@ -22095,8 +22920,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());
@@ -22184,7 +23009,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);
@@ -22402,8 +23227,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.",
@@ -23360,8 +24188,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;
@@ -23375,6 +24211,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();