unbrowse 2.1.1 → 2.1.2

package/dist/index.js

@@ -2251,7 +2251,7 @@ function shouldRetryEphemeralProfileError(error) {
 }
 function shouldRestartKuriForError(error) {
   const message = error instanceof Error ? error.message : String(error ?? "");
-  return /CDP command failed|target closed|session closed|No target with given id/i.test(message);
+  return /CDP command failed|target closed|session closed|No target with given id|No tabs available and failed to create one/i.test(message);
 }
 function extractRouteHint(url) {
   try {
@@ -11204,11 +11204,26 @@ function shouldFallbackToBrowserReplay(data, endpoint, intent, contextUrl) {
     return false;
   if (endpoint.dom_extraction && typeof data === "string" && isHtml(data))
     return false;
-  if (typeof data === "string")
+  if (typeof data === "string") {
+    if (isHtml(data) && looksLikeSearchAuthOrHomepageBounceHtml(data))
+      return false;
     return isHtml(data) || isSpaShell(data);
+  }
   const assessment = assessIntentResult(data, intent);
   return assessment.verdict === "fail";
 }
+function looksLikeSearchAuthOrHomepageBounceHtml(html, finalUrl) {
+  if (!isHtml(html))
+    return false;
+  const lower = html.toLowerCase();
+  const titleMatch = lower.match(/<title[^>]*>([^<]+)</i);
+  const title = titleMatch?.[1]?.trim() ?? "";
+  const final = finalUrl?.toLowerCase() ?? "";
+  const combined = `${title} ${lower}`;
+  const hasLawnetBounceMarkers = /about lawnet legal research/.test(combined) || /what is lawnet/.test(combined) || /forgot password/.test(combined) || /lawnet legal research, a service of/.test(combined) || /\/lawnet\/web\/lawnet\/about-lawnet\b/.test(combined) || /\/lawnet\/web\/lawnet\/home\b/.test(final);
+  const hasGenericAuthMarkers = /\b(login|log in|sign in|forgot password)\b/.test(combined) && /\b(search|legal research|lawnet)\b/.test(combined);
+  return hasLawnetBounceMarkers || hasGenericAuthMarkers;
+}
 function buildSampleRequestFromUrl(url) {
   try {
     return Object.fromEntries(sanitizeNavigationQueryParams(new URL(url)).searchParams.entries());
@@ -12340,8 +12355,10 @@ async function tryHttpFetch(url, authHeaders, cookies) {
 }
 async function executeDomExtractionEndpoint(endpoint, url, intent, authHeaders, cookies) {
   const extractionIntent = deriveDomExecutionIntent(endpoint, intent);
+  const isCapturedPageArtifact = /captured page artifact/i.test(endpoint.description ?? "");
   const ssrResult = await tryHttpFetch(url, authHeaders, cookies);
   if (ssrResult) {
+    const looksLikeBounce = looksLikeSearchAuthOrHomepageBounceHtml(ssrResult.html, ssrResult.final_url);
     const ssrExtracted = extractFromDOMWithHint(ssrResult.html, extractionIntent, endpoint.dom_extraction);
     if (ssrExtracted.data) {
       const ssrQuality = validateExtractionQuality(ssrExtracted.data, ssrExtracted.confidence, extractionIntent);
@@ -12373,6 +12390,41 @@ async function executeDomExtractionEndpoint(endpoint, url, intent, authHeaders,
           };
         }
       }
+      if (isCapturedPageArtifact) {
+        return {
+          data: {
+            error: "low_quality_dom_extraction",
+            message: `Structured DOM extraction was rejected: ${looksLikeBounce ? "search_auth_or_homepage_bounce" : "captured_page_artifact_miss"}`
+          },
+          status: 422,
+          trace_id: nanoid5(),
+          network_events: [toTraceNetworkEvent({
+            url: ssrResult.final_url,
+            method: "GET",
+            requestHeaders: authHeaders,
+            responseStatus: 200,
+            responseHeaders: { "content-type": "text/html" },
+            responseBody: ssrResult.html
+          })]
+        };
+      }
+    } else if (isCapturedPageArtifact && looksLikeBounce) {
+      return {
+        data: {
+          error: "low_quality_dom_extraction",
+          message: "Structured DOM extraction was rejected: search_auth_or_homepage_bounce"
+        },
+        status: 422,
+        trace_id: nanoid5(),
+        network_events: [toTraceNetworkEvent({
+          url: ssrResult.final_url,
+          method: "GET",
+          requestHeaders: authHeaders,
+          responseStatus: 200,
+          responseHeaders: { "content-type": "text/html" },
+          responseBody: ssrResult.html
+        })]
+      };
     }
     console.log(`[ssr-fast] miss, falling back to browser`);
   } else {
@@ -14125,6 +14177,24 @@ function promoteResultSnapshot(cacheKey, skill, endpointId, result, trace, respo
     expires: Date.now() + ROUTE_CACHE_TTL
   });
 }
+function invalidateResolveCacheEntries(cacheKeys, domainKeys = []) {
+  let routeCacheDirty = false;
+  let domainCacheDirty = false;
+  for (const cacheKey of new Set(cacheKeys.filter(Boolean))) {
+    routeResultCache.delete(cacheKey);
+    capturedDomainCache.delete(cacheKey);
+    if (skillRouteCache.delete(cacheKey))
+      routeCacheDirty = true;
+  }
+  for (const domainKey of new Set(domainKeys.filter(Boolean))) {
+    if (domainSkillCache.delete(domainKey))
+      domainCacheDirty = true;
+  }
+  if (routeCacheDirty)
+    persistRouteCache();
+  if (domainCacheDirty)
+    persistDomainCache();
+}
 async function getSkillWithTimeout(skillId, scope, timeoutMs = MARKETPLACE_GET_SKILL_TIMEOUT_MS) {
   return Promise.race([
     getSkill2(skillId, scope),
@@ -14176,6 +14246,10 @@ function isCachedSkillRelevantForIntent(skill, intent, contextUrl) {
   const resolvedSkill = withContextReplayEndpoint(skill, intent, contextUrl);
   const ranked = rankEndpoints(resolvedSkill.endpoints, intent, resolvedSkill.domain, contextUrl);
   const top = ranked[0];
+  const isSearchIntent = /\b(search|find|lookup|browse|discover)\b/i.test(intent);
+  if (top && isSearchIntent && contextUrl && /captured page artifact/i.test(top.endpoint.description ?? "") && top.endpoint.response_schema?.type !== "array" && top.endpoint.url_template === contextUrl && !skillHasBetterStructuredSearchEndpoint(resolvedSkill, top.endpoint.endpoint_id, intent, contextUrl)) {
+    return false;
+  }
   if (top && isEducationCatalogIntent(intent) && isRootContextUrl(contextUrl) && /captured page artifact/i.test(top.endpoint.description ?? "") && top.endpoint.url_template === contextUrl) {
     return false;
   }
@@ -14324,6 +14398,9 @@ async function withDomainCaptureLock(domain, fn) {
       captureDomainLocks.delete(domain);
   }
 }
+function shouldFallbackToLiveCaptureAfterAutoexecFailure(autoexecFailedAll, contextUrl) {
+  return autoexecFailedAll && !!contextUrl;
+}
 function computeCompositeScore(embeddingScore, skill) {
   const reliabilities = skill.endpoints.map((e) => e.reliability_score);
   const avgReliability = reliabilities.length > 0 ? reliabilities.reduce((a, b) => a + b, 0) / reliabilities.length : 0.5;
@@ -14904,13 +14981,20 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
         const autoResult = await tryAutoExecute(skill, source);
         if (autoResult) {
           promoteLearnedSkill(clientScope, cacheKey, skill, autoResult.trace.endpoint_id ?? "", context?.url);
-          return autoResult;
+          return { orchestratorResult: autoResult, autoexecFailedAll: false };
         }
+        return {
+          orchestratorResult: buildDeferral(skill, source, extraFields),
+          autoexecFailedAll: true
+        };
       } catch (err) {
         console.warn(`[auto-exec] failed, falling back to deferral: ${err.message}`);
       }
     }
-    return buildDeferral(skill, source, extraFields);
+    return {
+      orchestratorResult: buildDeferral(skill, source, extraFields),
+      autoexecFailedAll: false
+    };
   }
   function buildDeferral(skill, source, extraFields) {
     const resolvedSkill = withContextReplayEndpoint(skill, intent, context?.url);
@@ -15238,6 +15322,7 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
     return null;
   }
   const requestedDomain = context?.domain ?? (context?.url ? new URL(context.url).hostname : null);
+  const requestedDomainCacheKey = getDomainReuseKey(context?.url ?? requestedDomain);
   const resolveCacheKey = buildResolveCacheKey(requestedDomain, intent, context?.url);
   const cacheKey = scopedCacheKey(clientScope, resolveCacheKey);
   if (!forceCapture && !agentChoseEndpoint) {
@@ -15246,10 +15331,15 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
       if (cachedResult.expires <= Date.now() || !isAcceptableIntentResult(cachedResult.result, intent) || !isCachedSkillRelevantForIntent(cachedResult.skill, intent, context?.url)) {
         routeResultCache.delete(cacheKey);
       } else {
-        timing.cache_hit = true;
         const deferred2 = await buildDeferralWithAutoExec(cachedResult.skill, "marketplace");
-        deferred2.timing.cache_hit = true;
-        return deferred2;
+        if (shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred2.autoexecFailedAll, context?.url)) {
+          console.log("[route-result-cache] stale cached skill; retrying via live capture");
+          invalidateResolveCacheEntries([cacheKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
+        } else {
+          timing.cache_hit = true;
+          deferred2.orchestratorResult.timing.cache_hit = true;
+          return deferred2.orchestratorResult;
+        }
       }
     }
   }
@@ -15282,10 +15372,15 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
       if (bestCached.scopedKey !== cacheKey) {
         promoteLearnedSkill(clientScope, resolveCacheKey, bestCached.skill, bestCached.entry.endpointId, context?.url);
       }
-      timing.cache_hit = true;
       const deferred2 = await buildDeferralWithAutoExec(bestCached.skill, "marketplace");
-      deferred2.timing.cache_hit = true;
-      return deferred2;
+      if (shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred2.autoexecFailedAll, context?.url)) {
+        console.log("[route-cache] stale cached skill; retrying via live capture");
+        invalidateResolveCacheEntries([cacheKey, bestCached.scopedKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
+      } else {
+        timing.cache_hit = true;
+        deferred2.orchestratorResult.timing.cache_hit = true;
+        return deferred2.orchestratorResult;
+      }
     }
   }
   if (!forceCapture && !agentChoseEndpoint && requestedDomain) {
@@ -15294,11 +15389,16 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
     if (domainCached && Date.now() - domainCached.ts < 7 * 24 * 60 * 60000) {
       const skill = readSkillSnapshot(domainCached.localSkillPath) ?? await getSkill2(domainCached.skillId, clientScope);
       if (skill && isCachedSkillRelevantForIntent(skill, intent, context?.url)) {
-        timing.cache_hit = true;
         console.log(`[domain-cache] hit for ${domainKey} → skill ${skill.skill_id.slice(0, 15)}`);
         const result2 = await buildDeferralWithAutoExec(skill, "marketplace");
-        result2.timing.cache_hit = true;
-        return result2;
+        if (shouldFallbackToLiveCaptureAfterAutoexecFailure(result2.autoexecFailedAll, context?.url)) {
+          console.log(`[domain-cache] stale skill for ${domainKey}; retrying via live capture`);
+          invalidateResolveCacheEntries([cacheKey], [domainKey]);
+        } else {
+          timing.cache_hit = true;
+          result2.orchestratorResult.timing.cache_hit = true;
+          return result2.orchestratorResult;
+        }
       } else if (skill) {
         const ranked = rankEndpoints(skill.endpoints, intent, skill.domain, context?.url);
         const top = ranked[0];
@@ -15459,7 +15559,11 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
         if (best.endpointId) {
           console.log(`[search] endpoint-level hit hint: ${best.endpointId} score=${best.candidate.score.toFixed(3)}`);
         }
-        return await buildDeferralWithAutoExec(best.skill, "marketplace");
+        const deferred2 = await buildDeferralWithAutoExec(best.skill, "marketplace");
+        if (!shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred2.autoexecFailedAll, context?.url)) {
+          return deferred2.orchestratorResult;
+        }
+        console.log("[marketplace] stale top skill; retrying via live capture");
       }
     }
   }
@@ -15472,8 +15576,6 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
     if (!isCachedSkillRelevantForIntent(domainHit.skill, intent, context?.url)) {
       capturedDomainCache.delete(cacheKey);
     } else {
-      timing.cache_hit = true;
-      let staleCachedEndpoint = false;
       if (agentChoseEndpoint) {
         const execOut = await executeSkill(domainHit.skill, { ...params, endpoint_id: params.endpoint_id ?? domainHit.endpointId }, projection, { ...options, intent, contextUrl: context?.url });
         if (execOut.trace.success && isAcceptableIntentResult(execOut.result, intent)) {
@@ -15488,11 +15590,17 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
             extraction_hints: execOut.extraction_hints
           };
         }
-        staleCachedEndpoint = true;
+        invalidateResolveCacheEntries([cacheKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
       }
       const deferred2 = await buildDeferralWithAutoExec(domainHit.skill, "marketplace");
-      deferred2.timing.cache_hit = true;
-      return deferred2;
+      if (shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred2.autoexecFailedAll, context?.url)) {
+        console.log("[captured-domain-cache] stale skill; retrying via live capture");
+        invalidateResolveCacheEntries([cacheKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
+      } else {
+        timing.cache_hit = true;
+        deferred2.orchestratorResult.timing.cache_hit = true;
+        return deferred2.orchestratorResult;
+      }
     }
   }
   const bypassLiveCaptureQueue = shouldBypassLiveCaptureQueue(context?.url);
@@ -15522,9 +15630,9 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
           auth_recommended: true,
           auth_hint: captureResult2.auth_hint
         } : undefined);
