@ovrdev/cli 0.1.0-alpha.16 → 0.1.0-alpha.18

package/dist/cli/index.js

@@ -6,6 +6,7 @@ import {
   coerceEnv,
   collectRefTargets,
   configAsks,
+  defaultRoot,
   evalConfig,
   forkChain,
   forkTreeOrder,
@@ -32,14 +33,143 @@ import {
   serviceRefs,
   withLocalBins,
   workspaceOrder
-} from "../index-4m3gj5te.js";
+} from "../index-s6rge1qt.js";
 
 // src/cli/cmd.ts
 import * as clack2 from "@clack/prompts";
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync9, readFileSync as readFileSync7, writeFileSync as writeFileSync8 } from "node:fs";
 import { homedir } from "node:os";
-import { join as join9, resolve as resolve2 } from "node:path";
+import { basename as basename2, join as join9, resolve as resolve2 } from "node:path";
+
+// src/core/load.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { createInterface } from "node:readline/promises";
+import { pathToFileURL } from "node:url";
+var CONFIG_FILES = ["ovr.config.mts", "ovr.config.ts", "ovr.config.js", "ovr.config.mjs"];
+var findConfigFile = (dir) => CONFIG_FILES.map((f) => join(dir, f)).find(existsSync);
+var answersPath = (dir) => join(dir, ".ovr", "answers.json");
+var readAnswers = (dir) => {
+  try {
+    return JSON.parse(readFileSync(answersPath(dir), "utf8"));
+  } catch {
+    return {};
+  }
+};
+var writeAnswers = (dir, a) => {
+  mkdirSync(join(dir, ".ovr"), { recursive: true });
+  writeFileSync(answersPath(dir), `${JSON.stringify(a, null, "\t")}
+`);
+};
+function coerceAnswer(spec, raw) {
+  if (spec.kind === "confirm") {
+    if (typeof raw === "boolean")
+      return raw;
+    if (raw === "true" || raw === "y" || raw === "yes" || raw === "1")
+      return true;
+    if (raw === "false" || raw === "n" || raw === "no" || raw === "0")
+      return false;
+    return;
+  }
+  return typeof raw === "string" && spec.options.includes(raw) ? raw : undefined;
+}
+async function resolveAsks(asks, opts) {
+  const answers = {};
+  let changed = false;
+  for (const [key, spec] of Object.entries(asks)) {
+    const flag = opts.overrides[key] !== undefined ? coerceAnswer(spec, opts.overrides[key]) : undefined;
+    if (flag !== undefined) {
+      answers[key] = flag;
+      changed ||= opts.saved[key] !== flag;
+      continue;
+    }
+    if (!opts.reask) {
+      const saved = coerceAnswer(spec, opts.saved[key]);
+      if (saved !== undefined) {
+        answers[key] = saved;
+        continue;
+      }
+    }
+    if (opts.prompt) {
+      answers[key] = coerceAnswer(spec, await opts.prompt(key, spec)) ?? spec.default;
+      changed = true;
+      continue;
+    }
+    if (spec.default !== undefined) {
+      answers[key] = spec.default;
+      changed = true;
+    }
+  }
+  return { answers, changed };
+}
+async function promptAsk(repo, key, spec) {
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  try {
+    if (spec.kind === "confirm") {
+      const hint = spec.default === false ? "y/N" : spec.default === true ? "Y/n" : "y/n";
+      const raw = (await rl.question(`? ${repo}: ${spec.question} (${hint}) `)).trim().toLowerCase();
+      if (!raw && spec.default !== undefined)
+        return spec.default;
+      return raw === "y" || raw === "yes" || raw === "true" || raw === "1";
+    }
+    process.stderr.write(`? ${repo}: ${spec.question}
+`);
+    spec.options.forEach((o, i) => {
+      process.stderr.write(`  ${i + 1}) ${o}${o === spec.default ? "  (default)" : ""}
+`);
+    });
+    for (;; ) {
+      const raw = (await rl.question("> ")).trim();
+      if (!raw && spec.default !== undefined)
+        return spec.default;
+      const byNum = spec.options[Number.parseInt(raw, 10) - 1];
+      if (byNum)
+        return byNum;
+      if (spec.options.includes(raw))
+        return raw;
+      process.stderr.write(`  pick 1-${spec.options.length}
+`);
+    }
+  } finally {
+    rl.close();
+  }
+}
+async function loadRepoConfig(dir, workspace, repo, opts = {}) {
+  const file = findConfigFile(dir);
+  if (!file)
+    return null;
+  const mod = await import(pathToFileURL(file).href);
+  const config = mod.default ?? mod;
+  const asks = configAsks(config);
+  let answers;
+  if (Object.keys(asks).length) {
+    const interactive = process.stdin.isTTY && process.stderr.isTTY;
+    const resolved = await resolveAsks(asks, {
+      saved: readAnswers(dir),
+      overrides: opts.answers ?? {},
+      reask: opts.reask,
+      prompt: interactive ? (key, spec) => promptAsk(repo, key, spec) : undefined
+    });
+    answers = resolved.answers;
+    if (resolved.changed)
+      writeAnswers(dir, answers);
+  }
+  return evalConfig(config, workspace, repo, dir, answers);
+}
+function parseAskFlags(args) {
+  const answers = {};
+  for (let i = 0;i < args.length; i++) {
+    if (args[i] === "--mode" && args[i + 1])
+      answers.mode = args[++i];
+    else if (args[i] === "--answer" && args[i + 1]) {
+      const eq = args[++i].indexOf("=");
+      if (eq > 0)
+        answers[args[i].slice(0, eq)] = args[i].slice(eq + 1);
+    }
+  }
+  return { answers, reask: args.includes("--ask") };
+}
 
 // src/util/color.ts
 var useColor = process.stdout.isTTY && !process.env.NO_COLOR;
