unoverse 0.1.96 → 0.1.98

package/operator/lib/deploy.sh

@@ -377,6 +377,25 @@ _ensure_ground_config() {
       info "${DIM}(Auth0 or any OIDC provider; the issuer looks like https://your-tenant.auth0.com)${NC}"
     fi
   fi
+  # AWS ONLY. Cognito needs a first administrator, and nothing else in the CLI collects an
+  # email — so this was left FILL_ME and the deploy gave up. It is one question.
+  if [ "$cloud" = "aws" ] && grep -q '^admin_email[[:space:]]*=[[:space:]]*"FILL_ME"' "$tfv" 2>/dev/null; then
+    local admin_email=""
+    echo ""
+    echo -e "  ${CYAN}${BOLD}Who is the first administrator?${NC}"
+    echo -e "  ${DIM}They get a Cognito account with every role, and an invitation by email.${NC}"
+    echo ""
+    while [ -z "$admin_email" ]; do
+      read -r -p "  Email: " admin_email
+      case "$admin_email" in
+        *@*.*) : ;;
+        *) [ -n "$admin_email" ] && warn "That does not look like an email address"; admin_email="" ;;
+      esac
+    done
+    _tf_put admin_email "$admin_email"
+    ok "First administrator: ${BOLD}$admin_email${NC}"
+  fi
+
   _tf_fill auth_issuer    AUTH_ISSUER    "AUTH_ISSUER"
   _tf_fill auth_client_id AUTH_CLIENT_ID "AUTH_CLIENT_ID"
 
@@ -384,9 +403,16 @@ _ensure_ground_config() {
   # it declared a complete file blank.
   if grep -qE '=[[:space:]]*"FILL_ME"' "$tfv" 2>/dev/null; then
     echo ""
-    warn "Some values are still blank in ${BOLD}infra/$cloud/terraform.tfvars${NC} — fill them, then:"
-    info "  cd infra/$cloud && terraform init && terraform apply"
-    info "  cd ../.. && unoverse deploy"
+    # NAME THE VALUES, AND NEVER HAND BACK TERRAFORM. This said "fill them, then cd
+    # infra/<cloud> && terraform init && terraform apply" — the homework this CLI exists to
+    # remove — and then named `unoverse deploy` without the ground, which on a universe with
+    # two grounds is a command that refuses. Say which values, say where, say the command
+    # that resumes.
+    warn "These still need a value in ${BOLD}infra/$cloud/terraform.tfvars${NC}:"
+    echo ""
+    grep -nE '=[[:space:]]*"FILL_ME"' "$tfv" | sed -E 's/^([0-9]+):([a-z_]+).*/      line \1   \2/' | while read -r l; do echo -e "  ${DIM}$l${NC}"; done
+    echo ""
+    info "Fill them in, then: ${BOLD}unoverse deploy $cloud${NC}"
     echo ""
     exit 1
   fi
@@ -541,13 +567,30 @@ cmd_deploy() {
   # ── ONE FLOW ────────────────────────────────────────────────────────────────
   # Which ground, is it configured, plan it, apply it, ship it. In that order, every
   # time, whether this is the first deploy or the fiftieth.
-  # A named ground wins; one configured ground is implied; two without a name is refused
-  # (see _pick_ground). Nothing configured at all falls through to creating one below,
-  # which is the first-run path and the only case where an empty answer is not a mistake.
-  local cloud="" rc have=0
-  [ -f "$ROOT/infra/digitalocean/terraform.tfvars" ] || [ -f "$ROOT/infra/aws/terraform.tfvars" ] && have=1
-  if [ "$have" = "1" ]; then
-    cloud=$(SELF_CMD="unoverse deploy" _pick_ground "${GROUND_ARG:-}") || exit 1
+  # NAMING A GROUND THAT DOES NOT EXIST YET MEANS BUILD IT THERE. `unoverse deploy aws` on a
+  # universe with only a DigitalOcean ground used to answer "No aws ground here. Run
+  # unoverse deploy aws to create one" — the command just typed, refusing itself. Those
+  # words already say where this should go, so the only thing left to do is set it up.
+  #
+  # A named ground with no tfvars falls through to the create flow below and skips the
+  # "which cloud?" question, because it has been answered. An UNNAMED deploy still goes
+  # through _pick_ground, which refuses to guess between two configured grounds.
+  local cloud="" rc
+  case "${GROUND_ARG:-}" in
+    do|digitalocean) cloud="digitalocean" ;;
+    aws|amazon)      cloud="aws" ;;
+  esac
+
+  if [ -n "$cloud" ]; then
+    # Named. Configured already? Then use it; otherwise create it below.
+    [ -f "$ROOT/infra/$cloud/terraform.tfvars" ] || { cmd_ground "$([ "$cloud" = "aws" ] && echo aws || echo do)" || {
+        echo ""
+        info "Once that is sorted, run ${BOLD}unoverse deploy $cloud${NC} again. It picks up right here."
+        echo ""
+        exit 1
+      }; }
+  elif [ -f "$ROOT/infra/digitalocean/terraform.tfvars" ] || [ -f "$ROOT/infra/aws/terraform.tfvars" ]; then
+    cloud=$(SELF_CMD="unoverse deploy" _pick_ground "") || exit 1
   fi
 
   if [ -z "$cloud" ]; then

package/operator/lib/ground.sh

@@ -291,8 +291,9 @@ openai_api_key = "FILL_ME"
 # hyperbrowser_api_key = ""             # optional — page intelligence
 
 oauth_callback_urls = [
-$( if [ -n "$zone_domain" ]; then echo "  \"https://$zone_domain\","; else echo "  \"https://FILL_ME\","; fi )
+$( if [ -n "$zone_domain" ]; then echo "  \"https://canvas.$zone_domain\","; fi )
   "http://localhost:5173", # local Studio/Canvas dev against this universe
+  # Add your Canvas URL here once a domain is set (https://canvas.<domain>).
 ]
 
 # RBAC roles (noun:verb). Each becomes a Cognito group; put a user in the group

package/package.json

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