@underpostnet/cyberia 3.3.73 → 3.3.77

package/deploy/lib/github-actions-logging.sh

@@ -1,37 +1,20 @@
 # Logging helpers for deploy/<deploy-id>/*.sh. Sourced, never executed directly.
 #
-# Deploy script contract:
-# - deploy_start once for the run's title, prepare_host from lib/host.sh next,
-#   then one deploy_step call per remote command, each with its own label
-# - the body lives in main(), invoked on the last line: the first remote command
-#   pulls this repository, rewriting the running script while bash reads it
+# Environment read by these helpers, and nothing else:
+#   RUN_QUIET_DEBUG  Stream every line verbatim: no table, no folding, no dropped traces. For an
+#                    operator watching a step over SSH who needs the run itself, not a report of
+#                    it. Wins over the two below, which each hide part of the stream by design.
+#   RUN_QUIET_CI     Marks stdout as a GitHub Actions log, which folds monitor frames into
+#                    collapsed sections. The CD workflows export it on the far side of the SSH
+#                    hop because GITHUB_ACTIONS is runner-local and does not travel; a remote
+#                    deploy has no other way to know. `underpost state publish` reads the same
+#                    pair to choose workflow commands over JSON.
+#   RUN_QUIET_PLAIN  No colour, no cursor motion, no folding: frames stream as they arrive.
+#   NO_COLOR         Colour off, the usual convention. Everything else is unaffected.
 #
-# deploy_step is the entry point every deploy script uses. run_quiet stays the
-# mechanism underneath it, for the rare caller that needs a different report
-# pattern or passthrough window.
-#
-# run_quiet hides normal output and returns the command's exit status so
-# `set -e` stops the deployment. Lines matching `patterns` that parse as a
-# deployment pod report are folded into a table — one row per pod, three columns
-# wide — instead of being streamed; the monitor's raw `deploy-monitor` JSON emits
-# are consumed into that table's cells rather than printed. The monitor
-# iteration and its clock are per frame, not per pod, so they title the table
-# rather than repeating down a column of every row. Anything else within
-# `lines_after` lines of a match scrolls above the table. On failure it keeps
-# two temp files and prints their paths in red instead of their contents: the
-# error trace and the full unfiltered log up to the error. The trace is stderr
-# plus the failing tail of the merged log, because the engine CLI reports through
-# its logger and that writes to stdout — stderr alone routinely holds nothing but
-# git progress output.
-#
-# The table renders three ways, because a log viewer is not a terminal:
-# - terminal: redrawn in place, cursor relative, one frame at a time
-# - CI (GITHUB_ACTIONS/RUN_QUIET_CI): no cursor addressing exists there, so the
-#   changed rows stream inside a collapsed `::group::` and the final table is
-#   printed after it, expanded
-# - anywhere else: changed rows appended
-# Colour is ANSI SGR only and is emitted in all three (GitHub renders SGR in
-# step logs); NO_COLOR or RUN_QUIET_PLAIN turns it off.
+# Whatever the rendering, the parsing behind it is the same: a step that reports a fatal runtime
+# status fails, including one that exits 0, and including in debug mode.
+
 
 if [ -n "${NO_COLOR:-}${RUN_QUIET_PLAIN:-}" ]; then
     RUN_QUIET_RED=''
@@ -41,8 +24,8 @@ else
     RUN_QUIET_RESET=$'\033[0m'
 fi
 
-RUN_QUIET_NODE_NAME=$(hostname 2>/dev/null | tr '[:upper:]' '[:lower:]')
-RUN_QUIET_NODE_TAG=${RUN_QUIET_NODE_NAME:+ [$RUN_QUIET_NODE_NAME]}
+RUN_QUIET_NODE_TAG=$(hostname 2>/dev/null | tr '[:upper:]' '[:lower:]')
+RUN_QUIET_NODE_TAG=${RUN_QUIET_NODE_TAG:+ [$RUN_QUIET_NODE_TAG]}
 
 # The report pattern and the passthrough window describe the deployment log
 # format, not any one step, so they are declared once here instead of being
