@oya-ai/cli 1.0.144 → 1.0.146

package/dist/index.js

@@ -35,7 +35,8 @@ var SWITCHES = /* @__PURE__ */ new Set([
   "live",
   "preview",
   "replace",
-  "version"
+  "version",
+  "yes"
 ]);
 var VALUE_FLAGS = {
   after: "--after 120",
@@ -568,12 +569,13 @@ function findRepoRoot(from = process.cwd()) {
   }
   return null;
 }
+var DEFAULT_CLONE = () => join(process.cwd(), "oya-browser");
 var REPO_URL = "https://github.com/OyadotAI/oya-browser.git";
-async function locateRepo(dryRun = false) {
+async function locateRepo(dryRun = false, yes = false) {
   const found = findRepoRoot();
   if (found) return found;
   console.log("\nThis does not look like an oya-browser checkout.");
-  const where = await ask("Clone it to:", join(process.cwd(), "oya-browser"));
+  const where = yes ? DEFAULT_CLONE() : await ask("Clone it to:", DEFAULT_CLONE());
   if (dryRun) return wouldClone(where);
   if (existsSync(where)) throw new Error(`${where} already exists`);
   await run("git", ["clone", "--depth", "1", REPO_URL, where], { cwd: process.cwd() });
@@ -1304,17 +1306,56 @@ function printDone(publicUrl, apiKey) {
   console.log(`  oya login --url ${publicUrl} --key ${apiKey}`);
   console.log(`  oya ls && oya goto https://example.com
 `);
+  console.log(`OYA_BASE_URL=${publicUrl}`);
+  console.log(`OYA_API_KEY=${apiKey}`);
+}
+
+// src/install/defaults.ts
+var NO_LLM = { provider: "skip", baseUrl: "", model: "" };
+function openaiFromEnv(env2) {
+  const { base, model } = LLM_PRESETS.openai;
+  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 || "" } };
+}
+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 } };
+}
+var LOCAL = {
+  version: 1,
+  host: "docker",
+  database: "sqlite",
+  fleet: "docker-workers",
+  workers: 1,
+  publicUrl: `http://localhost:${DEFAULT_PORT}`,
+  optional: { captcha: "", recordingBucket: "", metrics: false }
+};
+function defaultInstall(env2 = process.env) {
+  const { llm, secrets } = llmFromEnv(env2);
+  return { answers: { ...LOCAL, optional: { ...LOCAL.optional }, llm }, secrets };
 }
 
 // src/install.ts
 var ANSWERS_FILE = "oya-install.json";
-async function gather(configPath2, dryRun) {
-  const root = await locateRepo(dryRun);
-  const preset = configPath2 ? readJsonFile(configPath2) : {};
+function presetFor(m) {
+  const saved = m.configPath ? readJsonFile(m.configPath) : {};
+  return m.yes ? { ...defaultInstall().answers, ...saved } : saved;
+}
+function announce(root, m, replay) {
   banner("Oya Browser, self-host install", root);
-  if (configPath2) note(`replaying ${configPath2}`);
-  steps(configPath2 ? 0 : INTERVIEW_STEPS);
-  return { root, ...await interview(preset, !!configPath2) };
+  if (m.configPath) note(`replaying ${m.configPath}`);
+  if (m.yes) note("--yes: SQLite, Docker on this machine, no questions");
+  steps(replay ? 0 : INTERVIEW_STEPS);
+}
+async function gather(m) {
+  const root = await locateRepo(m.dryRun, m.yes);
+  const replay = !!m.configPath || m.yes;
+  announce(root, m, replay);
+  const result = await interview(presetFor(m), replay);
+  if (m.yes) result.secrets = { ...defaultInstall().secrets, ...result.secrets };
+  return { root, ...result };
 }
 async function checkMachine(root, answers, dryRun) {
   const checks = await preflight(root, answers);
@@ -1329,21 +1370,28 @@ function warnLocalDatabase(answers, databaseUrl = "") {
   warn("DATABASE_URL points at localhost, which inside a container means the container itself.");
   note("Use host.docker.internal (macOS, Windows) or the host IP so the server can reach it.");
 }
-async function guardKek(existing, answers, root, dryRun) {
-  if (existing.OYA_PROFILE_SECRET || answers.host !== "docker" || dryRun) return;
+function unattendedKek(volume) {
+  if (process.env.OYA_PROFILE_SECRET) return process.env.OYA_PROFILE_SECRET;
+  throw new Error(
+    `${volume} holds encrypted data from an earlier install, and there is no .env with its OYA_PROFILE_SECRET.
+  Re-run with OYA_PROFILE_SECRET=<the old secret> set, or without --yes to choose what to do.`
+  );
+}
+async function guardKek(existing, answers, root, m) {
+  if (existing.OYA_PROFILE_SECRET || answers.host !== "docker" || m.dryRun) return;
   const volume = await priorState();
   if (!volume) return;
-  const reused = await resolveKekConflict(volume, root);
+  const reused = m.yes ? unattendedKek(volume) : await resolveKekConflict(volume, root);
   if (reused) existing.OYA_PROFILE_SECRET = reused;
 }
-async function plan(flags, dryRun) {
-  const interviewed = await gather(typeof flags.config === "string" ? flags.config : null, dryRun);
+async function plan(m) {
+  const interviewed = await gather(m);
   const { root, answers, secrets } = interviewed;
-  await checkMachine(root, answers, dryRun);
+  await checkMachine(root, answers, m.dryRun);
   warnLocalDatabase(answers, secrets.DATABASE_URL);
   const envPath = join5(root, ".env");
   const existing = readEnv(envPath);
-  await guardKek(existing, answers, root, dryRun);
+  await guardKek(existing, answers, root, m);
   return { ...interviewed, envPath, existing, env: buildEnv(answers, secrets, existing) };
 }
 function writeFiles(p) {
@@ -1370,10 +1418,11 @@ async function apply2(p) {
   printDone(p.answers.publicUrl, p.env.apiKey);
 }
 async function cmdInstall(flags) {
-  const dryRun = flags["dry-run"] === true;
-  const p = await plan(flags, dryRun);
+  const configPath2 = typeof flags.config === "string" ? flags.config : null;
+  const m = { configPath: configPath2, yes: flags.yes === true, dryRun: flags["dry-run"] === true };
+  const p = await plan(m);
   printPlan(p.answers, p.envPath);
-  if (dryRun) return printDryRun(p.env.values);
+  if (m.dryRun) return printDryRun(p.env.values);
   await apply2(p);
 }
 
@@ -3056,7 +3105,9 @@ var HELP = `oya, thousands of browsers, one API
 Usage: oya <command> [arguments] [options]
 
 Set up
-  oya install [--dry-run] [--config <file>]  Stand up a self-hosted control plane
+  oya install [--yes] [--dry-run] [--config <file>]
+                                             Stand up a self-hosted control plane;
+                                             --yes: SQLite + Docker here, no questions
   oya login [--key <key>] [--url <url>]      Save an API key for this machine
   oya init                                   Set your model, browser provider and sign-ins
   oya whoami                                 Which control plane and key are in use, and from where

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oya-ai/cli",
-  "version": "1.0.144",
+  "version": "1.0.146",
   "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.144",
+    "@oya-ai/browser": "1.0.146",
     "@types/node": "^20.19.43",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0"