unbrowse 12.3.0 → 12.3.1

package/SKILL.md

@@ -40,7 +40,7 @@ From an agent's shell (no terminal for the person): run `npx unbrowse login --no
 
 Then the first call: `npx unbrowse run 'top stories on hacker news'`. The site requests go from the person's own IP by default; `--from-unbrowse` sends them from Unbrowse instead.
 
-`npx unbrowse mcp` (a stdio MCP for hosts that need one) uses the CLI sign-in. A remote MCP in a host config uses only that host's own OAuth: one sign-in does not cover the other, and the CLI token does not go into an MCP config.
+`npx unbrowse mcp` (a stdio MCP for hosts that need one) uses the CLI sign-in; `unbrowse mcp add` registers it with Claude Code and Codex, so they run on that one sign-in. The other way: with no CLI sign-in, the CLI uses Claude Code's own Unbrowse MCP sign-in (the plugin's `https://unbrowse.ai/api/mcp`; a token for `/mcp` does not work on the REST API). No token is ever written into an MCP config.
 
 For automation and CI without a browser, set `UNBROWSE_API_KEY` from the caller's secret manager (create a key in the signed-in console at https://unbrowse.ai/app). Never put keys into committed config, prompts, command arguments or logs.
 
@@ -81,7 +81,7 @@ Do not infer business success from HTTP 200, tool transport success, a screensho
 
 When the person names a site:
 
-1. If `unbrowse_discover` is not in this session's tool list, the MCP is not signed in. Stop. Name the configured MCP URL and say the CLI login does not cover it.
+1. If `unbrowse_discover` is not in this session's tool list, the MCP is not signed in. Stop. Name the configured MCP URL. A remote MCP needs the host's own OAuth; with the CLI signed in, `npx unbrowse mcp add` gives the host a server on that sign-in instead (it takes effect in a new session).
 2. Look the host up (`unbrowse_sites`, or CLI `unbrowse site <host>`). Tools already compiled: use one. Stop.
 3. No tools: `unbrowse_index {url, focus}` or `POST /api/v1/index`. Poll `unbrowse_index_status` or `GET /api/v1/index/{jobId}`.
 4. `status: failed` and `error.code: model_unavailable`: the indexing model is out of credit. Report the job id and the message. Do not browse instead, and do not start the same job again in a loop.

package/dist/cli.js

@@ -26,7 +26,7 @@ var __esm = (fn, res, err) => () => {
 };
 
 // ../sdk/src/version.ts
-var SDK_VERSION = "12.3.0";
+var SDK_VERSION = "12.3.1";
 
 // ../sdk/src/client.ts
 function apiBase(url) {
@@ -992,7 +992,7 @@ function quoteSystemd(s) {
   return /[\s"\\]/.test(s) ? `"${s.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"` : s;
 }
 function ephemeralCli(cli) {
-  return /[\\/](_npx|\.npm[\\/]_npx|npx-[^\\/]+|tmp|Temp)[\\/]/i.test(cli);
+  return /[\\/](_npx|\.npm[\\/]_npx|npx-[^\\/]+|bunx-[^\\/]+|tmp|Temp)[\\/]/i.test(cli);
 }
 var ALL_SITES = "*", allSites = (cfg) => cfg.sites.includes(ALL_SITES), UPLOAD_BATCH = 500, TWO_LEVEL, DEFAULT_INTERVAL_MIN = 15, REFRESH_MS, SERVICE = "unbrowse-cookies", LAUNCHD_LABEL = "ai.unbrowse.cookies", configFile = (dir) => join3(dir, "cookie-sync.json"), stateFile = (dir) => join3(dir, "cookie-sync.state.json");
 var init_cookie_daemon = __esm(() => {
@@ -1521,7 +1521,7 @@ import { createInterface as createInterface2 } from "node:readline/promises";
 import { createHash, randomBytes } from "node:crypto";
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { createServer } from "node:http";
-import { homedir } from "node:os";
+import { homedir, hostname } from "node:os";
 import { dirname, join } from "node:path";
 function configPath() {
   const root = process.env.UNBROWSE_CONFIG_DIR ?? join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "unbrowse");
@@ -1567,6 +1567,7 @@ function sharedSignIn(baseUrl, now = Date.now()) {
     return;
   }
   const api = new URL(apiResource(baseUrl));
+  let best;
   for (const e of entries) {
     if (typeof e?.serverUrl !== "string" || typeof e.accessToken !== "string" || !e.accessToken)
       continue;
@@ -1580,9 +1581,11 @@ function sharedSignIn(baseUrl, now = Date.now()) {
     }
     if (url.origin !== api.origin || !(url.pathname === api.pathname || url.pathname.startsWith(`${api.pathname}/`)))
       continue;
-    return { token: e.accessToken, from: `Claude Code's MCP sign-in (${String(e.serverName ?? url.origin + url.pathname)})` };
+    const expiresAt = typeof e.expiresAt === "number" ? e.expiresAt : 0;
+    if (!best || expiresAt > best.expiresAt)
+      best = { token: e.accessToken, from: `Claude Code's MCP sign-in (${String(e.serverName ?? url.origin + url.pathname)})`, expiresAt };
   }
-  return;
+  return best && { token: best.token, from: best.from };
 }
 async function currentToken(baseUrl, fetchImpl = fetch) {
   if (process.env.UNBROWSE_API_KEY)
@@ -1606,6 +1609,16 @@ async function currentToken(baseUrl, fetchImpl = fetch) {
   }
   return o.accessToken;
 }
+async function tokenFor(baseUrl, target, fetchImpl = fetch) {
+  const token = await currentToken(baseUrl, fetchImpl);
+  if (!token)
+    return;
+  let same = false;
+  try {
+    same = new URL(target, baseUrl).origin === new URL(baseUrl).origin;
+  } catch {}
+  return same || signInSource(baseUrl) !== "shared" ? token : undefined;
+}
 function signInSource(baseUrl) {
   if (process.env.UNBROWSE_API_KEY)
     return "env";
@@ -1715,14 +1728,70 @@ ${url.toString()}`);
     server.close();
   }
 }
+async function deviceLogin(baseUrl, opts) {
+  const fetchImpl = opts.fetch ?? fetch;
+  const sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  const now = opts.now ?? Date.now;
+  const name = opts.clientName ?? `Unbrowse CLI (${hostname()})`;
+  const redirectUri = `${baseUrl.replace(/\/+$/, "")}/device/done`;
+  const reg = await fetchImpl(`${baseUrl}/oauth/register`, {
+    method: "POST",
+    headers: { "content-type": "application/json", accept: "application/json" },
+    body: JSON.stringify({ client_name: name, redirect_uris: [redirectUri], grant_types: ["authorization_code", "refresh_token"], response_types: ["code"], token_endpoint_auth_method: "none" })
+  });
+  const client = await reg.json().catch(() => ({}));
+  if (!reg.ok || !client.client_id)
+    throw new Error(`client registration failed: ${client.error_description ?? `HTTP ${reg.status}`}`);
+  const da = await fetchImpl(`${baseUrl}/oauth/device_authorization`, {
+    method: "POST",
+    headers: { "content-type": "application/x-www-form-urlencoded", accept: "application/json" },
+    body: new URLSearchParams({ client_id: client.client_id, resource: apiResource(baseUrl) }).toString()
+  });
+  const dev = await da.json().catch(() => ({}));
+  if (!da.ok || !dev.device_code || !dev.user_code)
+    throw new Error(`could not start device sign-in: ${dev.error_description ?? dev.error ?? `HTTP ${da.status}`}`);
+  opts.log(`To sign in, open ${dev.verification_uri} on any device and enter the code:
+
+    ${dev.user_code}
+
+(or open ${dev.verification_uri_complete} to skip typing it). Waiting for approval…`);
+  const deadline = now() + (dev.expires_in ?? 600) * 1000;
+  let interval = Math.max(1, dev.interval ?? 5);
+  while (now() < deadline) {
+    await sleep(interval * 1000);
+    const res = await fetchImpl(`${baseUrl}/oauth/token`, {
+      method: "POST",
+      headers: { "content-type": "application/x-www-form-urlencoded", accept: "application/json" },
+      body: new URLSearchParams({ grant_type: "urn:ietf:params:oauth:grant-type:device_code", device_code: dev.device_code, client_id: client.client_id }).toString()
+    });
+    const body = await res.json().catch(() => ({}));
+    if (res.ok && body.access_token) {
+      save({ baseUrl, oauth: { clientId: client.client_id, accessToken: body.access_token, refreshToken: body.refresh_token, expiresAt: body.expires_in ? now() + body.expires_in * 1000 : undefined } });
+      return;
+    }
+    if (body.error === "authorization_pending")
+      continue;
+    if (body.error === "slow_down") {
+      interval += 5;
+      continue;
+    }
+    if (body.error === "access_denied")
+      throw new Error("the sign-in was denied");
+    if (body.error === "expired_token")
+      throw new Error("the code expired before it was approved; run `unbrowse login` again");
+    throw new Error(body.error_description ?? body.error ?? `device sign-in failed (HTTP ${res.status})`);
+  }
+  throw new Error("timed out waiting for approval");
+}
 
 // src/cli.ts
 init_src();
-var VERSION = "12.3.0";
+var VERSION = "12.3.1";
 var DEFAULT_ORIGIN = "https://unbrowse.ai";
 var HELP = `unbrowse ${VERSION} — call websites as APIs through the Unbrowse API
 
   login [--key ub_live_…]         Sign in in your browser (OAuth), or store an API key
+       [--device]                 On a remote/headless machine, show a code to approve on your phone
                                   (first use of any command below signs you in the same way)
   logout                          Forget the stored sign-in
   whoami                          Workspace and usage
@@ -1840,9 +1909,10 @@ async function main(argv, io = stdio) {
   const client = async () => new Unbrowse({ apiKey: await currentToken(origin) ?? "", baseUrl: origin, client: `cli/${VERSION}` });
   if (cmd === "mcp" && rest[0] !== "add") {
     await Promise.resolve().then(() => init_mcp_proxy());
+    const url = flag("url") ?? process.env.UNBROWSE_MCP_URL ?? `${origin}/api/mcp`;
     await serveStdio({
-      url: flag("url") ?? process.env.UNBROWSE_MCP_URL ?? `${origin}/api/mcp`,
-      token: async () => await currentToken(origin) ?? undefined,
+      url,
+      token: () => tokenFor(origin, url),
       version: VERSION,
       endUser: flag("end-user") ?? process.env.UNBROWSE_END_USER,
       ...args.flags["from-here"] || process.env.UNBROWSE_EGRESS === "client" ? { fromHere: client } : {}
@@ -1956,6 +2026,8 @@ Your browser opens ${origin}; approve it and \`unbrowse ${cmd}\` carries on. (Sc
         const key = flag("key");
         if (key)
           save({ baseUrl: origin, apiKey: key });
+        else if (args.flags.device || !io.interactive)
+          await deviceLogin(origin, { log: io.err });
         else
           await oauthLogin(origin, { open: (u) => openLink(u, args, io), log: io.err });
         const me = await (await client()).me();
@@ -2354,9 +2426,11 @@ async function mcpAdd(rest, args, io, origin) {
       }
     }
     const r = exec(shell(plan.add));
-    if (r.status === 0)
+    if (r.status === 0) {
       io.err(`✓ ${h}: added "${name}" (stdio, on this CLI's sign-in)`);
-    else
+      if (h === "claude" && exec(shell(["claude", "mcp", "get", "plugin:unbrowse:unbrowse"])).status === 0)
+        io.err(`  Claude Code also has the Unbrowse plugin's server (plugin:unbrowse:unbrowse), so its tools now show twice. Keep one: disable that server in /mcp, or \`claude mcp remove ${name} --scope user\`.`);
+    } else
       failed++, io.err(`✗ ${h}: ${(r.stderr || r.stdout).trim() || `exit ${r.status}`}`);
   }
   if (!dry) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unbrowse",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "mcpName": "io.github.unbrowse-ai/unbrowse",
   "description": "Call websites as APIs: a thin CLI over the Unbrowse API.",
   "license": "MIT",