@@ -68,27 +51,37 @@ run_quiet() {
     local patterns="$2"
     local lines_after="$3"
     shift 3
-    
+
     local debug_log
     local error_log
     local fail_flag
     local fatal
-    local reason
     local fifo_dir
     local filter_pid
     local stderr_pid
     local color=0
+    local debug=0
     local groups=0
     local redraw=0
     local width=0
     local rows=0
     local status=0
-    
+
     echo "$RUN_QUIET_NODE_TAG $(date -Is) ▶ $label"
-    
+
+    # How a step renders is decided by what its destination can do, not by preference, and the
+    # three renderings are mutually exclusive:
+    #   debug   an operator watching over SSH — nothing filtered, folded or overwritten
+    #   redraw  a terminal — one live region, rewritten in place
+    #   groups  a GitHub Actions log — no cursor motion, so frames fold into a collapsed section
+    # With none of them the frames simply stream. RUN_QUIET_DEBUG is resolved first because it
+    # is the operator asking to see the stream itself, which neither of the others can show: a
+    # live region overwrites what came before, and a collapsed section hides it.
+    [ -z "${RUN_QUIET_DEBUG:-}" ] || debug=1
+
     [ -n "${NO_COLOR:-}${RUN_QUIET_PLAIN:-}" ] || color=1
-    
-    if [ -t 1 ] && [ "${TERM:-dumb}" != dumb ] && [ -z "${RUN_QUIET_PLAIN:-}" ]; then
+
+    if [ "$debug" -eq 0 ] && [ -t 1 ] && [ "${TERM:-dumb}" != dumb ] && [ -z "${RUN_QUIET_PLAIN:-}" ]; then
         redraw=1
         width=${COLUMNS:-0}
         [ "$width" -gt 0 ] 2>/dev/null || width=$(tput cols 2>/dev/null || echo 0)
@@ -98,18 +91,22 @@ run_quiet() {
         # addresses the table no longer matches the lines it printed.
         [ "$width" -ge 20 ] || redraw=0
     fi
-    
-    if [ "$redraw" -eq 0 ] && [ -z "${RUN_QUIET_PLAIN:-}" ] && [ -n "${GITHUB_ACTIONS:-}${RUN_QUIET_CI:-}" ]; then
+
+    # GITHUB_ACTIONS exists on a runner but is not carried across the SSH hop a remote deploy runs
+    # over, so RUN_QUIET_CI — which the workflows export on the far side — is what actually marks
+    # a step whose stdout a GitHub log will render.
+    if [ "$debug" -eq 0 ] && [ "$redraw" -eq 0 ] && [ -z "${RUN_QUIET_PLAIN:-}" ] &&
+        [ -n "${GITHUB_ACTIONS:-}${RUN_QUIET_CI:-}" ]; then
         groups=1
     fi
-    
+
     debug_log=$(mktemp --suffix=.debug.log)
     error_log=$(mktemp --suffix=.error.log)
     fail_flag=$(mktemp --suffix=.fatal)
     : >"$fail_flag"
     fifo_dir=$(mktemp -d)
     mkfifo "$fifo_dir/merged" "$fifo_dir/stderr"
-    
+
     # The filter reads the live stream rather than the finished log: a deployment
     # monitor prints its report for minutes before exiting, so a pass over the
     # completed file would show nothing until then. fflush defeats awk's block
@@ -133,6 +130,7 @@ run_quiet() {
     -v debug_log="$debug_log" \
     -v redraw="$redraw" \
     -v color="$color" \
+    -v debug="$debug" \
     -v groups="$groups" \
     -v label="$label" \
     -v width="$width" \
@@ -422,7 +420,31 @@ run_quiet() {
         # actually moved; the iteration count alone is not a change. The title is
         # reprinted whenever a later iteration is the one moving rows, so a
         # streamed row is still dated without carrying its own clock column.
+        # The parsing every rendering shares: it advances the monitor'"'"'s event state machine,
+        # records what each pod reported, and latches a fatal runtime status. What a line *is*
+        # cannot depend on how the run is being displayed, so this answers only that, and the
+        # caller decides what to show.
+        function track(line) {
+            if (in_json) {
+                if (line ~ json_close) {
+                    in_json = 0
+                    apply_event()
+                } else {
+                    if (json_value("phase") != "") event_phase = json_value("phase")
+                    if (json_value("state") != "") event_state = json_value("state")
+                    if (json_value("status") != "") event_status = json_value("status")
+                }
+                return "event"
+            }
+            if (line ~ json_open) {
+                in_json = 1
+                event_phase = event_state = event_status = ""
+                return "event"
+            }
+            return read_pod_line(line) ? "pod" : "other"
+        }
         function append_row(pod,   cells) {
+            if (debug) return
             cells = pod "|" k8s_cell(pod) "|" runtime_cell(pod)
             if (cells == last_row[pod]) return
             last_row[pod] = cells
@@ -456,34 +478,30 @@ run_quiet() {
             if ($0 !~ /"timestamp"/ && match(strip($0), clock)) last_time = substr(strip($0), RSTART, RLENGTH)
         }
         {
+            # DEBUG streams the step verbatim: no table, no group, no passthrough window, and no
+            # dropped stack traces — a CI transcript withholds those because it is published,
+            # which is not true of the session an operator opened to audit this run. Tracking
+            # still runs, so a fatal runtime status latches here exactly as in every other mode
+            # and a step that reports one still fails.
+            if (debug) {
+                track($0)
+                put($0)
+                next
+            }
             if (!handed_off && $0 !~ pattern && ready_pending()) hand_off()
             if (handed_off) {
                 if ($0 !~ pattern) next
                 reset_table()
             }
+            line_kind = track($0)
             # The monitor JSON is state already carried by the table cells: it is
             # consumed here and never reaches the terminal.
-            if (in_json) {
-                if ($0 ~ json_close) {
-                    in_json = 0
-                    apply_event()
-                } else {
-                    if (json_value("phase") != "") event_phase = json_value("phase")
-                    if (json_value("state") != "") event_state = json_value("state")
-                    if (json_value("status") != "") event_status = json_value("status")
-                }
+            if (line_kind == "event") {
                 if (remaining > 0) remaining--
                 last_pod_line = 0
                 next
             }
-            if ($0 ~ json_open) {
-                in_json = 1
-                event_phase = event_state = event_status = ""
-                if (remaining > 0) remaining--
-                last_pod_line = 0
-                next
-            }
-            if (read_pod_line($0)) {
+            if (line_kind == "pod") {
                 # Pod reports arrive back to back, one per pod, once per monitor
                 # iteration: the first of a run opens a new cycle.
                 if (!last_pod_line) cycles++
@@ -511,27 +529,27 @@ run_quiet() {
             }
         }
         END {
-            if (!handed_off && ready_pending()) hand_off()
+            if (!debug && !handed_off && ready_pending()) hand_off()
             close_group()
         }
     ' <"$fifo_dir/merged" &
     filter_pid=$!
-    
+
     # stderr is duplicated: on its own for the native error and stack trace, and
     # into the merged stream so both the debug log and the filter see it in
     # chronological order with stdout.
     tee -a "$error_log" <"$fifo_dir/stderr" >"$fifo_dir/merged" &
     stderr_pid=$!
-    
+
     "$@" >"$fifo_dir/merged" 2>"$fifo_dir/stderr" || status=$?
-    
+
     # Drain both readers before the paths are printed, or the trace can still be
     # in flight. Bounded: a command that leaks a child holding a stream open must
     # not hang the deployment, and by then everything read has been written.
     run_quiet_drain "$stderr_pid"
     run_quiet_drain "$filter_pid"
     rm -rf "$fifo_dir"
-    
+
     # A deployment can fail without the command failing. The in-pod lifecycle latches
     # `container-status=error` and deliberately does not crash the container, so a step that
     # reported a fatal runtime state can still exit 0 — and a green step here is a green
@@ -541,23 +559,21 @@ run_quiet() {
     rm -f "$fail_flag"
     if [ "$status" -eq 0 ] && [ -n "$fatal" ]; then
         status=1
-        printf '%s✖ %s reported a fatal runtime state but exited 0 (%s)%s\n' \
-        "$RUN_QUIET_RED" "$label" "$fatal" "$RUN_QUIET_RESET" >&2
+        printf -- '--- fatal runtime latch ---\n%s\n' "$fatal" >>"$error_log"
+        printf '%s✖ %s reported a fatal runtime state but exited 0%s\n' \
+        "$RUN_QUIET_RED" "$label" "$RUN_QUIET_RESET" >&2
     fi
-    
+
     if [ "$status" -ne 0 ]; then
         run_quiet_error_trace "$debug_log" "$error_log"
-        # One line of why, never the trace: the filter drops trace lines from the window.
-        reason=$(grep -a -m1 -E '^[A-Za-z]*Error: |reported runtime status=' "$debug_log" 2>/dev/null | head -1) || true
         printf '%s✖ %s failed (exit %s)%s\n' "$RUN_QUIET_RED" "$label" "$status" "$RUN_QUIET_RESET" >&2
-        [ -n "$reason" ] && printf '%s  reason:      %s%s\n' "$RUN_QUIET_RED" "$reason" "$RUN_QUIET_RESET" >&2
         printf '%s  error trace: %s\n  debug log:   %s%s\n' \
         "$RUN_QUIET_RED" "$error_log" "$debug_log" "$RUN_QUIET_RESET" >&2
         return "$status"
     fi
-    
+
     rm -f "$debug_log" "$error_log"
-    
+
     return "$status"
 }
 
@@ -570,13 +586,13 @@ run_quiet_error_trace() {
     local error_log="$2"
     local tail_lines="${3:-40}"
     local first
-    
+
     # grep exits 1 when it matches nothing, and every deploy script runs under `set -e` with
     # `pipefail`: unguarded, a failing step whose log carries no marker aborted this function
     # before run_quiet could print the exit code and the two log paths, and the tail fallback
     # below was unreachable. The no-match case is the fallback's trigger, not an error.
     first=$(grep -a -n -m1 -E 'Error:|Error \[|^[[:space:]]+at |✖' "$debug_log" 2>/dev/null | cut -d: -f1) || true
-    
+
     printf -- '--- error trace (from merged log) ---\n' >>"$error_log"
     if [ -n "$first" ]; then
         tail -n "+$first" "$debug_log" >>"$error_log"
@@ -587,7 +603,7 @@ run_quiet_error_trace() {
 
 run_quiet_drain() {
     local pid="$1"
-    
+
     timeout 10 tail --pid="$pid" -f /dev/null 2>/dev/null || true
     kill "$pid" 2>/dev/null || true
     wait "$pid" 2>/dev/null || true

package/deploy/lib/host.sh

@@ -1,6 +1,9 @@
 # Host preparation for deploy/<deploy-id>/*.sh. Sourced, never executed directly.
 # Requires lib/github-actions-logging.sh for deploy_step.
 
+LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$LIB_DIR/config.sh"
+
 # The host configuration store, if this node has one.
 #
 # Every step below drives the CLI through `sudo`, so the store the CLI writes is root's, not the
@@ -82,21 +85,24 @@ deploy_id_from_repo() {
 #
 # Usage: install_deploy_dependencies <engine-root> [deploy-id]
 install_deploy_dependencies() {
-    local engine_root="${1:-/home/dd/engine}"
+    local engine_root="${1:-$ENGINE_ROOT}"
     local deploy_id="$2"
     local manifest="engine-private/conf/$deploy_id/package.json"
 
     if [ -n "$deploy_id" ] && [ -f "$engine_root/$manifest" ]; then
         deploy_step "Install dependencies ($deploy_id)" \
-        sudo -n -- /bin/bash -lc "cd $engine_root && cp -a ./$manifest ./package.json && npm install"
+            sudo -n -- /bin/bash -lc "cd $engine_root && cp -a ./$manifest ./package.json && npm install"
     else
         deploy_step "Install dependencies" \
-        sudo -n -- /bin/bash -lc "cd $engine_root && npm install"
+            sudo -n -- /bin/bash -lc "cd $engine_root && npm install"
     fi
 
+    # The global `underpost` is a symlink onto this checkout's entrypoint, so the link is only
+    # usable while that file carries its executable mode. The mode is tracked in git; the chmod
+    # is what carries a checkout that predates it, which is every node still to be synced.
     deploy_step "Link underpost CLI" \
-    sudo -n -- /bin/bash -lc \
-    "cd $engine_root && npm link --force && test \"\$(readlink -f \"\$(command -v underpost)\")\" = \"\$(readlink -f ./bin/index.js)\""
+        sudo -n -- /bin/bash -lc \
+        "cd $engine_root && chmod +x ./bin/index.js && npm link --force && test -x ./bin/index.js && test \"\$(readlink -f \"\$(command -v underpost)\")\" = \"\$(readlink -f ./bin/index.js)\""
 }
 
 # Brings a node to the state every deploy assumes: the engine source at HEAD, its dependencies
@@ -109,21 +115,21 @@ install_deploy_dependencies() {
 # installed again after it, because the pull resets the checkout to its remote and takes
 # `package.json` with it.
 prepare_host() {
-    local engine_root="${1:-/home/dd/engine}"
+    local engine_root="${1:-$ENGINE_ROOT}"
     local src_repo="${2:-$ENGINE_SRC_REPO}"
     local src_private_repo="${3:-$ENGINE_SRC_PRIVATE_REPO}"
     local deploy_id="${4:-$(deploy_id_from_repo "$src_repo")}"
-    
+
     install_deploy_dependencies "$engine_root" "$deploy_id"
-    
+
     deploy_step "Pull repository" \
-    sudo -n -- /bin/bash -lc \
-    "cd $engine_root && node bin run pull $src_repo${src_private_repo:+ --repo-engine-private $src_private_repo}"
-    
+        sudo -n -- /bin/bash -lc \
+        "cd $engine_root && node bin run pull $src_repo${src_private_repo:+ --repo-engine-private $src_private_repo}"
+
     install_deploy_dependencies "$engine_root" "$deploy_id"
-    
+
     deploy_step "Load host config" \
-    sudo -n -- /bin/bash -lc "cd $engine_root && node bin host load"
+        sudo -n -- /bin/bash -lc "cd $engine_root && node bin host load"
 }
 
 # Whether a tracked path carries uncommitted changes, as `1` or empty.
@@ -136,10 +142,10 @@ prepare_host() {
 # Usage: has_changes <path> [engine-root]
 has_changes() {
     local path="$1"
-    local engine_root="${2:-${ENGINE_ROOT:-/home/dd/engine}}"
-    
+    local engine_root="${2:-$ENGINE_ROOT}"
+
     sudo -n -- /bin/bash -lc \
-    "cd $engine_root && node bin cmt $path --has-changes" | tr -d '\n'
+        "cd $engine_root && node bin cmt $path --has-changes" | tr -d '\n'
 }
 
 # The in-pod bootstrap, emitted as a `--cmd` payload (comma-separated: `underpost deploy`
@@ -163,13 +169,16 @@ has_changes() {
 # `install` hook installs global tooling and `npm link` publishes the CLI there, and both write
 # a tree the image left owned by root.
 #
+# The paths below are the container's, fixed by the image layout, and deliberately not
+# `$ENGINE_ROOT`: that one names the checkout on the host running this script.
+#
 # Usage: pod_bootstrap_cmd <deploy-id> [env] [owner/repo]
 pod_bootstrap_cmd() {
     local deploy_id="$1"
     local env="${2:-production}"
-    local repo="${3:-underpostnet/engine-test-${deploy_id#dd-}}"
+    local repo="${3:-underpostnet/engine-${deploy_id#dd-}}"
     local name="${repo##*/}"
-    
+
     printf '%s' "cd /home/dd, \
 underpost clone ${repo}, \
 mkdir -p /home/dd/engine, \
@@ -181,5 +190,5 @@ sudo chown -R \$(id -u):\$(id -g) \$(npm prefix -g)/lib/node_modules \$(npm pref
 npm install, \
 npm link --force, \
 test \"\$(readlink -f \"\$(command -v underpost)\")\" = \"\$(readlink -f ./bin/index.js)\", \
-    underpost state set container-status ${deploy_id}-${env}-build-deployment"
+        underpost state set container-status ${deploy_id}-${env}-build-deployment"
 }

package/deploy/lib/state.sh

@@ -3,6 +3,9 @@
 # The one source of streamed state for every context. Nothing here is conditional on GitHub
 # Actions: annotations are just the rendering the state domain picks when it detects a workflow.
 
+LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$LIB_DIR/config.sh"
+
 STATE_ENV="${STATE_ENV:-production}"
 STATE_NAMESPACE="${STATE_NAMESPACE:-default}"
 STATE_STREAM="${STATE_STREAM:-1}"
@@ -18,7 +21,7 @@ STATE_WATCH="${STATE_WATCH:-2}"
 #
 # Usage: stream_state <engine-root> [deploy-id] [instance-id]
 stream_state() {
-    local engine_root="${1:-/home/dd/engine}"
+    local engine_root="${1:-$ENGINE_ROOT}"
     local deploy_id="${2:-$(basename "$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd)")}"
     local instance_id="${3:-}"
     local args="deploy-id=${deploy_id}"

package/deploy/pwa-microservices-template/deploy.sh

@@ -9,6 +9,8 @@ source "$SCRIPT_DIR/../lib/github-actions-logging.sh"
 # grandparent rather than a fixed remote path.
 REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
+DEPLOY_ID=dd-github-pages
+
 main() {
     deploy_start "Starting github pages deploy"
 
@@ -29,17 +31,17 @@ main() {
     deploy_step "Install dependencies" \
         npm install
 
-    deploy_step "Build dd-github-pages configuration" \
-        node bin new --default-conf --conf-workflow-id dd-github-pages
+    deploy_step "Build $DEPLOY_ID configuration" \
+        node bin new --default-conf --conf-workflow-id $DEPLOY_ID
 
-    deploy_step "Create dd-github-pages deployment" \
-        node bin new --deploy-id dd-github-pages
+    deploy_step "Create $DEPLOY_ID deployment" \
+        node bin new --deploy-id $DEPLOY_ID
 
-    deploy_step "Load dd-github-pages production environment" \
-        node bin app load --env production --args deploy-id=dd-github-pages
+    deploy_step "Load $DEPLOY_ID production environment" \
+        node bin app load --env production --args deploy-id=$DEPLOY_ID
 
-    deploy_step "Build dd-github-pages client" \
-        env NODE_ENV=production node bin client dd-github-pages '' underpostnet.github.io /pwa-microservices-template-ghpkg
+    deploy_step "Build $DEPLOY_ID client" \
+        env NODE_ENV=production node bin client $DEPLOY_ID '' underpostnet.github.io /pwa-microservices-template-ghpkg
 }
 
 main "$@"

package/deploy/release/deploy.sh

@@ -5,8 +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
-
 main() {
     deploy_start "Starting remote release deploy"
 

package/deployment.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: dd-cyberia-development-blue
-          image: underpost/underpost-engine:v3.3.73
+          image: underpost/underpost-engine:v3.3.77
           imagePullPolicy: IfNotPresent
           envFrom:
             - secretRef:

package/docker-compose.yml

@@ -135,7 +135,7 @@ services:
   # server starts but rejects connections until seeded). Serves REST/WS on 4005
   # and the engine gRPC data service on 50051.
   engine-cyberia-runtime:
-    image: ${ENGINE_CYBERIA_IMAGE:-underpost/engine-cyberia-dev}:${ENGINE_CYBERIA_TAG:-v3.3.73}
+    image: ${ENGINE_CYBERIA_IMAGE:-underpost/engine-cyberia-dev}:${ENGINE_CYBERIA_TAG:-v3.3.77}
     container_name: dd-cyberia-engine
     command:
       - /bin/sh
@@ -190,14 +190,16 @@ services:
   # gateway on host port 8081, so one port can route every instance path.
 
   cyberia-server-runtime:
-    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.73}
+    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.77}
     container_name: dd-cyberia-server
     environment:
       INSTANCE_CODE: amethyst-strata-expansion
       CYBERIA_BASE_PATH: /
-      ENGINE_API_BASE_URL: ${ENGINE_API_BASE_URL:-http://engine-cyberia}
+      CYBERIA_PUBLIC_URL: ${CYBERIA_SERVER_PUBLIC_ORIGIN:-http://localhost:8081}
+      CYBERIA_SERVER_API_KEY: ${CYBERIA_SERVER_API_KEY:-}
+      CYBERIA_DATA_SERVER_URL: ${CYBERIA_DATA_SERVER_URL:-http://engine-cyberia}
       ENGINE_PUBLIC_URL: ${ENGINE_PUBLIC_URL:-http://localhost:4005}
-      ENGINE_GRPC_ADDRESS: ${ENGINE_GRPC_ADDRESS:-engine-cyberia-runtime:50051}
+      CYBERIA_DATA_SERVER_GRPC: ${CYBERIA_DATA_SERVER_GRPC:-engine-cyberia-runtime:50051}
       ENGINE_GRPC_RELOAD_INTERVAL_SEC: ${ENGINE_GRPC_RELOAD_INTERVAL_SEC:-300}
       STATIC_DIR: ${CYBERIA_SERVER_STATIC_DIR:-/home/dd/engine/cyberia-server/public}
       APP_ENV: ${CYBERIA_SERVER_APP_ENV:-development}
@@ -226,14 +228,16 @@ services:
     restart: unless-stopped
 
   cyberia-server-forest:
-    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.73}
+    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.77}
     container_name: dd-cyberia-server-forest
     environment:
       INSTANCE_CODE: FOREST
       CYBERIA_BASE_PATH: /FOREST
-      ENGINE_API_BASE_URL: ${ENGINE_API_BASE_URL:-http://engine-cyberia}
+      CYBERIA_PUBLIC_URL: ${CYBERIA_SERVER_PUBLIC_ORIGIN:-http://localhost:8081}/FOREST
+      CYBERIA_SERVER_API_KEY: ${CYBERIA_SERVER_API_KEY:-}
+      CYBERIA_DATA_SERVER_URL: ${CYBERIA_DATA_SERVER_URL:-http://engine-cyberia}
       ENGINE_PUBLIC_URL: ${ENGINE_PUBLIC_URL:-http://localhost:4005}
-      ENGINE_GRPC_ADDRESS: ${ENGINE_GRPC_ADDRESS:-engine-cyberia-runtime:50051}
+      CYBERIA_DATA_SERVER_GRPC: ${CYBERIA_DATA_SERVER_GRPC:-engine-cyberia-runtime:50051}
       ENGINE_GRPC_RELOAD_INTERVAL_SEC: ${ENGINE_GRPC_RELOAD_INTERVAL_SEC:-300}
       STATIC_DIR: ${CYBERIA_SERVER_STATIC_DIR:-/home/dd/engine/cyberia-server/public}
       APP_ENV: ${CYBERIA_SERVER_APP_ENV:-development}
@@ -262,14 +266,16 @@ services:
     restart: unless-stopped
 
   cyberia-server-test:
-    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.73}
+    image: ${CYBERIA_SERVER_IMAGE:-underpost/cyberia-server-dev}:${CYBERIA_SERVER_TAG:-v3.3.77}
     container_name: dd-cyberia-server-test
     environment:
       INSTANCE_CODE: TEST
       CYBERIA_BASE_PATH: /TEST
-      ENGINE_API_BASE_URL: ${ENGINE_API_BASE_URL:-http://engine-cyberia}
+      CYBERIA_PUBLIC_URL: ${CYBERIA_SERVER_PUBLIC_ORIGIN:-http://localhost:8081}/TEST
+      CYBERIA_SERVER_API_KEY: ${CYBERIA_SERVER_API_KEY:-}
+      CYBERIA_DATA_SERVER_URL: ${CYBERIA_DATA_SERVER_URL:-http://engine-cyberia}
       ENGINE_PUBLIC_URL: ${ENGINE_PUBLIC_URL:-http://localhost:4005}
-      ENGINE_GRPC_ADDRESS: ${ENGINE_GRPC_ADDRESS:-engine-cyberia-runtime:50051}
+      CYBERIA_DATA_SERVER_GRPC: ${CYBERIA_DATA_SERVER_GRPC:-engine-cyberia-runtime:50051}
       ENGINE_GRPC_RELOAD_INTERVAL_SEC: ${ENGINE_GRPC_RELOAD_INTERVAL_SEC:-300}
       STATIC_DIR: ${CYBERIA_SERVER_STATIC_DIR:-/home/dd/engine/cyberia-server/public}
       APP_ENV: ${CYBERIA_SERVER_APP_ENV:-development}
@@ -299,7 +305,7 @@ services:
 
   # === Tier 4: presentation, one per variant ===============================
   # One WASM bundle serves every variant; the instance is resolved from the URL
-  # sub-path (docker-driver injects CYBERIA_BASE_PATH / _WS_ORIGIN /
+  # sub-path (wasm-driver injects CYBERIA_BASE_PATH / _WS_ORIGIN /
   # _ENGINE_API_ORIGIN / _DEFAULT_INSTANCE). Each client waits ONLY for its own
   # server, so the three
   # server->client pipelines advance independently (in parallel) once the shared
@@ -309,7 +315,7 @@ services:
   #   cyberia-server-test   -> cyberia-client-test
 
   cyberia-client-runtime:
-    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.73}
+    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.77}
     container_name: dd-cyberia-client
     environment:
       CYBERIA_PORT: '8081'
@@ -317,7 +323,7 @@ services:
       CYBERIA_BASE_PATH: /
       CYBERIA_DEFAULT_INSTANCE: ${CYBERIA_DEFAULT_INSTANCE:-amethyst-strata-expansion}
       CYBERIA_WS_ORIGIN: ${CYBERIA_WS_ORIGIN:-ws://localhost:8081}
-      CYBERIA_ENGINE_API_ORIGIN: ${CYBERIA_ENGINE_API_ORIGIN:-http://localhost}
+      CYBERIA_DATA_SERVER_URL: ${CYBERIA_CLIENT_DATA_SERVER_URL:-http://localhost}
     networks:
       - dd-cyberia-internal
     expose:
@@ -334,7 +340,7 @@ services:
     restart: unless-stopped
 
   cyberia-client-forest:
-    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.73}
+    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.77}
     container_name: dd-cyberia-client-forest
     environment:
       CYBERIA_PORT: '8081'
@@ -342,7 +348,7 @@ services:
       CYBERIA_BASE_PATH: /FOREST
       CYBERIA_DEFAULT_INSTANCE: ${CYBERIA_DEFAULT_INSTANCE:-amethyst-strata-expansion}
       CYBERIA_WS_ORIGIN: ${CYBERIA_WS_ORIGIN:-ws://localhost:8081}
-      CYBERIA_ENGINE_API_ORIGIN: ${CYBERIA_ENGINE_API_ORIGIN:-http://localhost}
+      CYBERIA_DATA_SERVER_URL: ${CYBERIA_CLIENT_DATA_SERVER_URL:-http://localhost}
     networks:
       - dd-cyberia-internal
     expose:
@@ -359,7 +365,7 @@ services:
     restart: unless-stopped
 
   cyberia-client-test:
-    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.73}
+    image: ${CYBERIA_CLIENT_IMAGE:-underpost/cyberia-client-dev}:${CYBERIA_CLIENT_TAG:-v3.3.77}
     container_name: dd-cyberia-client-test
     environment:
       CYBERIA_PORT: '8081'
@@ -367,7 +373,7 @@ services:
       CYBERIA_BASE_PATH: /TEST
       CYBERIA_DEFAULT_INSTANCE: ${CYBERIA_DEFAULT_INSTANCE:-amethyst-strata-expansion}
       CYBERIA_WS_ORIGIN: ${CYBERIA_WS_ORIGIN:-ws://localhost:8081}
-      CYBERIA_ENGINE_API_ORIGIN: ${CYBERIA_ENGINE_API_ORIGIN:-http://localhost}
+      CYBERIA_DATA_SERVER_URL: ${CYBERIA_CLIENT_DATA_SERVER_URL:-http://localhost}
     networks:
       - dd-cyberia-internal
     expose: