unbrowse 2.12.0 → 2.12.2

package/dist/cli.js

@@ -680,6 +680,31 @@ async function waitForTabRegistration(tabId, timeoutMs = 2000) {
     await new Promise((resolve) => setTimeout(resolve, 100));
   }
 }
+async function createTabViaChromeCdp(url = "about:blank") {
+  if (!kuriCdpPort)
+    return "";
+  try {
+    const res = await fetch(`http://127.0.0.1:${kuriCdpPort}/json/new?${url}`, {
+      method: "PUT",
+      signal: AbortSignal.timeout(5000)
+    });
+    const target = await res.json();
+    return target?.id ?? target?.targetId ?? "";
+  } catch (err) {
+    log("kuri", `Chrome tab creation failed: ${err instanceof Error ? err.message : err}`);
+    return "";
+  }
+}
+async function findReusableIdleTab() {
+  await ensureTabsDiscovered();
+  try {
+    const tabs = await kuriGet("/tabs");
+    const candidate = tabs.find((tab) => /^(about:blank|chrome:\/\/newtab\/?)$/i.test(tab?.url ?? ""));
+    return candidate?.id ?? "";
+  } catch {
+    return "";
+  }
+}
 async function navigate(tabId, url) {
   await kuriGet("/navigate", { tab_id: tabId, url });
 }
