unoverse 0.1.29 → 0.1.30

package/lib/create.mjs

@@ -214,6 +214,22 @@ export async function create(nameArg) {
     }
 
     if (choice === "2") {
+      // ALREADY A UNIVERSE? Then this is a re-run, not a conflict. The first create
+      // scaffolds the files; if setup was interrupted (Ctrl-C at any question), running
+      // create again used to refuse with "this folder is not empty" — which reads as
+      // broken when the folder holds exactly what create itself put there. A universe is
+      // recognized by its compose file; resume setup instead.
+      const target = nameArg || ".";
+      if (existsSync(`${target}/docker-compose.yml`)) {
+        console.log(`\n  ${dim(`${target === "." ? "This folder" : `./${target}`} is already a universe. Picking setup back up.`)}\n`);
+        rl.close();
+        const here2 = dirname(fileURLToPath(import.meta.url));
+        const vend = resolve(here2, "../operator/operator.sh");
+        const op = existsSync(vend) ? vend : resolve(here2, "../../../scripts/operator.sh");
+        const r2 = spawnSync("bash", [op, "init"], { stdio: "inherit", cwd: target });
+        process.exit(r2.status ?? 0);
+      }
+
       // TARGET FIRST, credential second. This used to ask for the registry token, make a
       // network round-trip to validate it, and only then discover the folder was not
       // empty. Never ask for a credential you are about to throw away.

package/operator/lib/init.sh

@@ -77,22 +77,19 @@ cmd_init() {
     echo ""
   fi
 
-  # Check for existing .env
-  if [ -f "$ROOT/.env" ]; then
-    echo ""
-    read -r -p "  .env already exists. Overwrite? [y/N] " REPLY
-    echo ""
-    if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then
-      info "Keeping existing .env"
-      cmd_login
-      cmd_pull
-      return
-    fi
-  fi
+  # RE-RUNNING EDITS. There is no "overwrite? [y/N]" gate any more: every existing value
+  # becomes its question's default, so Enter keeps a setting and typing replaces it.
+  # Walking through changes only what you change — which makes this the way to change
+  # one env var, not a destructive restart.
+  _env_cur() { grep "^$1=" "$ROOT/.env" 2>/dev/null | head -1 | cut -d= -f2-; }
 
   echo ""
   echo -e "  ${BOLD}Configure your environment:${NC}"
-  echo -e "  ${DIM}(Press Enter to use defaults)${NC}"
+  if [ -f "$ROOT/.env" ]; then
+    echo -e "  ${DIM}(Existing .env found. Enter keeps each current value)${NC}"
+  else
+    echo -e "  ${DIM}(Press Enter to use defaults)${NC}"
+  fi
   echo ""
 
   # DOCR Token. `unoverse create` has already asked for this and VALIDATED it against
@@ -102,8 +99,15 @@ cmd_init() {
     DOCR_TOKEN="$UNOVERSE_DOCR_TOKEN"
     ok "Registry token carried over from create"
   else
+    local cur_token
+    cur_token=$(_env_cur DOCR_TOKEN)
     while true; do
-      read -p "  DOCR Token (from your Unoverse admin): " DOCR_TOKEN || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+      if [ -n "$cur_token" ]; then
+        read -p "  DOCR Token [keep current]: " DOCR_TOKEN || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+        DOCR_TOKEN="${DOCR_TOKEN:-$cur_token}"
+      else
+        read -p "  DOCR Token (from your Unoverse admin): " DOCR_TOKEN || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+      fi
       if [[ "$DOCR_TOKEN" == dop_v1_* ]]; then
         break
       fi
@@ -114,7 +118,8 @@ cmd_init() {
   # A DEFAULT, because "from your admin" is meaningless when you are the admin. The
   # platform ships no database (docker-compose has no postgres), so this points at one
   # you run. Enter takes the conventional local one.
-  DB_DEFAULT="postgres://postgres:postgres@localhost:5432/unoverse"
+  DB_DEFAULT=$(_env_cur DATABASE_URL)
+  DB_DEFAULT="${DB_DEFAULT:-postgres://postgres:postgres@localhost:5432/unoverse}"
   while true; do
     read -p "  DATABASE_URL [${DB_DEFAULT}]: " DATABASE_URL || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
     DATABASE_URL="${DATABASE_URL:-$DB_DEFAULT}"
@@ -139,17 +144,27 @@ cmd_init() {
     fi
   fi
 
-  # Redis
-  read -p "  REDIS_HOST [host.docker.internal]: " REDIS_HOST
-  REDIS_HOST="${REDIS_HOST:-host.docker.internal}"
+  # Redis, current values as defaults
+  local rd
+  rd=$(_env_cur REDIS_HOST); rd="${rd:-host.docker.internal}"
+  read -p "  REDIS_HOST [$rd]: " REDIS_HOST
+  REDIS_HOST="${REDIS_HOST:-$rd}"
 
-  read -p "  REDIS_PORT [6379]: " REDIS_PORT
-  REDIS_PORT="${REDIS_PORT:-6379}"
+  rd=$(_env_cur REDIS_PORT); rd="${rd:-6379}"
+  read -p "  REDIS_PORT [$rd]: " REDIS_PORT
+  REDIS_PORT="${REDIS_PORT:-$rd}"
 
-  read -p "  REDIS_PASSWORD (blank for none): " REDIS_PASSWORD
+  rd=$(_env_cur REDIS_PASSWORD)
+  if [ -n "$rd" ]; then
+    read -p "  REDIS_PASSWORD [keep current]: " REDIS_PASSWORD
+    REDIS_PASSWORD="${REDIS_PASSWORD:-$rd}"
+  else
+    read -p "  REDIS_PASSWORD (blank for none): " REDIS_PASSWORD
+  fi
 
-  read -p "  REDIS_TLS [false]: " REDIS_TLS
-  REDIS_TLS="${REDIS_TLS:-false}"
+  rd=$(_env_cur REDIS_TLS); rd="${rd:-false}"
+  read -p "  REDIS_TLS [$rd]: " REDIS_TLS
+  REDIS_TLS="${REDIS_TLS:-$rd}"
 
   # Auth (required — from admin)
   # ASK BEFORE DEMANDING. A developer trying the platform locally has no identity
@@ -160,13 +175,28 @@ cmd_init() {
   # rather than trusting this wizard: authConfig.ts refuses to start with auth off when
   # NODE_ENV=production. So answering "no" here cannot produce an unprotected deployment.
   echo ""
-  read -r -p "  Do you have an identity provider (Auth0/OIDC) to connect? [y/N] " HAS_IDP
+  local cur_auth idp_prompt
+  cur_auth=$(_env_cur AUTH_ENABLED)
+  idp_prompt="[y/N]"
+  [ "$cur_auth" = "true" ] && idp_prompt="[Y/n]"
+  read -r -p "  Do you have an identity provider (Auth0/OIDC) to connect? $idp_prompt " HAS_IDP
   echo ""
+  if [ -z "$HAS_IDP" ] && [ "$cur_auth" = "true" ]; then HAS_IDP=y; fi
 
   if [[ "$HAS_IDP" =~ ^[Yy]$ ]]; then
     AUTH_ENABLED=true
+    local cur_iss cur_cid cur_aud
+    cur_iss=$(_env_cur AUTH_ISSUER)
+    cur_cid=$(_env_cur AUTH_CLIENT_ID)
+    cur_aud=$(_env_cur AUTH_AUDIENCE)
+
     while true; do
-      read -p "  AUTH_ISSUER (e.g. https://your-tenant.auth0.com): " AUTH_ISSUER || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+      if [ -n "$cur_iss" ]; then
+        read -p "  AUTH_ISSUER [$cur_iss]: " AUTH_ISSUER || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+        AUTH_ISSUER="${AUTH_ISSUER:-$cur_iss}"
+      else
+        read -p "  AUTH_ISSUER (e.g. https://your-tenant.auth0.com): " AUTH_ISSUER || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+      fi
       if [ -n "$AUTH_ISSUER" ] && [[ "$AUTH_ISSUER" == https://* ]]; then
         break
       fi
@@ -174,15 +204,21 @@ cmd_init() {
     done
 
     while true; do
-      read -p "  AUTH_CLIENT_ID: " AUTH_CLIENT_ID || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+      if [ -n "$cur_cid" ]; then
+        read -p "  AUTH_CLIENT_ID [$cur_cid]: " AUTH_CLIENT_ID || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+        AUTH_CLIENT_ID="${AUTH_CLIENT_ID:-$cur_cid}"
+      else
+        read -p "  AUTH_CLIENT_ID: " AUTH_CLIENT_ID || { fail "no input (end of stream). Run unoverse init interactively"; exit 1; }
+      fi
       if [ -n "$AUTH_CLIENT_ID" ] && [[ "$AUTH_CLIENT_ID" != *"your-"* ]]; then
         break
       fi
       fail "AUTH_CLIENT_ID is required"
     done
 
-    read -p "  AUTH_AUDIENCE [gravity-api]: " AUTH_AUDIENCE
-    AUTH_AUDIENCE="${AUTH_AUDIENCE:-gravity-api}"
+    cur_aud="${cur_aud:-gravity-api}"
+    read -p "  AUTH_AUDIENCE [$cur_aud]: " AUTH_AUDIENCE
+    AUTH_AUDIENCE="${AUTH_AUDIENCE:-$cur_aud}"
   else
     AUTH_ENABLED=false
     AUTH_ISSUER=""
@@ -207,7 +243,14 @@ cmd_init() {
   ok "Redis namespace: ${BOLD}${REDIS_NAMESPACE}${NC}"
 
   # OpenAI (for Memory Server)
-  read -p "  OPENAI_API_KEY (for Memory Server, blank to skip): " OPENAI_API_KEY
+  local cur_oai
+  cur_oai=$(_env_cur OPENAI_API_KEY)
+  if [ -n "$cur_oai" ]; then
+    read -p "  OPENAI_API_KEY [keep current]: " OPENAI_API_KEY
+    OPENAI_API_KEY="${OPENAI_API_KEY:-$cur_oai}"
+  else
+    read -p "  OPENAI_API_KEY (for Memory Server, blank to skip): " OPENAI_API_KEY
+  fi
 
   # Write .env
   cat > "$ROOT/.env" << ENVEOF

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "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",