@oya-ai/cli 1.0.202 → 1.0.203

package/dist/index.js

@@ -1517,11 +1517,23 @@ function first(flag, env2, saved, names) {
 }
 function origin({ apiKey, baseUrl } = {}) {
   const saved = load();
-  const key = first(apiKey, process.env.OYA_API_KEY, saved.apiKey, KEY_SOURCES);
   const url = first(baseUrl, process.env.OYA_BASE_URL, saved.baseUrl, URL_SOURCES);
   const address = (url?.value ?? DEFAULT_BASE_URL).replace(/\/+$/, "");
+  const key = first(apiKey, process.env.OYA_API_KEY, savedKeyFor(saved, address), KEY_SOURCES);
   const found = { apiKey: key?.value ?? "", apiKeyFrom: key?.from ?? "none", baseUrl: address };
-  return { ...found, baseUrlFrom: url?.from ?? "default", savedKey: !!saved.apiKey };
+  return { ...found, baseUrlFrom: url?.from ?? "default", savedKey: !!saved.apiKey, savedUrl: saved.baseUrl };
+}
+function savedKeyFor(saved, address) {
+  if (!saved.baseUrl || deploymentOf(saved.baseUrl) === deploymentOf(address)) return saved.apiKey;
+  return void 0;
+}
+function deploymentOf(url) {
+  try {
+    const { origin: site, pathname } = new URL(String(url).trim());
+    return `${site}${pathname.replace(/\/+$/, "")}`;
+  } catch {
+    return String(url).trim().replace(/\/+$/, "");
+  }
 }
 var KEY_SOURCES = ["--key", "OYA_API_KEY", "saved"];
 var URL_SOURCES = ["--url", "OYA_BASE_URL", "saved"];
@@ -1631,6 +1643,11 @@ var Http = class {
     this.fetchImpl = fetchImpl;
     this.origin = origin3;
   }
+  baseUrl;
+  apiKey;
+  timeoutMs;
+  fetchImpl;
+  origin;
   /** Sends one request and returns the parsed answer, or throws an OyaError when it failed. */
   async request(method, path, body, timeoutMs = this.timeoutMs, headers = {}) {
     const res = await this.send(`${this.baseUrl}${path}`, this.init(method, body, timeoutMs, headers), timeoutMs);
@@ -1705,15 +1722,32 @@ function addressOf(options, saved) {
   const found = firstOf(options.baseUrl, "OYA_BASE_URL", saved, "baseUrl");
   return found.value ? found : { value: DEFAULT_BASE_URL2, from: "default" };
 }
-function keyOf(options, saved) {
-  const found = firstOf(options.apiKey, "OYA_API_KEY", saved, "apiKey");
-  if (!found.value) throw new Error("No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.");
+function keyOf(options, saved, address) {
+  const found = firstOf(options.apiKey, "OYA_API_KEY", savedKeyFor2(saved, address), "apiKey");
+  if (!found.value) throw new Error(noKey(saved, address));
   return { ...found, value: headerSafe(found.value, "apiKey", "Copy the key again.") };
 }
+function savedKeyFor2(saved, address) {
+  if (!saved.baseUrl || deploymentOf2(saved.baseUrl) === deploymentOf2(address)) return saved.apiKey;
+  return void 0;
+}
+function deploymentOf2(url) {
+  try {
+    const { origin: origin3, pathname } = new URL(String(url).trim());
+    return `${origin3}${pathname.replace(/\/+$/, "")}`;
+  } catch {
+    return String(url).trim().replace(/\/+$/, "");
+  }
+}
+function noKey(saved, address) {
+  if (!saved.apiKey) return "No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.";
+  const why = `the key saved in ~/.oya/config.json is for ${saved.baseUrl} and is only sent there`;
+  return `No API key for ${address}: ${why}. Pass { apiKey }, set OYA_API_KEY, or run \`npx @oya-ai/cli login --url ${address}\`.`;
+}
 function createHttp(options) {
   const saved = savedConfig();
-  const key = keyOf(options, saved.apiKey);
   const address = addressOf(options, saved.baseUrl);
+  const key = keyOf(options, saved, webAddress(address));
   const fetchImpl = options.fetch || globalThis.fetch;
   if (!fetchImpl) throw new Error("No fetch available, pass { fetch } or use Node 18+.");
   const origin3 = { apiKeyFrom: key.from, baseUrlFrom: address.from, savedKey: !!saved.apiKey };
@@ -1824,6 +1858,8 @@ var Run = class {
     this.done.catch(() => {
     });
   }
+  http;
+  id;
   /** Settles with the result when the run succeeds, or rejects when it fails. */
   done;
   /** The run's current state. */
@@ -1847,6 +1883,8 @@ var Browser = class {
     ({ id: this.id, provider: this.provider, persona: this.persona, cdpUrl: this.cdpUrl } = info);
     this.reused = info.reused === true;
   }
+  http;
+  autoCaptcha;
   /** The browser's id. */
   id;
   /** Which provider runs it. */
@@ -2501,11 +2539,15 @@ var Oya = class {
 // src/context.ts
 var origin2 = (flags) => origin({ apiKey: flagStr(flags, "key"), baseUrl: flagStr(flags, "url") });
 function client(flags) {
-  const { apiKey, baseUrl } = origin2(flags);
-  if (!apiKey)
-    throw new CliError("No API key.", "no_api_key", { hint: "Run oya login, or pass --key, or set OYA_API_KEY." });
+  const { apiKey, baseUrl, savedKey, savedUrl } = origin2(flags);
+  if (!apiKey) throw new CliError("No API key.", "no_api_key", { hint: noKeyHint(baseUrl, savedKey, savedUrl) });
   return new Oya({ apiKey, baseUrl });
 }
+function noKeyHint(baseUrl, savedKey, savedUrl) {
+  if (!savedKey) return "Run oya login, or pass --key, or set OYA_API_KEY.";
+  const why = `The key oya login saved is for ${savedUrl ?? "another control plane"} and is only sent there.`;
+  return `${why} Pass --key or set OYA_API_KEY for ${baseUrl}, or run oya login --url ${baseUrl} to replace the saved key.`;
+}
 var printJson = (value) => console.log(JSON.stringify(value, null, JSON_INDENT2));
 var out = (flags, value, human) => {
   if (flags.json) printJson(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oya-ai/cli",
-  "version": "1.0.202",
+  "version": "1.0.203",
   "description": "Command line for the Oya browser control plane.",
   "license": "MIT",
   "homepage": "https://oyabrowser.com",
@@ -50,9 +50,9 @@
     "access": "public"
   },
   "devDependencies": {
-    "@oya-ai/browser": "1.0.202",
+    "@oya-ai/browser": "1.0.203",
     "@types/node": "^20.19.43",
-    "tsup": "^8.5.1",
+    "tsup": "^9.0.0",
     "typescript": "^6.0.3"
   },
   "author": "mk@getoya.ai"