unbrowse 2.12.0 → 2.12.2

package/runtime-src/cli.ts

@@ -8,7 +8,6 @@
  */
 
 import { config as loadEnv } from "dotenv";
-import { spawn } from "node:child_process";
 import {
   detectTelemetryHostType,
   ensureCliInstallTracked,
@@ -19,7 +18,7 @@ import {
 } from "./client/index.js";
 import { findSitePack, findTask, allSitePacks, buildDepsGraph, planExecution, buildDepsMetadata, type SitePack } from "./cli/shortcuts.js";
 import { ensureLocalServer, checkServerVersion, stopServer, restartServer } from "./runtime/local-server.js";
-import { isMainModule, resolveSiblingEntrypoint, runtimeArgsForEntrypoint } from "./runtime/paths.js";
+import { isMainModule } from "./runtime/paths.js";
 import { drainPendingIndexJobs } from "./indexer/index.js";
 import { drainPendingPassivePublishes } from "./orchestrator/passive-publish.js";
 import { runSetup, type SetupReport, type SetupScope } from "./runtime/setup.js";
@@ -156,68 +155,16 @@ function slimTrace(obj: Record<string, unknown>): Record<string, unknown> {
   };
   if ("result" in 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: number): string {
-  if (ms >= 60_000) return `${(ms / 60_000).toFixed(1)}m`;
-  if (ms >= 10_000) return `${Math.round(ms / 1000)}s`;
-  if (ms >= 1000) return `${(ms / 1000).toFixed(1)}s`;
-  return `${ms}ms`;
-}
-
-function emitImpactSummary(result: Record<string, unknown>): void {
-  const impact = result.impact as Record<string, unknown> | undefined;
-  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: string[] = [];
-  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(" • "));
-}
-
-function emitNextActionSummary(result: Record<string, unknown>): void {
-  const nextActions = Array.isArray(result.next_actions)
-    ? result.next_actions as Array<Record<string, unknown>>
-    : [];
-  if (nextActions.length === 0) return;
-  info("Likely next actions:");
-  for (const action of nextActions.slice(0, 3)) {
-    const command = typeof action.command === "string" ? action.command : "";
-    const title = typeof action.title === "string" ? action.title : (action.endpoint_id as string | undefined) ?? "next step";
-    const why = typeof action.why === "string" ? action.why : "";
-    info(`  ${command || title}${why ? `  # ${why}` : ""}`);
-  }
-}
-
 
 async function cmdHealth(flags: Record<string, string | boolean>): Promise<void> {
   output(await api("GET", "/health"), !!flags.pretty);
 }
 
-function telemetryDomainFromInput(domain?: string, url?: string): string | null {
-  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: Record<string, string | boolean>): Promise<void> {
   const intent = flags.intent as string;
   if (!intent) die("--intent is required");
@@ -233,9 +180,6 @@ async function cmdResolve(flags: Record<string, string | boolean>): Promise<void
     hostType,
     properties: {
       command: "resolve",
-      intent,
-      domain: telemetryDomainFromInput(flags.domain as string | undefined, flags.url as string | undefined),
-      url: typeof flags.url === "string" ? flags.url : null,
       has_url: typeof flags.url === "string",
       has_domain: typeof flags.domain === "string",
       auto_execute: !!flags.execute,
@@ -392,9 +336,6 @@ async function cmdResolve(flags: Record<string, string | boolean>): Promise<void
         hostType,
         properties: {
           command: "resolve",
-          intent,
-          domain: telemetryDomainFromInput(domain, url),
-          url: url ?? null,
           source: result.source,
           auto_execute: autoExecute,
           explicit_endpoint: explicitEndpointId ?? null,
@@ -403,8 +344,6 @@ async function cmdResolve(flags: Record<string, string | boolean>): Promise<void
     }
 
     result = slimTrace(result);
-    emitImpactSummary(result);
-    emitNextActionSummary(result);
 
     const skill = result.skill as Record<string, unknown> | undefined;
     const trace = result.trace as Record<string, unknown> | undefined;
@@ -420,9 +359,6 @@ async function cmdResolve(flags: Record<string, string | boolean>): Promise<void
       hostType,
       properties: {
         command: "resolve",
-        intent,
-        domain: telemetryDomainFromInput(flags.domain as string | undefined, flags.url as string | undefined),
-        url: typeof flags.url === "string" ? flags.url : null,
         failure_stage: "resolve",
         failure_reason: message,
       },
@@ -533,9 +469,6 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
     hostType,
     properties: {
       command: "execute",
-      intent: typeof flags.intent === "string" ? flags.intent : null,
-      domain: telemetryDomainFromInput(undefined, flags.url as string | undefined),
-      url: typeof flags.url === "string" ? flags.url : null,
       skill_id: skillId,
       endpoint_id: typeof flags.endpoint === "string" ? flags.endpoint : null,
     },
@@ -569,9 +502,6 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
         hostType,
         properties: {
           command: "execute",
-          intent: typeof flags.intent === "string" ? flags.intent : null,
-          domain: telemetryDomainFromInput(undefined, flags.url as string | undefined),
-          url: typeof flags.url === "string" ? flags.url : null,
           skill_id: skillId,
           endpoint_id: typeof flags.endpoint === "string" ? flags.endpoint : null,
         },
@@ -580,8 +510,6 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
 
     // Strip metadata bloat
     result = slimTrace(result);
-    emitImpactSummary(result);
-    emitNextActionSummary(result);
 
     const pathFlag = flags.path as string | undefined;
     const extractFlag = flags.extract as string | undefined;
@@ -592,12 +520,7 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
     // --schema: show response structure without data
     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;
     }
 
@@ -615,13 +538,7 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
       const limited = limitFlag ? extracted.slice(0, limitFlag) : extracted;
 
       const trace = result.trace as Record<string, unknown> | undefined;
-      const out: Record<string, unknown> = {
-        trace: result.trace,
-        data: limited,
-        count: limited.length,
-        ...(result.impact ? { impact: result.impact } : {}),
-        ...(result.next_actions ? { next_actions: result.next_actions } : {}),
-      };
+      const out: Record<string, unknown> = { trace: result.trace, data: limited, count: limited.length };
 
       // Prompt agent to review when this is likely a first-time execute
       if (trace?.skill_id && trace?.endpoint_id && limited.length > 0) {
@@ -639,8 +556,6 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
         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,
@@ -659,9 +574,6 @@ async function cmdExecute(flags: Record<string, string | boolean>): Promise<void
       hostType,
       properties: {
         command: "execute",
-        intent: typeof flags.intent === "string" ? flags.intent : null,
-        domain: telemetryDomainFromInput(undefined, flags.url as string | undefined),
-        url: typeof flags.url === "string" ? flags.url : null,
         skill_id: skillId,
         failure_stage: "execute",
         failure_reason: message,
@@ -736,53 +648,7 @@ async function cmdSearch(flags: Record<string, string | boolean>): Promise<void>
   const path = domain ? "/v1/search/domain" : "/v1/search";
   const body: Record<string, unknown> = { 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 api("POST", path, body) as Record<string, unknown>;
-    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 api("POST", path, body), !!flags.pretty);
 }
 
 async function cmdSessions(flags: Record<string, string | boolean>): Promise<void> {
@@ -891,7 +757,6 @@ async function cmdSetup(flags: Record<string, string | boolean>): Promise<void>
 export const 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 → search/capture/execute" },
     { name: "execute", usage: "--skill ID --endpoint ID [opts]", desc: "Execute a specific endpoint" },
@@ -904,7 +769,7 @@ export const 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" },
@@ -941,7 +806,6 @@ export const 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"',
@@ -996,8 +860,8 @@ function printHelp(): void {
     "  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",
+    "  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",
   );
 
@@ -1059,35 +923,6 @@ async function cmdUpgrade(flags: Record<string, string | boolean>): Promise<void
   }
 }
 
-async function cmdMcp(flags: Record<string, string | boolean>): Promise<void> {
-  const entrypoint = resolveSiblingEntrypoint(import.meta.url, "mcp");
-  const child = spawn(
-    process.execPath,
-    [...runtimeArgsForEntrypoint(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<number>((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);
-}
-
 // ---------------------------------------------------------------------------
 // Site/task shortcut commands
 // ---------------------------------------------------------------------------
@@ -1415,7 +1250,6 @@ async function main(): Promise<void> {
   }
 
   // Server lifecycle commands (don't need ensureLocalServer)
-  if (command === "mcp") return cmdMcp(flags);
   if (command === "status") return cmdStatus(flags);
   if (command === "stop") { cmdStop(flags); return; }
   if (command === "restart") return cmdRestart(flags);
@@ -1424,7 +1258,7 @@ async function main(): Promise<void> {
 
   // --- Shortcut resolution: unbrowse <site> [task] [flags] ---
   const KNOWN_COMMANDS = new Set([
-    "health", "mcp", "setup", "resolve", "execute", "exec",
+    "health", "setup", "resolve", "execute", "exec",
     "feedback", "fb", "review", "publish", "login", "skills", "skill", "search", "sessions",
     "status", "stop", "restart", "upgrade", "update",
     "go", "submit", "snap", "click", "fill", "type", "press", "select", "scroll",
@@ -1455,7 +1289,6 @@ async function main(): Promise<void> {
 
   switch (command) {
     case "health": return cmdHealth(flags);
-    case "mcp": return cmdMcp(flags);
     case "setup": return cmdSetup(flags);
     case "resolve": return cmdResolve(flags);
     case "execute": case "exec": return cmdExecute(flags);

package/runtime-src/client/index.ts

@@ -518,7 +518,8 @@ async function promptAgentEmail(defaultName: string): Promise<string> {
   }
 }
 
-async function checkTosStatus(): Promise<void> {
+async function checkTosStatus(options?: { exitOnFailure?: boolean }): Promise<boolean> {
+  const exitOnFailure = options?.exitOnFailure ?? true;
   const config = loadConfig();
 
   let tosInfo: { version: string; summary: string; url: string };
@@ -527,11 +528,11 @@ async function checkTosStatus(): Promise<void> {
   } catch {
     // Offline — allow usage with whatever ToS was previously accepted.
     // Backend will enforce on next actual API call anyway.
-    return;
+    return true;
   }
 
   if (config?.tos_accepted_version === tosInfo.version) {
-    return; // Already accepted current version
+    return true; // Already accepted current version
   }
 
   // Need re-acceptance
@@ -539,7 +540,8 @@ async function checkTosStatus(): Promise<void> {
   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;
   }
 
   // Call accept-tos endpoint
@@ -557,17 +559,20 @@ async function checkTosStatus(): Promise<void> {
     console.warn(`Failed to record ToS acceptance: ${(err as Error).message}`);
     // Don't block — backend will enforce on next call
   }
+  return true;
 }
 
 /** Auto-register with the backend if no API key is configured. Persists to ~/.unbrowse/config.json. */
-export async function ensureRegistered(options?: { promptForEmail?: boolean }): Promise<void> {
+export async function ensureRegistered(options?: { promptForEmail?: boolean; exitOnFailure?: boolean }): Promise<void> {
   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 accepted = await checkTosStatus({ exitOnFailure });
+    if (!accepted) return;
     try {
       const profile = await getMyProfile();
       const wallet = getLocalWalletContext();
@@ -592,7 +597,8 @@ export async function ensureRegistered(options?: { promptForEmail?: boolean }):
   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;
   }
 
   // Step 3: Register with ToS version
@@ -628,8 +634,38 @@ export async function ensureRegistered(options?: { promptForEmail?: boolean }):
   } catch (err) {
     console.warn(`Registration failed: ${(err as Error).message}`);
     console.warn("Set UNBROWSE_API_KEY manually or try again.");
-    process.exit(1);
+    if (exitOnFailure) process.exit(1);
+  }
+}
+
+let backgroundRegistrationPromise: Promise<void> | null = null;
+
+export function startBackgroundRegistration(options?: { promptForEmail?: boolean }): Promise<void> {
+  if (LOCAL_ONLY) return Promise.resolve();
+  if (backgroundRegistrationPromise) return backgroundRegistrationPromise;
+  backgroundRegistrationPromise = ensureRegistered({
+    promptForEmail: options?.promptForEmail,
+    exitOnFailure: false,
+  })
+    .catch((err) => {
+      console.warn(`[unbrowse] Background registration failed: ${(err as Error).message}`);
+    })
+    .finally(() => {
+      backgroundRegistrationPromise = null;
+    });
+  return backgroundRegistrationPromise;
+}
+
+export async function waitForBackgroundRegistration(timeoutMs = 0): Promise<void> {
+  if (!backgroundRegistrationPromise) return;
+  if (timeoutMs <= 0) {
+    await backgroundRegistrationPromise;
+    return;
   }
+  await Promise.race([
+    backgroundRegistrationPromise,
+    new Promise<void>((resolve) => setTimeout(resolve, timeoutMs)),
+  ]);
 }
 
 // --- Skill CRUD ---
@@ -950,13 +986,6 @@ export interface AnalyticsSessionPayload {
   cached_skill_calls?: number;
   fresh_index_calls?: number;
   browser_mode?: "default" | "replaced" | "manual" | "unknown";
-  success?: boolean;
-  source?: string;
-  time_saved_ms?: number;
-  time_saved_pct?: number;
-  tokens_saved?: number;
-  tokens_saved_pct?: number;
-  cost_saved_uc?: number;
 }
 
 /**

package/runtime-src/execution/index.ts

@@ -1899,14 +1899,9 @@ export async function executeEndpoint(
     }
   }
 
-  const hasAuthContext =
-    cookies.length > 0 ||
-    Object.keys(authHeaders).length > 0 ||
-    !!skill.auth_profile_ref ||
-    endpoint.semantic?.auth_required === true;
 
   // robots.txt compliance gate — block disallowed paths before any network call.
-  if (!options?.skip_robots_check && !hasAuthContext) {
+  if (!options?.skip_robots_check) {
     const allowed = await isAllowedByRobots(url);
     if (!allowed) {
       const traceId = nanoid();

package/runtime-src/indexer/index.ts

@@ -17,6 +17,8 @@ import { join } from "node:path";
 import { homedir } from "node:os";
 
 const UNBROWSE_CONFIG_PATH = join(homedir(), ".unbrowse", "config.json");
+const SKILL_SNAPSHOT_DIR = process.env.UNBROWSE_SKILL_SNAPSHOT_DIR
+  ?? join(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
 
 /** Read agent_id from local config — used for contributor attribution on publish. */
 function getLocalAgentId(): string | undefined {
@@ -283,10 +285,6 @@ export function mergeAgentReview(
     };
   });
 }
-
-
-const SKILL_SNAPSHOT_DIR = join(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
-
 /**
  * Find existing domain snapshots and merge incoming endpoints into them.
  * Returns a merged skill with all endpoints from both existing snapshots

package/runtime-src/kuri/client.ts

@@ -549,6 +549,32 @@ async function waitForTabRegistration(tabId: string, timeoutMs = 2_000): Promise
   }
 }
 
+async function createTabViaChromeCdp(url = "about:blank"): Promise<string> {
+  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() as { id?: string; targetId?: string };
+    return target?.id ?? target?.targetId ?? "";
+  } catch (err) {
+    log("kuri", `Chrome tab creation failed: ${err instanceof Error ? err.message : err}`);
+    return "";
+  }
+}
+
+async function findReusableIdleTab(): Promise<string> {
+  await ensureTabsDiscovered();
+  try {
+    const tabs = (await kuriGet("/tabs")) as Array<{ id?: string; url?: string }>;
+    const candidate = tabs.find((tab) => /^(about:blank|chrome:\/\/newtab\/?)$/i.test(tab?.url ?? ""));
+    return candidate?.id ?? "";
+  } catch {
+    return "";
+  }
+}
+
 /** Navigate tab to URL. */
 export async function navigate(tabId: string, url: string): Promise<void> {
   await kuriGet("/navigate", { tab_id: tabId, url });
@@ -771,8 +797,15 @@ export async function closeTab(tabId: string): Promise<void> {
 export async function newTab(url?: string): Promise<string> {
   const params: Record<string, string> = {};
   if (url) params.url = url;
-  const result = (await kuriGet("/tab/new", params)) as { tab_id?: string };
-  const tabId = result?.tab_id ?? "";
+  let tabId = "";
+  try {
+    const result = (await kuriGet("/tab/new", params)) as { tab_id?: string; id?: string; targetId?: string };
+    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(() => {});
   }

package/runtime-src/orchestrator/index.ts

@@ -128,7 +128,8 @@ const skillRouteCache = new Map<
   { skillId: string; domain: string; endpointId?: string; localSkillPath?: string; ts: number }
 >();
 const ROUTE_CACHE_FILE = join(process.env.HOME ?? "/tmp", ".unbrowse", "route-cache.json");
-const SKILL_SNAPSHOT_DIR = join(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
+const SKILL_SNAPSHOT_DIR = process.env.UNBROWSE_SKILL_SNAPSHOT_DIR
+  ?? join(process.env.HOME ?? "/tmp", ".unbrowse", "skill-snapshots");
 
 // Domain-level skill cache: maps domain → best skillId (independent of intent/URL)
 // This enables cross-intent reuse: "find keyboards" seeds cache, "find monitors" reuses it
@@ -1953,7 +1954,6 @@ export async function resolveAndExecute(
       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,

package/runtime-src/reverse-engineer/index.ts

@@ -1155,15 +1155,7 @@ function templatizePathSegments(
         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)) {

package/runtime-src/runtime/setup.ts

@@ -197,9 +197,9 @@ export async function runSetup(options?: {
   const lobsterInstalled = hasBinary("lobstercash") ||
     existsSync(path.join(os.homedir(), ".agents", "skills", "lobstercash", "SKILL.md"));
 
-  // Auto-setup Crossmint lobster.cash if the wallet tooling is already present.
+  // Auto-setup lobster.cash wallet if skill is installed but wallet not configured
   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 {
       execFileSync("npx", ["@crossmint/lobster-cli", "setup"], {
         stdio: "inherit",
@@ -211,7 +211,7 @@ export 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");
     }
   }
 
@@ -223,13 +223,13 @@ export async function runSetup(options?: {
     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.",
+        ? "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
-        ? "npx @crossmint/lobster-cli setup"
-        : "npx @crossmint/lobster-cli setup",
+        ? "lobstercash setup"
+        : "npx skills add https://github.com/Crossmint/lobstercash-cli-skills --global --yes",
   };
 
   return {

package/runtime-src/server.ts

@@ -6,7 +6,7 @@ import cors from "@fastify/cors";
 import { registerRoutes } from "./api/routes.js";
 import { registerRateLimiter } from "./ratelimit/index.js";
 import { schedulePeriodicVerification } from "./verification/index.js";
-import { ensureRegistered } from "./client/index.js";
+import { startBackgroundRegistration } from "./client/index.js";
 import { shutdownAllBrowsers } from "./capture/index.js";
 import * as kuri from "./kuri/client.js";
 
@@ -63,8 +63,9 @@ export async function startUnbrowseServer(options: StartServerOptions = {}): Pro
 
   // Kuri starts on demand when browse/capture commands need it.
   // No eager start — avoids launching Chrome on every server restart.
-
-  await ensureRegistered();
+  // Registration is allowed to finish in the background so /health is not
+  // blocked by remote Worker latency during server bootstrap.
+  void startBackgroundRegistration();
 
   const app = Fastify({ logger: options.logger ?? true });
   await app.register(cors, { origin: true });