@quanta-intellect/vessel-browser 0.1.143 → 0.1.144

package/out/main/index.js

@@ -8817,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;
@@ -8886,7 +8986,7 @@ function buildOpenRouterAttributionHeaders() {
 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}
@@ -8896,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();
@@ -8999,38 +9099,7 @@ 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 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) {
+function isSearchContextResettingTool(name) {
   return ![
     "read_page",
     "current_tab",
@@ -9043,18 +9112,6 @@ function isOpenAIRealProgressToolForSearch(name) {
     "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;
@@ -9138,15 +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|no content|empty response)/i.test(
+  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.`;
+    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;
 }
@@ -9256,9 +9322,7 @@ class OpenAICompatProvider {
       const recentCompactToolSignatures = [];
       const recentToolNames = [];
       const successfulToolNames = [];
-      const recentSuccessfulSearchQueries = [];
-      const recentSuccessfulSearchToolByQuery = /* @__PURE__ */ new Map();
-      let lastSuccessfulWebSearchQuery = null;
+      const searchLoopGuard = new SearchLoopGuard(isSearchContextResettingTool);
       let clickReadLoopNudged = false;
       for (let i = 0; i < maxIterations; i++) {
         iterationsUsed = i + 1;
@@ -9493,24 +9557,20 @@ 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) {
+          const searchToolQuery = normalizeSearchToolQuery(tc.name, args);
+          const searchLoopCheck = searchLoopGuard.check(tc.name, searchToolQuery);
+          if (searchLoopCheck) {
             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,
+              content: buildRepeatedSearchError(
+                searchLoopCheck.previousTool,
+                searchLoopCheck.previousQuery,
                 latestToolMessage ? String(latestToolMessage.content || "") : null,
-                mode
+                searchLoopCheck.mode
               )
             });
             compactCorrectionCount += 1;
@@ -9590,25 +9650,15 @@ class OpenAICompatProvider {
               recentCompactToolSignatures.shift();
             }
           }
-          if (!/^Error:/i.test(toolContent.trim())) {
+          const toolSucceeded = !/^Error:/i.test(toolContent.trim());
+          if (toolSucceeded) {
             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;
-            }
           }
+          searchLoopGuard.recordSuccess(
+            tc.name,
+            searchToolQuery,
+            toolSucceeded
+          );
           recentToolNames.push(tc.name);
           if (recentToolNames.length > 8) recentToolNames.shift();
           if (!clickReadLoopNudged && recentToolNames.length >= 6 && isClickReadLoop(recentToolNames)) {
@@ -10138,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.`,
@@ -10310,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.`,
@@ -10343,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.`
@@ -10562,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;
@@ -10654,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);
@@ -10731,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(
@@ -12711,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)) {
@@ -12733,17 +12725,7 @@ 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(" ")
-  );
+  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
@@ -12852,24 +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 -= 18 - datePriority * 4;
+        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);
@@ -12901,9 +12893,7 @@ function formatInteractiveElements(elements) {
       appendFieldAffordances(parts, el);
       if (el.options?.length) {
         const maxOptions = isDateOrShowtimeControl(el) ? 10 : 5;
-        parts.push(
-          `options=${el.options.slice(0, maxOptions).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
-        );
+        parts.push(`options=${formatElementOptions(el.options, maxOptions)}`);
       }
     } else if (el.type === "textarea") {
       parts.push(`[${el.label || "Text Area"}]`);
@@ -12966,7 +12956,7 @@ function formatForms(forms) {
           if (field.options?.length) {
             const maxOptions = isDateOrShowtimeControl(field) ? 10 : 5;
             fieldParts.push(
-              `options=${field.options.slice(0, maxOptions).map((o) => typeof o === "string" ? o : o.label || o.value).join("|")}`
+              `options=${formatElementOptions(field.options, maxOptions)}`
             );
           }
         } else if (field.type === "textarea") {
@@ -13231,26 +13221,10 @@ function chooseAgentReadMode(page) {
       return "visible_only";
   }
 }
-function isSearchOrListingPage(page) {
-  if (isHackerNewsListingPage(page.url)) return true;
-  const haystack = normalizeComparable(
-    [
-      page.url,
-      page.title,
-      page.excerpt,
-      page.headings.map((heading) => heading.text).join(" ")
-    ].filter(Boolean).join(" ")
-  );
-  return /\b(search|results|find|discover|browse|repositories|repository|issues|pull requests|prs|users|events|listings)\b/.test(
-    haystack
-  );
-}
-function isHackerNewsListingPage(url) {
-  try {
-    const parsed = new URL(url);
-    if (parsed.hostname !== "news.ycombinator.com") return false;
-    const pathname = parsed.pathname.replace(/\/+$/, "") || "/";
-    return [
+const SITE_RESULT_FILTERS = [
+  {
+    hostname: "news.ycombinator.com",
+    listingPaths: [
       "/",
       "/news",
       "/newest",
@@ -13262,30 +13236,62 @@ function isHackerNewsListingPage(url) {
       "/active",
       "/classic",
       "/noobstories"
-    ].includes(pathname);
-  } catch {
-    return false;
+    ],
+    utilityPathnames: ["/hide", "/user"],
+    utilityTextPatterns: [
+      /^(hide|past|favorite|unfavorite|flag|unflag|discuss|reply|parent|more)$/,
+      /^\d+\s+(?:comments?|points?)$/
+    ]
   }
-}
-function isHackerNewsUtilityLink(element) {
-  if (!element.href) return false;
-  let url;
+];
+function matchesSiteFilter(url, filter, baseHostname) {
   try {
-    url = new URL(element.href);
+    const parsed = new URL(url, baseHostname ? `https://${baseHostname}` : void 0);
+    return parsed.hostname === filter.hostname;
   } 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;
+}
+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 {
+    }
   }
-  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);
+  return false;
+}
+function isSearchOrListingPage(page) {
+  if (isSiteListingPage(page.url)) return true;
+  const haystack = normalizeComparable(
+    [
+      page.url,
+      page.title,
+      page.excerpt,
+      page.headings.map((heading) => heading.text).join(" ")
+    ].filter(Boolean).join(" ")
+  );
+  return /\b(search|results|find|discover|browse|repositories|repository|issues|pull requests|prs|users|events|listings)\b/.test(
+    haystack
+  );
 }
 function collectJsonLdEntityItems(input, results = []) {
   if (!input) return results;
@@ -13326,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 && !isHackerNewsUtilityLink(element)
+    (element) => element.type === "link" && element.text?.trim() && element.href && !isSiteUtilityLink(element)
   ).map((element) => {
     const text = element.text?.trim() || "";
     const comparableText = normalizeComparable(text);
@@ -13786,7 +13792,7 @@ 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 (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)

package/out/preload/content-script.js

@@ -3085,7 +3085,7 @@ function buildBaseMetadata(el) {
 }
 function isNavigableEmbeddedSrc(src) {
   const normalized = src.trim().toLowerCase();
-  return Boolean(normalized) && !/^(about:blank|javascript:|data:)/.test(normalized);
+  return Boolean(normalized) && !/^(about:blank|javascript:|data:|blob:|file:)/i.test(normalized);
 }
 function getEmbeddedFrameLabel(iframe) {
   const explicitLabel = getTrimmedText(iframe.getAttribute("title")) || getTrimmedText(iframe.getAttribute("aria-label")) || getTrimmedText(iframe.name) || getTrimmedText(iframe.id);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quanta-intellect/vessel-browser",
   "mcpName": "io.github.unmodeled-tyler/vessel-browser",
-  "version": "0.1.143",
+  "version": "0.1.144",
   "description": "AI-native web browser runtime for autonomous agents with human supervision",
   "main": "./out/main/index.js",
   "bin": {