underpost 3.2.70 → 3.2.90

package/src/cli/docker-compose.js

@@ -81,9 +81,10 @@ class UnderpostDockerCompose {
    * Resolves the canonical directory for a custom docker-compose workflow,
    * keyed by `--deploy-id` + `--docker-compose-id`:
    * `engine-private/conf/<deploy-id>/docker-compose/<docker-compose-id>`.
-   * This directory ships its own `docker-compose.yml`, `compose.env`, and
-   * `nginx.conf` (used as-is, never generated). Returns null when
-   * `--docker-compose-id` is not set (the default, self-generating workflow).
+   * This directory ships its own `docker-compose.yml`, `compose.env`, and any
+   * project-specific bind-mounted files (all used as-is, never generated).
+   * Returns null when `--docker-compose-id` is not set (the default,
+   * self-generating workflow).
    * @param {object} options - CLI options.
    * @returns {string|null} Repo-root-relative canonical dir, or null.
    * @memberof UnderpostDockerCompose
@@ -99,8 +100,8 @@ class UnderpostDockerCompose {
    * so behavior is independent of the caller's working directory.
    *
    * Custom workflow (`--docker-compose-id`): the compose file, env-file, and
-   * bind-mounted config (nginx.conf, mongodb/) all live in the canonical dir, so
-   * compose runs with `--project-directory` pinned there and no app-override.
+   * project-owned bind-mounted config all live in the canonical dir, so compose
+   * runs with `--project-directory` pinned there and no app-override.
    * @param {object} options - CLI options.
    * @returns {string} The base command string (without a subcommand).
    * @memberof UnderpostDockerCompose
@@ -191,7 +192,7 @@ services:
 MONGO_IMAGE=mongo:latest
 VALKEY_IMAGE=valkey/valkey:latest
 APP_IMAGE=underpost/underpost-engine
-APP_TAG=v3.2.70
+APP_TAG=v3.2.90
 PROXY_IMAGE=nginx:stable-alpine
 PROMETHEUS_IMAGE=prom/prometheus:latest
 GRAFANA_IMAGE=grafana/grafana:latest
@@ -371,17 +372,17 @@ datasources:
    * @memberof UnderpostDockerCompose
    */
   static generate(options = {}) {
-    // Custom workflow: docker-compose.yml, compose.env, and nginx.conf are
-    // pre-authored in the canonical dir and used as-is — do NOT generate them.
-    // Only (re)write the required MongoDB entrypoint (replica-set bootstrap),
-    // the single generated infra artifact, into <canonical>/mongodb so the
-    // stack stays self-contained under `--project-directory`.
+    // A named custom workflow is fully owned by its canonical directory. The
+    // generic CLI validates the standard entry files but never imports project
+    // modules or generates application-specific nginx, env, or helper content.
     const composeIdBase = UnderpostDockerCompose.composeIdBase(options);
     if (composeIdBase) {
-      const mongoEntrypointPath = UnderpostDockerCompose.resolve(`${composeIdBase}/mongodb/entrypoint.sh`);
-      fs.mkdirpSync(nodePath.dirname(mongoEntrypointPath));
-      fs.writeFileSync(mongoEntrypointPath, UnderpostDockerCompose.mongoEntrypointContent(), { mode: 0o755 });
-      logger.info('mongodb entrypoint written (custom workflow)', { path: mongoEntrypointPath });
+      const required = ['docker-compose.yml', 'compose.env'].map((name) =>
+        UnderpostDockerCompose.resolve(`${composeIdBase}/${name}`),
+      );
+      const missing = required.filter((path) => !fs.existsSync(path));
+      if (missing.length) throw new Error(`Custom Docker Compose workflow is missing: ${missing.join(', ')}`);
+      logger.info('custom Docker Compose workflow uses canonical files as-is', { path: composeIdBase });
       return;
     }
 
@@ -491,16 +492,10 @@ datasources:
       silentOnError: true,
     });
 
-    // Custom workflow: the compose file, compose.env, and nginx.conf are
-    // hand-authored source — never prune them. Only drop the one generated
-    // artifact (the mongo entrypoint), regenerated on the next --up/--generate.
+    // A named custom workflow owns every file beneath its canonical directory.
+    // Reset tears down Docker resources but never prunes project-owned files.
     const composeIdBase = UnderpostDockerCompose.composeIdBase(options);
     if (composeIdBase) {
-      const mongoEntrypointPath = UnderpostDockerCompose.resolve(`${composeIdBase}/mongodb/entrypoint.sh`);
-      if (fs.existsSync(mongoEntrypointPath)) {
-        fs.removeSync(mongoEntrypointPath);
-        logger.info('removed generated artifact', { path: mongoEntrypointPath });
-      }
       logger.info('Docker Compose reset complete. Run `--up` to recreate the stack.');
       return;
     }
@@ -545,7 +540,7 @@ datasources:
      * @param {boolean} [options.shell] - Open an interactive shell in `target` (default: app).
      * @param {string} [options.exec] - General-purpose passthrough docker compose subcommand.
      * @param {string} [options.deployId] - Deployment to run as the app (default: dd-default). `dd-default` self-bootstraps a fresh engine; any other id runs the standard `underpost start` command.
-     * @param {string} [options.dockerComposeId] - Custom-workflow selector. When set, use the canonical stack at `engine-private/conf/<deploy-id>/docker-compose/<docker-compose-id>/` (docker-compose.yml + compose.env + nginx.conf, used as-is), skipping nginx/env/app-override generation. Used by the Cyberia MMO ecosystem (`--deploy-id dd-cyberia --docker-compose-id cyberia`).
+     * @param {string} [options.dockerComposeId] - Custom-workflow selector. When set, use the canonical stack at `engine-private/conf/<deploy-id>/docker-compose/<docker-compose-id>/` (docker-compose.yml + compose.env, used as-is), skipping nginx/env/app-override generation.
      * @param {string} [options.env] - Deployment environment for non-default deploy ids (default: development).
      * @param {string} [options.composeFile] - Override compose file path.
      * @param {string} [options.envFile] - Override env-file path.

package/src/cli/fs.js

@@ -315,7 +315,6 @@ class UnderpostFileStorage {
         public_ids: [path],
         resource_type: 'raw',
       });
