unbrowse 12.3.0 → 12.4.0

package/README.md

@@ -13,6 +13,7 @@ unbrowse resume <runId> origin=SIN           # answer on the same run
 | Command | Does |
 |---|---|
 | `login [--key K]`, `logout`, `whoami`, `usage` | Account |
+| `accounts`, `accounts use <name>`, `--account NAME` | Several Unbrowse accounts on one machine, each with its own vault ([docs](https://github.com/unbrowse-ai/unbrowse/blob/main/docs/cli.md#several-accounts)) |
 | `discover <query>` | Your capabilities, then the public registry |
 | `run <task…>`, `inspect`, `resume`, `cancel` | Runs |
 | `scrape <url>` | One page as markdown on stdout |
@@ -21,8 +22,9 @@ unbrowse resume <runId> origin=SIN           # answer on the same run
 | `logins`, `logins remove <origin>` | Saved logins, masked. The CLI never takes a password |
 | `registry [query]`, `site <host>`, `openapi <host>` | Public compiled sites, a site's tools, its OpenAPI 3.1 document — no account |
 | `call <host> <tool> [JSON]` | Run one site tool (`--set k=v`, `--deadline MS`, `--select a,b`, `--idempotency-key K`, `--end-user ID`) |
+| `tools [query]`, `tool <name> [--key value…]` | Every tool of the hosted MCP from the shell: the cloud browser (`tool browse_open --url …`), `map`, replay, memory, your sites' tools |
 
-The CLI is the REST client. The remote MCP is a separate client; see the [install guide](https://github.com/unbrowse-ai/unbrowse/blob/main/docs/install.md).
+The CLI is the REST client, and through `tool` it can call everything the remote MCP has. To give an agent host the MCP itself, see the [install guide](https://github.com/unbrowse-ai/unbrowse/blob/main/docs/install.md).
 
 Exit codes: 0 accepted/ok (check status and verified), 1 error, 2 input required, 3 sign-in or saved login needed, 4 not verified.
 Env: `UNBROWSE_API_KEY`, `UNBROWSE_BASE_URL`. Node 18.17+, no dependencies.

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.4.0";
 
 // ../sdk/src/client.ts
 function apiBase(url) {
@@ -924,10 +924,12 @@ async function watch(opts) {
 }
 function servicePlan(opts) {
   const os = opts.os ?? platform();
+  const service = opts.account ? `${SERVICE}-${opts.account}` : SERVICE;
+  const label = opts.account ? `${LAUNCHD_LABEL}.${opts.account}` : LAUNCHD_LABEL;
   const home = opts.home ?? homedir3();
   const env = Object.entries(opts.env ?? {});
   if (os === "linux") {
-    const path = join3(home, ".config", "systemd", "user", `${SERVICE}.service`);
+    const path = join3(home, ".config", "systemd", "user", `${service}.service`);
     const content = [
       "[Unit]",
       "Description=Unbrowse cookie sync: keeps your browser sign-ins for chosen sites in sync with Unbrowse",
@@ -948,21 +950,21 @@ function servicePlan(opts) {
       kind: "systemd",
       path,
       content,
-      enable: [["systemctl", "--user", "daemon-reload"], ["systemctl", "--user", "enable", "--now", `${SERVICE}.service`]],
-      disable: [["systemctl", "--user", "disable", "--now", `${SERVICE}.service`], ["systemctl", "--user", "daemon-reload"]],
-      status: ["systemctl", "--user", "is-active", `${SERVICE}.service`],
-      log: `journalctl --user -u ${SERVICE} -f`
+      enable: [["systemctl", "--user", "daemon-reload"], ["systemctl", "--user", "enable", "--now", `${service}.service`]],
+      disable: [["systemctl", "--user", "disable", "--now", `${service}.service`], ["systemctl", "--user", "daemon-reload"]],
+      status: ["systemctl", "--user", "is-active", `${service}.service`],
+      log: `journalctl --user -u ${service} -f`
     };
   }
   if (os === "darwin") {
-    const path = join3(home, "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
-    const logPath = join3(home, "Library", "Logs", `${SERVICE}.log`);
+    const path = join3(home, "Library", "LaunchAgents", `${label}.plist`);
+    const logPath = join3(home, "Library", "Logs", `${service}.log`);
     const esc = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     const content = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>Label</key><string>${LAUNCHD_LABEL}</string>
+  <key>Label</key><string>${label}</string>
   <key>ProgramArguments</key>
   <array><string>${esc(opts.node)}</string><string>${esc(opts.cli)}</string><string>cookies</string><string>watch</string></array>
 ${env.length ? `  <key>EnvironmentVariables</key>
@@ -982,7 +984,7 @@ ${env.length ? `  <key>EnvironmentVariables</key>
       content,
       enable: [["launchctl", "bootout", domain, path], ["launchctl", "bootstrap", domain, path]],
       disable: [["launchctl", "bootout", domain, path]],
-      status: ["launchctl", "print", `${domain}/${LAUNCHD_LABEL}`],
+      status: ["launchctl", "print", `${domain}/${label}`],
       log: `tail -f ${logPath}`
     };
   }
@@ -992,7 +994,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(() => {
@@ -1218,7 +1220,7 @@ var HEADER = 100;
 // src/cookies.ts
 import { createDecipheriv, createHash as createHash3, pbkdf2Sync } from "node:crypto";
 import { execFileSync } from "node:child_process";
-import { existsSync as existsSync4, readdirSync, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync4, readdirSync as readdirSync2, readFileSync as readFileSync4 } from "node:fs";
 import { homedir as homedir4, platform as platform2 } from "node:os";
 import { join as join4 } from "node:path";
 function chromium(name, [mac, linux], keychain) {
@@ -1306,7 +1308,7 @@ function firefoxProfiles(def, base) {
 }
 function safeReaddir(dir) {
   try {
-    return readdirSync(dir);
+    return readdirSync2(dir);
   } catch {
     return [];
   }
@@ -1510,6 +1512,85 @@ var init_cookies = __esm(() => {
   TEXT = /^[\x20-\x7e]*$/;
 });
 
+// src/mcp-tools.ts
+function resolveTool(tools, typed) {
+  const names = new Map(tools.map((t) => [t.name, t]));
+  const safe = safeToolName(typed);
+  const underscored = safe.replace(/-/g, "_");
+  for (const n of [typed, safe, underscored, `unbrowse_${safe}`, `unbrowse_${underscored}`])
+    if (names.has(n))
+      return names.get(n);
+  return;
+}
+function shortName(name) {
+  return name.replace(/^unbrowse_/, "");
+}
+function signature(t, max = 60) {
+  const schema = t.inputSchema ?? {};
+  const required = new Set(schema.required ?? []);
+  const keys = Object.keys(schema.properties ?? {});
+  const props = [...keys.filter((k) => required.has(k)), ...keys.filter((k) => !required.has(k)).map((k) => `${k}?`)];
+  let shown = "";
+  for (const [i, p] of props.entries()) {
+    const next = shown ? `${shown}, ${p}` : p;
+    if (`${shortName(t.name)}(${next})`.length > max && i > 0)
+      return `${shortName(t.name)}(${shown}, …)`;
+    shown = next;
+  }
+  return `${shortName(t.name)}(${shown})`;
+}
+function summary(description = "", max = 110) {
+  const first = description.split(/(?<=[.!?])\s|\n/)[0].trim();
+  return first.length > max ? `${first.slice(0, max - 1)}…` : first;
+}
+function filterTools(tools, query) {
+  const split = (s) => s.toLowerCase().split(/[^a-z0-9]+/).filter(Boolean);
+  const words = split(query);
+  const matches = (text) => {
+    const tokens = split(text);
+    return words.every((w) => tokens.some((k) => k.startsWith(w)));
+  };
+  const byName = tools.filter((t) => matches(shortName(t.name)));
+  return byName.length ? byName : tools.filter((t) => matches(`${shortName(t.name)} ${t.description ?? ""}`));
+}
+function toolInput(t, json, flags, sets, coerce) {
+  const props = new Set(Object.keys((t.inputSchema ?? {}).properties ?? {}));
+  const key = (k) => props.has(k) ? k : k.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+  const base = json ? JSON.parse(json) : {};
+  if (!base || typeof base !== "object" || Array.isArray(base))
+    throw new SyntaxError("the tool's input must be a JSON object");
+  const out = { ...base };
+  for (const [k, v] of Object.entries(flags))
+    if (!CLI_FLAGS.has(k))
+      out[key(k)] = typeof v === "string" ? coerce(v) : v;
+  for (const [k, v] of Object.entries(sets))
+    out[key(k)] = v;
+  return out;
+}
+function resultValue(r) {
+  if (r.structuredContent !== undefined)
+    return r.structuredContent;
+  const parts = (r.content ?? []).map((c) => c.type === "text" ? c.text ?? "" : `[${c.type}${c.mimeType ? ` ${c.mimeType}` : ""}]`);
+  const text = parts.join(`
+`);
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+function resultCode(r, value) {
+  if (r.isError)
+    return 1;
+  const status = value?.status;
+  return status === "input_required" ? 2 : 0;
+}
+var CLI_FLAGS;
+var init_mcp_tools = __esm(() => {
+  init_mcp_proxy();
+  CLI_FLAGS = new Set(["json", "base-url", "account", "no-open", "input", "from-here", "help", "version"]);
+});
+
 // src/cli.ts
 import { spawn, spawnSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -1519,13 +1600,70 @@ import { createInterface as createInterface2 } from "node:readline/promises";
 
 // src/auth.ts
 import { createHash, randomBytes } from "node:crypto";
-import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readdirSync, 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 configRoot() {
+  return process.env.UNBROWSE_CONFIG_DIR ?? join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "unbrowse");
+}
+var selected;
+var ACCOUNT_NAME = /^[A-Za-z0-9][A-Za-z0-9_-]{0,39}$/;
+var defaultFile = () => join(configRoot(), "account");
+function checkAccount(name) {
+  if (name !== "default" && !ACCOUNT_NAME.test(name))
+    throw new Error(`invalid account name "${name}": use letters, digits, - and _ (up to 40)`);
+  return name;
+}
+function savedAccount() {
+  try {
+    const name = readFileSync(defaultFile(), "utf8").trim();
+    return name && ACCOUNT_NAME.test(name) ? name : undefined;
+  } catch {
+    return;
+  }
+}
+function selectAccount(name) {
+  const pick = name ?? (process.env.UNBROWSE_ACCOUNT || undefined) ?? savedAccount();
+  selected = !pick || checkAccount(pick) === "default" ? undefined : pick;
+  return account();
+}
+function account() {
+  return selected ?? "default";
+}
+function useAccount(name) {
+  if (checkAccount(name) === "default")
+    return void rmSync(defaultFile(), { force: true });
+  mkdirSync(configRoot(), { recursive: true, mode: 448 });
+  writeFileSync(defaultFile(), `${name}
+`, { mode: 384 });
+}
+function listAccounts() {
+  const read = (path) => {
+    try {
+      return JSON.parse(readFileSync(path, "utf8"));
+    } catch {
+      return;
+    }
+  };
+  const row = (name, s) => ({ name, ...s.baseUrl ? { baseUrl: s.baseUrl } : {}, signIn: s.apiKey ? "api key" : s.oauth ? "oauth" : "none" });
+  const out = [];
+  const main = read(join(configRoot(), "cli.json"));
+  if (main)
+    out.push(row("default", main));
+  let names = [];
+  try {
+    names = readdirSync(join(configRoot(), "accounts")).filter((n) => ACCOUNT_NAME.test(n)).sort();
+  } catch {}
+  for (const n of names) {
+    const s = read(join(configRoot(), "accounts", n, "cli.json"));
+    if (s)
+      out.push(row(n, s));
+  }
+  return out;
+}
 function configPath() {
-  const root = process.env.UNBROWSE_CONFIG_DIR ?? join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "unbrowse");
-  return join(root, "cli.json");
+  return selected ? join(configRoot(), "accounts", selected, "cli.json") : join(configRoot(), "cli.json");
 }
 function load() {
   const path = configPath();
@@ -1567,6 +1705,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 +1719,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)
@@ -1594,7 +1735,7 @@ async function currentToken(baseUrl, fetchImpl = fetch) {
     return stored.apiKey;
   const o = stored.oauth;
   if (!o)
-    return v1Key(baseUrl) ?? sharedSignIn(baseUrl)?.token;
+    return selected ? undefined : v1Key(baseUrl) ?? sharedSignIn(baseUrl)?.token;
   if (o.expiresAt && o.refreshToken && Date.now() > o.expiresAt - 60000) {
     try {
       const fresh = await tokenRequest(baseUrl, { grant_type: "refresh_token", refresh_token: o.refreshToken, client_id: o.clientId, resource: apiResource(baseUrl) }, fetchImpl);
@@ -1606,6 +1747,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";
@@ -1614,6 +1765,8 @@ function signInSource(baseUrl) {
     return;
   if (stored.apiKey || stored.oauth)
     return "stored";
+  if (selected)
+    return;
   if (v1Key(baseUrl))
     return "v1";
   return sharedSignIn(baseUrl) ? "shared" : undefined;
@@ -1628,6 +1781,8 @@ function describe(baseUrl) {
     return `API key ${mask(stored.apiKey)} in ${configPath()}`;
   if (stored.oauth)
     return `OAuth sign-in in ${configPath()}`;
+  if (selected)
+    return `not signed in (account "${selected}": \`unbrowse login --account ${selected}\`)`;
   const v1 = !stored.baseUrl ? v1Key(baseUrl) : undefined;
   if (v1)
     return `v1 API key ${mask(v1)} from ~/.unbrowse/config.json (still works; \`unbrowse login\` replaces it)`;
@@ -1715,16 +1870,74 @@ ${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.4.0";
 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
+  accounts                        Sign-ins saved on this machine, one per Unbrowse account (each has its own vault)
+  accounts use <name>             Make one the default; any command takes --account NAME for just that run
   whoami                          Workspace and usage
   usage                           Verified calls this month and quota left
 
@@ -1746,6 +1959,8 @@ var HELP = `unbrowse ${VERSION} — call websites as APIs through the Unbrowse A
   cookies list                    Browsers and profiles found on this machine (--json for agents)
   cookies sync                    Send your browser cookies so runs act as your signed-in self
       [--browser NAME] [--profile NAME] [--domain d] [--all]
+                                  A page that says "sign in to view" (claude.ai, Notion, Google Docs…): sign in to it
+                                  in your browser once, then: unbrowse cookies sync --domain <site>
   cookies watch --domain a,b      Keep those sites' cookies in sync (re-upload on change) [--interval MIN] [--all-sites]
   cookies daemon start|status|stop
                                   The same as a background service (systemd / launchd) [--domain a,b | --all-sites] [--yes]
@@ -1765,18 +1980,26 @@ var HELP = `unbrowse ${VERSION} — call websites as APIs through the Unbrowse A
   call <host> <tool> [JSON]       Run one site tool with its inputs (or --set key=value…); prints the run
       [--deadline MS] [--select PATH,…] [--idempotency-key K] [--end-user ID]
 
-  mcp                             Local stdio MCP server proxying the hosted one (tool names use _ not .)
+  tools [query | name]            Every tool of the hosted MCP (cloud browser, map, replay, memory, your sites' tools…);
+                                  one name prints its description and inputs (--json: every schema)
+  tool <name> [JSON]              Call one, the same as an agent over MCP: unbrowse tool browse_open --url https://…
+      [--key value]… [--set key=value]… [--input JSON]
+                                    the unbrowse_ prefix is optional; every --flag the CLI does not use is an input
+      [--from-here]                 run sends its site requests from this machine, like \`unbrowse run\`
+
+  mcp                          Local stdio MCP server proxying the hosted one (tool names use _ not .)
       [--url URL] [--end-user ID]   for agent hosts that need stdio or strict tool names (Grok Build)
-      [--from-here]                 unbrowse_run sends its site requests from this machine, like run (a Grok Bot's computer)
+      [--from-here]                 unbrowse_run sends its site requests from this machine, like run (a Grok Bot's computer).
+                                    It changes the IP only: it does not sign you in to a site (that is cookies sync)
   mcp add [claude] [codex]        Register that proxy with Claude Code / Codex: they use this CLI's sign-in (no second sign-in)
       [--name NAME] [--replace] [--dry-run]
                                   And back: no CLI sign-in, but Claude Code signed in to Unbrowse (plugin) → the CLI uses that
 
-Options: --json (errors as JSON) · --base-url URL · --no-open
-Env: UNBROWSE_API_KEY, UNBROWSE_BASE_URL (default ${DEFAULT_ORIGIN}), UNBROWSE_EGRESS=server, UNBROWSE_MCP_URL, UNBROWSE_END_USER
+Options: --json (errors as JSON) · --base-url URL · --no-open · --account NAME
+Env: UNBROWSE_API_KEY, UNBROWSE_ACCOUNT, UNBROWSE_BASE_URL (default ${DEFAULT_ORIGIN}), UNBROWSE_EGRESS=server, UNBROWSE_MCP_URL, UNBROWSE_END_USER
 Exit: 0 ok · 1 error · 2 input required · 3 sign-in or login needed · 4 not verified`;
 var BOOLEAN = new Set(["json", "help", "version", "no-open", "no-wait", "unattended", "from-here", "from-unbrowse", "all", "all-sites", "yes", "full", "events", "dry-run", "with-keys", "replace"]);
-var NEEDS_ACCOUNT = new Set(["whoami", "usage", "discover", "run", "scrape", "index", "inspect", "resume", "cancel", "learn", "learned", "logins", "call", "cookies"]);
+var NEEDS_ACCOUNT = new Set(["whoami", "usage", "discover", "run", "scrape", "index", "inspect", "resume", "cancel", "learn", "learned", "logins", "call", "cookies", "tools", "tool"]);
 var SCRAPE_FORMATS = ["markdown", "html", "text", "links", "raw"];
 function parseArgs(argv) {
   const out = { _: [], flags: {}, sets: {} };
@@ -1834,15 +2057,25 @@ async function main(argv, io = stdio) {
     return io.out(VERSION), 0;
   if (!cmd || cmd === "help" || args.flags.help)
     return io.out(HELP), 0;
+  if (args.flags.account === true)
+    return io.err("usage: --account NAME"), 1;
+  try {
+    selectAccount(typeof args.flags.account === "string" ? args.flags.account : undefined);
+  } catch (e) {
+    return io.err(e.message), 1;
+  }
+  const named = account() !== "default" ? account() : undefined;
+  const loginCmd = `unbrowse login${named ? ` --account ${named}` : ""}`;
   const origin = String(args.flags["base-url"] ?? process.env.UNBROWSE_BASE_URL ?? load().baseUrl ?? DEFAULT_ORIGIN).replace(/\/+$/, "");
   const flag = (k) => typeof args.flags[k] === "string" ? args.flags[k] : undefined;
   const print = (v) => io.out(JSON.stringify(v, null, 2));
   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 } : {}
@@ -1881,7 +2114,7 @@ async function main(argv, io = stdio) {
       io.err("This CLI runs from a temporary npx copy, which a background service cannot point at. Install it first: npm i -g unbrowse — then run this again.");
       return 1;
     }
-    const plan = D.servicePlan({ os: io.service?.os, home: io.service?.home, node, cli, env: { ...origin !== DEFAULT_ORIGIN ? { UNBROWSE_BASE_URL: origin } : {}, ...process.env.UNBROWSE_CONFIG_DIR ? { UNBROWSE_CONFIG_DIR: process.env.UNBROWSE_CONFIG_DIR } : {}, ...process.env.UNBROWSE_COOKIES_HOME ? { UNBROWSE_COOKIES_HOME: process.env.UNBROWSE_COOKIES_HOME } : {} } });
+    const plan = D.servicePlan({ os: io.service?.os, home: io.service?.home, node, cli, account: named, env: { ...origin !== DEFAULT_ORIGIN ? { UNBROWSE_BASE_URL: origin } : {}, ...named ? { UNBROWSE_ACCOUNT: named } : {}, ...process.env.UNBROWSE_CONFIG_DIR ? { UNBROWSE_CONFIG_DIR: process.env.UNBROWSE_CONFIG_DIR } : {}, ...process.env.UNBROWSE_COOKIES_HOME ? { UNBROWSE_COOKIES_HOME: process.env.UNBROWSE_COOKIES_HOME } : {} } });
     if (!plan) {
       io.err("No background service on this OS yet. Keep it running with: unbrowse cookies watch (e.g. from Task Scheduler at logon).");
       return 1;
@@ -1932,7 +2165,7 @@ async function main(argv, io = stdio) {
   };
   const onboard = async () => {
     if (!io.interactive || args.flags.json) {
-      const message = `Not signed in to ${origin}. Run \`npx unbrowse login\` (opens your browser, nothing to paste), or set UNBROWSE_API_KEY (keys: ${origin}/app).`;
+      const message = `Not signed in to ${origin}${named ? ` as account "${named}"` : ""}. Run \`npx ${loginCmd}\` (opens your browser, nothing to paste), or set UNBROWSE_API_KEY (keys: ${origin}/app).`;
       if (args.flags.json)
         print({ error: { status: 401, code: "not_signed_in", message, details: null } });
       else
@@ -1956,21 +2189,36 @@ 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();
-        io.err(`Signed in to ${origin} (workspace ${me.workspaceId}).`);
+        io.err(`Signed in to ${origin}${named ? ` as account "${named}"` : ""} (workspace ${me.workspaceId}).`);
         await offerCookieSync().catch((e) => io.err(`Cookie sync not set up: ${e.message}`));
         return 0;
       }
+      case "accounts": {
+        if (rest[0] === "use") {
+          const name = checkAccount(need(rest[1], "accounts use <name>"));
+          useAccount(name);
+          const saved = listAccounts().some((a) => a.name === name);
+          io.err(`Commands now use account "${name}"${saved ? "" : ` (not signed in yet: unbrowse login${name === "default" ? "" : ` --account ${name}`})`}.${process.env.UNBROWSE_ACCOUNT ? ` UNBROWSE_ACCOUNT=${process.env.UNBROWSE_ACCOUNT} still wins while it is set.` : ""}`);
+          return 0;
+        }
+        if (rest[0])
+          throw new UsageError("usage: unbrowse accounts [use <name>]");
+        print({ current: account(), accounts: listAccounts() });
+        return 0;
+      }
       case "mcp":
-        return await mcpAdd(rest.slice(1), args, io, origin);
+        return await mcpAdd(rest.slice(1), args, io, origin, named);
       case "logout":
         clear();
-        io.err("Signed out.");
+        io.err(named ? `Signed out of account "${named}".` : "Signed out.");
         return 0;
       case "whoami":
-        print({ origin, auth: describe(origin), ...await ub.me() });
+        print({ origin, account: account(), auth: describe(origin), ...await ub.me() });
         return 0;
       case "usage":
         print(await ub.usage());
@@ -1994,6 +2242,8 @@ Your browser opens ${origin}; approve it and \`unbrowse ${cmd}\` carries on. (Sc
         };
         const fromHere = !args.flags["from-unbrowse"] && !args.flags["no-wait"] && process.env.UNBROWSE_EGRESS !== "server";
         const view = fromHere ? await ub.runOnClient(request, { onRequest: (r) => void io.err(`→ ${r.method} ${r.url}`) }) : await ub.run(request);
+        if (fromHere && view.egress?.mode === "server")
+          io.err("Ran from Unbrowse, not this machine: this site uses your saved sign-in, which never leaves your vault.");
         return settle(ub, view, args, io, print);
       }
       case "scrape": {
@@ -2108,7 +2358,7 @@ Your browser opens ${origin}; approve it and \`unbrowse ${cmd}\` carries on. (Sc
         if (sub === "daemon") {
           const action = rest[1] ?? "status";
           const { D, dir, saved, config } = await cookieSync();
-          const plan = D.servicePlan({ os: io.service?.os, home: io.service?.home, node: io.service?.node ?? process.execPath, cli: io.service?.cli ?? process.argv[1] ?? "" });
+          const plan = D.servicePlan({ os: io.service?.os, home: io.service?.home, node: io.service?.node ?? process.execPath, cli: io.service?.cli ?? process.argv[1] ?? "", account: named });
           const exec = io.exec ?? (() => ({ status: 1, stdout: "", stderr: "no exec" }));
           if (action === "start" || action === "install")
             return await installCookieDaemon(config(), !!args.flags.yes);
@@ -2254,6 +2504,9 @@ Your browser opens ${origin}; approve it and \`unbrowse ${cmd}\` carries on. (Sc
           return io.err("Outcome unknown: a change may have happened. Inspect before retrying."), 4;
         return io.err(`${run.status}${run.error ? `: ${run.error.code} — ${run.error.message}` : ""}`), 1;
       }
+      case "tools":
+      case "tool":
+        return await mcpTools(cmd, rest, args, io, origin, print, client);
       default:
         throw new UsageError(`unknown command "${cmd}". Run \`unbrowse help\`.`);
     }
@@ -2269,10 +2522,13 @@ Your browser opens ${origin}; approve it and \`unbrowse ${cmd}\` carries on. (Sc
       const cause = e.cause;
       e.message = `could not reach ${origin}${cause?.code ? ` (${cause.code})` : cause?.message ? ` (${cause.message})` : ""}. Check the connection, or --base-url / UNBROWSE_BASE_URL.`;
     }
+    const siteSignIn = e.status === 401 && siteLoginRequired(e.body);
     if (args.flags.json)
       print({ error: { status: e.status ?? null, message: e.message, details: e.body ?? null } });
+    else if (siteSignIn)
+      io.err(siteSignInHint(siteSignIn, e.message));
     else
-      io.err(e.status === 401 ? `Not signed in to ${origin}. Run \`unbrowse login\`, or set UNBROWSE_API_KEY.` : `error${e.status ? ` (HTTP ${e.status})` : ""}: ${e.message}`);
+      io.err(e.status === 401 ? `Not signed in to ${origin}${named ? ` as account "${named}"` : ""}. Run \`${loginCmd}\`, or set UNBROWSE_API_KEY.` : `error${e.status ? ` (HTTP ${e.status})` : ""}: ${e.message}`);
     return e.status === 401 ? 3 : 1;
   }
 }
@@ -2307,12 +2563,12 @@ async function settle(ub, view, args, io, print) {
     io.err(`${view.status}: ${view.error.code}${view.error.message ? ` — ${view.error.message}` : ""}`);
   return 1;
 }
-async function mcpAdd(rest, args, io, origin) {
+async function mcpAdd(rest, args, io, origin, account) {
   const HOSTS = ["claude", "codex"];
   const unknown = rest.filter((h) => !HOSTS.includes(h));
   if (unknown.length)
     throw new UsageError(`usage: unbrowse mcp add [claude] [codex] [--name NAME] [--replace] [--dry-run] (unknown: ${unknown.join(", ")})`);
-  const name = (typeof args.flags.name === "string" ? args.flags.name : "") || "unbrowse";
+  const name = (typeof args.flags.name === "string" ? args.flags.name : "") || (account ? `unbrowse-${account}` : "unbrowse");
   const exec = io.exec ?? (() => ({ status: 1, stdout: "", stderr: "no exec" }));
   const dry = !!args.flags["dry-run"];
   const replace = !!args.flags.replace;
@@ -2323,7 +2579,7 @@ async function mcpAdd(rest, args, io, origin) {
   try {
     cli = realpathSync(cli);
   } catch {}
-  const launch = [...io.service?.cli || !ephemeralCli(cli) ? [io.service?.node ?? process.execPath, cli] : shell(["npx", "-y", "unbrowse"]), "mcp", ...origin !== DEFAULT_ORIGIN ? ["--base-url", origin] : []];
+  const launch = [...io.service?.cli || !ephemeralCli(cli) ? [io.service?.node ?? process.execPath, cli] : shell(["npx", "-y", "unbrowse"]), "mcp", ...origin !== DEFAULT_ORIGIN ? ["--base-url", origin] : [], ...account ? ["--account", account] : []];
   const env = ["UNBROWSE_CONFIG_DIR", "XDG_CONFIG_HOME", "CLAUDE_CONFIG_DIR", "UNBROWSE_SHARED_SIGNIN"].flatMap((k) => process.env[k] ? [`${k}=${process.env[k]}`] : []);
   const plans = {
     claude: { get: ["claude", "mcp", "get", name], remove: ["claude", "mcp", "remove", name, "--scope", "user"], add: ["claude", "mcp", "add", "--scope", "user", name, ...env.flatMap((e) => ["-e", e]), "--", ...launch] },
@@ -2354,9 +2610,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) {
@@ -2449,6 +2707,95 @@ ${unique(servers.filter((s) => !s.self)).length} to import: unbrowse mcps import
   }
   return rows.some((r) => r.status === "failed") ? 1 : 0;
 }
+async function mcpTools(cmd, rest, args, io, origin, print, client) {
+  const T = await Promise.resolve().then(() => (init_mcp_tools(), {}));
+  await Promise.resolve().then(() => init_mcp_proxy());
+  await Promise.resolve().then(() => init_src());
+  const url = process.env.UNBROWSE_MCP_URL ?? `${origin}/api/mcp`;
+  const endUser = process.env.UNBROWSE_END_USER;
+  const handle = createProxy(async () => new UnbrowseMcp({ url, apiKey: await tokenFor(origin, url) ?? "", endUser, client: `cli/${VERSION}` }), VERSION, args.flags["from-here"] ? { runLocal: localRun(client) } : {});
+  let id = 0;
+  const rpc = async (method, params) => {
+    const res = await handle({ jsonrpc: "2.0", id: ++id, method, ...params ? { params } : {} });
+    if (res.error)
+      throw Object.assign(new Error(res.error.message), { status: res.error.data?.code === "unauthorized" || /unbrowse login/.test(res.error.message) ? 401 : undefined, code: res.error.data?.code });
+    return res.result;
+  };
+  const { tools } = await rpc("tools/list");
+  if (cmd === "tools") {
+    const query = rest.join(" ");
+    const one = rest.length === 1 ? resolveTool(tools, rest[0]) : undefined;
+    if (one) {
+      if (args.flags.json)
+        return print(one), 0;
+      io.out(`${one.name}
+
+${one.description ?? ""}
+
+Inputs: ${JSON.stringify(one.inputSchema ?? {}, null, 2)}`);
+      return io.err(`Call it: unbrowse tool ${shortName(one.name)} --key value…`), 0;
+    }
+    const shown = query ? filterTools(tools, query) : tools;
+    if (args.flags.json)
+      return print({ tools: shown }), 0;
+    if (!shown.length)
+      return io.err(`No tool matches "${query}". All of them: unbrowse tools`), 1;
+    for (const t of shown)
+      io.out(`${signature(t).padEnd(44)} ${summary(t.description)}`);
+    io.err(`
+${shown.length} tool(s). One in full: unbrowse tools <name> · call one: unbrowse tool <name> --key value…`);
+    return 0;
+  }
+  const typed = need(rest[0], "tool <name> [JSON] [--key value]… (list them: unbrowse tools)");
+  const tool = resolveTool(tools, typed);
+  if (!tool) {
+    const words = typed.toLowerCase().split(/[._\s-]+/).filter((w) => w && w !== "unbrowse");
+    const near = tools.filter((t) => words.some((w) => shortName(t.name).toLowerCase().includes(w))).slice(0, 5).map((t) => shortName(t.name));
+    throw new UsageError(`no MCP tool named "${typed}".${near.length ? ` Did you mean: ${near.join(", ")}?` : ""} List them: unbrowse tools`);
+  }
+  const input = toolInput(tool, rest[1] ? rest.slice(1).join(" ") : typeof args.flags.input === "string" ? args.flags.input : undefined, args.flags, mapValues(args.sets), coerce);
+  const result = await rpc("tools/call", { name: tool.name, arguments: input });
+  const value = resultValue(result);
+  const code = resultCode(result, value);
+  if (code === 1)
+    io.err(typeof value === "string" ? value : JSON.stringify(value, null, 2));
+  else if (typeof value === "string")
+    io.out(value);
+  else
+    print(value);
+  if (code === 2) {
+    const runId = value.runId;
+    io.err(`Input required: ${runId ? `unbrowse resume ${runId} key=value…` : "answer it with unbrowse tool resume"}`);
+  }
+  return code;
+}
+function siteLoginRequired(body) {
+  const err = body?.error;
+  if (err?.code !== "login_required")
+    return;
+  const d = err.details ?? {};
+  let site = typeof d.site === "string" ? d.site : undefined;
+  if (!site && typeof d.finalUrl === "string") {
+    try {
+      site = new URL(d.finalUrl).hostname.replace(/^www\./, "");
+    } catch {}
+  }
+  const next = Array.isArray(d.next) ? d.next.filter((s) => typeof s === "string") : undefined;
+  return { site, next };
+}
+function siteSignInHint(found, message) {
+  const site = found.site ?? "<site>";
+  const lines = [message || `${site} shows a sign-in page.`];
+  if (found.next?.length)
+    lines.push(...found.next.map((s) => `  - ${s}`));
+  else {
+    lines.push(`  Use your own browser's sign-in:  unbrowse cookies sync --domain ${site}`);
+    lines.push(`  Keep it fresh:                   unbrowse cookies daemon start --domain ${site}`);
+  }
+  lines.push("  (--from-here / --from-unbrowse change only where requests come from; neither signs you in.)");
+  return lines.join(`
+`);
+}
 function noCapabilityHint(view, args) {
   const result = view.result ?? {};
   const task = args._.slice(1).join(" ");
@@ -2457,6 +2804,7 @@ function noCapabilityHint(view, args) {
   if (url) {
     lines.push(`  Read the page now:        unbrowse scrape ${url}`);
     lines.push(`  Teach Unbrowse the site:  unbrowse index ${url}   (minutes; then run the task again)`);
+    lines.push(`  Do it in a cloud browser: unbrowse tool browse_open --url ${url}   (recorded, so it teaches the site too)`);
   } else {
     lines.push(`  Name the site:            unbrowse run ${JSON.stringify(task || "<task>")} --url https://…`);
     lines.push("  Read any page now:        unbrowse scrape https://…");
@@ -2503,5 +2851,7 @@ export {
   DEFAULT_ORIGIN,
   main,
   noCapabilityHint,
-  parseArgs
+  parseArgs,
+  siteLoginRequired,
+  siteSignInHint
 };

package/package.json

@@ -1,8 +1,24 @@
 {
   "name": "unbrowse",
-  "version": "12.3.0",
+  "version": "12.4.0",
   "mcpName": "io.github.unbrowse-ai/unbrowse",
   "description": "Call websites as APIs: a thin CLI over the Unbrowse API.",
+  "keywords": [
+    "unbrowse",
+    "cli",
+    "mcp",
+    "browser",
+    "web-scraping",
+    "scraper",
+    "api",
+    "agent",
+    "ai-agent",
+    "claude",
+    "llm",
+    "automation",
+    "headless-browser",
+    "website-to-api"
+  ],
   "license": "MIT",
   "type": "module",
   "homepage": "https://unbrowse.ai",

package/references/tools.json

@@ -251,7 +251,8 @@
             "type": "string"
           },
           "value": {
-            "type": "string"
+            "type": "string",
+            "description": "fill: the text to type. select: the option, by its value or label as the snapshot's `options` list it (any case; a unique part of a label also works)"
           },
           "name": {
             "type": "string"