unbrowse 10.1.2 → 10.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unbrowse",
-  "version": "10.1.2",
+  "version": "10.1.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/unbrowse-ai/unbrowse.git"

package/runtime/cli.js

@@ -64268,6 +64268,52 @@ function cardinalityMatches(intent, subject, opts) {
 function resolutionCardinalityMatches(intent, data) {
   return cardinalityMatches(intent, { kind: "value", value: data });
 }
+function registrableHostOf(input) {
+  if (!input)
+    return null;
+  const host = (() => {
+    try {
+      return new URL(input).hostname;
+    } catch {}
+    try {
+      return new URL(`https://${input}`).hostname;
+    } catch {
+      return null;
+    }
+  })();
+  if (!host)
+    return null;
+  return host.replace(/^www\./, "").split(".").slice(-2).join(".") || null;
+}
+function collectRecordHosts(data) {
+  const out = [];
+  const push = (rec) => {
+    if (!rec || typeof rec !== "object")
+      return;
+    const r = rec;
+    for (const k of ["url", "link", "href", "source_url"]) {
+      const v = r[k];
+      const h = typeof v === "string" ? registrableHostOf(v) : null;
+      if (h)
+        out.push(h);
+    }
+  };
+  if (Array.isArray(data))
+    for (const rec of data.slice(0, 20))
+      push(rec);
+  else
+    push(data);
+  return out;
+}
+function resolutionHostMatches(url, data) {
+  const reqHost = registrableHostOf(url);
+  if (!reqHost)
+    return true;
+  const hosts = collectRecordHosts(data);
+  if (hosts.length === 0)
+    return true;
+  return hosts.some((h) => h === reqHost);
+}
 var LIST_INTENT_RE, ITEM_SCHEMA_TYPES, COLLECTION_KEYS;
 var init_cardinality = __esm(() => {
   LIST_INTENT_RE = /\b(search|find|lookup|browse|discover|list(?:ings?)?|feed|catalog(?:ue)?)\b/i;
@@ -64800,7 +64846,7 @@ var init_telemetry = __esm(() => {
 });
 
 // .tmp-runtime-src/build-info.generated.ts
-var BUILD_RELEASE_VERSION = "10.1.2", BUILD_GIT_SHA = "8002dc451033", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiMTAuMS4yIiwiZ2l0X3NoYSI6IjgwMDJkYzQ1MTAzMyIsImNvZGVfaGFzaCI6IjVkOWViZjYxOWM2MSIsInRyYWNlX3ZlcnNpb24iOiI1ZDllYmY2MTljNjFAODAwMmRjNDUxMDMzIiwiaXNzdWVkX2F0IjoiMjAyNi0wNi0yM1QwNDozMjoyOS4xNDNaIn0", BUILD_RELEASE_MANIFEST_SIGNATURE = "NPU8xYfUzBkwRNykEn62P0fq9duwqNDk8Bw0-ZaVWUo", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
+var BUILD_RELEASE_VERSION = "10.1.3", BUILD_GIT_SHA = "de11df6cf838", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiMTAuMS4zIiwiZ2l0X3NoYSI6ImRlMTFkZjZjZjgzOCIsImNvZGVfaGFzaCI6IjVkOWViZjYxOWM2MSIsInRyYWNlX3ZlcnNpb24iOiI1ZDllYmY2MTljNjFAZGUxMWRmNmNmODM4IiwiaXNzdWVkX2F0IjoiMjAyNi0wNi0yM1QwOTowMzoyNC4wODlaIn0", BUILD_RELEASE_MANIFEST_SIGNATURE = "tQDAYXIj-Q4C-i2E4CTsKtHaEiTFy7uzrDQDxDjqO6o", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
 
 // .tmp-runtime-src/version.ts
 import { createHash as createHash8 } from "crypto";
@@ -195657,7 +195703,9 @@ function shouldAutoWalk(requestedUrl, topUrl, topScore, minScore = 0.8) {
     return false;
   const reqReg = registrableHost(requestedUrl);
   const topReg = registrableHost(topUrl);
-  return !!reqReg && reqReg === topReg || (topScore ?? 0) >= minScore;
+  if (reqReg)
+    return reqReg === topReg;
+  return (topScore ?? 0) >= minScore;
 }
 function pickWalkTarget(requestedUrl, ranked, minScore = 0.8) {
   const eligible = ranked.filter((c) => c?.url && shouldAutoWalk(requestedUrl, c.url, c.score, minScore));
@@ -196114,6 +196162,17 @@ function endpointMatchesContextOrigin(endpoint, contextUrl) {
     return true;
   }
 }
+function cachedSkillHostMatchesContext(skillDomain, contextUrl) {
+  if (!contextUrl)
+    return true;
+  const ctxReg = registrableHost(contextUrl);
+  if (!ctxReg)
+    return true;
+  const skillReg = registrableHost(skillDomain) ?? registrableHost(`https://${skillDomain ?? ""}`);
+  if (!skillReg)
+    return true;
+  return skillReg === ctxReg;
+}
 function endpointTargetsMismatchedLocalReplayHost(endpoint, contextUrl) {
   if (!contextUrl)
     return false;
@@ -199091,7 +199150,7 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
   if (!forceCapture && !agentChoseEndpoint) {
     const cachedResult = routeResultCache.get(cacheKey2);
     if (cachedResult) {
-      if (!shouldReuseRouteResultSnapshot(cachedResult, queryIntent, context?.url)) {
+      if (!cachedSkillHostMatchesContext(cachedResult.skill.domain, context?.url) || !shouldReuseRouteResultSnapshot(cachedResult, queryIntent, context?.url)) {
         routeResultCache.delete(cacheKey2);
       } else {
         timing.cache_hit = true;
@@ -199128,6 +199187,11 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
         persistRouteCache();
         continue;
       }
+      if (!cachedSkillHostMatchesContext(cached5.domain, context?.url)) {
+        skillRouteCache.delete(scopedKey);
+        persistRouteCache();
+        continue;
+      }
       const skill = readSkillSnapshot(cached5.localSkillPath) ?? await getSkillWithTimeout(cached5.skillId, clientScope);
       if (!skill || !isCachedSkillRelevantForIntent(skill, queryIntent, context?.url)) {
         skillRouteCache.delete(scopedKey);
@@ -199230,6 +199294,11 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
         persistRouteCache();
         continue;
       }
+      if (!cachedSkillHostMatchesContext(cached6.domain, context?.url)) {
+        skillRouteCache.delete(scopedKey);
+        persistRouteCache();
+        continue;
+      }
       const skill = readSkillSnapshot(cached6.localSkillPath) ?? await getSkillWithTimeout(cached6.skillId, clientScope);
       if (!skill)
         continue;
@@ -293679,6 +293748,7 @@ async function handler14(parsed, opts) {
     const wsEndpoint = typeof parsed.flags.ws === "string" ? parsed.flags.ws : undefined;
     const conn = wsEndpoint ? await attach(wsEndpoint) : await spawnChrome({ headless: true, perContextProxy: false, persist: true });
     const target = await createTarget(conn, url, {});
+    let cookiesInjected = 0;
     try {
       const { shouldImportBrowserCookies: shouldImportBrowserCookies2 } = await init_auth().then(() => exports_auth);
       if (shouldImportBrowserCookies2()) {
@@ -293709,6 +293779,7 @@ async function handler14(parsed, opts) {
           });
           await conn.call("Network.setCookies", { cookies: cdpCookies }, target.sessionId);
           await conn.call("Page.navigate", { url }, target.sessionId);
+          cookiesInjected = cdpCookies.length;
           process.stderr.write(`[auth] act go: injected ${cdpCookies.length} cookie(s) for ${host}, re-navigated authenticated
 `);
         } else {
@@ -293718,6 +293789,24 @@ async function handler14(parsed, opts) {
       }
     } catch (cookieErr) {
       process.stderr.write(`[auth] act go: cookie injection skipped: ${cookieErr instanceof Error ? cookieErr.message : String(cookieErr)}
+`);
+    }
+    let pageText = null;
+    try {
+      await conn.call("Runtime.enable", {}, target.sessionId);
+      const deadline = Date.now() + 6000;
+      while (Date.now() < deadline) {
+        const rs = await conn.call("Runtime.evaluate", { expression: "document.readyState", returnByValue: true }, target.sessionId);
+        if (rs?.result?.value === "complete")
+          break;
+        await new Promise((res) => setTimeout(res, 200));
+      }
+      const body = await conn.call("Runtime.evaluate", { expression: "document.body ? document.body.innerText : ''", returnByValue: true }, target.sessionId);
+      const v = body?.result?.value;
+      if (typeof v === "string" && v.length > 0)
+        pageText = v.slice(0, 200000);
+    } catch (readErr) {
+      process.stderr.write(`[page] act go: body read skipped: ${readErr instanceof Error ? readErr.message : String(readErr)}
 `);
     }
     let captcha;
@@ -293750,6 +293839,8 @@ async function handler14(parsed, opts) {
       context_id: "",
       chrome_ws_url: conn.endpoint,
       url,
+      cookies_injected: cookiesInjected,
+      ...pageText !== null ? { page: { text: pageText } } : {},
       ...captcha ? { captcha } : {},
       audit: {
         ok: navAudit.ok,
@@ -303939,7 +304030,8 @@ async function cmdResolve(flags) {
   }
   if (resolveCacheSafe(flags)) {
     const cachedHit = peekResolution(resolveCacheKeyFor(flags, intent), resolveCacheTtlMs());
-    if (cachedHit && resolutionCardinalityMatches(intent, cachedHit.result ?? cachedHit.data)) {
+    const cachedData = cachedHit ? cachedHit.result ?? cachedHit.data : undefined;
+    if (cachedHit && resolutionCardinalityMatches(intent, cachedData) && resolutionHostMatches(typeof flags.url === "string" ? flags.url : undefined, cachedData)) {
       const replay = markResolveCacheReplay(cachedHit);
       const hostType2 = detectTelemetryHostType2();
       if (process.env.UNBROWSE_LANDING_TOKEN || process.env.UNBROWSE_ATTRIBUTION_B64) {
@@ -304236,6 +304328,14 @@ function parseCmdHoleIntentArgs(args, flags, verb) {
       return { error: `usage: unbrowse ${verb} <url> "task"` };
     return { url: args[0], intent: intent2 };
   }
+  const urlArgs = args.filter(looksLikeUrl);
+  if (urlArgs.length === 1) {
+    const rest = args.filter((a) => a !== urlArgs[0]);
+    const intent2 = flagIntent ?? (rest.length > 0 ? rest.join(" ") : undefined);
+    if (!intent2)
+      return { error: `usage: unbrowse ${verb} <url> "task"` };
+    return { url: urlArgs[0], intent: intent2 };
+  }
   const intent = flagIntent ?? (args.length > 0 ? args.join(" ") : undefined);
   if (!intent)
     return { error: `usage: unbrowse ${verb} "task" [--url <url>]` };

package/runtime/mcp.js

@@ -101443,7 +101443,7 @@ async function mergedAuthHeaders(key, signer) {
 var AUTH_DOMAIN = "unbrowse-auth:v1";
 
 // .tmp-runtime-src/build-info.generated.ts
-var BUILD_RELEASE_VERSION = "10.1.2", BUILD_GIT_SHA = "8002dc451033", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiMTAuMS4yIiwiZ2l0X3NoYSI6IjgwMDJkYzQ1MTAzMyIsImNvZGVfaGFzaCI6IjVkOWViZjYxOWM2MSIsInRyYWNlX3ZlcnNpb24iOiI1ZDllYmY2MTljNjFAODAwMmRjNDUxMDMzIiwiaXNzdWVkX2F0IjoiMjAyNi0wNi0yM1QwNDozMjoyOS4xNDNaIn0", BUILD_RELEASE_MANIFEST_SIGNATURE = "NPU8xYfUzBkwRNykEn62P0fq9duwqNDk8Bw0-ZaVWUo", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
+var BUILD_RELEASE_VERSION = "10.1.3", BUILD_GIT_SHA = "de11df6cf838", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiMTAuMS4zIiwiZ2l0X3NoYSI6ImRlMTFkZjZjZjgzOCIsImNvZGVfaGFzaCI6IjVkOWViZjYxOWM2MSIsInRyYWNlX3ZlcnNpb24iOiI1ZDllYmY2MTljNjFAZGUxMWRmNmNmODM4IiwiaXNzdWVkX2F0IjoiMjAyNi0wNi0yM1QwOTowMzoyNC4wODlaIn0", BUILD_RELEASE_MANIFEST_SIGNATURE = "tQDAYXIj-Q4C-i2E4CTsKtHaEiTFy7uzrDQDxDjqO6o", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
 
 // .tmp-runtime-src/version.ts
 import { createHash as createHash6 } from "crypto";
@@ -104929,6 +104929,52 @@ function cardinalityMatches(intent, subject, opts) {
 function resolutionCardinalityMatches(intent, data) {
   return cardinalityMatches(intent, { kind: "value", value: data });
 }
+function registrableHostOf(input) {
+  if (!input)
+    return null;
+  const host = (() => {
+    try {
+      return new URL(input).hostname;
+    } catch {}
+    try {
+      return new URL(`https://${input}`).hostname;
+    } catch {
+      return null;
+    }
+  })();
+  if (!host)
+    return null;
+  return host.replace(/^www\./, "").split(".").slice(-2).join(".") || null;
+}
+function collectRecordHosts(data) {
+  const out = [];
+  const push = (rec) => {
+    if (!rec || typeof rec !== "object")
+      return;
+    const r = rec;
+    for (const k of ["url", "link", "href", "source_url"]) {
+      const v = r[k];
+      const h = typeof v === "string" ? registrableHostOf(v) : null;
+      if (h)
+        out.push(h);
+    }
+  };
+  if (Array.isArray(data))
+    for (const rec of data.slice(0, 20))
+      push(rec);
+  else
+    push(data);
+  return out;
+}
+function resolutionHostMatches(url, data) {
+  const reqHost = registrableHostOf(url);
+  if (!reqHost)
+    return true;
+  const hosts = collectRecordHosts(data);
+  if (hosts.length === 0)
+    return true;
+  return hosts.some((h) => h === reqHost);
+}
 var LIST_INTENT_RE, ITEM_SCHEMA_TYPES, COLLECTION_KEYS;
 var init_cardinality = __esm(() => {
   LIST_INTENT_RE = /\b(search|find|lookup|browse|discover|list(?:ings?)?|feed|catalog(?:ue)?)\b/i;
@@ -192838,7 +192884,9 @@ function shouldAutoWalk(requestedUrl, topUrl, topScore, minScore = 0.8) {
     return false;
   const reqReg = registrableHost(requestedUrl);
   const topReg = registrableHost(topUrl);
-  return !!reqReg && reqReg === topReg || (topScore ?? 0) >= minScore;
+  if (reqReg)
+    return reqReg === topReg;
+  return (topScore ?? 0) >= minScore;
 }
 function pickWalkTarget(requestedUrl, ranked, minScore = 0.8) {
   const eligible = ranked.filter((c) => c?.url && shouldAutoWalk(requestedUrl, c.url, c.score, minScore));
@@ -193295,6 +193343,17 @@ function endpointMatchesContextOrigin(endpoint, contextUrl) {
     return true;
   }
 }
+function cachedSkillHostMatchesContext(skillDomain, contextUrl) {
+  if (!contextUrl)
+    return true;
+  const ctxReg = registrableHost(contextUrl);
+  if (!ctxReg)
+    return true;
+  const skillReg = registrableHost(skillDomain) ?? registrableHost(`https://${skillDomain ?? ""}`);
+  if (!skillReg)
+    return true;
+  return skillReg === ctxReg;
+}
 function endpointTargetsMismatchedLocalReplayHost(endpoint, contextUrl) {
   if (!contextUrl)
     return false;
@@ -196272,7 +196331,7 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
   if (!forceCapture && !agentChoseEndpoint) {
     const cachedResult = routeResultCache.get(cacheKey2);
     if (cachedResult) {
-      if (!shouldReuseRouteResultSnapshot(cachedResult, queryIntent, context?.url)) {
+      if (!cachedSkillHostMatchesContext(cachedResult.skill.domain, context?.url) || !shouldReuseRouteResultSnapshot(cachedResult, queryIntent, context?.url)) {
         routeResultCache.delete(cacheKey2);
       } else {
         timing.cache_hit = true;
@@ -196309,6 +196368,11 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
         persistRouteCache();
         continue;
       }
+      if (!cachedSkillHostMatchesContext(cached5.domain, context?.url)) {
+        skillRouteCache.delete(scopedKey);
+        persistRouteCache();
+        continue;
+      }
       const skill = readSkillSnapshot(cached5.localSkillPath) ?? await getSkillWithTimeout(cached5.skillId, clientScope);
       if (!skill || !isCachedSkillRelevantForIntent(skill, queryIntent, context?.url)) {
         skillRouteCache.delete(scopedKey);
@@ -196411,6 +196475,11 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
         persistRouteCache();
         continue;
       }
+      if (!cachedSkillHostMatchesContext(cached6.domain, context?.url)) {
+        skillRouteCache.delete(scopedKey);
+        persistRouteCache();
+        continue;
+      }
       const skill = readSkillSnapshot(cached6.localSkillPath) ?? await getSkillWithTimeout(cached6.skillId, clientScope);
       if (!skill)
         continue;
@@ -285751,6 +285820,7 @@ async function handler14(parsed, opts) {
     const wsEndpoint = typeof parsed.flags.ws === "string" ? parsed.flags.ws : undefined;
     const conn = wsEndpoint ? await attach(wsEndpoint) : await spawnChrome({ headless: true, perContextProxy: false, persist: true });
     const target = await createTarget(conn, url, {});
+    let cookiesInjected = 0;
     try {
       const { shouldImportBrowserCookies: shouldImportBrowserCookies2 } = await init_auth().then(() => exports_auth);
       if (shouldImportBrowserCookies2()) {
@@ -285781,6 +285851,7 @@ async function handler14(parsed, opts) {
           });
           await conn.call("Network.setCookies", { cookies: cdpCookies }, target.sessionId);
           await conn.call("Page.navigate", { url }, target.sessionId);
+          cookiesInjected = cdpCookies.length;
           process.stderr.write(`[auth] act go: injected ${cdpCookies.length} cookie(s) for ${host}, re-navigated authenticated
 `);
         } else {
@@ -285790,6 +285861,24 @@ async function handler14(parsed, opts) {
       }
     } catch (cookieErr) {
       process.stderr.write(`[auth] act go: cookie injection skipped: ${cookieErr instanceof Error ? cookieErr.message : String(cookieErr)}
+`);
+    }
+    let pageText = null;
+    try {
+      await conn.call("Runtime.enable", {}, target.sessionId);
+      const deadline = Date.now() + 6000;
+      while (Date.now() < deadline) {
+        const rs = await conn.call("Runtime.evaluate", { expression: "document.readyState", returnByValue: true }, target.sessionId);
+        if (rs?.result?.value === "complete")
+          break;
+        await new Promise((res) => setTimeout(res, 200));
+      }
+      const body = await conn.call("Runtime.evaluate", { expression: "document.body ? document.body.innerText : ''", returnByValue: true }, target.sessionId);
+      const v = body?.result?.value;
+      if (typeof v === "string" && v.length > 0)
+        pageText = v.slice(0, 200000);
+    } catch (readErr) {
+      process.stderr.write(`[page] act go: body read skipped: ${readErr instanceof Error ? readErr.message : String(readErr)}
 `);
     }
     let captcha;
@@ -285822,6 +285911,8 @@ async function handler14(parsed, opts) {
       context_id: "",
       chrome_ws_url: conn.endpoint,
       url,
+      cookies_injected: cookiesInjected,
+      ...pageText !== null ? { page: { text: pageText } } : {},
       ...captcha ? { captcha } : {},
       audit: {
         ok: navAudit.ok,
@@ -296188,7 +296279,8 @@ async function cmdResolve(flags) {
   }
   if (resolveCacheSafe(flags)) {
     const cachedHit = peekResolution(resolveCacheKeyFor(flags, intent), resolveCacheTtlMs());
-    if (cachedHit && resolutionCardinalityMatches(intent, cachedHit.result ?? cachedHit.data)) {
+    const cachedData = cachedHit ? cachedHit.result ?? cachedHit.data : undefined;
+    if (cachedHit && resolutionCardinalityMatches(intent, cachedData) && resolutionHostMatches(typeof flags.url === "string" ? flags.url : undefined, cachedData)) {
       const replay = markResolveCacheReplay(cachedHit);
       const hostType2 = detectTelemetryHostType();
       if (process.env.UNBROWSE_LANDING_TOKEN || process.env.UNBROWSE_ATTRIBUTION_B64) {
@@ -296474,6 +296566,14 @@ function parseCmdHoleIntentArgs(args, flags, verb) {
       return { error: `usage: unbrowse ${verb} <url> "task"` };
     return { url: args[0], intent: intent2 };
   }
+  const urlArgs = args.filter(looksLikeUrl);
+  if (urlArgs.length === 1) {
+    const rest = args.filter((a) => a !== urlArgs[0]);
+    const intent2 = flagIntent ?? (rest.length > 0 ? rest.join(" ") : undefined);
+    if (!intent2)
+      return { error: `usage: unbrowse ${verb} <url> "task"` };
+    return { url: urlArgs[0], intent: intent2 };
+  }
   const intent = flagIntent ?? (args.length > 0 ? args.join(" ") : undefined);
   if (!intent)
     return { error: `usage: unbrowse ${verb} "task" [--url <url>]` };
@@ -299908,6 +300008,7 @@ __export(exports_orchestrator, {
   compositeContentId: () => compositeContentId2,
   compositeAddress: () => compositeAddress2,
   chooseBestRouteCacheCandidate: () => chooseBestRouteCacheCandidate2,
+  cachedSkillHostMatchesContext: () => cachedSkillHostMatchesContext2,
   buildResolveCacheKey: () => buildResolveCacheKey2,
   buildCompositeEdges: () => buildCompositeEdges2,
   attachCompositeToSkill: () => attachCompositeToSkill2,
@@ -299940,7 +300041,9 @@ function shouldAutoWalk2(requestedUrl, topUrl, topScore, minScore = 0.8) {
     return false;
   const reqReg = registrableHost2(requestedUrl);
   const topReg = registrableHost2(topUrl);
-  return !!reqReg && reqReg === topReg || (topScore ?? 0) >= minScore;
+  if (reqReg)
+    return reqReg === topReg;
+  return (topScore ?? 0) >= minScore;
 }
 function pickWalkTarget2(requestedUrl, ranked, minScore = 0.8) {
   const eligible = ranked.filter((c) => c?.url && shouldAutoWalk2(requestedUrl, c.url, c.score, minScore));
@@ -300397,6 +300500,17 @@ function endpointMatchesContextOrigin2(endpoint, contextUrl) {
     return true;
   }
 }
+function cachedSkillHostMatchesContext2(skillDomain, contextUrl) {
+  if (!contextUrl)
+    return true;
+  const ctxReg = registrableHost2(contextUrl);
+  if (!ctxReg)
+    return true;
+  const skillReg = registrableHost2(skillDomain) ?? registrableHost2(`https://${skillDomain ?? ""}`);
+  if (!skillReg)
+    return true;
+  return skillReg === ctxReg;
+}
 function endpointTargetsMismatchedLocalReplayHost2(endpoint, contextUrl) {
   if (!contextUrl)
     return false;
@@ -303382,7 +303496,7 @@ async function resolveAndExecute2(intent, params = {}, context, projection, opti
   if (!forceCapture && !agentChoseEndpoint) {
     const cachedResult = routeResultCache2.get(cacheKey2);
     if (cachedResult) {
-      if (!shouldReuseRouteResultSnapshot2(cachedResult, queryIntent, context?.url)) {
+      if (!cachedSkillHostMatchesContext2(cachedResult.skill.domain, context?.url) || !shouldReuseRouteResultSnapshot2(cachedResult, queryIntent, context?.url)) {
         routeResultCache2.delete(cacheKey2);
       } else {
         timing.cache_hit = true;
@@ -303419,6 +303533,11 @@ async function resolveAndExecute2(intent, params = {}, context, projection, opti
         persistRouteCache2();
         continue;
       }
+      if (!cachedSkillHostMatchesContext2(cached6.domain, context?.url)) {
+        skillRouteCache2.delete(scopedKey2);
+        persistRouteCache2();
+        continue;
+      }
       const skill = readSkillSnapshot2(cached6.localSkillPath) ?? await getSkillWithTimeout2(cached6.skillId, clientScope);
       if (!skill || !isCachedSkillRelevantForIntent2(skill, queryIntent, context?.url)) {
         skillRouteCache2.delete(scopedKey2);
@@ -303521,6 +303640,11 @@ async function resolveAndExecute2(intent, params = {}, context, projection, opti
         persistRouteCache2();
         continue;
       }
+      if (!cachedSkillHostMatchesContext2(cached7.domain, context?.url)) {
+        skillRouteCache2.delete(scopedKey2);
+        persistRouteCache2();
+        continue;
+      }
       const skill = readSkillSnapshot2(cached7.localSkillPath) ?? await getSkillWithTimeout2(cached7.skillId, clientScope);
       if (!skill)
         continue;