-        queuePassivePublishIfExecuted(learned_skill, deferred2, parityBaseline2);
-        deferred2.timing.cache_hit = true;
-        return deferred2;
+        queuePassivePublishIfExecuted(learned_skill, deferred2.orchestratorResult, parityBaseline2);
+        deferred2.orchestratorResult.timing.cache_hit = true;
+        return deferred2.orchestratorResult;
       }
       return {
         result,
@@ -15725,8 +15833,8 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
     auth_recommended: true,
     auth_hint: captureResult.auth_hint
   } : undefined);
-  queuePassivePublishIfExecuted(learned_skill, deferred, parityBaseline);
-  return deferred;
+  queuePassivePublishIfExecuted(learned_skill, deferred.orchestratorResult, parityBaseline);
+  return deferred.orchestratorResult;
 }
 async function getOrCreateBrowserCaptureSkill() {
   const existing = await getSkill2(BROWSER_CAPTURE_SKILL_ID);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unbrowse",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Reverse-engineer any website into reusable API skills. npm CLI + local engine.",
   "type": "module",
   "bin": {

package/runtime-src/capture/index.ts

@@ -315,9 +315,9 @@ function shouldRetryEphemeralProfileError(error: unknown): boolean {
   return /persistentcontext|target page, context or browser has been closed|browser has been closed|page has been closed/i.test(message);
 }
 
-function shouldRestartKuriForError(error: unknown): boolean {
+export function shouldRestartKuriForError(error: unknown): boolean {
   const message = error instanceof Error ? error.message : String(error ?? "");
-  return /CDP command failed|target closed|session closed|No target with given id/i.test(message);
+  return /CDP command failed|target closed|session closed|No target with given id|No tabs available and failed to create one/i.test(message);
 }
 
 /**

package/runtime-src/execution/index.ts

@@ -746,7 +746,7 @@ export function buildStructuredReplayHeaders(
   return headers;
 }
 
-function shouldFallbackToBrowserReplay(
+export function shouldFallbackToBrowserReplay(
   data: unknown,
   endpoint: EndpointDescriptor,
   intent?: string,
@@ -755,11 +755,37 @@ function shouldFallbackToBrowserReplay(
   const replayUrl = resolveExecutionUrlTemplate(endpoint, contextUrl);
   if (!isDocumentLikeUrl(replayUrl)) return false;
   if (endpoint.dom_extraction && typeof data === "string" && isHtml(data)) return false;
-  if (typeof data === "string") return isHtml(data) || isSpaShell(data);
+  if (typeof data === "string") {
+    if (isHtml(data) && looksLikeSearchAuthOrHomepageBounceHtml(data)) return false;
+    return isHtml(data) || isSpaShell(data);
+  }
   const assessment = assessIntentResult(data, intent);
   return assessment.verdict === "fail";
 }
 
+export function looksLikeSearchAuthOrHomepageBounceHtml(
+  html: string,
+  finalUrl?: string,
+): boolean {
+  if (!isHtml(html)) return false;
+  const lower = html.toLowerCase();
+  const titleMatch = lower.match(/<title[^>]*>([^<]+)</i);
+  const title = titleMatch?.[1]?.trim() ?? "";
+  const final = finalUrl?.toLowerCase() ?? "";
+  const combined = `${title} ${lower}`;
+  const hasLawnetBounceMarkers =
+    /about lawnet legal research/.test(combined) ||
+    /what is lawnet/.test(combined) ||
+    /forgot password/.test(combined) ||
+    /lawnet legal research, a service of/.test(combined) ||
+    /\/lawnet\/web\/lawnet\/about-lawnet\b/.test(combined) ||
+    /\/lawnet\/web\/lawnet\/home\b/.test(final);
+  const hasGenericAuthMarkers =
+    /\b(login|log in|sign in|forgot password)\b/.test(combined) &&
+    /\b(search|legal research|lawnet)\b/.test(combined);
+  return hasLawnetBounceMarkers || hasGenericAuthMarkers;
+}
+
 function buildSampleRequestFromUrl(url: string): Record<string, unknown> {
   try {
     return Object.fromEntries(sanitizeNavigationQueryParams(new URL(url)).searchParams.entries());
@@ -2127,10 +2153,12 @@ async function executeDomExtractionEndpoint(
   cookies: Array<{ name: string; value: string; domain: string }>,
 ): Promise<{ data: unknown; status: number; trace_id: string; network_events?: TraceNetworkEvent[] }> {
   const extractionIntent = deriveDomExecutionIntent(endpoint, intent);
+  const isCapturedPageArtifact = /captured page artifact/i.test(endpoint.description ?? "");
 
   // SSR fast-path: try plain HTTP fetch before browser
   const ssrResult = await tryHttpFetch(url, authHeaders, cookies);
   if (ssrResult) {
+    const looksLikeBounce = looksLikeSearchAuthOrHomepageBounceHtml(ssrResult.html, ssrResult.final_url);
     const ssrExtracted = extractFromDOMWithHint(ssrResult.html, extractionIntent, endpoint.dom_extraction);
     if (ssrExtracted.data) {
       const ssrQuality = validateExtractionQuality(ssrExtracted.data, ssrExtracted.confidence, extractionIntent);
@@ -2162,6 +2190,41 @@ async function executeDomExtractionEndpoint(
           };
         }
       }
+      if (isCapturedPageArtifact) {
+        return {
+          data: {
+            error: "low_quality_dom_extraction",
+            message: `Structured DOM extraction was rejected: ${looksLikeBounce ? "search_auth_or_homepage_bounce" : "captured_page_artifact_miss"}`,
+          },
+          status: 422,
+          trace_id: nanoid(),
+          network_events: [toTraceNetworkEvent({
+            url: ssrResult.final_url,
+            method: "GET",
+            requestHeaders: authHeaders,
+            responseStatus: 200,
+            responseHeaders: { "content-type": "text/html" },
+            responseBody: ssrResult.html,
+          })],
+        };
+      }
+    } else if (isCapturedPageArtifact && looksLikeBounce) {
+      return {
+        data: {
+          error: "low_quality_dom_extraction",
+          message: "Structured DOM extraction was rejected: search_auth_or_homepage_bounce",
+        },
+        status: 422,
+        trace_id: nanoid(),
+        network_events: [toTraceNetworkEvent({
+          url: ssrResult.final_url,
+          method: "GET",
+          requestHeaders: authHeaders,
+          responseStatus: 200,
+          responseHeaders: { "content-type": "text/html" },
+          responseBody: ssrResult.html,
+        })],
+      };
     }
     console.log(`[ssr-fast] miss, falling back to browser`);
   } else {

package/runtime-src/orchestrator/index.ts

@@ -329,6 +329,21 @@ function promoteResultSnapshot(
   });
 }
 
+function invalidateResolveCacheEntries(cacheKeys: string[], domainKeys: string[] = []): void {
+  let routeCacheDirty = false;
+  let domainCacheDirty = false;
+  for (const cacheKey of new Set(cacheKeys.filter(Boolean))) {
+    routeResultCache.delete(cacheKey);
+    capturedDomainCache.delete(cacheKey);
+    if (skillRouteCache.delete(cacheKey)) routeCacheDirty = true;
+  }
+  for (const domainKey of new Set(domainKeys.filter(Boolean))) {
+    if (domainSkillCache.delete(domainKey)) domainCacheDirty = true;
+  }
+  if (routeCacheDirty) persistRouteCache();
+  if (domainCacheDirty) persistDomainCache();
+}
+
 async function getSkillWithTimeout(
   skillId: string,
   scope: string,
@@ -408,6 +423,23 @@ export function isCachedSkillRelevantForIntent(
     contextUrl,
   );
   const top = ranked[0];
+  const isSearchIntent = /\b(search|find|lookup|browse|discover)\b/i.test(intent);
+  if (
+    top &&
+    isSearchIntent &&
+    contextUrl &&
+    /captured page artifact/i.test(top.endpoint.description ?? "") &&
+    top.endpoint.response_schema?.type !== "array" &&
+    top.endpoint.url_template === contextUrl &&
+    !skillHasBetterStructuredSearchEndpoint(
+      resolvedSkill,
+      top.endpoint.endpoint_id,
+      intent,
+      contextUrl,
+    )
+  ) {
+    return false;
+  }
   if (
     top &&
     isEducationCatalogIntent(intent) &&
@@ -626,6 +658,18 @@ export interface OrchestratorResult {
   extraction_hints?: import("../transform/schema-hints.js").ExtractionHint;
 }
 
+type AutoExecDecision = {
+  orchestratorResult: OrchestratorResult;
+  autoexecFailedAll: boolean;
+};
+
+export function shouldFallbackToLiveCaptureAfterAutoexecFailure(
+  autoexecFailedAll: boolean,
+  contextUrl?: string,
+): boolean {
+  return autoexecFailedAll && !!contextUrl;
+}
+
 function computeCompositeScore(embeddingScore: number, skill: SkillManifest): number {
   // Average reliability across endpoints
   const reliabilities = skill.endpoints.map((e) => e.reliability_score);
@@ -1391,7 +1435,7 @@ export async function resolveAndExecute(
     skill: SkillManifest,
     source: "marketplace" | "live-capture",
     extraFields?: Record<string, unknown>,
-  ): Promise<OrchestratorResult> {
+  ): Promise<AutoExecDecision> {
     // Only attempt auto-exec if we have an intent to infer params from
     if (intent && intent.trim().length > 0) {
       try {
@@ -1399,13 +1443,20 @@ export async function resolveAndExecute(
         if (autoResult) {
           // Promote to marketplace cache so subsequent requests skip live-capture
           promoteLearnedSkill(clientScope, cacheKey, skill, autoResult.trace.endpoint_id ?? "", context?.url);
-          return autoResult;
+          return { orchestratorResult: autoResult, autoexecFailedAll: false };
         }
+        return {
+          orchestratorResult: buildDeferral(skill, source, extraFields),
+          autoexecFailedAll: true,
+        };
       } catch (err) {
         console.warn(`[auto-exec] failed, falling back to deferral: ${(err as Error).message}`);
       }
     }
-    return buildDeferral(skill, source, extraFields);
+    return {
+      orchestratorResult: buildDeferral(skill, source, extraFields),
+      autoexecFailedAll: false,
+    };
   }
 
   /** Build a deferral response — returns the skill + ranked endpoints for the agent to choose. */
@@ -1882,6 +1933,7 @@ export async function resolveAndExecute(
   }
 
   const requestedDomain = context?.domain ?? (context?.url ? new URL(context.url).hostname : null);
+  const requestedDomainCacheKey = getDomainReuseKey(context?.url ?? requestedDomain);
   const resolveCacheKey = buildResolveCacheKey(requestedDomain, intent, context?.url);
   const cacheKey = scopedCacheKey(clientScope, resolveCacheKey);
 
@@ -1895,10 +1947,15 @@ export async function resolveAndExecute(
       ) {
         routeResultCache.delete(cacheKey);
       } else {
-        timing.cache_hit = true;
         const deferred = await buildDeferralWithAutoExec(cachedResult.skill, "marketplace");
-        deferred.timing.cache_hit = true;
-        return deferred;
+        if (shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred.autoexecFailedAll, context?.url)) {
+          console.log("[route-result-cache] stale cached skill; retrying via live capture");
+          invalidateResolveCacheEntries([cacheKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
+        } else {
+          timing.cache_hit = true;
+          deferred.orchestratorResult.timing.cache_hit = true;
+          return deferred.orchestratorResult;
+        }
       }
     }
   }
@@ -1940,10 +1997,18 @@ export async function resolveAndExecute(
           context?.url,
         );
       }
-      timing.cache_hit = true;
       const deferred = await buildDeferralWithAutoExec(bestCached.skill, "marketplace");
-      deferred.timing.cache_hit = true;
-      return deferred;
+      if (shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred.autoexecFailedAll, context?.url)) {
+        console.log("[route-cache] stale cached skill; retrying via live capture");
+        invalidateResolveCacheEntries(
+          [cacheKey, bestCached.scopedKey],
+          requestedDomainCacheKey ? [requestedDomainCacheKey] : [],
+        );
+      } else {
+        timing.cache_hit = true;
+        deferred.orchestratorResult.timing.cache_hit = true;
+        return deferred.orchestratorResult;
+      }
     }
   }
 