@@ -869,8 +894,17 @@ async function newTab(url) {
   const params = {};
   if (url)
     params.url = url;
-  const result = await kuriGet("/tab/new", params);
-  const tabId = result?.tab_id ?? "";
+  let tabId = "";
+  try {
+    const result = await kuriGet("/tab/new", params);
+    tabId = result?.tab_id ?? result?.id ?? result?.targetId ?? "";
+  } catch {
+    tabId = "";
+  }
+  if (!tabId)
+    tabId = await createTabViaChromeCdp(url ?? "about:blank");
+  if (!tabId)
+    tabId = await findReusableIdleTab();
   if (tabId) {
     await waitForTabRegistration(tabId).catch(() => {});
   }
@@ -3625,12 +3659,7 @@ function templatizePathSegments(templateUrl, originalUrl, context) {
         try {
           const contextSegments = new URL(context.pageUrl).pathname.split("/");
           const contextSeg = contextSegments[i];
-          const prevSeg = tSegments[i - 1] ?? "";
-          const prevContextSeg = contextSegments[i - 1] ?? "";
-          const nextSeg = tSegments[i + 1] ?? "";
-          const nextContextSeg = contextSegments[i + 1] ?? "";
-          const hasStructuralNeighborMatch = !!prevSeg && !!prevContextSeg && prevSeg === prevContextSeg || !!nextSeg && !!nextContextSeg && nextSeg === nextContextSeg;
-          if (contextSeg && contextSeg !== tSeg && hasStructuralNeighborMatch && !contextSeg.includes(".") && contextSeg.length >= 2 && contextSeg.length <= 40 && !/^(api|v\d+|www|en|es|fr|de|latest|search|i)$/i.test(contextSeg)) {
+          if (contextSeg && contextSeg !== tSeg && !contextSeg.includes(".") && contextSeg.length >= 2 && contextSeg.length <= 40 && !/^(api|v\d+|www|en|es|fr|de|latest|search|i)$/i.test(contextSeg)) {
             const paramName = inferParamName(tSegments, i, "slug", usedNames);
             tSegments[i] = `{${paramName}}`;
             pathParams[paramName] = contextSeg;
@@ -5075,11 +5104,13 @@ var init_capture = __esm(() => {
 // ../../src/client/index.ts
 var exports_client2 = {};
 __export(exports_client2, {
+  waitForBackgroundRegistration: () => waitForBackgroundRegistration,
   verifyMarketplaceDiscovery: () => verifyMarketplaceDiscovery,
   validateManifest: () => validateManifest,
   updateEndpointScore: () => updateEndpointScore,
   updateEndpointSchema: () => updateEndpointSchema,
   syncAgentWallet: () => syncAgentWallet2,
+  startBackgroundRegistration: () => startBackgroundRegistration,
   setSkillSplitConfig: () => setSkillSplitConfig,
   setSkillPrice: () => setSkillPrice,
   searchIntentResolve: () => searchIntentResolve,
@@ -5518,23 +5549,26 @@ Email for this agent (leave blank to use a local device id): `, resolve);
     rl.close();
   }
 }
-async function checkTosStatus2() {
+async function checkTosStatus2(options) {
+  const exitOnFailure = options?.exitOnFailure ?? true;
   const config = loadConfig2();
   let tosInfo;
   try {
     tosInfo = await api2("GET", "/v1/tos/current");
   } catch {
-    return;
+    return true;
   }
   if (config?.tos_accepted_version === tosInfo.version) {
-    return;
+    return true;
   }
   console.log(`
 The Unbrowse Terms of Service have been updated.`);
   const accepted = await promptTosAcceptance2(tosInfo.summary, tosInfo.url);
   if (!accepted) {
     console.log("You must accept the updated Terms of Service to continue using Unbrowse.");
-    process.exit(1);
+    if (exitOnFailure)
+      process.exit(1);
+    return false;
   }
   try {
     await api2("POST", "/v1/agents/accept-tos", { tos_version: tosInfo.version });
@@ -5547,16 +5581,20 @@ The Unbrowse Terms of Service have been updated.`);
   } catch (err) {
     console.warn(`Failed to record ToS acceptance: ${err.message}`);
   }
+  return true;
 }
 async function ensureRegistered2(options) {
   if (LOCAL_ONLY2)
     return;
+  const exitOnFailure = options?.exitOnFailure ?? true;
   const usableKey = await findUsableApiKey2();
   if (usableKey) {
     if (usableKey.source === "config") {
       console.log("[unbrowse] Restored saved registration.");
     }
-    await checkTosStatus2();
+    const accepted2 = await checkTosStatus2({ exitOnFailure });
+    if (!accepted2)
+      return;
     try {
       const profile = await getMyProfile2();
       const wallet = getLocalWalletContext2();
@@ -5577,7 +5615,9 @@ async function ensureRegistered2(options) {
   const accepted = await promptTosAcceptance2(tosInfo.summary, tosInfo.url);
   if (!accepted) {
     console.log("You must accept the Terms of Service to use Unbrowse.");
-    process.exit(1);
+    if (exitOnFailure)
+      process.exit(1);
+    return;
   }
   const fallbackName = buildDefaultAgentName2();
   const name = options?.promptForEmail ? await promptAgentEmail2(fallbackName) : resolveAgentName2(process.env.UNBROWSE_AGENT_EMAIL, fallbackName);
@@ -5605,8 +5645,36 @@ async function ensureRegistered2(options) {
   } catch (err) {
     console.warn(`Registration failed: ${err.message}`);
     console.warn("Set UNBROWSE_API_KEY manually or try again.");
-    process.exit(1);
+    if (exitOnFailure)
+      process.exit(1);
+  }
+}
+function startBackgroundRegistration(options) {
+  if (LOCAL_ONLY2)
+    return Promise.resolve();
+  if (backgroundRegistrationPromise)
+    return backgroundRegistrationPromise;
+  backgroundRegistrationPromise = ensureRegistered2({
+    promptForEmail: options?.promptForEmail,
+    exitOnFailure: false
+  }).catch((err) => {
+    console.warn(`[unbrowse] Background registration failed: ${err.message}`);
+  }).finally(() => {
+    backgroundRegistrationPromise = null;
+  });
+  return backgroundRegistrationPromise;
+}
+async function waitForBackgroundRegistration(timeoutMs = 0) {
+  if (!backgroundRegistrationPromise)
+    return;
+  if (timeoutMs <= 0) {
+    await backgroundRegistrationPromise;
+    return;
   }
+  await Promise.race([
+    backgroundRegistrationPromise,
+    new Promise((resolve) => setTimeout(resolve, timeoutMs))
+  ]);
 }
 function skillCachePath(skillId) {
   return join3(getSkillCacheDir(), `${skillId}.json`);
@@ -5997,7 +6065,7 @@ async function setSkillPrice(skillId, priceUsd) {
 async function setSkillSplitConfig(skillId, splitConfig) {
   return api2("PATCH", `/v1/skills/${skillId}`, { split_config: splitConfig });
 }
-var API_URL2, PROFILE_NAME2, recentLocalSkills2, LOCAL_ONLY2, EMAIL_RE2, API_TIMEOUT_MS2, PUBLISH_TIMEOUT_MS2;
+var API_URL2, PROFILE_NAME2, recentLocalSkills2, LOCAL_ONLY2, EMAIL_RE2, API_TIMEOUT_MS2, PUBLISH_TIMEOUT_MS2, backgroundRegistrationPromise = null;
 var init_client2 = __esm(() => {
   init_cascade();
   API_URL2 = process.env.UNBROWSE_BACKEND_URL || "https://beta-api.unbrowse.ai";
@@ -11901,8 +11969,7 @@ async function executeEndpoint(skill, endpoint, params = {}, projection, options
       } catch {}
     }
   }
-  const hasAuthContext = cookies.length > 0 || Object.keys(authHeaders).length > 0 || !!skill.auth_profile_ref || endpoint.semantic?.auth_required === true;
-  if (!options?.skip_robots_check && !hasAuthContext) {
+  if (!options?.skip_robots_check) {
     const allowed = await isAllowedByRobots(url);
     if (!allowed) {
       const traceId = nanoid5();
@@ -15294,7 +15361,6 @@ async function resolveAndExecute(intent, params = {}, context, projection, optio
       result: {
         message: `Found ${epRanked.length} endpoint(s). Pick one and call POST /v1/skills/${resolvedSkill.skill_id}/execute with params.endpoint_id.`,
         skill_id: resolvedSkill.skill_id,
-        suggested_next_operation_id: chunk.available_operation_ids[0],
         available_operations: chunk.operations.map((operation) => ({
           operation_id: operation.operation_id,
           endpoint_id: operation.endpoint_id,
@@ -16731,7 +16797,7 @@ var init_orchestrator = __esm(async () => {
   captureDomainLocks = new Map;
   skillRouteCache = new Map;
   ROUTE_CACHE_FILE = join9(process.env.HOME ?? "/tmp", ".unbrowse", "route-cache.json");
-  SKILL_SNAPSHOT_DIR = join9(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
+  SKILL_SNAPSHOT_DIR = process.env.UNBROWSE_SKILL_SNAPSHOT_DIR ?? join9(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
   domainSkillCache = new Map;
   DOMAIN_CACHE_FILE = join9(process.env.HOME ?? "/tmp", ".unbrowse", "domain-skill-cache.json");
   try {
@@ -17144,7 +17210,7 @@ async function processIndexJob(job) {
   }
   console.log(`[background-index] completed for ${domain} -> ${published.skill_id}`);
 }
-var UNBROWSE_CONFIG_PATH, SECRET_VALUE_PATTERNS, SECRET_KEY_PATTERNS, SKILL_SNAPSHOT_DIR2, indexInFlight;
+var UNBROWSE_CONFIG_PATH, SKILL_SNAPSHOT_DIR2, SECRET_VALUE_PATTERNS, SECRET_KEY_PATTERNS, indexInFlight;
 var init_indexer = __esm(async () => {
   init_graph();
   init_client2();
@@ -17152,6 +17218,7 @@ var init_indexer = __esm(async () => {
   init_domain();
   await init_orchestrator();
   UNBROWSE_CONFIG_PATH = join10(homedir6(), ".unbrowse", "config.json");
+  SKILL_SNAPSHOT_DIR2 = process.env.UNBROWSE_SKILL_SNAPSHOT_DIR ?? join10(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
   SECRET_VALUE_PATTERNS = [
     /^eyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}/,
     /^Bearer\s+\S+/i,
@@ -17165,7 +17232,6 @@ var init_indexer = __esm(async () => {
     /^v2\.[A-Za-z0-9_-]{20,}/
   ];
   SECRET_KEY_PATTERNS = /^(api[_-]?key|access[_-]?token|auth[_-]?token|secret[_-]?key|private[_-]?key|password|passwd|session[_-]?id|session[_-]?token|csrf[_-]?token|client[_-]?secret|bearer|refresh[_-]?token|id[_-]?token|jwt|nonce|otp|pin|ssn|credit[_-]?card)$/i;
-  SKILL_SNAPSHOT_DIR2 = join10(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
   indexInFlight = new Map;
 });
 
@@ -17311,113 +17377,6 @@ var init_session_logs = __esm(() => {
   init_domain();
 });
 
-// ../../src/agent-outcome.ts
-function edgePriority(kind) {
-  switch (kind) {
-    case "parent_child":
-      return 4;
-    case "pagination":
-      return 3;
-    case "dependency":
-      return 2;
-    case "hint":
-      return 1;
-    case "auth":
-      return 0;
-    default:
-      return -1;
-  }
-}
-function nextActionWhy(kind, bindingKey, title) {
-  switch (kind) {
-    case "parent_child":
-      return `Likely next detail step after this result. Exposes ${title}.`;
-    case "pagination":
-      return `Likely next page or continuation step. Carries ${bindingKey || "cursor"} forward.`;
-    case "dependency":
-      return `Unlocks the next dependent call using ${bindingKey || "known bindings"}.`;
-    case "auth":
-      return "Useful once authentication is in place.";
-    case "hint":
-      return "Common follow-up action from the current result.";
-    default:
-      return "Likely follow-up action.";
-  }
-}
-function operationTitle(operation) {
-  const semantic = [operation.action_kind, operation.resource_kind].filter(Boolean).join(" ").replace(/_/g, " ").trim();
-  return operation.description_out || semantic || operation.endpoint_id;
-}
-function buildAgentImpact(timing) {
-  if (!timing?.source)
-    return;
-  return {
-    source: timing.source,
-    cache_hit: timing.cache_hit === true,
-    browser_avoided: !BROWSER_SOURCES.has(timing.source),
-    baseline_total_ms: timing.baseline_total_ms,
-    actual_total_ms: timing.actual_total_ms,
-    time_saved_ms: timing.time_saved_ms,
-    time_saved_pct: timing.time_saved_pct ?? 0,
-    tokens_saved: timing.tokens_saved ?? 0,
-    tokens_saved_pct: timing.tokens_saved_pct ?? 0,
-    baseline_cost_uc: timing.baseline_cost_uc,
-    actual_cost_uc: timing.actual_cost_uc,
-    cost_saved_uc: timing.cost_saved_uc
-  };
-}
-function buildNextActions(skill, endpointId, maxActions = 3) {
-  if (!skill?.operation_graph || !endpointId)
-    return [];
-  const graph = skill.operation_graph;
-  const current = graph.operations.find((operation) => operation.endpoint_id === endpointId);
-  if (!current)
-    return [];
-  const byOperationId = new Map(graph.operations.map((operation) => [operation.operation_id, operation]));
-  const scored = new Map;
-  for (const edge of graph.edges) {
-    if (edge.from_operation_id !== current.operation_id)
-      continue;
-    const target = byOperationId.get(edge.to_operation_id);
-    if (!target)
-      continue;
-    const candidate = {
-      operation_id: target.operation_id,
-      endpoint_id: target.endpoint_id,
-      title: operationTitle(target),
-      why: nextActionWhy(edge.kind, edge.binding_key, operationTitle(target)),
-      score: edgePriority(edge.kind) * 10 + Math.round(edge.confidence * 10)
-    };
-    const existing = scored.get(target.operation_id);
-    if (!existing || candidate.score > existing.score) {
-      scored.set(target.operation_id, candidate);
-    }
-  }
-  return [...scored.values()].sort((a, b) => b.score - a.score || a.title.localeCompare(b.title)).slice(0, maxActions).map((candidate) => ({
-    endpoint_id: candidate.endpoint_id,
-    operation_id: candidate.operation_id,
-    title: candidate.title,
-    why: candidate.why,
-    command: `unbrowse execute --skill ${skill.skill_id} --endpoint ${candidate.endpoint_id}`
-  }));
-}
-function attachAgentOutcomeHints(payload, opts) {
-  const target = payload;
-  const impact = buildAgentImpact(opts?.timing);
-  if (impact) {
-    target.impact = impact;
-  }
-  const nextActions = buildNextActions(opts?.skill, opts?.endpointId);
-  if (nextActions.length > 0) {
-    target.next_actions = nextActions;
-  }
-  return target;
-}
-var BROWSER_SOURCES;
-var init_agent_outcome = __esm(() => {
-  BROWSER_SOURCES = new Set(["live-capture", "first-pass", "browser-action"]);
-});
-
 // ../../src/api/browse-session.ts
 function extractBrowseFailureMessage(value) {
   return typeof value === "string" ? value : getKuriErrorMessage(value);
@@ -17432,6 +17391,8 @@ function isRecoverableBrowseFailure(value) {
 async function createBrowseSession(sessions, client, injectInterceptor2) {
   await client.start().catch(() => {});
   const tabId = await client.newTab();
+  if (!tabId)
+    throw new Error("Failed to create browser tab");
   await client.harStart(tabId).catch(() => {});
   await injectInterceptor2(tabId);
   const session = { tabId, url: "about:blank", harActive: true, domain: "" };
@@ -17454,7 +17415,7 @@ async function adoptExistingBrowseTab(sessions, client, injectInterceptor2, pref
     const candidate = tabs.find((tab) => {
       const domain = extractDomain2(tab.url);
       return !!domain && !!normalizedPreferred && domain === normalizedPreferred;
-    }) ?? tabs.find((tab) => /^https?:\/\//.test(tab.url ?? ""));
+    }) ?? tabs.find((tab) => /^(about:blank|chrome:\/\/newtab\/?)$/i.test(tab.url ?? "")) ?? (!normalizedPreferred ? tabs.find((tab) => /^https?:\/\//.test(tab.url ?? "")) : undefined);
     if (!candidate?.id)
       return null;
     await client.harStart(candidate.id).catch(() => {});
@@ -18011,6 +17972,21 @@ function parseJsonString(value) {
     return null;
   }
 }
+async function settleSubmitDestination(client, tabId, url, html) {
+  let settledUrl = url;
+  let settledHtml = html;
+  const deadline = Date.now() + SUBMIT_SETTLE_WINDOW_MS;
+  while (Date.now() < deadline) {
+    await sleep(Math.min(SUBMIT_POLL_INTERVAL_MS, Math.max(50, deadline - Date.now())));
+    const nextUrl = await client.getCurrentUrl(tabId).catch(() => "");
+    const nextHtml = await client.getPageHtml(tabId).catch(() => "");
+    if (nextUrl && !nextUrl.startsWith("about:blank"))
+      settledUrl = nextUrl;
+    if (nextHtml)
+      settledHtml = nextHtml;
+  }
+  return { url: settledUrl, html: settledHtml };
+}
 async function waitForSubmitOutcome(client, tabId, beforeUrl, beforeHtml, options) {
   const timeoutMs = options.timeoutMs ?? DEFAULT_SUBMIT_TIMEOUT_MS;
   const deadline = Date.now() + timeoutMs;
@@ -18021,7 +17997,7 @@ async function waitForSubmitOutcome(client, tabId, beforeUrl, beforeHtml, option
       if (waitResult?.status === "found" || waitResult?.status === "ready") {
         const url = await client.getCurrentUrl(tabId).catch(() => beforeUrl);
         const html = await client.getPageHtml(tabId).catch(() => beforeHtml);
-        return { ok: true, url, html };
+        return { ok: true, ...await settleSubmitDestination(client, tabId, url, html) };
       }
     } catch {}
   }
@@ -18029,20 +18005,20 @@ async function waitForSubmitOutcome(client, tabId, beforeUrl, beforeHtml, option
     const url = await client.getCurrentUrl(tabId).catch(() => "");
     const html = await client.getPageHtml(tabId).catch(() => "");
     if (waitFor && isUrlWaitHint(waitFor) && url.includes(waitFor)) {
-      return { ok: true, url, html };
+      return { ok: true, ...await settleSubmitDestination(client, tabId, url, html) };
     }
     if (url && url !== beforeUrl && !url.startsWith("about:blank")) {
-      return { ok: true, url, html };
+      return { ok: true, ...await settleSubmitDestination(client, tabId, url, html) };
     }
     if (hasMeaningfulPageChange(beforeHtml, html)) {
-      return { ok: true, url: url || beforeUrl, html };
+      return { ok: true, ...await settleSubmitDestination(client, tabId, url || beforeUrl, html) };
     }
     await sleep(SUBMIT_POLL_INTERVAL_MS);
   }
   return { ok: false, url: beforeUrl, html: beforeHtml };
 }
 async function submitBrowseForm(deps, options = {}) {
-  const { client, session, flushCapture, restartCapture, rehydratePlugins } = deps;
+  const { client, session, restartCapture, rehydratePlugins } = deps;
   const sameOriginFetchFallback = options.sameOriginFetchFallback !== false;
   const beforeUrl = await client.getCurrentUrl(session.tabId).catch(() => session.url);
   const beforeHtml = await client.getPageHtml(session.tabId).catch(() => "");
@@ -18068,14 +18044,6 @@ async function submitBrowseForm(deps, options = {}) {
   const domOutcome = await waitForSubmitOutcome(client, session.tabId, beforeUrl, beforeHtml, options);
   if (domOutcome.ok) {
     session.url = domOutcome.url || beforeUrl || session.url;
-    let captureSync2 = null;
-    if (flushCapture) {
-      try {
-        captureSync2 = await flushCapture(session);
-      } catch {
-        captureSync2 = null;
-      }
-    }
     await restartCapture(session);
     return {
       ok: true,
@@ -18084,8 +18052,7 @@ async function submitBrowseForm(deps, options = {}) {
       fallback_used: false,
       same_origin_html_rehydrated: false,
       wait_for: options.waitFor,
-      submit_meta: submitMeta,
-      capture_sync: captureSync2
+      submit_meta: submitMeta
     };
   }
   if (submitError && !isRecoverableBrowseFailure(submitError) && !sameOriginFetchFallback) {
@@ -18123,14 +18090,6 @@ async function submitBrowseForm(deps, options = {}) {
   if (!rehydrate) {
     rehydrate = await rehydratePlugins(session.tabId).catch(() => null);
   }
-  let captureSync = null;
-  if (flushCapture) {
-    try {
-      captureSync = await flushCapture(session);
-    } catch {
-      captureSync = null;
-    }
-  }
   await restartCapture(session);
   return {
     ok: true,
@@ -18141,11 +18100,10 @@ async function submitBrowseForm(deps, options = {}) {
     status: typeof fallbackPayload.status === "number" ? fallbackPayload.status : undefined,
     wait_for: options.waitFor,
     submit_meta: submitMeta,
-    capture_sync: captureSync,
     rehydrate
   };
 }
-var DEFAULT_SUBMIT_TIMEOUT_MS = 8000, SUBMIT_POLL_INTERVAL_MS = 250;
+var DEFAULT_SUBMIT_TIMEOUT_MS = 8000, SUBMIT_POLL_INTERVAL_MS = 250, SUBMIT_SETTLE_WINDOW_MS = 1000;
 var init_browse_submit = __esm(() => {
   init_browse_session();
 });
@@ -18270,7 +18228,6 @@ import { join as join12 } from "path";
 function buildAnalyticsSessionPayload(result, opts) {
   const source = result.timing?.source ?? result.source;
   const apiCalls = result.trace.endpoint_id ? 1 : 0;
-  const browserMode = opts.browser_mode ?? (source === "live-capture" || source === "first-pass" || source === "browser-action" ? "default" : "replaced");
   const cachedSkillCalls = opts.cached_skill_calls ?? (apiCalls > 0 && source !== "live-capture" && source !== "first-pass" ? 1 : 0);
   const freshIndexCalls = opts.fresh_index_calls ?? (apiCalls > 0 && (source === "live-capture" || source === "first-pass") ? 1 : 0);
   return {
@@ -18282,14 +18239,7 @@ function buildAnalyticsSessionPayload(result, opts) {
     discovery_queries: opts.discovery_queries,
     cached_skill_calls: cachedSkillCalls,
     fresh_index_calls: freshIndexCalls,
-    browser_mode: browserMode,
-    success: result.trace.success ?? true,
-    source,
-    time_saved_ms: result.timing?.time_saved_ms,
-    time_saved_pct: result.timing?.time_saved_pct,
-    tokens_saved: result.trace.tokens_saved ?? result.timing?.tokens_saved,
-    tokens_saved_pct: result.trace.tokens_saved_pct ?? result.timing?.tokens_saved_pct,
-    cost_saved_uc: result.timing?.cost_saved_uc
+    browser_mode: opts.browser_mode ?? "unknown"
   };
 }
 function passiveIndexFromRequests(requests, pageUrl) {
@@ -18470,7 +18420,11 @@ async function registerRoutes(app) {
   app.addHook("onRequest", async (req, reply) => {
     if (req.url === "/health" || req.url === "/v1/stats")
       return;
-    const key = getApiKey2();
+    let key = getApiKey2();
+    if (!key) {
+      await waitForBackgroundRegistration(15000);
+      key = getApiKey2();
+    }
     if (!key) {
       return reply.code(401).send({
         error: "api_key_required",
@@ -18486,11 +18440,7 @@ async function registerRoutes(app) {
       return reply.code(400).send({ error: "intent required" });
     try {
       const result = await resolveAndExecute(intent, params ?? {}, context, projection, { confirm_unsafe, dry_run, force_capture, client_scope: clientScope });
-      const res = attachAgentOutcomeHints({ ...result }, {
-        skill: result.skill,
-        endpointId: result.trace.endpoint_id,
-        timing: result.timing
-      });
+      const res = result;
       if (result.timing) {
         res.timing = result.timing;
       }
@@ -18499,9 +18449,10 @@ async function registerRoutes(app) {
         res.available_endpoints = innerResult.available_endpoints;
       }
       await recordAnalyticsSession(buildAnalyticsSessionPayload(result, {
+        browser_mode: "replaced",
         discovery_queries: 1
       })).catch(() => {});
-      return reply.send(res);
+      return reply.send(result);
     } catch (err) {
       return reply.code(500).send({ error: err.message });
     }
@@ -18711,33 +18662,26 @@ async function registerRoutes(app) {
             recordExecution(freshResult.trace.skill_id, freshResult.trace.endpoint_id, freshResult.trace, skill).catch(() => {});
           }
           await recordAnalyticsSession(buildAnalyticsSessionPayload(freshResult, {
+            browser_mode: "manual",
             discovery_queries: 1
           })).catch(() => {});
-          const recovered = attachAgentOutcomeHints({
+          return reply.send({
             ...freshResult,
             _recovery: {
               reason: "stale_endpoint_404",
               original_skill_id: skill_id,
               message: "Original endpoint returned 404. Auto-recovered with fresh capture."
             }
-          }, {
-            skill: freshResult.skill ?? skill,
-            endpointId: freshResult.trace.endpoint_id,
-            timing: freshResult.timing
-          });
-          return reply.send({
-            ...recovered
           });
         } catch {}
       }
       await recordAnalyticsSession(buildAnalyticsSessionPayload(execResult, {
-        discovery_queries: 0
+        browser_mode: "manual",
+        discovery_queries: 0,
+        cached_skill_calls: execResult.trace.endpoint_id ? 1 : 0,
+        fresh_index_calls: 0
       })).catch(() => {});
-      const response = attachAgentOutcomeHints({ ...execResult }, {
-        skill,
-        endpointId: execResult.trace.endpoint_id
-      });
-      return reply.send(response);
+      return reply.send(execResult);
     } catch (err) {
       return reply.code(500).send({ error: err.message });
     }
@@ -18886,71 +18830,6 @@ async function registerRoutes(app) {
     session.harActive = true;
     await injectInterceptor(session.tabId).catch(() => {});
   }
-  async function flushBrowseCapture(session, options = {}) {
-    let intercepted = [];
-    try {
-      const raw = await collectInterceptedRequests(session.tabId);
-      intercepted = raw.map((request) => ({
-        url: request.url,
-        method: request.method,
-        request_headers: request.request_headers ?? {},
-        request_body: request.request_body,
-        response_status: request.response_status,
-        response_headers: request.response_headers ?? {},
-        response_body: request.response_body,
-        timestamp: request.timestamp
-      }));
-    } catch {}
-    let harEntries = [];
-    if (session.harActive) {
-      try {
-        const { entries } = await harStop(session.tabId);
-        harEntries = entries;
-      } catch {}
-    }
-    session.harActive = false;
-    const allRequests = mergeBrowseRequests(intercepted, harEntries, session.url);
-    const syncResult = await cacheBrowseRequests({
-      sessionUrl: session.url,
-      sessionDomain: session.domain,
-      requests: allRequests,
-      getPageHtml: () => getPageHtml(session.tabId)
-    });
-    let backgroundPublishQueued = false;
-    if (options.queueBackgroundPublish) {
-      if (allRequests.length > 0) {
-        passiveIndexFromRequests(allRequests, session.url);
-        backgroundPublishQueued = true;
-      } else if (syncResult.skill) {
-        queueBackgroundIndex({
-          skill: { ...syncResult.skill },
-          domain: syncResult.domain,
-          intent: syncResult.skill.intent_signature || `browse ${syncResult.domain}`,
-          contextUrl: session.url,
-          cacheKey: `browse-submit:${syncResult.domain}:${Date.now()}`
-        });
-        backgroundPublishQueued = true;
-      }
-    }
-    return {
-      indexed: syncResult.indexed,
-      mode: syncResult.mode,
-      domain: syncResult.domain,
-      skill_id: syncResult.skill?.skill_id ?? null,
-      endpoint_count: syncResult.skill?.endpoints.length ?? 0,
-      endpoints: (syncResult.skill?.endpoints ?? []).map((endpoint) => ({
-        endpoint_id: endpoint.endpoint_id,
-        method: endpoint.method,
-        url_template: endpoint.url_template,
-        description: endpoint.description,
-        trigger_url: endpoint.trigger_url,
-        action_kind: endpoint.semantic?.action_kind,
-        resource_kind: endpoint.semantic?.resource_kind
-      })),
-      request_count: allRequests.length,
-      background_publish_queued: backgroundPublishQueued
-    };
-  }
   app.post("/v1/browse/go", async (req, reply) => {
     const { url } = req.body;
     if (!url)
@@ -19007,7 +18886,6 @@ async function registerRoutes(app) {
     const { session, result, recovered } = await withRecoveredBrowseSession(browseSessions, exports_client, injectInterceptor, async (session2) => submitBrowseForm({
       client: exports_client,
       session: session2,
-      flushCapture: async (session3) => await flushBrowseCapture(session3, { queueBackgroundPublish: true }),
       restartCapture: restartBrowseCapture,
       rehydratePlugins: bestEffortRehydratePlugins
     }, {
@@ -19020,10 +18898,8 @@ async function registerRoutes(app) {
     session.url = result.url || await getCurrentUrl(session.tabId).catch(() => session.url);
     session.domain = profileName(session.url);
     const statusCode = result.ok ? 200 : result.recoverable ? 502 : 400;
-    const nextStep = result.ok ? result.capture_sync?.background_publish_queued ? "Background publish queued for this step. Continue the flow, then run `unbrowse close` when you're done to save auth and finalize any remaining capture." : "If more UI steps remain, continue the flow. Run `unbrowse close` when you're done to save auth and finalize capture." : "Inspect the page state with `unbrowse snap --filter interactive`, then retry submit with selectors or a wait hint if needed.";
     return reply.code(statusCode).send({
       ...result,
-      next_step: nextStep,
       recovered,
       tab_id: session.tabId,
       url: session.url
@@ -19133,18 +19009,57 @@ async function registerRoutes(app) {
     const session = browseSessions.get("default");
     if (!session)
       return reply.send({ ok: false, error: "no active session" });
-    const syncResult = await flushBrowseCapture(session);
-    await restartBrowseCapture(session);
+    let intercepted = [];
+    try {
+      const raw = await collectInterceptedRequests(session.tabId);
+      intercepted = raw.map((request) => ({
+        url: request.url,
+        method: request.method,
+        request_headers: request.request_headers ?? {},
+        request_body: request.request_body,
+        response_status: request.response_status,
+        response_headers: request.response_headers ?? {},
+        response_body: request.response_body,
+        timestamp: request.timestamp
+      }));
+    } catch {}
+    let harEntries = [];
+    if (session.harActive) {
+      try {
+        const { entries } = await harStop(session.tabId);
+        harEntries = entries;
+      } catch {}
+    }
+    session.harActive = false;
+    const allRequests = mergeBrowseRequests(intercepted, harEntries, session.url);
+    const syncResult = await cacheBrowseRequests({
+      sessionUrl: session.url,
+      sessionDomain: session.domain,
+      requests: allRequests,
+      getPageHtml: () => getPageHtml(session.tabId)
+    });
+    await networkEnable(session.tabId).catch(() => {});
+    await harStart(session.tabId).catch(() => {});
+    await scriptInject(session.tabId, INTERCEPTOR_SCRIPT).catch(() => {});
+    session.harActive = true;
+    await injectInterceptor(session.tabId).catch(() => {});
     return reply.send({
       ok: true,
       tab_id: session.tabId,
       indexed: syncResult.indexed,
       mode: syncResult.mode,
       domain: syncResult.domain,
-      skill_id: syncResult.skill_id,
-      endpoint_count: syncResult.endpoint_count,
-      endpoints: syncResult.endpoints,
-      request_count: syncResult.request_count
+      skill_id: syncResult.skill?.skill_id ?? null,
+      endpoint_count: syncResult.skill?.endpoints.length ?? 0,
+      endpoints: (syncResult.skill?.endpoints ?? []).map((endpoint) => ({
+        endpoint_id: endpoint.endpoint_id,
+        method: endpoint.method,
+        url_template: endpoint.url_template,
+        description: endpoint.description,
+        trigger_url: endpoint.trigger_url,
+        action_kind: endpoint.semantic?.action_kind,
+        resource_kind: endpoint.semantic?.resource_kind
+      }))
     });
   });
   app.post("/v1/browse/close", async (_req, reply) => {
@@ -19154,16 +19069,42 @@ async function registerRoutes(app) {
     if (session.domain) {
       await authProfileSave(session.tabId, session.domain).catch(() => {});
     }
-    const syncResult = await flushBrowseCapture(session, { queueBackgroundPublish: true });
+    let intercepted = [];
+    try {
+      const raw = await collectInterceptedRequests(session.tabId);
+      intercepted = raw.map((r) => ({
+        url: r.url,
+        method: r.method,
+        request_headers: r.request_headers ?? {},
+        request_body: r.request_body,
+        response_status: r.response_status,
+        response_headers: r.response_headers ?? {},
+        response_body: r.response_body,
+        timestamp: r.timestamp
+      }));
+    } catch {}
+    let harEntries = [];
+    if (session.harActive) {
+      try {
+        const { entries } = await harStop(session.tabId);
+        harEntries = entries;
+      } catch {}
+    }
+    const allRequests = mergeBrowseRequests(intercepted, harEntries, session.url);
+    const syncResult = await cacheBrowseRequests({
+      sessionUrl: session.url,
+      sessionDomain: session.domain,
+      requests: allRequests,
+      getPageHtml: () => getPageHtml(session.tabId)
+    });
+    passiveIndexFromRequests(allRequests, session.url);
     await closeTab(session.tabId).catch(() => {});
     browseSessions.delete("default");
     return reply.send({
       ok: true,
       indexed: syncResult.indexed,
       mode: syncResult.mode,
-      endpoint_count: syncResult.endpoint_count,
-      request_count: syncResult.request_count,
-      background_publish_queued: syncResult.background_publish_queued,
+      endpoint_count: syncResult.skill?.endpoints.length ?? 0,
       auth_saved: session.domain || null
     });
   });
@@ -19190,7 +19131,6 @@ var init_routes = __esm(async () => {
   init_ratelimit();
   init_graph();
   init_session_logs();
-  init_agent_outcome();
   init_browse_session();
   init_browse_submit();
   await __promiseAll([
@@ -19247,7 +19187,7 @@ async function startUnbrowseServer(options = {}) {
   try {
     execSync2("pkill -f chrome-headless-shell", { stdio: "ignore" });
   } catch {}
-  await ensureRegistered2();
+  startBackgroundRegistration();
   const app = Fastify({ logger: options.logger ?? true });
   await app.register(cors, { origin: true });
   await registerRateLimiter(app);
@@ -19282,7 +19222,6 @@ var init_server = __esm(async () => {
 
 // ../../src/cli.ts
 import { config as loadEnv } from "dotenv";
-import { spawn as spawn3 } from "child_process";
 
 // ../../src/client/index.ts
 init_cascade();
@@ -19664,23 +19603,26 @@ Email for this agent (leave blank to use a local device id): `, resolve);
     rl.close();
   }
 }
-async function checkTosStatus() {
+async function checkTosStatus(options) {
+  const exitOnFailure = options?.exitOnFailure ?? true;
   const config = loadConfig();
   let tosInfo;
   try {
     tosInfo = await api("GET", "/v1/tos/current");
   } catch {
-    return;
+    return true;
   }
   if (config?.tos_accepted_version === tosInfo.version) {
-    return;
+    return true;
   }
   console.log(`
 The Unbrowse Terms of Service have been updated.`);
   const accepted = await promptTosAcceptance(tosInfo.summary, tosInfo.url);
   if (!accepted) {
     console.log("You must accept the updated Terms of Service to continue using Unbrowse.");
-    process.exit(1);
+    if (exitOnFailure)
+      process.exit(1);
+    return false;
   }
   try {
     await api("POST", "/v1/agents/accept-tos", { tos_version: tosInfo.version });
@@ -19693,16 +19635,20 @@ The Unbrowse Terms of Service have been updated.`);
   } catch (err) {
     console.warn(`Failed to record ToS acceptance: ${err.message}`);
   }
+  return true;
 }
 async function ensureRegistered(options) {
   if (LOCAL_ONLY)
     return;
+  const exitOnFailure = options?.exitOnFailure ?? true;
   const usableKey = await findUsableApiKey();
   if (usableKey) {
     if (usableKey.source === "config") {
       console.log("[unbrowse] Restored saved registration.");
     }
-    await checkTosStatus();
+    const accepted2 = await checkTosStatus({ exitOnFailure });
+    if (!accepted2)
+      return;
     try {
       const profile = await getMyProfile();
       const wallet = getLocalWalletContext();
@@ -19723,7 +19669,9 @@ async function ensureRegistered(options) {
   const accepted = await promptTosAcceptance(tosInfo.summary, tosInfo.url);
   if (!accepted) {
     console.log("You must accept the Terms of Service to use Unbrowse.");
-    process.exit(1);
+    if (exitOnFailure)
+      process.exit(1);
+    return;
   }
   const fallbackName = buildDefaultAgentName();
   const name = options?.promptForEmail ? await promptAgentEmail(fallbackName) : resolveAgentName(process.env.UNBROWSE_AGENT_EMAIL, fallbackName);
@@ -19751,7 +19699,8 @@ async function ensureRegistered(options) {
   } catch (err) {
     console.warn(`Registration failed: ${err.message}`);
     console.warn("Set UNBROWSE_API_KEY manually or try again.");
-    process.exit(1);
+    if (exitOnFailure)
+      process.exit(1);
   }
 }
 async function getMyProfile() {
@@ -20149,26 +20098,7 @@ async function restartServer(baseUrl, metaUrl) {
 // ../../src/runtime/paths.ts
 import { existsSync as existsSync13, mkdirSync as mkdirSync11, realpathSync as realpathSync2 } from "node:fs";
 import path7 from "node:path";
-import { createRequire as createRequire3 } from "node:module";
 import { fileURLToPath as fileURLToPath3, pathToFileURL as pathToFileURL2 } from "node:url";
-function resolveSiblingEntrypoint2(metaUrl, basename) {
-  const file = fileURLToPath3(metaUrl);
-  return path7.join(path7.dirname(file), `${basename}${path7.extname(file) || ".js"}`);
-}
-function runtimeArgsForEntrypoint2(metaUrl, entrypoint) {
-  if (path7.extname(entrypoint) !== ".ts")
-    return [entrypoint];
-  if (process.versions.bun)
-    return [entrypoint];
-  try {
-    const req = createRequire3(metaUrl);
-    const tsxPkg = req.resolve("tsx/package.json");
-    const tsxLoader = path7.join(path7.dirname(tsxPkg), "dist", "loader.mjs");
-    if (existsSync13(tsxLoader))
-      return ["--import", pathToFileURL2(tsxLoader).href, entrypoint];
-  } catch {}
-  return ["--import", "tsx", entrypoint];
-}
 function isMainModule(metaUrl) {
   const entry = process.argv[1];
   if (!entry)
@@ -20190,7 +20120,7 @@ await init_orchestrator();
 import { join as join13 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 var UNBROWSE_CONFIG_PATH2 = join13(homedir7(), ".unbrowse", "config.json");
-var SKILL_SNAPSHOT_DIR3 = join13(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
+var SKILL_SNAPSHOT_DIR3 = process.env.UNBROWSE_SKILL_SNAPSHOT_DIR ?? join13(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
 var indexInFlight2 = new Map;
 async function drainPendingIndexJobs() {
   const pending = [...indexInFlight2.values()];
@@ -20347,7 +20277,7 @@ async function runSetup(options) {
   const skipWalletSetup = process.env.UNBROWSE_SKIP_WALLET_SETUP === "1";
   const lobsterInstalled = hasBinary("lobstercash") || existsSync14(path8.join(os4.homedir(), ".agents", "skills", "lobstercash", "SKILL.md"));
   if (!skipWalletSetup && !walletCheck.configured && lobsterInstalled) {
-    console.log("[unbrowse] Crossmint lobster.cash detected but wallet not configured — running wallet setup...");
+    console.log("[unbrowse] lobster.cash skill detected but wallet not configured — running wallet setup...");
     try {
       execFileSync3("npx", ["@crossmint/lobster-cli", "setup"], {
         stdio: "inherit",
@@ -20358,15 +20288,15 @@ async function runSetup(options) {
         console.log(`[unbrowse] wallet configured (${recheck.provider})`);
       }
     } catch {
-      console.warn("[unbrowse] Crossmint lobster.cash setup failed or was skipped — continuing without wallet");
+      console.warn("[unbrowse] lobster.cash wallet setup failed or was skipped — continuing without wallet");
     }
   }
   const finalWalletCheck = checkWalletConfigured();
   const wallet = {
     ...finalWalletCheck,
     lobster_installed: lobsterInstalled,
-    message: finalWalletCheck.configured ? `Wallet configured (${finalWalletCheck.provider}). This address is the contributor truth: it is synced onto your agent profile, used for contributor payouts when your routes earn, and used for paid-route spending.` : lobsterInstalled ? "Crossmint lobster.cash is installed but not paired. Pair it now so this wallet address becomes your contributor payout target and your paid-route spending wallet. Run: npx @crossmint/lobster-cli setup" : "No wallet configured. Recommended for new installs: set up Crossmint lobster.cash so contributor payouts have a destination address and paid-route spending can clear automatically. Without it you stay in free indexing mode only.",
-    install_hint: finalWalletCheck.configured ? undefined : lobsterInstalled ? "npx @crossmint/lobster-cli setup" : "npx @crossmint/lobster-cli setup"
+    message: finalWalletCheck.configured ? `Wallet configured (${finalWalletCheck.provider}). This address is the contributor truth: it is synced onto your agent profile, used for contributor payouts when your routes earn, and used for paid-route spending.` : lobsterInstalled ? "lobster.cash installed but wallet not paired. Pair it now so this wallet address becomes your contributor payout target and your paid-route spending wallet. Run: lobstercash setup" : "No wallet configured. Install/pair a wallet so your contributor payouts have a destination address and premium-route spending can clear automatically. Without it you stay in free indexing mode only.",
+    install_hint: finalWalletCheck.configured ? undefined : lobsterInstalled ? "lobstercash setup" : "npx skills add https://github.com/Crossmint/lobstercash-cli-skills --global --yes"
   };
   return {
     os: {
@@ -20494,73 +20424,15 @@ function slimTrace(obj) {
     out.result = obj.result;
   if (obj.available_endpoints)
     out.available_endpoints = obj.available_endpoints;
-  if (obj.impact)
-    out.impact = obj.impact;
-  if (obj.next_actions)
-    out.next_actions = obj.next_actions;
-  if (obj.next_step)
-    out.next_step = obj.next_step;
   if (obj.source)
     out.source = obj.source;
   if (obj.skill)
     out.skill = obj.skill;
   return out;
 }
-function formatSavedDuration(ms) {
-  if (ms >= 60000)
-    return `${(ms / 60000).toFixed(1)}m`;
-  if (ms >= 1e4)
-    return `${Math.round(ms / 1000)}s`;
-  if (ms >= 1000)
-    return `${(ms / 1000).toFixed(1)}s`;
-  return `${ms}ms`;
-}
-function emitImpactSummary(result) {
-  const impact = result.impact;
-  if (!impact)
-    return;
-  const timeSavedMs = typeof impact.time_saved_ms === "number" ? impact.time_saved_ms : 0;
-  const tokensSaved = typeof impact.tokens_saved === "number" ? impact.tokens_saved : 0;
-  const timeSavedPct = typeof impact.time_saved_pct === "number" ? impact.time_saved_pct : 0;
-  const tokensSavedPct = typeof impact.tokens_saved_pct === "number" ? impact.tokens_saved_pct : 0;
-  const browserAvoided = impact.browser_avoided === true;
-  if (timeSavedMs <= 0 && tokensSaved <= 0 && !browserAvoided)
-    return;
-  const parts = [];
-  if (timeSavedMs > 0)
-    parts.push(`${formatSavedDuration(timeSavedMs)} saved (${timeSavedPct}% faster)`);
-  if (tokensSaved > 0)
-    parts.push(`${tokensSaved.toLocaleString("en-US")} tokens saved (${tokensSavedPct}% less context)`);
-  if (browserAvoided)
-    parts.push("browser avoided");
-  info(parts.join(" \u2022 "));
-}
-function emitNextActionSummary(result) {
-  const nextActions = Array.isArray(result.next_actions) ? result.next_actions : [];
-  if (nextActions.length === 0)
-    return;
-  info("Likely next actions:");
-  for (const action2 of nextActions.slice(0, 3)) {
-    const command = typeof action2.command === "string" ? action2.command : "";
-    const title = typeof action2.title === "string" ? action2.title : action2.endpoint_id ?? "next step";
-    const why = typeof action2.why === "string" ? action2.why : "";
-    info(`  ${command || title}${why ? `  # ${why}` : ""}`);
-  }
-}
 async function cmdHealth(flags) {
   output(await api3("GET", "/health"), !!flags.pretty);
 }
-function telemetryDomainFromInput(domain, url) {
-  if (domain?.trim())
-    return domain.trim().replace(/^www\./, "");
-  if (!url?.trim())
-    return null;
-  try {
-    return new URL(url).hostname.replace(/^www\./, "");
-  } catch {
-    return null;
-  }
-}
 async function cmdResolve(flags) {
   const intent = flags.intent;
   if (!intent)
@@ -20577,9 +20449,6 @@ async function cmdResolve(flags) {
     hostType,
     properties: {
       command: "resolve",
-      intent,
-      domain: telemetryDomainFromInput(flags.domain, flags.url),
-      url: typeof flags.url === "string" ? flags.url : null,
       has_url: typeof flags.url === "string",
       has_domain: typeof flags.domain === "string",
       auto_execute: !!flags.execute
@@ -20706,9 +20575,6 @@ async function cmdResolve(flags) {
         hostType,
         properties: {
           command: "resolve",
-          intent,
-          domain: telemetryDomainFromInput(domain, url),
-          url: url ?? null,
           source: result.source,
           auto_execute: autoExecute,
           explicit_endpoint: explicitEndpointId ?? null
@@ -20716,8 +20582,6 @@ async function cmdResolve(flags) {
       });
     }
     result = slimTrace(result);
-    emitImpactSummary(result);
-    emitNextActionSummary(result);
     const skill = result.skill;
     const trace = result.trace;
     if (skill?.skill_id && trace) {
@@ -20731,9 +20595,6 @@ async function cmdResolve(flags) {
       hostType,
       properties: {
         command: "resolve",
-        intent,
-        domain: telemetryDomainFromInput(flags.domain, flags.url),
-        url: typeof flags.url === "string" ? flags.url : null,
         failure_stage: "resolve",
         failure_reason: message
       }
@@ -20832,9 +20693,6 @@ async function cmdExecute(flags) {
     hostType,
     properties: {
       command: "execute",
-      intent: typeof flags.intent === "string" ? flags.intent : null,
-      domain: telemetryDomainFromInput(undefined, flags.url),
-      url: typeof flags.url === "string" ? flags.url : null,
       skill_id: skillId,
       endpoint_id: typeof flags.endpoint === "string" ? flags.endpoint : null
     }
@@ -20865,17 +20723,12 @@ async function cmdExecute(flags) {
         hostType,
         properties: {
           command: "execute",
-          intent: typeof flags.intent === "string" ? flags.intent : null,
-          domain: telemetryDomainFromInput(undefined, flags.url),
-          url: typeof flags.url === "string" ? flags.url : null,
           skill_id: skillId,
           endpoint_id: typeof flags.endpoint === "string" ? flags.endpoint : null
         }
       });
     }
     result = slimTrace(result);
-    emitImpactSummary(result);
-    emitNextActionSummary(result);
     const pathFlag = flags.path;
     const extractFlag = flags.extract;
     const limitFlag = flags.limit ? Number(flags.limit) : undefined;
@@ -20883,12 +20736,7 @@ async function cmdExecute(flags) {
     const rawFlag = !!flags.raw;
     if (schemaFlag && !rawFlag) {
       const data = result.result;
-      output({
-        trace: result.trace,
-        schema: schemaOf(data),
-        ...result.impact ? { impact: result.impact } : {},
-        ...result.next_actions ? { next_actions: result.next_actions } : {}
-      }, !!flags.pretty);
+      output({ trace: result.trace, schema: schemaOf(data) }, !!flags.pretty);
       return;
     }
     if (!rawFlag && (pathFlag || extractFlag || limitFlag)) {
@@ -20897,13 +20745,7 @@ async function cmdExecute(flags) {
       const extracted = extractFlag ? applyExtract(items, extractFlag) : items;
       const limited = limitFlag ? extracted.slice(0, limitFlag) : extracted;
       const trace = result.trace;
-      const out = {
-        trace: result.trace,
-        data: limited,
-        count: limited.length,
-        ...result.impact ? { impact: result.impact } : {},
-        ...result.next_actions ? { next_actions: result.next_actions } : {}
-      };
+      const out = { trace: result.trace, data: limited, count: limited.length };
       if (trace?.skill_id && trace?.endpoint_id && limited.length > 0) {
         out._review_hint = `After presenting results, improve this endpoint's description: unbrowse review --skill ${trace.skill_id} --endpoints '[{"endpoint_id":"${trace.endpoint_id}","description":"DESCRIBE WHAT THIS RETURNS","action_kind":"ACTION","resource_kind":"RESOURCE"}]'`;
       }
@@ -20916,8 +20758,6 @@ async function cmdExecute(flags) {
         const schema = schemaOf(result.result);
         output({
           trace: result.trace,
-          ...result.impact ? { impact: result.impact } : {},
-          ...result.next_actions ? { next_actions: result.next_actions } : {},
           extraction_hints: {
             message: "Response is large. Use --path/--extract/--limit to filter, or --schema to see structure, or --raw for full response.",
             schema_tree: schema,
@@ -20935,9 +20775,6 @@ async function cmdExecute(flags) {
       hostType,
       properties: {
         command: "execute",
-        intent: typeof flags.intent === "string" ? flags.intent : null,
-        domain: telemetryDomainFromInput(undefined, flags.url),
-        url: typeof flags.url === "string" ? flags.url : null,
         skill_id: skillId,
         failure_stage: "execute",
         failure_reason: message
@@ -21013,53 +20850,7 @@ async function cmdSearch(flags) {
   const body = { intent, k: Number(flags.k) || 5 };
   if (domain)
     body.domain = domain;
-  const hostType = detectTelemetryHostType();
-  await ensureCliInstallTracked(hostType);
-  await recordFunnelTelemetryEvent("cli_invoked", {
-    source: "cli",
-    hostType,
-    properties: { command: "search" }
-  });
-  await recordFunnelTelemetryEvent("search_started", {
-    source: "cli",
-    hostType,
-    properties: {
-      command: "search",
-      intent,
-      domain: domain ?? null,
-      k: body.k
-    }
-  });
-  try {
-    const result = await api3("POST", path9, body);
-    const results = Array.isArray(result.results) ? result.results : [];
-    await recordFunnelTelemetryEvent("search_completed", {
-      source: "cli",
-      hostType,
-      properties: {
-        command: "search",
-        intent,
-        domain: domain ?? null,
-        k: body.k,
-        result_count: results.length
-      }
-    });
-    output(result, !!flags.pretty);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    await recordFunnelTelemetryEvent("search_failed", {
-      source: "cli",
-      hostType,
-      properties: {
-        command: "search",
-        intent,
-        domain: domain ?? null,
-        failure_stage: "search",
-        failure_reason: message
-      }
-    });
-    throw error;
-  }
+  output(await api3("POST", path9, body), !!flags.pretty);
 }
 async function cmdSessions(flags) {
   const domain = flags.domain;
@@ -21150,7 +20941,6 @@ async function cmdSetup(flags) {
 var CLI_REFERENCE = {
   commands: [
     { name: "health", usage: "", desc: "Server health check" },
-    { name: "mcp", usage: "[--no-auto-start]", desc: "Run the stdio MCP server" },
     { name: "setup", usage: "[--opencode auto|global|project|off] [--no-start]", desc: "Bootstrap browser deps + Open Code command" },
     { name: "resolve", usage: '--intent "..." --url "..." [opts]', desc: "Resolve intent \u2192 search/capture/execute" },
     { name: "execute", usage: "--skill ID --endpoint ID [opts]", desc: "Execute a specific endpoint" },
@@ -21163,7 +20953,7 @@ var CLI_REFERENCE = {
     { name: "search", usage: '--intent "..." [--domain "..."]', desc: "Search marketplace" },
     { name: "sessions", usage: '--domain "..." [--limit N]', desc: "Debug session logs" },
     { name: "go", usage: "<url>", desc: "Open a live Kuri browser tab for capture-first workflows" },
-    { name: "submit", usage: "[--form-selector sel] [--submit-selector sel] [--wait-for hint]", desc: "Submit current form, auto-flush current capture, and fall back to same-origin rehydrate for JS-heavy flows" },
+    { name: "submit", usage: "[--form-selector sel] [--submit-selector sel] [--wait-for hint]", desc: "Submit current form with DOM-first + same-origin rehydrate fallback for JS-heavy flows" },
     { name: "snap", usage: "[--filter interactive]", desc: "A11y snapshot with @eN refs" },
     { name: "click", usage: "<ref>", desc: "Click element by ref (e.g. e5)" },
     { name: "fill", usage: "<ref> <value>", desc: "Fill input by ref" },
@@ -21200,7 +20990,6 @@ var CLI_REFERENCE = {
   ],
   examples: [
     "unbrowse setup",
-    "unbrowse mcp",
     'unbrowse resolve --intent "top stories" --url "https://news.ycombinator.com" --execute',
     'unbrowse resolve --intent "get timeline" --url "https://x.com"',
     'unbrowse go "https://www.mandai.com/en/ticketing/admission-and-rides/parks-selection.html"',
@@ -21239,7 +21028,7 @@ function printHelp() {
   for (const e of r.examples) {
     lines.push(`  ${e}`);
   }
-  lines.push("", "Browser workflow:", "  1. go -> open the live tab you want to work in", "  2. snap -> inspect refs and confirm the page state", "  3. click/fill/eval -> set real page state", "  4. submit -> prefer DOM submit; auto-flush current capture; fall back to same-origin rehydrate", "  5. sync -> flush any additional captured routes after a successful step", "  6. close -> finish capture + indexing");
+  lines.push("", "Browser workflow:", "  1. go -> open the live tab you want to work in", "  2. snap -> inspect refs and confirm the page state", "  3. click/fill/eval -> set real page state", "  4. submit -> prefer DOM submit; auto-falls back to same-origin rehydrate", "  5. sync -> flush captured routes after a successful step", "  6. close -> finish capture + indexing");
   lines.push("", "JS-heavy forms:", "  Prefer real calendar/time clicks before submit.", "  If the UI is flaky, inspect hidden inputs/cookies with eval, then submit the real form.");
   lines.push("");
   process.stderr.write(lines.join(`
@@ -21285,29 +21074,6 @@ async function cmdUpgrade(flags) {
     info(`Could not check for updates: ${err.message}`);
   }
 }
-async function cmdMcp(flags) {
-  const entrypoint = resolveSiblingEntrypoint2(import.meta.url, "mcp");
-  const child = spawn3(process.execPath, [...runtimeArgsForEntrypoint2(import.meta.url, entrypoint), ...flags["no-auto-start"] ? ["--no-auto-start"] : []], {
-    cwd: process.cwd(),
-    stdio: "inherit",
-    env: {
-      ...process.env,
-      MCP_SERVER_MODE: "1"
-    }
-  });
-  const code = await new Promise((resolve, reject) => {
-    child.once("error", reject);
-    child.once("exit", (exitCode, signal) => {
-      if (signal) {
-        process.kill(process.pid, signal);
-        return;
-      }
-      resolve(exitCode ?? 1);
-    });
-  });
-  if (code !== 0)
-    process.exit(code);
-}
 async function cmdSiteHelp(pack, flags) {
   if (flags.deps) {
     const graph = buildDepsGraph(pack);
@@ -21579,8 +21345,6 @@ async function main() {
     await cmdSetup(flags);
     return;
   }
-  if (command === "mcp")
-    return cmdMcp(flags);
   if (command === "status")
     return cmdStatus(flags);
   if (command === "stop") {
@@ -21595,7 +21359,6 @@ async function main() {
     return cmdConnectChrome();
   const KNOWN_COMMANDS = new Set([
     "health",
-    "mcp",
     "setup",
     "resolve",
     "execute",
@@ -21656,8 +21419,6 @@ async function main() {
   switch (command) {
     case "health":
       return cmdHealth(flags);
-    case "mcp":
-      return cmdMcp(flags);
     case "setup":
       return cmdSetup(flags);
     case "resolve":