-      logger.info('download result', downloadResult);
       await Downloader.downloadFile(downloadResult, zipPath);
 
       if (options.omitUnzip === true) {

package/src/cli/image.js

@@ -12,6 +12,7 @@ import { loggerFactory } from '../server/logger.js';
 import Underpost from '../index.js';
 import { getNpmRootPath } from '../server/conf.js';
 import { shellExec } from '../server/process.js';
+import { crictlCommandFactory } from '../server/cri.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -117,20 +118,38 @@ class UnderpostImage {
       };
       // addBuildSecret('github_token', process.env.GITHUB_TOKEN);
       addBuildSecret('github_username', process.env.GITHUB_USERNAME);
-      // Cloudinary creds power build-time asset pulls (`node bin fs --pull`).
-      // addBuildSecret('cloudinary_cloud_name', process.env.CLOUDINARY_CLOUD_NAME);
-      // addBuildSecret('cloudinary_api_key', process.env.CLOUDINARY_API_KEY);
-      // addBuildSecret('cloudinary_api_secret', process.env.CLOUDINARY_API_SECRET);
+      // Build secrets are created dynamically: each `RUN --mount=type=secret,id=<x>`
+      // id maps to a host env var; only the ones actually set are passed, so a
+      // Dockerfile that omits (or comments out) a mount just never sees it. Extend
+      // this map — plus a merge of any caller-supplied `options.buildSecrets` — to
+      // add more without touching the call sites. Secrets never persist in image
+      // history (unlike build-args); they live in 0600 temp files removed post-build.
+      const BUILD_SECRET_ENV = {
+        //   // Cloudinary creds power build-time asset pulls (`node bin fs --pull`).
+        //   cloudinary_cloud_name: 'CLOUDINARY_CLOUD_NAME',
+        //   cloudinary_api_key: 'CLOUDINARY_API_KEY',
+        //   cloudinary_api_secret: 'CLOUDINARY_API_SECRET',
+      };
+      for (const [id, envVar] of Object.entries(BUILD_SECRET_ENV)) addBuildSecret(id, process.env[envVar]);
+      for (const [id, value] of Object.entries(options.buildSecrets || {})) addBuildSecret(id, value);
       const secretArgs = secretFlags.length ? ` ${secretFlags.join(' ')}` : '';