@@ -1954,11 +2019,16 @@ export async function resolveAndExecute(
     if (domainCached && Date.now() - domainCached.ts < 7 * 24 * 60 * 60_000) {
       const skill = readSkillSnapshot(domainCached.localSkillPath) ?? await getSkill(domainCached.skillId, clientScope);
       if (skill && isCachedSkillRelevantForIntent(skill, intent, context?.url)) {
-        timing.cache_hit = true;
         console.log(`[domain-cache] hit for ${domainKey} → skill ${skill.skill_id.slice(0, 15)}`);
         const result = await buildDeferralWithAutoExec(skill, "marketplace");
-        result.timing.cache_hit = true;
-        return result;
+        if (shouldFallbackToLiveCaptureAfterAutoexecFailure(result.autoexecFailedAll, context?.url)) {
+          console.log(`[domain-cache] stale skill for ${domainKey}; retrying via live capture`);
+          invalidateResolveCacheEntries([cacheKey], [domainKey]);
+        } else {
+          timing.cache_hit = true;
+          result.orchestratorResult.timing.cache_hit = true;
+          return result.orchestratorResult;
+        }
       } else if (skill) {
         const ranked = rankEndpoints(skill.endpoints, intent, skill.domain, context?.url);
         const top = ranked[0];
@@ -2202,7 +2272,11 @@ export async function resolveAndExecute(
             `[search] endpoint-level hit hint: ${best.endpointId} score=${best.candidate.score.toFixed(3)}`,
           );
         }
-        return await buildDeferralWithAutoExec(best.skill, "marketplace");
+        const deferred = await buildDeferralWithAutoExec(best.skill, "marketplace");
+        if (!shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred.autoexecFailedAll, context?.url)) {
+          return deferred.orchestratorResult;
+        }
+        console.log("[marketplace] stale top skill; retrying via live capture");
       }
     }
   } // end !forceCapture
