@celilo/e2e 0.5.0 → 0.5.1

package/config/routing/management-routes.sh

@@ -34,20 +34,34 @@ echo "nameserver 100.100.0.1" > /etc/resolv.conf
 # Create celilo data directory (Linux default: /var/lib/celilo/)
 mkdir -p /var/lib/celilo/modules
 
-# Dependencies come from the host bind mount (node_modules/)
-# If missing, run 'cd apps/celilo && bun install' on the host first.
-cd /celilo/apps/celilo
-if [ ! -d node_modules/@clack ]; then
-  echo "WARNING: node_modules not found. Run 'cd apps/celilo && bun install' on the host."
+# If the monorepo is mounted at /celilo, use it for shell completions (dev mode).
+# Otherwise use the globally installed CLI from npm.
+if [ -d /celilo/apps/celilo ]; then
+  CELILO_SRC="/celilo/apps/celilo/src/cli/index.ts"
+  CELILO_CMD="bun run $CELILO_SRC"
+
+  # Warn if node_modules are missing (developer forgot to bun install)
+  if [ ! -d /celilo/apps/celilo/node_modules/@clack ]; then
+    echo "WARNING: /celilo/apps/celilo/node_modules not found. Run 'cd apps/celilo && bun install' on the host."
+  fi
+
+  # Generate zsh completions from source
+  mkdir -p /root/.zsh/completions
+  bun run "$CELILO_SRC" completion zsh > /root/.zsh/completions/_celilo 2>/dev/null || true
+
+  START_DIR="/celilo/apps/celilo"
+else
+  CELILO_CMD="celilo"
+  START_DIR="/root"
+
+  # Generate zsh completions from npm-installed CLI
+  mkdir -p /root/.zsh/completions
+  celilo completion zsh > /root/.zsh/completions/_celilo 2>/dev/null || true
 fi
 
-# Generate zsh completion script from celilo
-mkdir -p /root/.zsh/completions
-bun run /celilo/apps/celilo/src/cli/index.ts completion zsh > /root/.zsh/completions/_celilo 2>/dev/null || true
-
-# Shell setup: aliases and completion for zsh
-cat > /root/.zshrc << 'ZSHRC'
-export PATH="/root/.bun/bin:$PATH"
+# Shell setup
+cat > /root/.zshrc << ZSHRC
+export PATH="/root/.bun/bin:/usr/local/bin:\$PATH"
 
 # Simulated network overrides
 export DDNS_ENDPOINT="http://100.64.0.55:8080/update"
@@ -69,27 +83,22 @@ bindkey '^R' history-incremental-search-backward
 # Prompt
 PROMPT='%F{cyan}celilo%f:%F{yellow}%~%f# '
 
-# Commands
-celilo() { bun run /celilo/apps/celilo/src/cli/index.ts "$@"; }
-c() { celilo "$@"; }
+# Commands — celilo shim in /usr/local/bin prefers source when /celilo is mounted
+alias c='celilo'
 alias ll='ls -la'
 
-# Tab completion — use celilo's built-in zsh completion generator
-fpath=(~/.zsh/completions $fpath)
+# Tab completion
+fpath=(~/.zsh/completions \$fpath)
 autoload -Uz compinit && compinit -u
 
-# Also bind `c` to the same completion
-compdef _celilo c
-
-cd /celilo/apps/celilo
+cd $START_DIR
 ZSHRC
 
-# Also set up bash aliases (for non-zsh shells)
-cat > /root/.bashrc << 'BASHRC'
-export PATH="/root/.bun/bin:$PATH"
-alias celilo='bun run /celilo/apps/celilo/src/cli/index.ts'
+# Bash fallback (for non-zsh shells)
+cat > /root/.bashrc << BASHRC
+export PATH="/root/.bun/bin:/usr/local/bin:\$PATH"
 alias c='celilo'
-cd /celilo/apps/celilo
+cd $START_DIR
 BASHRC
 
 echo "Management machine ready"

package/docker/Dockerfile.management

@@ -22,13 +22,13 @@ RUN update-ca-certificates
 # Point apt at the simulated apt cache proxy (for runtime apt usage)
 RUN echo 'Acquire::http::Proxy "http://100.64.0.2:3142";' > /etc/apt/apt.conf.d/00proxy
 
-# Install celilo CLI from npm — provides the fallback `celilo` command
-RUN bun add -g @celilo/cli@0.1.4
+# Install celilo CLI from npm. bun installs the bin to /usr/local/bin/celilo
+# on the oven/bun base image. We rename it so our shim can fall back to it.
+RUN bun add -g @celilo/cli@0.1.5 \
+    && mv /usr/local/bin/celilo /usr/local/bin/celilo-npm
 
 # Shim: prefer /celilo source when mounted (dev loop), fall back to npm install.
-# This means `celilo ...` runs the monorepo's source code during e2e tests
-# instead of the pinned npm version — critical for iterating on fixes.
-RUN printf '#!/bin/bash\nif [ -d /celilo/apps/celilo ]; then\n  exec bun run /celilo/apps/celilo/src/cli/index.ts "$@"\nfi\nexec /root/.bun/bin/celilo "$@"\n' > /usr/local/bin/celilo \
+RUN printf '#!/bin/bash\nif [ -d /celilo/apps/celilo ]; then\n  exec bun run /celilo/apps/celilo/src/cli/index.ts "$@"\nfi\nexec /usr/local/bin/celilo-npm "$@"\n' > /usr/local/bin/celilo \
     && chmod +x /usr/local/bin/celilo
 
 # Standard modules pre-packaged as .netapp files — built by e2e-build.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/e2e",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "E2E test infrastructure for Celilo-deployed applications. Provides a simulated internet with DNS hierarchy, ACME server, firewalls, and target machines in Docker.",
   "type": "module",
   "main": "./src/index.ts",

package/src/container-manager.ts

@@ -108,9 +108,11 @@ function dockerExecAsync(
   timeoutMs = 60_000,
 ): Promise<ExecResult> {
   return new Promise((resolve) => {
+    // stdbuf -oL forces line-buffered stdout so output streams in real time
+    // rather than appearing in one burst when the process's buffer flushes.
     const args = [
       'compose', '-f', COMPOSE_FILE, '-p', projectName,
-      'exec', '-T', container, 'bash', '-c', cmd,
+      'exec', '-T', container, 'stdbuf', '-oL', 'bash', '-c', cmd,
     ];
     const child = spawn('docker', args, { cwd: composeDir });