@underpostnet/cyberia 3.3.73 → 3.3.77

package/compose.env

@@ -43,25 +43,37 @@ VALKEY_PORT=6379
 # cyberia-server-* -> stable engine gateway for HTTP and the raw engine runtime
 # for gRPC. The public engine-cyberia name belongs to nginx, avoiding ambiguous
 # Docker DNS while keeping one stable HTTP endpoint for every module.
-ENGINE_API_BASE_URL=http://engine-cyberia
-ENGINE_GRPC_ADDRESS=engine-cyberia-runtime:50051
+CYBERIA_DATA_SERVER_URL=http://engine-cyberia
+CYBERIA_DATA_SERVER_GRPC=engine-cyberia-runtime:50051
 
 # Client-visible Content Authority origin, forwarded to browser/Raylib clients
 # for every engine-cyberia content/asset/metadata request. Host-reachable
 # (Docker publishes the raw engine runtime on host :4005). Unlike the internal
-# ENGINE_API_BASE_URL, this value is consumed outside the Compose network:
+# CYBERIA_DATA_SERVER_URL, this value is consumed outside the Compose network:
 # the two responsibilities must never overwrite each other.
 ENGINE_PUBLIC_URL=http://localhost:4005
 ENGINE_GRPC_RELOAD_INTERVAL_SEC=300
 
-# --- Browser-facing client runtime config (injected by docker-driver.py) -----
+# Shared secret between the engine and every game server. It guards the server
+# registry report (server -> engine) and the hot-reload trigger (engine ->
+# server). Unset disables both: a server then stays out of the public list.
+CYBERIA_SERVER_API_KEY=change_me_dev_server_api_key
+
+# Public origin of the server gateway. Each server reports this origin plus its
+# own sub-path, which is the URL a client dials.
+CYBERIA_SERVER_PUBLIC_ORIGIN=http://localhost:8081
+
+# --- Browser-facing client runtime config (injected by wasm-driver.py) -----
 # The single WASM bundle resolves its instance from the URL sub-path and builds
 # its endpoints from these origins. HTTP client/API traffic uses nginx on :80;
 # WebSocket traffic uses the dedicated multi-path server gateway on :8081.
 #   http://localhost/          -> default, ws://localhost:8081/ws
 #   http://localhost/FOREST    -> FOREST,  ws://localhost:8081/FOREST/ws
 CYBERIA_WS_ORIGIN=ws://localhost:8081
-CYBERIA_ENGINE_API_ORIGIN=http://localhost
+# The browser's own route to the Data Server, through nginx on :80. Distinct from the internal
+# CYBERIA_DATA_SERVER_URL above: both name a Data Server origin, but from opposite sides of the
+# Compose network, and one file cannot hold two values under one name.
+CYBERIA_CLIENT_DATA_SERVER_URL=http://localhost
 CYBERIA_DEFAULT_INSTANCE=amethyst-strata-expansion
 
 # cyberia-server logging. This is the dev stack, so default to DEBUG. Set

package/conf.js