@@ -2222,8 +2296,6 @@ export async function resolveAndExecute(
     if (!isCachedSkillRelevantForIntent(domainHit.skill, intent, context?.url)) {
       capturedDomainCache.delete(cacheKey);
     } else {
-      timing.cache_hit = true;
-      let staleCachedEndpoint = false;
       if (agentChoseEndpoint) {
         const execOut = await executeSkill(
           domainHit.skill,
@@ -2254,14 +2326,20 @@ export async function resolveAndExecute(
               execOut.trace,
             ),
             response_schema: execOut.response_schema,
-            extraction_hints: execOut.extraction_hints,
-          };
+              extraction_hints: execOut.extraction_hints,
+            };
         }
-        staleCachedEndpoint = true;
+        invalidateResolveCacheEntries([cacheKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
       }
       const deferred = await buildDeferralWithAutoExec(domainHit.skill, "marketplace");
-      deferred.timing.cache_hit = true;
-      return deferred;
+      if (shouldFallbackToLiveCaptureAfterAutoexecFailure(deferred.autoexecFailedAll, context?.url)) {
+        console.log("[captured-domain-cache] stale skill; retrying via live capture");
+        invalidateResolveCacheEntries([cacheKey], requestedDomainCacheKey ? [requestedDomainCacheKey] : []);
+      } else {
+        timing.cache_hit = true;
+        deferred.orchestratorResult.timing.cache_hit = true;
+        return deferred.orchestratorResult;
+      }
     }
   }
 
@@ -2299,13 +2377,13 @@ export async function resolveAndExecute(
           authRecommended
             ? {
                 auth_recommended: true,
-                auth_hint: captureResult!.auth_hint,
-              }
+              auth_hint: captureResult!.auth_hint,
+            }
             : undefined,
         );
-        queuePassivePublishIfExecuted(learned_skill, deferred, parityBaseline);
-        deferred.timing.cache_hit = true;
-        return deferred;
+        queuePassivePublishIfExecuted(learned_skill, deferred.orchestratorResult, parityBaseline);
+        deferred.orchestratorResult.timing.cache_hit = true;
+        return deferred.orchestratorResult;
       }
       return {
         result,
@@ -2596,8 +2674,8 @@ export async function resolveAndExecute(
         }
       : undefined,
   );
-  queuePassivePublishIfExecuted(learned_skill, deferred, parityBaseline);
-  return deferred;
+  queuePassivePublishIfExecuted(learned_skill, deferred.orchestratorResult, parityBaseline);
+  return deferred.orchestratorResult;
 }
 
 async function getOrCreateBrowserCaptureSkill(): Promise<SkillManifest> {