-      if (secretFlags.length)
-        logger.info('Passing host GitHub credentials as build secrets', { ids: secretFlags.length });
+      if (secretFlags.length) logger.info('Passing host credentials as build secrets', { ids: secretFlags.length });
+
+      // Non-secret build args (e.g. INSTANCE_CODES for engine-cyberia): injected
+      // dynamically from `options.buildArgs`, overriding the Dockerfile's ARG
+      // defaults. Unlike secrets these DO persist in image metadata, so only
+      // non-sensitive values belong here.
+      const buildArgFlags = Object.entries(options.buildArgs || {})
+        .filter(([, v]) => v !== undefined && v !== null && v !== '')
+        .map(([k, v]) => `--build-arg ${k}=${JSON.stringify(String(v))}`);
+      const buildArgStr = buildArgFlags.length ? ` ${buildArgFlags.join(' ')}` : '';
 
       if (path)
         try {
           shellExec(
             `cd ${path} && sudo podman build -f ./${
               dockerfileName && typeof dockerfileName === 'string' ? dockerfileName : 'Dockerfile'
-            } -t ${imageName} --pull=never --cap-add=CAP_AUDIT_WRITE${cache}${secretArgs} --network host`,
+            } -t ${imageName} --pull=never --cap-add=CAP_AUDIT_WRITE${cache}${secretArgs}${buildArgStr} --network host`,
           );
         } finally {
           for (const file of secretTmpFiles) {
@@ -207,6 +226,7 @@ class UnderpostImage {
      * @param {object} options - Options for the image retrieval.
      * @param {boolean} options.spec - Whether to retrieve images from the pod specifications.
      * @param {string} options.namespace - Kubernetes namespace to filter pods.
+     * @param {boolean} [options.k3s] - Resolve the CRI endpoint as K3s' embedded containerd.
      * @returns {Array<object>} - Array of objects containing pod names and their corresponding images.
      * @memberof UnderpostImage
      */
@@ -227,10 +247,17 @@ class UnderpostImage {
           }))
           .filter((o) => o.image);
       }
-      const raw = shellExec(node === 'kind-worker' ? `docker exec -i ${node} crictl images` : `crictl images`, {
-        stdout: true,
-        silent: true,
-      });
+      // Outside kind, target the live CRI endpoint explicitly: /etc/crictl.yaml
+      // may still point at a CRI-O socket the host no longer runs.
+      const raw = shellExec(
+        node === 'kind-worker'
+          ? `docker exec -i ${node} crictl images`
+          : crictlCommandFactory('images', options || {}),
+        {
+          stdout: true,
+          silent: true,
+        },
+      );
 
       const heads = raw
         .split(`\n`)[0]
@@ -294,7 +321,7 @@ class UnderpostImage {
         shellExec(`docker exec -i kind-control-plane crictl rmi ${imageName}`);
         shellExec(`docker exec -i kind-worker crictl rmi ${imageName}`);
       } else if (kubeadm === true) {
-        shellExec(`crictl rmi ${imageName}`);
+        shellExec(crictlCommandFactory(`rmi ${imageName}`));
       } else if (k3s === true) {
         shellExec(`sudo k3s ctr images rm ${imageName}`);
       }
@@ -363,7 +390,7 @@ class UnderpostImage {
         shellExec(`docker pull ${image}`);
         shellExec(`sudo kind load docker-image ${image}`);
       } else {
-        shellExec(`sudo crictl pull ${image}`);
+        shellExec(crictlCommandFactory(`pull ${image}`, { k3s: targetK3s }));
       }
     },
   };

package/src/cli/index.js

@@ -108,6 +108,10 @@ program
   .option('--edit', 'Edit last commit.')
   .option('--deploy-id <deploy-id>', 'Sets the deployment configuration ID for the commit context.')
   .option('--cached', 'Commit staged changes only or context.')
+  .option(
+    '--init-repo [origin]',
+    'Initialize a git repository at the specified path. Optionally set the git remote origin URL.',
+  )
   .option('--hashes <hashes>', 'Comma-separated list of specific file hashes of commits.')
   .option('--extension <extension>', 'specific file extensions of commits.')
   .option('--changelog', 'Print the plain changelog of the last N commits (see --from-n-commit, default 1).')
@@ -260,7 +264,8 @@ program
   .option('--reset', `Deletes all clusters and prunes all related data and caches.`)
   .option(
     '--reset-mongodb',
-    `Performs a hard cleanup of only MongoDB-related resources (StatefulSet, PVCs/PVs, Secrets, ConfigMaps, caches) without restarting the whole node.`,
+    `Performs a hard cleanup of only MongoDB-related resources (StatefulSet, PVCs/PVs, Secrets, ConfigMaps, caches) without restarting the whole node. ` +
+      `Combined with --mongodb it instead wipes the retained hostPath volumes as part of that deploy, so the replica set starts from empty data.`,
   )
   .option('--mariadb', 'Initializes the cluster with a MariaDB statefulset.')
   .option('--mysql', 'Initializes the cluster with a MySQL statefulset.')
@@ -271,6 +276,16 @@ program
   .option('--valkey', 'Initializes the cluster with a Valkey service.')
   .option('--ipfs', 'Initializes the cluster with an ipfs-cluster statefulset.')
   .option('--contour', 'Initializes the cluster with Project Contour base HTTPProxy and Envoy.')
+  .option(
+    '--gateway-api',
+    'Initializes the cluster with the Gateway API control plane (CRDs, Envoy Gateway, GatewayClass) used by generated HTTPRoute + QUIC/HTTP3 manifests. ' +
+      'With --dev the data plane binds the listener ports on the host network for direct browser access.',
+  )
+  .option('--gateway-class <name>', 'GatewayClass name to provision (default "eg").')
+  .option(
+    '--ingress-node <node-name>',
+    'Dedicated node for underpost-ingress when both routing stacks coexist. Workload placement flags do not move it.',
+  )
   .option(
     '--node-port',
     'Exposes enabled ready services (e.g. MongoDB 4.4, Valkey) to the host/public network via their NodePort Service manifest.',
@@ -328,7 +343,6 @@ program
   .option('--remove', 'Deletes specified deployments and their associated services.')
   .option('--sync', 'Synchronizes deployment environment variables, ports, and replica counts.')
   .option('--info-router', 'Displays the current router structure and configuration.')
-  .option('--expose', 'Exposes services matching the provided deployment ID list.')
   .option('--cert', 'Resets TLS/SSL certificate secrets for deployments.')
   .option('--cert-hosts <hosts>', 'Resets TLS/SSL certificate secrets for specified hosts.')
   .option(
@@ -338,6 +352,10 @@ program
       'Enables TLS in the Contour HTTPProxy virtualhost without requiring a production ClusterIssuer.',
   )
   .option('--node <node>', 'Sets optional node for deployment operations.')
+  .option(
+    '--ingress-node <node-name>',
+    'Explicitly relocates the shared host-network ingress; ordinary --node placement never moves it.',
+  )
   .option(
     '--ssh-key-path <path>',
     'Private key path for node SSH operations. Currently used when shipping a hostPath volume to a remote target node over SSH. Defaults to engine-private/deploy/id_rsa.',
@@ -346,6 +364,10 @@ program
     '--build-manifest',
     'Builds Kubernetes YAML manifests, including deployments, services, proxies, and secrets.',
   )
+  .option(
+    '--sync-static',
+    'Places the SSR status pages and intercepted contexts in the gateway static utility tree, so the edge serves them instead of the application pods. Prefers the running workload and falls back to this checkout, so it can seed the tree before the deployment exists and refresh it once the deployment is Ready.',
+  )
   .option('--replicas <replicas>', 'Sets a custom number of replicas for deployments.')
   .option('--image <image>', 'Sets a custom image for deployments.')
   .option('--versions <deployment-versions>', 'A comma-separated list of custom deployment versions.')
@@ -358,35 +380,31 @@ program
   .option('--retry-count <count>', 'Sets HTTPProxy per-route retry count (e.g., 3).')
   .option('--retry-per-try-timeout <duration>', 'Sets HTTPProxy retry per-try timeout (e.g., "150ms").')
   .option('--disable-update-deployment', 'Disables updates to deployments.')
-  .option('--disable-runtime-probes', 'Omits the internal-status HTTP probes from generated deployment manifests.')
+  .option(
+    '--disable-runtime-probes',
+    'Deprecated compatibility flag; readiness probes remain mandatory. Use --tcp-probes for legacy workloads.',
+  )
   .option('--tcp-probes', 'Generates legacy TCP socket probes instead of HTTP internal-status probes (migration).')
   .option('--disable-update-proxy', 'Disables updates to proxies.')
   .option('--disable-deployment-proxy', 'Disables proxies of deployments.')
-  .option('--disable-update-volume', 'Disables updates to volume mounts during deployment.')
   .option(
-    '--status',
-    'Retrieves current network traffic data from resource deployments and the host machine network configuration.',
+    '--gateway-api',
+    'Routes through the Gateway API stack (Gateway + HTTPRoute) instead of the Contour HTTPProxy. ' +
+      'Both manifest sets are always generated; this selects which one is applied.',
+  )
+  .option('--gateway-class <name>', 'GatewayClass name for generated Gateway manifests (default "eg").')
+  .option(
+    '--disable-http3',
+    'Omits the QUIC/HTTP3 listener config and the Alt-Svc advertisement from Gateway API manifests.',
   )
+  .option('--quic-port <port>', 'UDP port advertised for QUIC/HTTP3 in generated Gateway API manifests (default 443).')
+  .option('--disable-update-volume', 'Disables updates to volume mounts during deployment.')
   .option('--kubeadm', 'Enables the kubeadm context for deployment operations.')
   .option('--k3s', 'Enables the k3s context for deployment operations.')
   .option('--kind', 'Enables the kind context for deployment operations.')
   .option('--git-clean', 'Runs git clean on volume mount paths before copying.')
   .option('--disable-update-underpost-config', 'Disables updates to Underpost configuration during deployment.')
   .option('--namespace <namespace>', 'Kubernetes namespace for deployment operations (defaults to "default").')
-  .option('--kind-type <kind-type>', 'Specifies the Kind cluster type for deployment operations.')
-  .option('--port <port>', 'Sets up port forwarding from local to remote ports.')
-  .option(
-    '--expose-port <port>',
-    'Sets the local:remote port to expose when --expose is active (overrides auto-detected service port).',
-  )
-  .option(
-    '--expose-local-port <port>',
-    'Sets a different local port for --expose (e.g. 80) while keeping the remote service port. Useful for /etc/hosts local access without specifying a port in the browser.',
-  )
-  .option(
-    '--local-proxy',
-    'Forward all service TCP ports locally and start the Node.js path-routing proxy. Enables full path-based routing (e.g. /wp alongside /) without needing --expose-local-port. Requires --expose.',
-  )
   .option('--cmd <cmd>', 'Custom initialization command for deployment (comma-separated commands).')
   .option(
     '--skip-full-build',
@@ -400,30 +418,71 @@ program
     '--image-pull-policy <policy>',
     'Override container imagePullPolicy in the generated deployment manifest (Always, IfNotPresent, Never). Defaults to Never for localhost/ images and IfNotPresent otherwise.',
   )
-  .option(
-    '--tls',
-    'Enables TLS for the local proxy started by --expose --local-proxy. ' +
-      'The proxy will serve HTTPS on port 443 using self-signed certificates resolved from the local SSL store. ' +
-      'Use together with --expose and --local-proxy.',
-  )
   .description('Manages application deployments, defaulting to deploying development pods.')
   .action(Underpost.deploy.callback);
 
 program
   .command('secret')
-  .argument('<platform>', `The secret management platform. Options: ${Object.keys(Underpost.secret).join(', ')}.`)
+  .argument(
+    '[platform]',
+    `The secret management platform. Options: ${Object.keys(Underpost.secret).join(', ')}. Defaults to "sops".`,
+    'sops',
+  )
   .option('--init', 'Initializes the secrets platform environment.')
   .option('--create-from-file <path-env-file>', 'Creates secrets from a specified environment file.')
   .option('--create-from-env', 'Creates secrets from container environment variables (envFrom: secretRef).')
   .option('--global-clean', 'Removes all filesystem traces of secrets (engine-private, .env, conf cache).')
   .option('--list', 'Lists all available secrets for the platform.')
+  .option(
+    '--encrypt <plaintext-path>',
+    'Encrypts a plaintext Secret manifest into the Git-tracked SOPS store and shreds the source (sops platform).',
+  )
+  .option(
+    '--apply',
+    'Decrypts stored SOPS manifests and streams them into kubectl apply, without writing plaintext to disk (sops platform).',
+  )
+  .option('--namespace <namespace>', 'Kubernetes namespace for secret operations (defaults to "default").')
+  .option(
+    '--install-tools',
+    'Installs the sops and age host binaries only, without running a full cluster host initialization.',
+  )
+  .option(
+    '--rotate',
+    'Re-keys every stored SOPS manifest onto --recipient. Secret values are unchanged, so no workload restart is needed.',
+  )
+  .option('--recipient <age-public-key>', 'Incoming Age public recipient for --rotate.')
+  .option(
+    '--prune-recipients',
+    'With --rotate, makes --recipient the only recipient, revoking every previous key (use after a key compromise). ' +
+      'Requires --force, and revokes CI/CD keys too unless they are named in --keep-recipients.',
+  )
+  .option(
+    '--keep-recipients <age-public-keys>',
+    'Comma-separated recipients to retain while --prune-recipients revokes the rest (e.g. the CI/CD key).',
+  )
+  .option(
+    '--purge <secret-name>',
+    'Emergency removal: deletes the live Kubernetes Secret and takes its encrypted manifest out of the store.',
+  )
+  .option(
+    '--force',
+    'Confirms the irreversible variant: deletes the manifest instead of archiving it (--purge), ' +
+      'revokes recipients (--rotate --prune-recipients), or replaces an existing manifest (--encrypt).',
+  )
+  .option('--dry-run', 'Reports what --apply, --rotate, or --purge would do without changing anything.')
   .description(`Manages secrets for various platforms.`)
-  .action((...args) => {
-    if (args[1].globalClean) return Underpost.secret.globalSecretClean();
-    if (args[1].createFromFile) return Underpost.secret[args[0]].createFromEnvFile(args[1].createFromFile);
-    if (args[1].createFromEnv) return Underpost.secret[args[0]].createFromContainerEnv();
-    if (args[1].list) return Underpost.secret[args[0]].list();
-    if (args[1].init) return Underpost.secret[args[0]].init();
+  .action((platform, options) => {
+    // Host tooling install is platform-independent, so it resolves before any platform lookup.
+    if (options.installTools) return Underpost.secret.sops.installTooling();
+    if (options.globalClean) return Underpost.secret.globalSecretClean();
+    if (options.rotate) return Underpost.secret[platform].rotate(options.recipient, options);
+    if (options.purge) return Underpost.secret[platform].purge(options.purge, options);
+    if (options.encrypt) return Underpost.secret[platform].encrypt(options.encrypt, options.namespace, options);
+    if (options.apply) return Underpost.secret[platform].apply(options.namespace, options);
+    if (options.createFromFile) return Underpost.secret[platform].createFromEnvFile(options.createFromFile);
+    if (options.createFromEnv) return Underpost.secret[platform].createFromContainerEnv();
+    if (options.list) return Underpost.secret[platform].list();
+    if (options.init) return Underpost.secret[platform].init();
   });
 
 program
@@ -648,11 +707,24 @@ program
   .option('--replicas <replicas>', 'Sets a custom number of replicas for deployment.')
   .option('--pod-name <pod-name>', 'Optional: Specifies the pod name for execution.')
   .option('--node-name <node-name>', 'Optional: Specifies the node name for execution.')
+  .option(
+    '--ingress-node <node-name>',
+    'Dedicated node for the host-network underpost-ingress listener. Workload --node-name never relocates it.',
+  )
   .option(
     '--ssh-key-path <path>',
     'Optional: Private key path for node SSH operations, forwarded to volume shipping over SSH. Defaults to engine-private/deploy/id_rsa.',
   )
   .option('--port <port>', 'Optional: Specifies the port for execution.')
+  .option(
+    '--expose-container-ports <ports>',
+    'Comma-separated Service/container ports; multiple matched resources consume values by resource index.',
+  )
+  .option(
+    '--expose-host-ports <ports>',
+    'Comma-separated host ports paired with container ports by resource/port index.',
+  )
+  .option('--local-proxy', 'Starts the development path proxy after the expose runner creates its port-forwards.')
   .option('--etc-hosts', 'Enables etc-hosts context for the runner execution.')
   .option('--volume-host-path <volume-host-path>', 'Optional: Specifies the volume host path for test execution.')
   .option('--volume-mount-path <volume-mount-path>', 'Optional: Specifies the volume mount path for test execution.')
@@ -688,7 +760,10 @@ program
     '--resource-template-id <resource-template-id >',
     'Specifies a resource template ID for the runner execution.',
   )
-  .option('--expose', 'Enables service exposure for the runner execution.')
+  .option(
+    '--expose',
+    'Enables exposure-only behavior in compatible runners; the expose runner itself does not require this flag.',
+  )
   .option('--conf-server-path <conf-server-path>', 'Sets a custom configuration server path.')
   .option('--underpost-root <underpost-root>', 'Sets a custom Underpost root path.')
   .option('--cmd-cron-jobs <cmd-cron-jobs>', 'Pre-script commands to run before cron job execution.')
@@ -700,7 +775,10 @@ program
   .option('--kubeadm', 'Sets the kubeadm cluster context for the runner execution.')
   .option('--k3s', 'Sets the k3s cluster context for the runner execution.')
   .option('--kind', 'Sets the kind cluster context for the runner execution.')
-  .option('--traffic <traffic>', 'Blue/green traffic colour to bake into generated manifests (default: blue).')
+  .option(
+    '--traffic <traffic>',
+    'Blue/green traffic colour to bake into generated manifests (default: blue). `stop` accepts a comma list, e.g. blue,green.',
+  )
   .option('--git-clean', 'Runs git clean on volume mount paths before copying.')
   .option('--deploy-id <deploy-id>', 'Sets deploy id context for the runner execution.')
   .option('--user <user>', 'Sets user context for the runner execution.')
@@ -714,6 +792,21 @@ program
   .option('--timeout-idle <duration>', 'Sets HTTPProxy per-route idle timeout (e.g., "10s", "infinity").')
   .option('--retry-count <count>', 'Sets HTTPProxy per-route retry count (e.g., 3).')
   .option('--retry-per-try-timeout <duration>', 'Sets HTTPProxy retry per-try timeout (e.g., "150ms").')
+  .option(
+    '--gateway-api',
+    'Routes through the Gateway API stack (Gateway + HTTPRoute) instead of the Contour HTTPProxy. ' +
+      'Both manifest sets are always generated; this selects which one is applied.',
+  )
+  .option(
+    '--disable-gateway-api',
+    'Falls back to the Contour HTTPProxy stack in runners where the Gateway API is the default (cluster).',
+  )
+  .option('--gateway-class <name>', 'GatewayClass name for generated Gateway manifests (default "eg").')
+  .option(
+    '--disable-http3',
+    'Omits the QUIC/HTTP3 listener config and the Alt-Svc advertisement from Gateway API manifests.',
+  )
+  .option('--quic-port <port>', 'UDP port advertised for QUIC/HTTP3 in generated Gateway API manifests (default 443).')
   .option('--disable-private-conf-update', 'Disables updates to private configuration during execution.')
   .option('--logs', 'Streams logs during the runner execution.')
   .option('--monitor-status <status>', 'Sets the status to monitor for pod/resource (default: "Running").')
@@ -758,6 +851,7 @@ program
     '--test',
     'Enables test/generic-purpose mode for the runner (e.g. use self-signed TLS instead of cert-manager).',
   )
+  .option('--branch <branch>', 'Sets the branch for git operations (default: current branch).')
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 

package/src/cli/ipfs.js

@@ -6,11 +6,14 @@
 
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
+import { resolveReplicaCount } from '../server/conf.js';
 import fs from 'fs-extra';
 import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
+const IPFS_DEFAULT_REPLICA_COUNT = 3;
+
 /**
  * @class UnderpostIPFS
  * @description Manages deployment of an ipfs-cluster StatefulSet on Kubernetes.
@@ -25,8 +28,12 @@ class UnderpostIPFS {
      * @description Resolves the IPFS cluster credentials from engine-private/ if they
      * already exist, otherwise generates new ones (hex cluster secret + peer identity
      * via ipfs-cluster-service init) and persists them with mode 0o600.
+     * Idempotent and self-healing: an existing pair is reused untouched, and a missing or
+     * unreadable one is regenerated. Both files are always rewritten together — the peer id and
+     * the private key are two halves of one identity, so reusing one with a freshly minted other
+     * would advertise a peer id that does not match the key.
      * @param {string} privateDir - Absolute path to the engine-private directory.
-     * @returns {{ CLUSTER_SECRET: string, IDENTITY_JSON: { id: string, private_key: string } }}
+     * @returns {{ CLUSTER_SECRET: string, IDENTITY_JSON: { id: string, private_key: string }, generated: boolean }}
      * @memberof UnderpostIPFS
      */
     resolveCredentials(privateDir) {
@@ -34,11 +41,17 @@ class UnderpostIPFS {
       const identityPath = `${privateDir}/ipfs-cluster-identity.json`;
 
       if (fs.existsSync(secretPath) && fs.existsSync(identityPath)) {
-        logger.info('Reusing existing IPFS cluster credentials from engine-private/');
-        return {
-          CLUSTER_SECRET: fs.readFileSync(secretPath, 'utf8').trim(),
-          IDENTITY_JSON: JSON.parse(fs.readFileSync(identityPath, 'utf8')),
-        };
+        try {
+          const CLUSTER_SECRET = fs.readFileSync(secretPath, 'utf8').trim();
+          const IDENTITY_JSON = JSON.parse(fs.readFileSync(identityPath, 'utf8'));
+          if (CLUSTER_SECRET && IDENTITY_JSON?.id && IDENTITY_JSON?.private_key) {
+            logger.info('Reusing existing IPFS cluster credentials from engine-private/');
+            return { CLUSTER_SECRET, IDENTITY_JSON, generated: false };
+          }
+          logger.warn('Existing IPFS cluster credentials are incomplete; regenerating');
+        } catch (error) {
+          logger.warn(`Existing IPFS cluster credentials are unreadable (${error.message}); regenerating`);
+        }
       }
 
       logger.info('Generating new IPFS cluster credentials and persisting to engine-private/');
@@ -61,7 +74,52 @@ class UnderpostIPFS {
 
       logger.info(`IPFS cluster credentials saved (peer ID: ${IDENTITY_JSON.id})`);
 
-      return { CLUSTER_SECRET, IDENTITY_JSON };
+      return { CLUSTER_SECRET, IDENTITY_JSON, generated: true };
+    },
+
+    /**
+     * @method storeCredentials
+     * @description Encrypts the current IPFS credentials into the SOPS store, replacing whatever
+     * is there. Called after a regeneration so the encrypted Secret cannot drift from the peer id
+     * the `env-config` ConfigMap advertises — the id lives only in the local identity file, so a
+     * stale manifest would pair someone else's private key with the new id and the cluster would
+     * never form.
+     * @param {{ CLUSTER_SECRET: string, IDENTITY_JSON: { private_key: string } }} credentials
+     * @param {object} options
+     * @param {string} options.namespace - Kubernetes namespace.
+     * @memberof UnderpostIPFS
+     */
+    storeCredentials({ CLUSTER_SECRET, IDENTITY_JSON }, options) {
+      const stageDir = '/dev/shm/underpost-secrets';
+      const stagePath = `${stageDir}/ipfs-cluster-secret.yaml`;
+      fs.ensureDirSync(stageDir);
+      fs.chmodSync(stageDir, 0o700);
+      try {
+        fs.outputFileSync(
+          stagePath,
+          [
+            'apiVersion: v1',
+            'kind: Secret',
+            'metadata:',
+            '  name: ipfs-cluster-secret',
+            `  namespace: ${options.namespace}`,
+            '  labels:',
+            '    app.kubernetes.io/managed-by: underpost',
+            'type: Opaque',
+            'stringData:',
+            `  cluster-secret: '${CLUSTER_SECRET.replace(/'/g, "''")}'`,
+            `  bootstrap-peer-priv-key: '${IDENTITY_JSON.private_key.replace(/'/g, "''")}'`,
+            '',
+          ].join('\n'),
+          'utf8',
+        );
+        fs.chmodSync(stagePath, 0o600);
+        // encrypt() stages, validates, moves into place, and shreds the plaintext source.
+        Underpost.secret.sops.encrypt(stagePath, options.namespace, { force: true });
+        logger.info('Re-encrypted regenerated IPFS credentials into the SOPS store');
+      } finally {
+        fs.removeSync(stageDir);
+      }
     },
 
     /**
@@ -100,12 +158,18 @@ class UnderpostIPFS {
     applySecrets({ CLUSTER_SECRET, IDENTITY_JSON }, options) {
       logger.info('Applying IPFS cluster Kubernetes Secret and env ConfigMap');
 
-      shellExec(
-        `kubectl create secret generic ipfs-cluster-secret \
+      // Encrypted store first, origin generate/read logic only when no manifest is stored.
+      // `--from-literal` places the cluster secret and the peer private key in the command
+      // string, so the seed path is kept out of the command log; the encrypted path never
+      // exposes them at all.
+      if (!Underpost.secret.sops.applyIfPresent('ipfs-cluster-secret', options.namespace))
+        shellExec(
+          `kubectl create secret generic ipfs-cluster-secret \
 --from-literal=cluster-secret=${CLUSTER_SECRET} \
 --from-literal=bootstrap-peer-priv-key=${IDENTITY_JSON.private_key} \
 --dry-run=client -o yaml | kubectl apply -f - -n ${options.namespace}`,
-      );
+          { disableLog: true },
+        );
 
       shellExec(
         `kubectl create configmap env-config \
@@ -165,7 +229,14 @@ sudo sysctl -w net.core.wmem_max=7500000`,
 
       const credentials = Underpost.ipfs.resolveCredentials(`${underpostRoot}/engine-private`);
 
-      const ipfsReplicas = options.replicas ? parseInt(options.replicas) : 3;
+      // `env-config` advertises `bootstrap-peer-id` from the local identity file — the peer id is
+      // not carried in the Secret. So a regeneration invalidates any stored manifest: it would
+      // pair the previous private key with the new id and the cluster would never form. Re-encrypt
+      // the fresh pair so the store and the ConfigMap stay one identity.
+      if (credentials.generated && Underpost.secret.sops.has('ipfs-cluster-secret', options.namespace))
+        Underpost.ipfs.storeCredentials(credentials, options);
+
+      const ipfsReplicas = resolveReplicaCount(options.replicas, IPFS_DEFAULT_REPLICA_COUNT);
 
       Underpost.ipfs.teardown(options, ipfsReplicas);
       Underpost.ipfs.applySecrets(credentials, options);

package/src/cli/monitor.js

@@ -123,7 +123,7 @@ class UnderpostMonitor {
 
       let errorPayloads = [];
       if (options.sync === true) {
-        const currentTraffic = Underpost.deploy.getCurrentTraffic(deployId, { namespace: options.namespace });
+        const currentTraffic = Underpost.deploy.getCurrentTraffic(deployId, { namespace: options.namespace, env });
         if (currentTraffic) Underpost.env.set(`${deployId}-${env}-traffic`, currentTraffic);
       }
       let traffic = Underpost.env.get(`${deployId}-${env}-traffic`) ?? 'blue';

package/src/cli/release.js

@@ -135,6 +135,10 @@ const buildVersionBumpTargets = () => [
     file: 'src/runtime/engine-cyberia/docker-compose.yml',
     patterns: /(_TAG:-v)\d+\.\d+\.\d+/g,
   },
+  {
+    file: 'engine-private/conf/dd-cyberia/docker-compose/cyberia/docker-compose.yml',
+    patterns: /(_TAG:-v)\d+\.\d+\.\d+/g,
+  },
 
   // ── Cyberia CLI dev image tar/name defaults (bin/cyberia.js). ──
   {