@@ -180,7 +180,6 @@ const DefaultConf = /**/ {
           'InstanceEngineCyberia',
           'ActionEngineCyberia',
           'EntityEngineCyberia',
-          'FallbackWorldEngineCyberia',
           'InstanceSelectionView',
         ],
         core: [
@@ -267,7 +266,6 @@ const DefaultConf = /**/ {
         { path: '/docs', client: 'CyberiaPortal', ssr: 'CyberiaPortal' },
         { path: '/cyberia-action-engine', client: 'CyberiaPortal', ssr: 'CyberiaPortal' },
         { path: '/cyberia-entity-engine', client: 'CyberiaPortal', ssr: 'CyberiaPortal' },
-        { path: '/fallback-world-engine', client: 'CyberiaPortal', ssr: 'CyberiaPortal' },
         { path: '/instance-selection', title: 'Select World', client: 'CyberiaPortal', ssr: 'CyberiaPortal' },
       ],
       dists: [
@@ -765,13 +763,17 @@ const DefaultConf = /**/ {
           'cyberia-entity-type-default',
           'cyberia-client-hints',
           'cyberia-saga',
+          'cyberia-audio',
+          'cyberia-map-audio-conf',
         ],
         ws: 'core',
         peer: true,
         docs: {
-          coveragePath: './hardhat',
           jsJsonPath: './typedoc.dd-cyberia.json',
-          coverageOutputDir: 'hardhat-coverage',
+          coverage: [
+            { id: 'cyberia', label: 'Cyberia coverage', suite: 'cyberia' },
+            { id: 'hardhat', label: 'Hardhat coverage', path: './hardhat' },
+          ],
           references: [
             './src/client/public/cyberia-docs/CYBERIA.md',
             './src/client/public/cyberia-docs/WHITE-PAPER.md',
@@ -779,6 +781,7 @@ const DefaultConf = /**/ {
             './src/client/public/cyberia-docs/QUEST-SYSTEM.md',
             './src/client/public/cyberia-docs/ACTION-SYSTEM.md',
             './src/client/public/cyberia-docs/ENTITY-PROFILE.md',
+            './src/client/public/cyberia-docs/STATS-PROGRESSION.md',
             './src/client/public/cyberia-docs/OFF-CHAIN-ECONOMY.md',
             './src/client/public/cyberia-docs/HARDHAT-MODULE.md',
             './src/client/public/cyberia-docs/CYBERIA-SERVER.md',

package/deploy/cyberia-client/deploy.sh

@@ -5,18 +5,18 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
-TARGET_NODE=hp-envy-iso-ram-rocky9
-INGRESS_NODE=localhost.localdomain
+DEPLOY_ID=dd-cyberia
+INSTANCE_ID=mmo-client
+TARGET_NODE="${TARGET_NODE:-$WORKER_NODE}"
 
 main() {
     deploy_start "Starting remote deploy"
 
     prepare_host "$ENGINE_ROOT"
 
-    deploy_step "Build dd-cyberia configuration" \
+    deploy_step "Build $DEPLOY_ID configuration" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin/build dd-cyberia --conf"
+        "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
 
     deploy_step "Wait for target node readiness" \
         sudo -n -- /bin/bash -lc \
@@ -30,18 +30,17 @@ main() {
         sudo -n -- /bin/bash -lc \
         "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-gateway -n default --timeout=5m"
 
-    deploy_step "Deploy cyberia mmo client instance" \
+    deploy_step "Deploy $DEPLOY_ID $INSTANCE_ID instance" \
         sudo -n -- /bin/bash -lc \
         "cd $ENGINE_ROOT && node bin run instance \
           --kubeadm \
+          ${TARGET_NODE:+--node-name ${TARGET_NODE}} \
           --gateway-api \
           --image-pull-policy Always \
-          --node-name ${TARGET_NODE} \
           --ingress-node ${INGRESS_NODE} \
-          --ssh-key-path /home/dd/tmp/897as9dxhaskd9 \
-          --deploy-id dd-cyberia \
-          --instance-id mmo-client"
-
+          --ssh-key-path ${DEPLOY_SSH_KEY_PATH} \
+          --deploy-id $DEPLOY_ID \
+          --instance-id $INSTANCE_ID"
 }
 
 main "$@"

package/deploy/cyberia-client/package.sh

@@ -5,7 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
 # This runtime is an instance of its parent deployment, and installs that deployment's manifest.
 DEPLOY_ID=dd-cyberia
 

package/deploy/cyberia-client/state.sh

@@ -5,10 +5,11 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/state.sh"
 
-ENGINE_ROOT=/home/dd/engine
+DEPLOY_ID=dd-cyberia
+INSTANCE_ID=mmo-client
 
 main() {
-    stream_state "$ENGINE_ROOT" dd-cyberia mmo-client
+    stream_state "$ENGINE_ROOT" "$DEPLOY_ID" "$INSTANCE_ID"
 }
 
 main "$@"

package/deploy/cyberia-server/deploy.sh

@@ -5,18 +5,18 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
-TARGET_NODE=hp-envy-iso-ram-rocky9
-INGRESS_NODE=localhost.localdomain
+DEPLOY_ID=dd-cyberia
+INSTANCE_ID=mmo-server
+TARGET_NODE="${TARGET_NODE:-$WORKER_NODE}"
 
 main() {
     deploy_start "Starting remote deploy"
 
     prepare_host "$ENGINE_ROOT"
 
-    deploy_step "Build dd-cyberia configuration" \
+    deploy_step "Build $DEPLOY_ID configuration" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin/build dd-cyberia --conf"
+        "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
 
     deploy_step "Wait for target node readiness" \
         sudo -n -- /bin/bash -lc \
@@ -30,18 +30,17 @@ main() {
         sudo -n -- /bin/bash -lc \
         "cd $ENGINE_ROOT && kubectl rollout status deployment/underpost-gateway -n default --timeout=5m"
 
-    deploy_step "Deploy cyberia mmo server instance" \
+    deploy_step "Deploy $DEPLOY_ID $INSTANCE_ID instance" \
         sudo -n -- /bin/bash -lc \
         "cd $ENGINE_ROOT && node bin run instance \
           --kubeadm \
+          ${TARGET_NODE:+--node-name ${TARGET_NODE}} \
           --gateway-api \
           --image-pull-policy Always \
-          --node-name ${TARGET_NODE} \
           --ingress-node ${INGRESS_NODE} \
-          --ssh-key-path /home/dd/tmp/897as9dxhaskd9 \
-          --deploy-id dd-cyberia \
-          --instance-id mmo-server"
-
+          --ssh-key-path ${DEPLOY_SSH_KEY_PATH} \
+          --deploy-id $DEPLOY_ID \
+          --instance-id $INSTANCE_ID"
 }
 
 main "$@"

package/deploy/cyberia-server/package.sh

@@ -5,7 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
 # This runtime is an instance of its parent deployment, and installs that deployment's manifest.
 DEPLOY_ID=dd-cyberia
 

package/deploy/cyberia-server/state.sh

@@ -5,10 +5,11 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/state.sh"
 
-ENGINE_ROOT=/home/dd/engine
+DEPLOY_ID=dd-cyberia
+INSTANCE_ID=mmo-server
 
 main() {
-    stream_state "$ENGINE_ROOT" dd-cyberia mmo-server
+    stream_state "$ENGINE_ROOT" "$DEPLOY_ID" "$INSTANCE_ID"
 }
 
 main "$@"

package/deploy/dd-cyberia/deploy.sh

@@ -5,18 +5,18 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
-INGRESS_NODE=localhost.localdomain
+DEPLOY_ID=dd-cyberia
 
 main() {
     deploy_start "Starting remote deploy"
 
     prepare_host "$ENGINE_ROOT"
 
-    deploy_step "Deploy dd-cyberia" \
+    deploy_step "Deploy $DEPLOY_ID" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin run deploy dd-cyberia --gateway-api --ingress-node ${INGRESS_NODE}"
-
+        "cd $ENGINE_ROOT && node bin run deploy $DEPLOY_ID \
+          --gateway-api \
+          --ingress-node ${INGRESS_NODE}"
 }
 
 main "$@"

package/deploy/dd-cyberia/init.sh

@@ -5,49 +5,50 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
-INGRESS_NODE=localhost.localdomain
+DEPLOY_ID=dd-cyberia
+DEPLOY_ENV="${DEPLOY_ENV:-production}"
 
 main() {
-    deploy_start "Starting init deploy"
+    deploy_start "Starting remote init deploy"
 
     prepare_host "$ENGINE_ROOT"
 
-    deploy_step "Build dd-cyberia configuration" \
+    deploy_step "Build $DEPLOY_ID configuration" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin/build dd-cyberia --conf"
+        "cd $ENGINE_ROOT && node bin/build $DEPLOY_ID --conf"
 
     local pod_cmd
-    pod_cmd="$(pod_bootstrap_cmd dd-cyberia production), underpost start dd-cyberia production --build --run --skip-pull-repo-base"
+    pod_cmd="$(pod_bootstrap_cmd $DEPLOY_ID $DEPLOY_ENV), \
+        underpost start $DEPLOY_ID $DEPLOY_ENV --build --run --skip-pull-repo-base"
 
-    deploy_step "Deploy dd-cyberia production" \
+    deploy_step "Deploy $DEPLOY_ID $DEPLOY_ENV" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin deploy dd-cyberia production \
+        "cd $ENGINE_ROOT && node bin deploy $DEPLOY_ID $DEPLOY_ENV \
           --versions green \
           --replicas 1 \
           --kubeadm \
-          --timeout-response 300000ms \
+          --timeout-response 10000ms \
           --gateway-api \
           --ingress-node ${INGRESS_NODE} \
           --sync \
           --build-manifest \
           --cmd '${pod_cmd}'"
 
-    deploy_step "Clean dd-cyberia working tree" \
+    deploy_step "Clean $DEPLOY_ID working tree" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin deploy dd-cyberia production \
+        "cd $ENGINE_ROOT && node bin deploy $DEPLOY_ID $DEPLOY_ENV \
           --kubeadm \
           --gateway-api \
           --ingress-node ${INGRESS_NODE} \
           --disable-update-proxy \
           --git-clean"
 
-    deploy_step "Promote dd-cyberia deployment" \
+    deploy_step "Promote $DEPLOY_ID deployment" \
         sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin monitor dd-cyberia production \
+        "cd $ENGINE_ROOT && node bin monitor $DEPLOY_ID $DEPLOY_ENV \
           --ready-deployment \
           --promote \
-          --timeout-response 300000ms \
+          --timeout-response 10000ms \
           --versions green \
           --replicas 1"
 }

package/deploy/dd-cyberia/package.sh

@@ -5,7 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
 DEPLOY_ID=dd-cyberia
 
 main() {

package/deploy/dd-cyberia/state.sh

@@ -5,10 +5,10 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/state.sh"
 
-ENGINE_ROOT=/home/dd/engine
+DEPLOY_ID=dd-cyberia
 
 main() {
-    stream_state "$ENGINE_ROOT"
+    stream_state "$ENGINE_ROOT" "$DEPLOY_ID"
 }
 
 main "$@"

package/deploy/dd-cyberia/sync-deploy.sh

@@ -5,112 +5,176 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 source "$SCRIPT_DIR/../lib/host.sh"
 
-ENGINE_ROOT=/home/dd/engine
-TARGET_NODE=localhost.localdomain
-INGRESS_NODE=localhost.localdomain
+DEPLOY_ID=dd-cyberia
+DEPLOY_ENV="${DEPLOY_ENV:-production}"
+TARGET_NODE="${TARGET_NODE:-$HOST_NODE}"
+DEPLOY_IMAGE="${DEPLOY_IMAGE:-underpost/engine-cyberia:latest}"
+# The source the pod bootstraps from, and the private configuration each side reads: the host
+# takes the monorepo conf, the pod takes this deploy's own conf repository.
+ENGINE_SRC_REPO="${ENGINE_SRC_REPO:-underpostnet/engine-test-cyberia}"
+ENGINE_SRC_PRIVATE_REPO="${ENGINE_SRC_PRIVATE_REPO:-underpostnet/engine-private}"
+POD_SRC_PRIVATE_REPO="${POD_SRC_PRIVATE_REPO:-underpostnet/engine-cyberia-private}"
 
-# Base source the pod bootstraps from. The private configuration repository is not named here:
-# `underpost start --build` derives it from the deploy id and clones it into ./engine-private.
-POD_SRC_REPO="${POD_SRC_REPO:-underpostnet/engine-test-cyberia}"
+CYBERIA_ASSETS=src/client/public/cyberia
+UNDERPOST_ASSETS=src/client/public/underpost
+
+# Bundle mode: the host builds the client once and uploads the zip parts, and the pod restores
+# that artifact instead of compiling the client itself. Set BUNDLE_MODE=0 to have the pod build
+# from source, which is the behaviour this script had before bundle mode existed.
+BUNDLE_MODE="${BUNDLE_MODE:-1}"
+BUNDLE_SPLIT="${BUNDLE_SPLIT:-8}"
+# Where push-bundle records the uploaded keys, relative to a conf checkout root.
+BUNDLE_MANIFEST_PATH="conf/$DEPLOY_ID/storage.bundle.json"
+# `mv` into a directory that already exists nests the checkout inside it rather than replacing
+# it, and the pod would then load whatever conf the image carried.
+POD_SRC_PRIVATE_DIR="${POD_SRC_PRIVATE_REPO##*/}"
+# Sibling of the engine checkout, so the publish work tree is never part of it.
+POD_PRIVATE_CHECKOUT="../$POD_SRC_PRIVATE_DIR"
 
 main() {
     deploy_start "Starting remote sync and deploy"
-    
+
     prepare_host "$ENGINE_ROOT"
-    
-    # deploy_step "Run tests" \
-    #     sudo -n -- /bin/bash -lc \
-    #     "cd $ENGINE_ROOT && npm run test"
-    
+
     deploy_step "Clean cyberia public assets" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin run clean src/client/public/cyberia"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin run clean $CYBERIA_ASSETS"
+
     deploy_step "Clean underpost public assets" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin run clean src/client/public/underpost"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin run clean $UNDERPOST_ASSETS"
+
     deploy_step "Initialize cyberia assets repository" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin cmt src/client/public/cyberia --init-repo"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin cmt $CYBERIA_ASSETS --init-repo"
+
     deploy_step "Initialize underpost assets repository" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin cmt src/client/public/underpost --init-repo"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin cmt $UNDERPOST_ASSETS --init-repo"
+
     deploy_step "Pull cyberia public assets" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin fs src/client/public/cyberia --pull --recursive --deploy-id dd-cyberia"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin fs $CYBERIA_ASSETS \
+          --deploy-id $DEPLOY_ID \
+          --pull \
+          --tracked"
+
     deploy_step "Pull underpost public assets" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin fs src/client/public/underpost \
-          --deploy-id dd-cyberia \
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin fs $UNDERPOST_ASSETS \
+          --deploy-id $DEPLOY_ID \
           --pull \
-          --recursive \
-    --storage-file-path './engine-private/conf/dd-cyberia/storage.underpost.json'"
-    
-    if [ "$(has_changes src/client/public/cyberia "$ENGINE_ROOT")" = "1" ]; then
+          --tracked \
+          --storage-id underpost"
+
+    if [ "$(has_changes $CYBERIA_ASSETS "$ENGINE_ROOT")" = "1" ]; then
         deploy_step "Commit cyberia public assets" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin cmt src/client/public/cyberia feat 'Update cyberia public assets'"
+            sudo -n -- /bin/bash -lc \
+            "cd $ENGINE_ROOT && git -C $CYBERIA_ASSETS add . && node bin cmt $CYBERIA_ASSETS feat 'Update cyberia public assets'"
     fi
-    
-    if [ "$(has_changes src/client/public/underpost "$ENGINE_ROOT")" = "1" ]; then
+
+    if [ "$(has_changes $UNDERPOST_ASSETS "$ENGINE_ROOT")" = "1" ]; then
         deploy_step "Commit underpost public assets" \
-        sudo -n -- /bin/bash -lc \
-        "cd $ENGINE_ROOT && node bin cmt src/client/public/underpost feat 'Update underpost public assets'"
+            sudo -n -- /bin/bash -lc \
+            "cd $ENGINE_ROOT && git -C $UNDERPOST_ASSETS add . && node bin cmt $UNDERPOST_ASSETS feat 'Update underpost public assets'"
     fi
-    
-    deploy_step "Apply format fixes" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && npm run fix"
-    
+
+
     deploy_step "Reinstall dependencies" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && npm install"
-    
-    deploy_step "Install dd-cyberia catalog dependencies" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin package dd-cyberia --install"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && npm install"
+
+    deploy_step "Install $DEPLOY_ID catalog dependencies" \
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin package $DEPLOY_ID --install"
+
     deploy_step "Clean build artifacts" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && underpost run clean"
-    
-    deploy_step "Load dd-cyberia production environment" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin app load --env production --args deploy-id=dd-cyberia"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin run clean"
+
+    deploy_step "Load $DEPLOY_ID $DEPLOY_ENV environment" \
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin app load --env $DEPLOY_ENV --args deploy-id=$DEPLOY_ID"
+
     deploy_step "Build cyberia manifests" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin/cyberia run-workflow build-manifest"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin/cyberia run-workflow build-manifest"
+
+    # Follows the manifest step: the client renders from the conf.ssr.json that build-manifest
+    # writes, so a bundle pushed before it would ship the previous SSR views. The uploaded keys
+    # are recorded in engine-private/conf/$DEPLOY_ID/storage.bundle.json, which the pod reads
+    # back through its own conf repository.
+    if [ "$BUNDLE_MODE" = "1" ]; then
+        deploy_step "Push $DEPLOY_ID client bundle" \
+            sudo -n -- /bin/bash -lc \
+            "cd $ENGINE_ROOT && node bin run push-bundle \
+              --deploy-id $DEPLOY_ID \
+              --split $BUNDLE_SPLIT"
+
+        # push-bundle records the keys in the host's own conf checkout, but the pod replaces
+        # ./engine-private with a clone of its conf repository — so the manifest is published
+        # there too, or the pod reads an empty one and restores nothing. Cloning from the engine
+        # root keeps `underpost clone` reading this checkout's credentials, and the work tree is
+        # then moved out so it is never part of the engine checkout.
+        deploy_step "Stage $DEPLOY_ID bundle manifest" \
+            sudo -n -- /bin/bash -lc \
+            "cd $ENGINE_ROOT && rm -rf $POD_PRIVATE_CHECKOUT \
+              && node bin clone $POD_SRC_PRIVATE_REPO \
+              && mv ./$POD_SRC_PRIVATE_DIR $POD_PRIVATE_CHECKOUT \
+              && mkdir -p $POD_PRIVATE_CHECKOUT/conf/$DEPLOY_ID \
+              && cp ./engine-private/$BUNDLE_MANIFEST_PATH $POD_PRIVATE_CHECKOUT/$BUNDLE_MANIFEST_PATH"
+
+        # A rerun that uploads the same keys leaves the manifest byte-identical, and committing
+        # nothing fails the step.
+        if [ "$(has_changes $POD_PRIVATE_CHECKOUT "$ENGINE_ROOT")" = "1" ]; then
+            deploy_step "Publish $DEPLOY_ID bundle manifest" \
+                sudo -n -- /bin/bash -lc \
+                "cd $ENGINE_ROOT && node bin cmt $POD_PRIVATE_CHECKOUT feat 'Update $DEPLOY_ID bundle manifest' \
+                  && node bin push $POD_PRIVATE_CHECKOUT $POD_SRC_PRIVATE_REPO"
+        fi
+    fi
+
     # Two commands, one bootstrap: `pod_bootstrap_cmd` replaces the image's engine with this
     # deploy's source and repoints the global bin at it — without that, the first step needing
     # the current CLI answered `unknown command 'app'`. `start --build` then owns the rest
-    # (private conf clone, dependencies, `app load`, client bundle) and `--skip-pull-repo-base` tells
-    # it the source is already in place, so the checkout is pulled exactly once.
+    # (dependencies, `app load`, client bundle), while `--skip-pull-repo-base` and
+    # `--skip-pull-private-repo` tell it the source and the conf are already in place, so each is
+    # fetched exactly once. The conf is cloned here rather than left to `--build` because the
+    # steps below it — `app load` and every `bin/cyberia` import — read that conf first.
     local pod_cmd
-    pod_cmd="$(pod_bootstrap_cmd dd-cyberia production "$POD_SRC_REPO"), \
-        node bin start dd-cyberia production --build --run --skip-pull-repo-base"
+    # In bundle mode `--pull-bundle` replaces the pod's client build with a download of the
+    # artifact the host just pushed; without it `--build` compiles the client in the pod.
+    local start_flags="--build --run --skip-pull-repo-base --skip-pull-private-repo"
+    if [ "$BUNDLE_MODE" = "1" ]; then
+        start_flags="$start_flags --pull-bundle"
+    fi
+    pod_cmd="$(pod_bootstrap_cmd $DEPLOY_ID $DEPLOY_ENV "$ENGINE_SRC_REPO"), \
+        underpost clone ${POD_SRC_PRIVATE_REPO}, \
+        sudo rm -rf ./engine-private, \
+        sudo mv ./${POD_SRC_PRIVATE_DIR} ./engine-private, \
+        underpost app load --env $DEPLOY_ENV --args deploy-id=$DEPLOY_ID, \
+        node bin/cyberia ol --drop --env-path .env, \
+        node bin/cyberia run-workflow drop-db --env-path .env, \
+        node bin/cyberia instance amethyst-strata-expansion --import --env-path .env, \
+        node bin/cyberia instance FOREST --import --env-path .env, \
+        node bin/cyberia instance TEST --import --env-path .env, \
+        underpost start $DEPLOY_ID $DEPLOY_ENV $start_flags"
 
-    deploy_step "Sync dd-cyberia cluster" \
-    sudo -n -- /bin/bash -lc \
-    "cd $ENGINE_ROOT && node bin run sync \
-          --deploy-id dd-cyberia \
+    deploy_step "Sync $DEPLOY_ID cluster" \
+        sudo -n -- /bin/bash -lc \
+        "cd $ENGINE_ROOT && node bin run sync \
+          --deploy-id $DEPLOY_ID \
           --replicas 1 \
-          --image underpost/engine-cyberia:latest \
+          --image '${DEPLOY_IMAGE}' \
           --kubeadm \
           --deploy-id-cron-jobs none \
-          --timeout-response 300000ms \
-          --node-name ${TARGET_NODE} \
+          --timeout-response 10000ms \
+          ${TARGET_NODE:+--node-name ${TARGET_NODE}} \
           --gateway-api \
           --ingress-node ${INGRESS_NODE} \
-          --ssh-key-path /home/dd/tmp/897as9dxhaskd9 \
+          --ssh-key-path ${DEPLOY_SSH_KEY_PATH} \
           --image-pull-policy Always \
           --cmd '${pod_cmd}'"
-    
 }
 
 main "$@"

package/deploy/lib/config.sh

@@ -0,0 +1,29 @@
+# Shared deploy constants for deploy/<deploy-id>/*.sh. Sourced by lib/host.sh and lib/state.sh,
+# never executed directly.
+#
+# One home for every value more than one deploy script needs, so renaming a node or moving a
+# checkout is a single edit instead of a sweep. Every name here resolves from the environment
+# first, which is how a run is retargeted without editing a script.
+
+# The engine checkout every step runs in. The library helpers take it as an argument and fall
+# back to this, so a caller driving a second checkout passes that one explicitly.
+ENGINE_ROOT="${ENGINE_ROOT:-/home/dd/engine}"
+
+# The fleet's nodes, named once. A deploy pins its own placement in TARGET_NODE, declared beside
+# its deploy id and left empty where the CLI resolves the node itself.
+#
+# `node bin deploy` publishes that flag as `--node` while `run sync` and `run instance` publish
+# it as `--node-name`. Both are public option names, so a script holds the value once and spells
+# the flag the way the command it drives publishes it.
+HOST_NODE="${HOST_NODE:-localhost.localdomain}"
+WORKER_NODE="${WORKER_NODE:-hp-envy-iso-ram-rocky9}"
+
+# The node carrying the shared host-network ingress.
+INGRESS_NODE="${INGRESS_NODE:-$HOST_NODE}"
+
+# The key the sync and instance steps ship volume data with.
+DEPLOY_SSH_KEY_PATH="${DEPLOY_SSH_KEY_PATH:-/home/dd/tmp/897as9dxhaskd9}"
+
+# The published image the WordPress deploys run. Pinned rather than derived from the checkout's
+# version: a tag is only deployable once the release workflow has published it.
+DEPLOY_WP_IMAGE="${DEPLOY_WP_IMAGE:-underpost/wp:v3.3.77}"