unoverse 0.1.5 → 0.1.7

package/bin/unoverse.mjs

@@ -9,21 +9,58 @@
  */
 import { existsSync } from "node:fs";
 import { spawnSync } from "node:child_process";
+import { join, resolve } from "node:path";
 import { create } from "../lib/create.mjs";
 
+/**
+ * ONE BINARY. There is no `./unoverse` any more.
+ *
+ * A universe is a folder holding the operator lib. Walk up for it, the same way git finds
+ * a repo, so the commands work from anywhere inside your universe rather than only at its
+ * root. Found means the operator commands exist; not found means they simply are not
+ * offered, instead of being advertised and then refusing.
+ */
+function findUniverse() {
+  for (let dir = process.cwd(); ; ) {
+    if (existsSync(join(dir, "scripts/lib/common.sh"))) return dir;
+    const parent = resolve(dir, "..");
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
+/** Run an operator command in the universe we are standing in. */
+function operator(root, args) {
+  const r = spawnSync("bash", [join(root, "scripts/operator.sh"), ...args], {
+    stdio: "inherit",
+    cwd: root,
+  });
+  process.exit(r.status ?? 0);
+}
+
+const UNIVERSE = findUniverse();
+
+// Everything the operator half owns. Listed here so an unknown command can say so,
+// rather than the two CLIs disagreeing about what exists.
+const OPERATOR_COMMANDS = new Set([
+  "start", "stop", "check", "logs", "deploy",
+  // kept working, not advertised
+  "ground", "dev", "build", "publish", "init", "doctor", "db-setup", "db-verify", "open",
+]);
+
 const [, , cmd, ...args] = process.argv;
 
 const HELP = `
   ⬡ unoverse
 
   unoverse create [name]   What are you building? Studio project · universe · client app
+                           No name scaffolds into the folder you are in; a name makes one
   unoverse studio          Launch Unoverse Studio (authoring: components, nodes, skills)
-  unoverse urls            Your deployed universe's addresses — probed live, not recited
+  unoverse where           Where your universe is — addresses probed live, not recited
   unoverse update          Update this CLI to the latest version
   unoverse help            This
 
-  Operating a running universe? That lives in your universe folder:
-    cd <your-universe> && ./unoverse
+  Standing in a universe folder adds: start · stop · check · logs · deploy
 `;
 
 switch (cmd) {
@@ -32,12 +69,9 @@ switch (cmd) {
     break;
 
   case "update": {
-    // The command people type when the CLI is stale. Inside a universe folder,
-    // update means the OPERATOR kit — defer to it. Otherwise update this package.
-    if (existsSync("./unoverse")) {
-      console.log(`\n  This folder is a universe — its own CLI owns updates:\n\n    ./unoverse update\n`);
-      process.exit(1);
-    }
+    // In a universe, "update" means THAT UNIVERSE (pull images, restart), not this CLI.
+    // Same word, different object, decided by where you are standing.
+    if (UNIVERSE) operator(UNIVERSE, ["update", ...args]);
     const r = spawnSync("npm", ["install", "-g", "unoverse@latest"], { stdio: "inherit" });
     if (r.status === 0) {
       const v = spawnSync("unoverse", ["-v"], { encoding: "utf8" }).stdout?.trim();
@@ -48,6 +82,8 @@ switch (cmd) {
     process.exit(r.status ?? 0);
   }
 
+  // `urls` stays as an alias: it shipped in 0.1.4/0.1.5 and is in people's fingers.
+  case "where":
   case "urls": {
     const { urls } = await import("../lib/urls.mjs");
     await urls();
@@ -66,6 +102,8 @@ switch (cmd) {
   case "--help":
   case "-h":
   case undefined:
+    // In a universe, its own help prints — it knows whether this kit has the owner lane.
+    if (UNIVERSE) operator(UNIVERSE, ["help"]);
     console.log(HELP);
     break;
 
@@ -81,10 +119,10 @@ switch (cmd) {
   }
 
   default:
-    // A universe folder has its own operator CLI — point there rather than
-    // half-implementing its commands here (v0.2 absorbs them properly).
-    if (existsSync("./unoverse")) {
-      console.log(`\n  '${cmd}' is an operator command — run it in your universe:\n\n    ./unoverse ${cmd} ${args.join(" ")}\n`);
+    // The operator half, run right here. No second CLI to be sent to.
+    if (UNIVERSE && OPERATOR_COMMANDS.has(cmd)) operator(UNIVERSE, [cmd, ...args]);
+    if (OPERATOR_COMMANDS.has(cmd)) {
+      console.log(`\n  '${cmd}' operates a universe, and this folder is not one.\n  ${"cd into your universe, or run: unoverse create"}\n`);
     } else {
       console.log(`\n  Unknown command: ${cmd}\n${HELP}`);
     }

package/lib/create.mjs

@@ -8,7 +8,7 @@
  * a real auth round-trip against the registry, not a format check.
  */
 import { createInterface } from "node:readline/promises";
-import { existsSync, mkdirSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 
 const REGISTRY_HOST = "registry.digitalocean.com";
@@ -56,15 +56,43 @@ async function validateRegistryToken(token) {
   }
 }
 
-function download(dir, name) {
+/**
+ * Where to scaffold. NO NAME MEANS THE FOLDER YOU ARE STANDING IN.
+ *
+ * That is what a Studio project has always done (option 1 hands the cwd to Studio), so
+ * the other two paths agreeing removes a difference nobody could have guessed. Passing a
+ * name still makes a subfolder: `unoverse create acme` → ./acme.
+ *
+ * The old guard refused any target that EXISTED, which made "." impossible — the folder
+ * you are in always exists, so it failed with "./. already exists". Existence was never
+ * the question; whether there is anything to overwrite is. `.git` and `.DS_Store` do not
+ * count, so scaffolding into a folder you just `git init`ed works.
+ */
+function resolveTarget(nameArg) {
+  const dir = nameArg || ".";
+  const here = dir === ".";
+  const existing = existsSync(dir)
+    ? readdirSync(dir).filter((f) => f !== ".git" && f !== ".DS_Store")
+    : [];
+  if (existing.length) {
+    fail(here ? "this folder is not empty" : `./${dir} is not empty`);
+    console.log(`  ${dim("Scaffolding would overwrite what is here. Use an empty folder, or pass a name.")}`);
+    process.exit(1);
+  }
+  return dir;
+}
+
+/** Human name for the target, for messages that should not say "./.". */
+const label = (dir) => (dir === "." ? "this folder" : `./${dir}`);
+
+function download(dir, stripComponents = 1, filter = "") {
   mkdirSync(dir, { recursive: true });
   const r = spawnSync(
     "sh",
-    ["-c", `curl -fsSL '${STARTER_TARBALL}' | tar -xz --strip-components=1 -C '${dir}'`],
+    ["-c", `curl -fsSL '${STARTER_TARBALL}' | tar -xz --strip-components=${stripComponents} -C '${dir}' ${filter}`],
     { stdio: ["ignore", "inherit", "inherit"] },
   );
   if (r.status !== 0) throw new Error("download failed");
-  ok(`universe scaffolded at ./${name}`);
 }
 
 export async function create(nameArg) {
@@ -102,17 +130,28 @@ export async function create(nameArg) {
       }
       ok("token accepted");
 
-      const name = nameArg || (await ask(rl, "Universe folder name [my-universe]: ")) || "my-universe";
-      if (existsSync(name)) {
-        fail(`./${name} already exists`);
-        process.exit(1);
+      const name = resolveTarget(nameArg);
+      download(name);
+      ok(`universe scaffolded in ${label(name)}`);
+
+      // CREATE FINISHES THE JOB. It used to stop here and tell you to go and run
+      // `./unoverse init`, which asked for this same token a second time. The token is
+      // already in hand and already validated, so hand it over and configure now.
+      rl.close();
+      console.log("");
+      const r = spawnSync("bash", [`${name}/scripts/operator.sh`, "init"], {
+        stdio: "inherit",
+        cwd: name,
+        env: { ...process.env, UNOVERSE_DOCR_TOKEN: token },
+      });
+      if (r.status !== 0) {
+        fail("setup did not finish — run 'unoverse init' in that folder to pick it up");
+        process.exit(r.status ?? 1);
       }
-      download(name, name);
       console.log(`
-  Next:
-    cd ${name}
-    ./unoverse init      ${dim("(setup wizard — have this token ready, it asks for it)")}
-    ./unoverse start
+  Next:${name === "." ? "" : `
+    cd ${name}`}
+    unoverse start
 
   ${cyan("Build with Claude:")} open the folder in Claude Code — it ships an
   authoring skill (components, nodes, agent skills) and a builder MCP that
@@ -122,21 +161,11 @@ export async function create(nameArg) {
     }
 
     if (choice === "3") {
-      const name = nameArg || (await ask(rl, "App folder name [my-client]: ")) || "my-client";
-      if (existsSync(name)) {
-        fail(`./${name} already exists`);
-        process.exit(1);
-      }
+      const name = resolveTarget(nameArg);
       // The reference client ships inside the starter — take just that folder.
-      mkdirSync(name, { recursive: true });
-      const r = spawnSync(
-        "sh",
-        ["-c", `curl -fsSL '${STARTER_TARBALL}' | tar -xz --strip-components=3 -C '${name}' '*/packages/client'`],
-        { stdio: ["ignore", "inherit", "inherit"] },
-      );
-      if (r.status !== 0 ) throw new Error("download failed");
-      ok(`client app scaffolded at ./${name}`);
-      console.log(`\n  Next:\n    cd ${name}\n    npm install && npm run dev\n\n  ${cyan("Build with Claude:")} open the folder in Claude Code and ask for what you want.\n`);
+      download(name, 3, "'*/packages/client'");
+      ok(`client app scaffolded in ${label(name)}`);
+      console.log(`\n  Next:${name === "." ? "" : `\n    cd ${name}`}\n    npm install && npm run dev\n\n  ${cyan("Build with Claude:")} open the folder in Claude Code and ask for what you want.\n`);
       return;
     }
 

package/lib/urls.mjs

@@ -1,5 +1,7 @@
 /**
- * `unoverse urls` — the deployed stack's addresses, PROBED, not recited.
+ * `unoverse where` — the deployed stack's addresses, PROBED, not recited.
+ *
+ * Named `urls` until 0.1.5; that spelling still works as an alias.
  *
  * Run it in a universe folder (or anywhere above one). It reads the deployment's
  * own facts — .env.production first, the ground's terraform outputs as enrichment —

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "The Unoverse front door — create a Studio project, a universe, or a client app, and launch Studio.",
   "license": "SEE LICENSE IN README.md",
   "type": "module",