unbrowse 2.0.23 → 2.1.2

package/README.md

@@ -122,11 +122,13 @@ Put that in:
 ```bash
 unbrowse health
 unbrowse resolve --intent "get trending searches" --url "https://google.com" --pretty
-unbrowse login --url "https://calendar.google.com"
+unbrowse login --url "https://calendar.google.com" --browser chrome
 unbrowse skills
 unbrowse search --intent "get stock prices"
 ```
 
+`unbrowse login` reuses cookies from a supported local browser profile. On macOS, pass `--browser chrome|arc|dia|brave|edge|vivaldi|chromium|firefox` if your default browser is Safari or another unsupported app.
+
 ## Demo notes
 
 - First-time capture/indexing on a site can take 20-80 seconds. That is the slow path; repeats should be much faster.

package/dist/cli.js

@@ -707,7 +707,7 @@ function readProcessCommand(pid) {
 }
 function isLikelyUnbrowseServerProcess(pid) {
   const command = readProcessCommand(pid);
-  return /\bunbrowse\b|runtime-src\/index\.ts|src\/index\.ts|dist\/index\.js/i.test(command);
+  return /\bunbrowse\b|runtime-src\/(index|supervisor)\.ts|src\/(index|supervisor)\.ts|dist\/(index|supervisor)\.js/i.test(command);
 }
 async function stopManagedServer(pid, pidFile, baseUrl) {
   try {
@@ -737,15 +737,32 @@ function isStartupLockStale(lockFile) {
     return true;
   }
 }
+function shouldReclaimStartupLock(lockFile, pidFile) {
+  if (!isStartupLockStale(lockFile))
+    return false;
+  const owner = readPidState(pidFile);
+  const ownerAlive = owner?.pid ? isPidAlive(owner.pid) : false;
+  return !ownerAlive;
+}
 function deriveListenEnv(baseUrl) {
   const url = new URL(baseUrl);
   const host = !url.hostname || url.hostname === "localhost" ? "127.0.0.1" : url.hostname;
   const port = url.port || (url.protocol === "https:" ? "443" : "80");
   return { HOST: host, PORT: port, UNBROWSE_URL: baseUrl };
 }
+function describeListenTarget(baseUrl) {
+  const url = new URL(baseUrl);
+  const host = !url.hostname || url.hostname === "localhost" ? "127.0.0.1" : url.hostname;
+  const port = url.port || (url.protocol === "https:" ? "443" : "80");
+  return `${host}:${port}`;
+}
 async function ensureLocalServer(baseUrl, noAutoStart, metaUrl) {
   const pidFile = getServerPidFile(baseUrl);
   const startupLockFile = `${pidFile}.lock`;
+  if (shouldReclaimStartupLock(startupLockFile, pidFile)) {
+    clearStalePidFile(pidFile);
+    clearStaleStartupLockFile(startupLockFile);
+  }
   let existing = readPidState(pidFile);
   const health = await getServerHealth(baseUrl);
   if (health.ok) {
@@ -784,6 +801,11 @@ async function ensureLocalServer(baseUrl, noAutoStart, metaUrl) {
     startupLockFd = openSync(startupLockFile, "wx");
   } catch (error) {
     if (error.code === "EEXIST") {
+      if (shouldReclaimStartupLock(startupLockFile, pidFile)) {
+        clearStalePidFile(pidFile);
+        clearStaleStartupLockFile(startupLockFile);
+        return ensureLocalServer(baseUrl, noAutoStart, metaUrl);
+      }
       if (await waitForHealthy(baseUrl, 30000))
         return;
       const owner = readPidState(pidFile);
@@ -800,7 +822,16 @@ async function ensureLocalServer(baseUrl, noAutoStart, metaUrl) {
   try {
     if (await isServerHealthy(baseUrl))
       return;
-    const entrypoint = resolveSiblingEntrypoint(metaUrl, "index");
+    const discoveredPid = findListeningPid(baseUrl);
+    if (discoveredPid) {
+      if (isLikelyUnbrowseServerProcess(discoveredPid)) {
+        if (await waitForHealthy(baseUrl, 5000))
+          return;
+        throw new Error(`Port ${describeListenTarget(baseUrl)} already has an unbrowse server (pid ${discoveredPid}), but it did not become healthy.`);
+      }
+      throw new Error(`Port ${describeListenTarget(baseUrl)} already in use by pid ${discoveredPid}.`);
+    }
+    const entrypoint = resolveSiblingEntrypoint(metaUrl, "supervisor");
     const packageRoot = getPackageRoot(metaUrl);
     const logFile = getServerAutostartLogFile();
     ensureDir(path3.dirname(logFile));
@@ -1374,6 +1405,17 @@ function detectEntityIndex(data) {
   }
   return best ? buildEntityIndex(best) : null;
 }
+function unwrapCarrier(data) {
+  if (data == null || typeof data !== "object" || Array.isArray(data))
+    return data;
+  const rec = data;
+  const keys = Object.keys(rec);
+  const isCarrierOnly = keys.every((key) => key === "data" || key === "_extraction");
+  if (isCarrierOnly && "data" in rec && (("_extraction" in rec) || Array.isArray(rec.data) || rec.data != null && typeof rec.data === "object")) {
+    return unwrapCarrier(rec.data);
+  }
+  return data;
+}
 function resolvePath(obj, path5, entityIndex) {
   if (!path5 || obj == null)
     return obj;
@@ -1483,8 +1525,8 @@ function looksStructuredForDirectOutput(value) {
   return scalarFields >= 2;
 }
 function applyTransforms(result, flags) {
-  let data = result;
-  const entityIndex = detectEntityIndex(result);
+  let data = unwrapCarrier(result);
+  const entityIndex = detectEntityIndex(data);
   const pathFlag = flags.path;
   if (pathFlag) {
     data = resolvePath(data, pathFlag, entityIndex);
@@ -1611,7 +1653,7 @@ async function cmdResolve(flags) {
   if (flags["force-capture"])
     body.force_capture = true;
   const hasTransforms = !!(flags.path || flags.extract);
-  if (flags.raw || hasTransforms)
+  if (flags.raw || flags.schema || hasTransforms)
     body.projection = { raw: true };
   const startedAt = Date.now();
   let result = await withPendingNotice(api2("POST", "/v1/intent/resolve", body), "Still working. First-time capture/indexing for a site can take 20-80s. Waiting is usually better than falling back.");
@@ -1658,7 +1700,7 @@ async function cmdExecute(flags) {
   if (flags["confirm-unsafe"])
     body.confirm_unsafe = true;
   const hasTransforms = !!(flags.path || flags.extract);
-  if (flags.raw || hasTransforms)
+  if (flags.raw || flags.schema || hasTransforms)
     body.projection = { raw: true };
   let result = await withPendingNotice(api2("POST", `/v1/skills/${skillId}/execute`, body), "Still working. This endpoint may require browser replay or first-time auth/capture setup.");
   if (flags.schema) {
@@ -1693,7 +1735,12 @@ async function cmdLogin(flags) {
   const url = flags.url;
   if (!url)
     die("--url is required");
-  output(await api2("POST", "/v1/auth/login", { url }), !!flags.pretty);
+  const browserLabel = typeof flags.browser === "string" ? flags.browser : "default browser";
+  const result = await withPendingNotice(api2("POST", "/v1/auth/login", {
+    url,
+    ...typeof flags.browser === "string" ? { browser: flags.browser } : {}
+  }), `Opened ${url} in ${browserLabel}. Finish sign-in there; waiting for fresh cookies...`, 1000);
+  output(result, !!flags.pretty);
 }
 async function cmdSkills(flags) {
   output(await api2("GET", "/v1/skills"), !!flags.pretty);
@@ -1728,7 +1775,7 @@ var CLI_REFERENCE = {
     { 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" },
     { name: "feedback", usage: "--skill ID --endpoint ID --rating N", desc: "Submit feedback (mandatory after resolve)" },
-    { name: "login", usage: '--url "..."', desc: "Interactive browser login" },
+    { name: "login", usage: '--url "..." [--browser chrome|arc|dia|brave|edge|vivaldi|chromium|firefox]', desc: "Interactive browser login" },
     { name: "skills", usage: "", desc: "List all skills" },
     { name: "skill", usage: "<id>", desc: "Get skill details" },
     { name: "search", usage: '--intent "..." [--domain "..."]', desc: "Search marketplace" },
@@ -1753,6 +1800,7 @@ var CLI_REFERENCE = {
   examples: [
     "unbrowse health",
     'unbrowse resolve --intent "get timeline" --url "https://x.com"',
+    'unbrowse login --url "https://lu.ma/signin" --browser chrome',
     "unbrowse execute --skill abc --endpoint def --pretty",
     'unbrowse execute --skill abc --endpoint def --extract "user,text,likes" --limit 10',
     'unbrowse execute --skill abc --endpoint def --path "data.included[]" --extract "name:actor.name,text:commentary.text" --limit 20',