@@ -53,15 +183,15 @@ var magenta = (s) => paint("35", s);
 var blue = (s) => paint("34", s);
 
 // src/engine/ports.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { createServer } from "node:net";
-import { dirname, join } from "node:path";
-var PORTS_PATH = join(CONFIG_DIR, "ports.json");
+import { dirname, join as join2 } from "node:path";
+var PORTS_PATH = join2(CONFIG_DIR, "ports.json");
 var loadFile = (file) => {
-  if (!existsSync(file))
+  if (!existsSync2(file))
     return {};
   try {
-    return JSON.parse(readFileSync(file, "utf8"));
+    return JSON.parse(readFileSync2(file, "utf8"));
   } catch {
     return {};
   }
@@ -87,7 +217,7 @@ function releasePorts(workspace, file = PORTS_PATH) {
   if (!(workspace in all))
     return;
   delete all[workspace];
-  writeFileSync(file, `${JSON.stringify(all, null, "\t")}
+  writeFileSync2(file, `${JSON.stringify(all, null, "\t")}
 `);
 }
 function createPortRegistry(workspace, file = PORTS_PATH) {
@@ -95,8 +225,8 @@ function createPortRegistry(workspace, file = PORTS_PATH) {
   const save = () => {
     const all = loadFile(file);
     all[workspace] = recorded;
-    mkdirSync(dirname(file), { recursive: true });
-    writeFileSync(file, `${JSON.stringify(all, null, "\t")}
+    mkdirSync2(dirname(file), { recursive: true });
+    writeFileSync2(file, `${JSON.stringify(all, null, "\t")}
 `);
   };
   const reservedElsewhere = (service, slot) => {
@@ -138,10 +268,10 @@ function createPortRegistry(workspace, file = PORTS_PATH) {
 }
 
 // src/engine/paths.ts
-import { mkdirSync as mkdirSync2, rmSync as rmSync2 } from "node:fs";
+import { mkdirSync as mkdirSync3, rmSync as rmSync2 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join2 } from "node:path";
-var DATA_ROOT = join2(CONFIG_DIR, "data");
+import { join as join3 } from "node:path";
+var DATA_ROOT = join3(CONFIG_DIR, "data");
 function safeSegments(label) {
   const segs = label.split(/[/\\]+/).filter((s) => s && s !== ".");
   for (const s of segs)
@@ -150,14 +280,14 @@ function safeSegments(label) {
   return segs;
 }
 function releaseData(workspace, root = DATA_ROOT) {
-  rmSync2(join2(root, workspace), { recursive: true, force: true });
+  rmSync2(join3(root, workspace), { recursive: true, force: true });
 }
 function createPathRegistry(workspace, root = DATA_ROOT) {
   return {
     forService(service) {
       return (label) => {
-        const dir = join2(root, workspace, service, ...label ? safeSegments(label) : []);
-        mkdirSync2(dir, { recursive: true });
+        const dir = join3(root, workspace, service, ...label ? safeSegments(label) : []);
+        mkdirSync3(dir, { recursive: true });
         return dir;
       };
     },
@@ -166,15 +296,15 @@ function createPathRegistry(workspace, root = DATA_ROOT) {
     }
   };
 }
-var dataDirPath = (workspace, service, root = DATA_ROOT) => join2(root, workspace, service);
-var SCRATCH_ROOT = join2(tmpdir(), "ovr-scratch");
+var dataDirPath = (workspace, service, root = DATA_ROOT) => join3(root, workspace, service);
+var SCRATCH_ROOT = join3(tmpdir(), "ovr-scratch");
 function createScratchRegistry(workspace, root = SCRATCH_ROOT) {
-  rmSync2(join2(root, workspace), { recursive: true, force: true });
+  rmSync2(join3(root, workspace), { recursive: true, force: true });
   return {
     forService(service) {
       return (label) => {
-        const dir = join2(root, workspace, service, ...label ? safeSegments(label) : []);
-        mkdirSync2(dir, { recursive: true });
+        const dir = join3(root, workspace, service, ...label ? safeSegments(label) : []);
+        mkdirSync3(dir, { recursive: true });
         return dir;
       };
     }
@@ -183,8 +313,8 @@ function createScratchRegistry(workspace, root = SCRATCH_ROOT) {
 
 // src/engine/keys.ts
 import { createHash, createPublicKey, generateKeyPairSync } from "node:crypto";
-import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname2, join as join3 } from "node:path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { dirname as dirname2, join as join4 } from "node:path";
 var ALG = { ed25519: "EdDSA", rsa: "RS256", ec: "ES256" };
 function jwkThumbprint(jwk) {
   const members = jwk.kty === "RSA" ? ["e", "kty", "n"] : jwk.kty === "EC" ? ["crv", "kty", "x", "y"] : ["crv", "kty", "x"];
@@ -197,12 +327,12 @@ function sshField(v) {
   len.writeUInt32BE(b.length);
   return Buffer.concat([len, b]);
 }
-var KEYS_PATH = join3(CONFIG_DIR, "keys.json");
+var KEYS_PATH = join4(CONFIG_DIR, "keys.json");
 var loadFile2 = (file) => {
-  if (!existsSync2(file))
+  if (!existsSync3(file))
     return {};
   try {
-    return JSON.parse(readFileSync2(file, "utf8"));
+    return JSON.parse(readFileSync3(file, "utf8"));
   } catch {
     return {};
   }
@@ -216,7 +346,7 @@ function releaseKeys(workspace, file = KEYS_PATH) {
   if (!(workspace in all))
     return;
   delete all[workspace];
-  writeFileSync2(file, `${JSON.stringify(all, null, "\t")}
+  writeFileSync3(file, `${JSON.stringify(all, null, "\t")}
 `);
 }
 function createKeyRegistry(workspace, file = KEYS_PATH, dataRoot = DATA_ROOT) {
@@ -224,8 +354,8 @@ function createKeyRegistry(workspace, file = KEYS_PATH, dataRoot = DATA_ROOT) {
   const save = () => {
     const all = loadFile2(file);
     all[workspace] = recorded;
-    mkdirSync3(dirname2(file), { recursive: true });
-    writeFileSync2(file, `${JSON.stringify(all, null, "\t")}
+    mkdirSync4(dirname2(file), { recursive: true });
+    writeFileSync3(file, `${JSON.stringify(all, null, "\t")}
 `);
   };
   return {
@@ -258,13 +388,13 @@ function createKeyRegistry(workspace, file = KEYS_PATH, dataRoot = DATA_ROOT) {
               return { publicKey: `ssh-ed25519 ${wire.toString("base64")} ${sopts.comment ?? "ovr"}`, privateKey };
             },
             write(wopts = {}) {
-              const base = join3(dataDirPath(workspace, service, dataRoot), "keys");
-              mkdirSync3(base, { recursive: true });
+              const base = join4(dataDirPath(workspace, service, dataRoot), "keys");
+              mkdirSync4(base, { recursive: true });
               const nm = wopts.name ?? name;
-              const privateKeyPath = join3(base, `${nm}.key`);
-              const publicKeyPath = join3(base, `${nm}.pub`);
-              writeFileSync2(privateKeyPath, privateKey);
-              writeFileSync2(publicKeyPath, publicKey);
+              const privateKeyPath = join4(base, `${nm}.key`);
+              const publicKeyPath = join4(base, `${nm}.pub`);
+              writeFileSync3(privateKeyPath, privateKey);
+              writeFileSync3(publicKeyPath, publicKey);
               return { privateKeyPath, publicKeyPath };
             }
           };
@@ -279,21 +409,21 @@ function createKeyRegistry(workspace, file = KEYS_PATH, dataRoot = DATA_ROOT) {
 }
 
 // src/engine/running.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname3, join as join4 } from "node:path";
-var RUNNING_PATH = join4(CONFIG_DIR, "running.json");
+import { existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "node:fs";
+import { dirname as dirname3, join as join5 } from "node:path";
+var RUNNING_PATH = join5(CONFIG_DIR, "running.json");
 var load = (file) => {
-  if (!existsSync3(file))
+  if (!existsSync4(file))
     return {};
   try {
-    return JSON.parse(readFileSync3(file, "utf8"));
+    return JSON.parse(readFileSync4(file, "utf8"));
   } catch {
     return {};
   }
 };
 var save = (file, data) => {
-  mkdirSync4(dirname3(file), { recursive: true });
-  writeFileSync3(file, `${JSON.stringify(data, null, "\t")}
+  mkdirSync5(dirname3(file), { recursive: true });
+  writeFileSync4(file, `${JSON.stringify(data, null, "\t")}
 `);
 };
 var pidAlive = (pid) => {
@@ -398,137 +528,6 @@ import { execSync } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
 import { mkdirSync as mkdirSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "node:fs";
 import { join as join6 } from "node:path";
-
-// src/core/load.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "node:fs";
-import { join as join5 } from "node:path";
-import { createInterface } from "node:readline/promises";
-import { pathToFileURL } from "node:url";
-var CONFIG_FILES = ["ovr.config.mts", "ovr.config.ts", "ovr.config.js", "ovr.config.mjs"];
-var findConfigFile = (dir) => CONFIG_FILES.map((f) => join5(dir, f)).find(existsSync4);
-var answersPath = (dir) => join5(dir, ".ovr", "answers.json");
-var readAnswers = (dir) => {
-  try {
-    return JSON.parse(readFileSync4(answersPath(dir), "utf8"));
-  } catch {
-    return {};
-  }
-};
-var writeAnswers = (dir, a) => {
-  mkdirSync5(join5(dir, ".ovr"), { recursive: true });
-  writeFileSync4(answersPath(dir), `${JSON.stringify(a, null, "\t")}
-`);
-};
-function coerceAnswer(spec, raw) {
-  if (spec.kind === "confirm") {
-    if (typeof raw === "boolean")
-      return raw;
-    if (raw === "true" || raw === "y" || raw === "yes" || raw === "1")
-      return true;
-    if (raw === "false" || raw === "n" || raw === "no" || raw === "0")
-      return false;
-    return;
-  }
-  return typeof raw === "string" && spec.options.includes(raw) ? raw : undefined;
-}
-async function resolveAsks(asks, opts) {
-  const answers = {};
-  let changed = false;
-  for (const [key, spec] of Object.entries(asks)) {
-    const flag = opts.overrides[key] !== undefined ? coerceAnswer(spec, opts.overrides[key]) : undefined;
-    if (flag !== undefined) {
-      answers[key] = flag;
-      changed ||= opts.saved[key] !== flag;
-      continue;
-    }
-    if (!opts.reask) {
-      const saved = coerceAnswer(spec, opts.saved[key]);
-      if (saved !== undefined) {
-        answers[key] = saved;
-        continue;
-      }
-    }
-    if (opts.prompt) {
-      answers[key] = coerceAnswer(spec, await opts.prompt(key, spec)) ?? spec.default;
-      changed = true;
-      continue;
-    }
-    if (spec.default !== undefined) {
-      answers[key] = spec.default;
-      changed = true;
-    }
-  }
-  return { answers, changed };
-}
-async function promptAsk(repo, key, spec) {
-  const rl = createInterface({ input: process.stdin, output: process.stderr });
-  try {
-    if (spec.kind === "confirm") {
-      const hint = spec.default === false ? "y/N" : spec.default === true ? "Y/n" : "y/n";
-      const raw = (await rl.question(`? ${repo}: ${spec.question} (${hint}) `)).trim().toLowerCase();
-      if (!raw && spec.default !== undefined)
-        return spec.default;
-      return raw === "y" || raw === "yes" || raw === "true" || raw === "1";
-    }
-    process.stderr.write(`? ${repo}: ${spec.question}
-`);
-    spec.options.forEach((o, i) => {
-      process.stderr.write(`  ${i + 1}) ${o}${o === spec.default ? "  (default)" : ""}
-`);
-    });
-    for (;; ) {
-      const raw = (await rl.question("> ")).trim();
-      if (!raw && spec.default !== undefined)
-        return spec.default;
-      const byNum = spec.options[Number.parseInt(raw, 10) - 1];
-      if (byNum)
-        return byNum;
-      if (spec.options.includes(raw))
-        return raw;
-      process.stderr.write(`  pick 1-${spec.options.length}
-`);
-    }
-  } finally {
-    rl.close();
-  }
-}
-async function loadRepoConfig(dir, workspace, repo, opts = {}) {
-  const file = findConfigFile(dir);
-  if (!file)
-    return null;
-  const mod = await import(pathToFileURL(file).href);
-  const config = mod.default ?? mod;
-  const asks = configAsks(config);
-  let answers;
-  if (Object.keys(asks).length) {
-    const interactive = process.stdin.isTTY && process.stderr.isTTY;
-    const resolved = await resolveAsks(asks, {
-      saved: readAnswers(dir),
-      overrides: opts.answers ?? {},
-      reask: opts.reask,
-      prompt: interactive ? (key, spec) => promptAsk(repo, key, spec) : undefined
-    });
-    answers = resolved.answers;
-    if (resolved.changed)
-      writeAnswers(dir, answers);
-  }
-  return evalConfig(config, workspace, repo, dir, answers);
-}
-function parseAskFlags(args) {
-  const answers = {};
-  for (let i = 0;i < args.length; i++) {
-    if (args[i] === "--mode" && args[i + 1])
-      answers.mode = args[++i];
-    else if (args[i] === "--answer" && args[i + 1]) {
-      const eq = args[++i].indexOf("=");
-      if (eq > 0)
-        answers[args[i].slice(0, eq)] = args[i].slice(eq + 1);
-    }
-  }
-  return { answers, reask: args.includes("--ask") };
-}
-
-// src/core/setup.ts
 var markerPath = (dir) => join6(dir, ".ovr", "setup");
 var stepsHash = (steps) => createHash2("sha1").update(JSON.stringify(steps)).digest("hex").slice(0, 12);
 function provisioned(dir, hash) {
@@ -782,6 +781,22 @@ import { defineConfig } from "@ovrdev/cli"
 
 export default defineConfig({ plugins: [] }, ({ workspace, kind }) => ({
 	services: {
+		// A placeholder so \`ovr run\` boots something right away. It prints a few tips and
+		// stays up until you quit (qq). Replace it with your real service(s) — see the example.
+		hello: kind.shell({
+			command: [
+				"echo ''",
+				"echo '  \uD83D\uDC4B ovr is running this repo.'",
+				"echo ''",
+				"echo '  • Edit ovr.config.mts to declare your real services, then rerun ovr run.'",
+				"echo '  • A service is a process: kind.shell({ command, env, ready, exports }).'",
+				"echo '  • Every service gets its own allocated port — cross-wire with refs.'",
+				"echo '  • Press qq to quit; a service that stays up keeps the run alive.'",
+				"echo ''",
+				"tail -f /dev/null", // hang until ovr stops it (SIGTERM on quit)
+			].join(" && "),
+		}),
+
 		// web: kind.shell({
 		// 	prepare: async ({ ports }) => ({ port: await ports.alloc() }),
 		// 	command: ({ port }) => \`pnpm dev --port \${port}\`,
@@ -809,6 +824,11 @@ function seedServiceConfig(cfg, workspace, repo) {
       }
     }
   }
+  return seedStarterConfig(dir);
+}
+function seedStarterConfig(dir) {
+  if (CONFIG_NAMES.some((f) => existsSync6(join8(dir, f))))
+    return;
   writeFileSync7(join8(dir, "ovr.config.mts"), STARTER_CONFIG);
   return { file: "ovr.config.mts" };
 }
@@ -893,6 +913,46 @@ async function cmdSetup(args = [], override) {
   if (!touched)
     console.log(dim("Nothing to provision (no setup declared, or nothing overridden)."));
 }
+function methodOfUrl(url) {
+  if (/^(git@|ssh:\/\/)/.test(url))
+    return "ssh";
+  if (/^https?:\/\//.test(url))
+    return "https";
+  return;
+}
+function inferCloneMethod(cfg) {
+  for (const def of Object.values(cfg.workspaces)) {
+    for (const decl of Object.values(def.repos ?? {})) {
+      if (decl.path) {
+        const m = methodOfUrl(decl.remote);
+        if (m)
+          return m;
+      }
+    }
+  }
+  return;
+}
+async function ensureCloneMethod(cfg, remote) {
+  if (cfg.cloneMethod)
+    return;
+  if (/^(git@|ssh:\/\/|https?:\/\/|file:\/\/)/.test(remote) || /^[/.~]/.test(remote))
+    return;
+  if (!process.stdin.isTTY)
+    return;
+  const initialValue = inferCloneMethod(cfg) ?? DEFAULT_CLONE_METHOD;
+  const sel = await clack.select({
+    message: "Clone method (how org/repo slugs expand)",
+    options: [
+      { value: "ssh", label: "ssh", hint: "git@github.com:org/repo.git" },
+      { value: "https", label: "https" }
+    ],
+    initialValue
+  });
+  if (clack.isCancel(sel))
+    return;
+  cfg.cloneMethod = sel;
+  saveConfig(cfg);
+}
 function cloneInto(cfg, workspace, name, decl) {
   const dir = repoDir(cfg, workspace, name);
   if (existsSync6(dir))
@@ -903,7 +963,7 @@ function cloneInto(cfg, workspace, name, decl) {
   console.log(`Cloning ${name} (${url}) → ${dir}`);
   execFileSync2("git", ["clone", "--branch", branch, url, dir], { stdio: "inherit" });
 }
-function cmdRepoAdd(args, override) {
+async function cmdRepoAdd(args, override) {
   let name;
   let branch;
   let noClone = false;
@@ -932,8 +992,10 @@ function cmdRepoAdd(args, override) {
   const decl = { remote };
   if (branch)
     decl.branch = branch;
-  if (!noClone)
+  if (!noClone) {
+    await ensureCloneMethod(cfg, remote);
     cloneInto(cfg, workspace, repoName, decl);
+  }
   proj.repos ??= {};
   proj.repos[repoName] = decl;
   saveConfig(cfg);
@@ -1257,7 +1319,7 @@ ${bold(name)}  ${dim("$ git fetch --prune")}`);
   console.log(fetched.size ? `
 ✓ fetched ${fetched.size} repo(s)` : "Nothing to fetch.");
 }
-function cmdRepoClone(args, override) {
+async function cmdRepoClone(args, override) {
   const all = args.includes("--all") || args.includes("-a");
   const name = args.find((a) => !a.startsWith("-"));
   const cfg = loadConfig();
@@ -1278,8 +1340,10 @@ function cmdRepoClone(args, override) {
   }
   if (!targets.length)
     return console.log("Nothing to clone — all declared repos are present.");
-  for (const r of targets)
+  for (const r of targets) {
+    await ensureCloneMethod(cfg, repos[r].remote);
     cloneInto(cfg, workspace, r, repos[r]);
+  }
   console.log(`✓ cloned ${targets.length} repo(s) into '${workspace}'`);
 }
 async function cmdFork(args, override) {
@@ -1517,9 +1581,6 @@ async function readSource(src) {
   }
   return readFileSync7(src, "utf8");
 }
-function defaultRoot() {
-  return join9(CONFIG_DIR, "workspaces");
-}
 async function cmdBootstrap(args) {
   const cfg = loadConfig();
   let methodFlag;
@@ -1666,7 +1727,7 @@ Shell integration — add to ${rc.display}:`);
         seeded.active = base;
         saveConfig(seeded);
       }
-      cmdRepoClone(["--all"], base);
+      await cmdRepoClone(["--all"], base);
     }
   }
   clack2.outro("Bootstrap complete.");
@@ -2021,22 +2082,35 @@ function cmdWorkspaceCreate(args) {
   console.log(dim("  add a repo:  ovr repo add <url|org/repo>   then   ovr run"));
 }
 async function cmdInit(args) {
-  const positional = args.filter((a) => !a.startsWith("-"));
-  const name = positional[0] || "dev";
-  const root = positional[1];
-  if (!/^[a-z0-9._-]+$/i.test(name))
-    throw new Error(`Invalid workspace name: ${name}`);
-  await cmdBootstrap([...root ? [root] : [], ...args.filter((a) => a.startsWith("-"))]);
   const cfg = loadConfig();
-  if (!cfg.root)
+  let methodFlag;
+  const positional = [];
+  for (let i = 0;i < args.length; i++) {
+    const a = args[i];
+    if (a === "--ssh")
+      methodFlag = "ssh";
+    else if (a === "--https")
+      methodFlag = "https";
+    else if (!a.startsWith("-"))
+      positional.push(a);
+  }
+  if (!cfg.root) {
+    const root = positional[0] ? resolve2(positional[0]) : defaultRoot();
+    cfg.root = root;
+    if (methodFlag)
+      cfg.cloneMethod = methodFlag;
+    mkdirSync9(root, { recursive: true });
+    saveConfig(cfg);
+    console.log(`✓ bootstrapped — root → ${root}${cfg.cloneMethod ? ` · clone → ${cfg.cloneMethod}` : ""}`);
+  }
+  const cwd = process.cwd();
+  const existing = findConfigFile(cwd);
+  if (existing) {
+    console.log(`✓ already an ovr project (${basename2(existing)}) — run:  ${bold("ovr run")}`);
     return;
-  if (!cfg.workspaces[name])
-    cfg.workspaces[name] = { branch: "main" };
-  cfg.active = name;
-  saveConfig(cfg);
-  console.log(`
-✓ workspace '${name}' ready and active`);
-  console.log(dim("  next:  ovr repo add <url|org/repo>   ·   ovr run"));
+  }
+  const seeded = seedStarterConfig(cwd);
+  console.log(`✓ scaffolded ${green(seeded?.file ?? "ovr.config.mts")} — declare your services, then:  ${bold("ovr run")}`);
 }
 function cmdWorkspaceInfo(args, override, inferredRepo) {
   const cfg = loadConfig();
@@ -2396,7 +2470,7 @@ compdef _ovr ovr`;
 // src/engine/run.ts
 import { execFileSync as execFileSync6 } from "node:child_process";
 import { existsSync as existsSync11, readdirSync as readdirSync2, readFileSync as readFileSync12 } from "node:fs";
-import { basename as basename4, join as join14 } from "node:path";
+import { basename as basename5, join as join14 } from "node:path";
 
 // src/engine/envname.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync10, readFileSync as readFileSync8, writeFileSync as writeFileSync9 } from "node:fs";
@@ -2526,7 +2600,7 @@ function createSecretRegistry(workspace, file = SECRETS_PATH) {
 
 // src/engine/prepare-helpers.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync13, readFileSync as readFileSync10, writeFileSync as writeFileSync11 } from "node:fs";
-import { basename as basename2, dirname as dirname6, isAbsolute, join as join13 } from "node:path";
+import { basename as basename3, dirname as dirname6, isAbsolute, join as join13 } from "node:path";
 function makeEnv(base) {
   return {
     get: (key, fallback) => base[key] ?? fallback,
@@ -2547,7 +2621,7 @@ function makeFiles(repoDir2, dataDir) {
       if (typeof template === "object") {
         const src = isAbsolute(template.from) ? template.from : join13(repoDir2, template.from);
         text2 = readFileSync10(src, "utf8");
-        name = opts.name ?? basename2(src).replace(/\.(tmpl|hbs|mustache|template)$/, "");
+        name = opts.name ?? basename3(src).replace(/\.(tmpl|hbs|mustache|template)$/, "");
       } else {
         text2 = template;
       }
@@ -4980,8 +5054,8 @@ function createTui(services, handlers, options = {}) {
 
 // src/workspace/onboard.ts
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { readFileSync as readFileSync11, realpathSync as realpathSync2 } from "node:fs";
-import { basename as basename3, resolve as resolve3 } from "node:path";
+import { mkdirSync as mkdirSync14, readFileSync as readFileSync11, realpathSync as realpathSync2 } from "node:fs";
+import { basename as basename4, resolve as resolve3 } from "node:path";
 import * as clack3 from "@clack/prompts";
 var real = (p) => {
   try {
@@ -5002,7 +5076,7 @@ function inferRepoName(dir) {
       return sanitizeName(base);
     }
   } catch {}
-  return sanitizeName(basename3(dir));
+  return sanitizeName(basename4(dir));
 }
 var git2 = (dir, args) => {
   try {
@@ -5039,6 +5113,10 @@ function freeName(cfg, base) {
       return `${base}-${i}`;
 }
 async function autoOnboard(cfg, cwd) {
+  if (!cfg.root) {
+    cfg.root = defaultRoot();
+    mkdirSync14(cfg.root, { recursive: true });
+  }
   const { repo, decl } = onboardDecl(cwd);
   const interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY);
   let target = freeName(cfg, repo);
@@ -5814,7 +5892,7 @@ function cmdLogs(args = [], override) {
   }
   for (const p of paths) {
     if (paths.length > 1)
-      process.stdout.write(dim(`── ${basename4(p, ".log")} ──
+      process.stdout.write(dim(`── ${basename5(p, ".log")} ──
 `));
     process.stdout.write(readFileSync12(p, "utf8"));
   }
@@ -5841,8 +5919,8 @@ var tree = {
     },
     {
       name: "init",
-      summary: "Get started: set the workspaces root + create a first workspace",
-      usage: "ovr init [workspace] [root] [--ssh|--https]",
+      summary: "Make the current directory an ovr project (bootstrap if needed + scaffold a config)",
+      usage: "ovr init [root] [--ssh|--https]",
       run: (c) => cmdInit(c.args)
     },
     {