unoverse 0.1.88 → 0.1.89

package/operator/lib/deploy.sh

@@ -260,28 +260,68 @@ _ensure_ground_config() {
     fi
   fi
 
-    # POSTGRES: ASK, DO NOT ASSUME. The ground discovers an existing cluster and writes
-  # it as a COMMENTED line, so the default silently provisions a SECOND database next
-  # to one the account already pays for. A choice with a monthly bill attached is a
-  # question, not a line to notice in a file.
+  # PRODUCTION'S DATABASE IS NOT THE ONE IN .env, AND THE QUESTION MUST SAY SO.
+  #
+  # `.env` holds the DEVELOPMENT database — what `npm run dev` talks to on the laptop. The
+  # deployed universe gets its own, so a developer cannot break production by experimenting
+  # locally. That separation is right and is the default.
+  #
+  # What was wrong was the words. This asked "You already have a database — use it?", where
+  # "it" meant the CLUSTER and "use" meant "create a new database inside it". A developer
+  # who had typed a DATABASE_URL during setup read that as "use the database I gave you",
+  # answered yes, and got an empty one — then could not find their 21 workflows and
+  # reasonably concluded the deploy had lost them. Nothing was lost; the sentence was.
+  #
+  # So: name the cluster, say a NEW database goes in it, and say what happens to the one in
+  # .env. Anyone wanting production to share the development database sets byo_postgres_url
+  # deliberately, which is a different and much louder act.
   if [ "$cloud" = "digitalocean" ] \
-     && grep -q '^#[[:space:]]*existing_pg_cluster_name' "$tfv" 2>/dev/null \
      && ! grep -q '^existing_pg_cluster_name' "$tfv" 2>/dev/null \
      && ! grep -q '^byo_postgres_url' "$tfv" 2>/dev/null; then
-    local found
-    found=$(grep '^#[[:space:]]*existing_pg_cluster_name' "$tfv" | sed -E 's/.*"([^"]+)".*/\1/')
-    if [ -n "$found" ]; then
-      echo ""
-      echo -e "  ${CYAN}${BOLD}You already have a database.${NC} ${DIM}$found${NC}"
-      echo ""
-      pick_option "Use it" "Create a new one   ~\$15/month"
-      if [ "$PICKED" = "0" ]; then
-        node -e 'const fs=require("fs");const[f,c]=process.argv.slice(1);let s=fs.readFileSync(f,"utf8");s=s.replace(/^#\s*(existing_pg_cluster_name\s*=.*)$/m,"$1");fs.writeFileSync(f,s)' "$tfv" "$found"
-        ok "Reusing $found"
-      else
-        ok "A new database will be created"
-      fi
+    local found env_db db_name
+    found=$(grep '^#[[:space:]]*existing_pg_cluster_name' "$tfv" 2>/dev/null | sed -E 's/.*"([^"]+)".*/\1/')
+    env_db=$(grep -E '^DATABASE_URL=' "$ROOT/.env" 2>/dev/null | head -1 | cut -d= -f2-)
+    db_name=$(echo "$env_db" | sed -E 's|.*/([^/?]+)(\?.*)?$|\1|')
+
+    echo ""
+    echo -e "  ${CYAN}${BOLD}Which database should the DEPLOYED universe use?${NC}"
+    echo ""
+    echo -e "  ${DIM}Your .env is your local development database and does not change.${NC}"
+    echo ""
+    local opt_new_db="" opt_share=""
+    [ -n "$found" ] && opt_new_db="Its own new database on ${found}   free"
+    [ -n "$db_name" ] && opt_share="The same one you develop against   ${db_name}"
+
+    # Order is the recommendation. Its own database first: production and development stay
+    # independent, which is what almost everyone wants and what nobody regrets.
+    if [ -n "$opt_new_db" ] && [ -n "$opt_share" ]; then
+      pick_option "$opt_new_db" "$opt_share" "A new cluster of its own   ~\$15/month"
+    elif [ -n "$opt_new_db" ]; then
+      pick_option "$opt_new_db" "A new cluster of its own   ~\$15/month"
+    elif [ -n "$opt_share" ]; then
+      pick_option "$opt_share" "A new cluster of its own   ~\$15/month"
+    else
+      PICKED=99   # nothing to reuse: the ground provisions a cluster, no question worth asking
     fi
+
+    local choice=""
+    case "$PICKED" in
+      0) [ -n "$opt_new_db" ] && choice="own" || choice="share" ;;
+      1) [ -n "$opt_new_db" ] && [ -n "$opt_share" ] && choice="share" || choice="fresh" ;;
+      *) choice="fresh" ;;
+    esac
+
+    case "$choice" in
+      own)
+        node -e 'const fs=require("fs");const[f]=process.argv.slice(1);let s=fs.readFileSync(f,"utf8");s=s.replace(/^#\s*(existing_pg_cluster_name\s*=.*)$/m,"$1");fs.writeFileSync(f,s)' "$tfv"
+        ok "Production gets its own database on $found ${DIM}(your development data is untouched)${NC}"
+        ;;
+      share)
+        node -e 'const fs=require("fs");const[f,v]=process.argv.slice(1);let s=fs.readFileSync(f,"utf8");s=s.replace(/^#?\s*byo_postgres_url\s*=.*$/m,"byo_postgres_url = "+JSON.stringify(v));fs.writeFileSync(f,s)' "$tfv" "$env_db"
+        ok "Production reads ${BOLD}$db_name${NC} ${DIM}(the same database you develop against — local changes are live)${NC}"
+        ;;
+      *) ok "A new cluster will be created for production" ;;
+    esac
   fi
 
   _tf_fill docr_token     DOCR_TOKEN     "Registry access token (from your Unoverse admin)"

package/package.json

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