@oya-ai/cli 1.0.209 → 1.0.213

package/dist/index.js

@@ -1049,8 +1049,10 @@ var FLEETS = {
   "oya-cloud": oyaCloud,
   "oya-selfhosted": governedDocker,
   k8s: kubernetes,
-  "docker-workers": (v) => {
-    v.OYA_BROWSER_PROVIDER = "oya-selfhosted";
+  // Always-on workers dial in on their own, so no provider is named: a bare start()
+  // then borrows a connected worker. Naming oya-selfhosted sent every start to the
+  // managed launcher, which this fleet does not run, and start() failed on a fresh install.
+  "docker-workers": () => {
   }
 };
 function fleetSettings(v, input) {
@@ -1260,6 +1262,7 @@ function nativeContext() {
 async function provisionDocker(root, a) {
   if (a.fleet === "oya-selfhosted") await provisionGoverned(root);
   const scale = a.fleet === "docker-workers" ? ["--scale", `browser=${a.workers}`] : ["--scale", "browser=0"];
+  if (a.fleet === "docker-workers") await run("docker", ["compose", "pull", "--quiet", "browser"], { cwd: root });
   await run("docker", ["compose", "up", "-d", "--build", ...scale], { cwd: root });
 }
 async function isReady(url) {
@@ -1334,11 +1337,17 @@ function openaiFromEnv(env2) {
   const llm = { provider: "openai", baseUrl: env2.OPENAI_BASE_URL || base, model: env2.CHAT_MODEL || model };
   return { llm, secrets: { OPENAI_API_KEY: env2.OPENAI_API_KEY || "" } };
 }
+var KEYED_PROVIDERS = [
+  ["ANTHROPIC_API_KEY", "anthropic"],
+  ["GEMINI_API_KEY", "gemini"]
+];
 function llmFromEnv(env2) {
   if (env2.OPENAI_API_KEY) return openaiFromEnv(env2);
-  if (!env2.ANTHROPIC_API_KEY) return { llm: NO_LLM, secrets: {} };
-  const { base, model } = LLM_PRESETS.anthropic;
-  return { llm: { provider: "anthropic", baseUrl: base, model }, secrets: { OPENAI_API_KEY: env2.ANTHROPIC_API_KEY } };
+  const found = KEYED_PROVIDERS.find(([name2]) => env2[name2]);
+  if (!found) return { llm: NO_LLM, secrets: {} };
+  const [name, provider] = found;
+  const { base, model } = LLM_PRESETS[provider];
+  return { llm: { provider, baseUrl: base, model }, secrets: { OPENAI_API_KEY: env2[name] } };
 }
 var LOCAL = {
   version: 1,
@@ -1636,18 +1645,20 @@ function saveKey(apiKey, baseUrl) {
 var OPTIONS_ORIGIN = { apiKeyFrom: "the apiKey option", baseUrlFrom: "the baseUrl option", savedKey: false };
 var Http = class {
   /** Stores where to call, with which key, how long to wait, which fetch to use, and where the key and address came from. */
-  constructor(baseUrl, apiKey, timeoutMs, fetchImpl, origin3 = OPTIONS_ORIGIN) {
+  constructor(baseUrl, apiKey, timeoutMs, fetchImpl, origin3 = OPTIONS_ORIGIN, defaults = {}) {
     this.baseUrl = baseUrl;
     this.apiKey = apiKey;
     this.timeoutMs = timeoutMs;
     this.fetchImpl = fetchImpl;
     this.origin = origin3;
+    this.defaults = defaults;
   }
   baseUrl;
   apiKey;
   timeoutMs;
   fetchImpl;
   origin;
+  defaults;
   /** 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);
@@ -1655,7 +1666,11 @@ var Http = class {
   }
   /** The fetch options for one call, with this client's key on them. */
   init(method, body, timeoutMs, headers) {
-    return requestInit(method, body, timeoutMs, { Authorization: `Bearer ${this.apiKey}`, ...headers });
+    return requestInit(method, body, timeoutMs, {
+      Authorization: `Bearer ${this.apiKey}`,
+      ...this.defaults,
+      ...headers
+    });
   }
   /**
    * fetch's own failures say only "fetch failed" or "The operation was
@@ -1740,7 +1755,7 @@ function deploymentOf2(url) {
   }
 }
 function noKey(saved, address) {
-  if (!saved.apiKey) return "No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.";
+  if (!saved.apiKey) return "No API key. Get one at https://oyabrowser.com, then set OYA_API_KEY or pass { apiKey }.";
   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}\`.`;
 }
@@ -1752,7 +1767,18 @@ function createHttp(options) {
   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 };
   const timeout = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  return new Http(webAddress(address), key.value, timeout, fetchImpl.bind(globalThis), origin3);
+  return new Http(webAddress(address), key.value, timeout, fetchImpl.bind(globalThis), origin3, modelHeaders(options));
+}
+var MODEL_FIX = "Check the model option.";
+function modelHeaders({ model }) {
+  if (!model) return {};
+  const fields = [
+    ["provider", "X-Oya-Llm-Provider"],
+    ["name", "X-Oya-Llm-Model"],
+    ["apiKey", "X-Oya-Llm-Api-Key"]
+  ];
+  const set = fields.filter(([field]) => model[field]);
+  return Object.fromEntries(set.map(([field, name]) => [name, headerSafe(model[field], `model.${field}`, MODEL_FIX)]));
 }
 var LOCAL_HOST = /^(localhost|127\.)/i;
 function webAddress({ value, from }) {

package/package.json

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