Address Codex setup review feedback

scripts/codex-cloud-setup.sh

@@ -29,6 +29,7 @@ fi
 
 export CI=1
 export PNPM_HOME="${PNPM_HOME:-$HOME/.local/share/pnpm}"
+export PNPM_VERSION="${PNPM_VERSION:-10.20.0}"
 export PATH="$PNPM_HOME:$HOME/.cargo/bin:$PATH"
 
 # Persist useful shell defaults for the later Codex agent phase. Codex setup runs
@@ -38,6 +39,7 @@ if ! grep -q "# Phokus Codex Cloud" "$HOME/.bashrc" 2>/dev/null; then
 
 # Phokus Codex Cloud
 export PNPM_HOME="${PNPM_HOME:-$HOME/.local/share/pnpm}"
+export PNPM_VERSION="${PNPM_VERSION:-10.20.0}"
 export PATH="$PNPM_HOME:$HOME/.cargo/bin:$PATH"
 export CI=1
 BASHRC
@@ -49,13 +51,28 @@ install_apt_packages() {
     return 0
   fi
 
+  local -a apt_cmd=(apt-get)
+  if [[ "$(id -u)" -ne 0 ]]; then
+    if command -v sudo >/dev/null 2>&1; then
+      apt_cmd=(sudo apt-get)
+    else
+      warn "apt-get is available but sudo is not. Re-run as root or add sudo to the image."
+      return 1
+    fi
+  fi
+
   log "Installing Linux system dependencies for Tauri, WebKit, SQLite/native crates, and browser tooling"
 
-  sudo apt-get update
+  "${apt_cmd[@]}" update
+
+  # Tauri v2 / wry needs the WebKitGTK 4.1 libsoup3 development package. Do not
+  # fall back to libwebkit2gtk-4.0-dev: that is the libsoup2 variant and will
+  # still fail later during cargo check for the current dependency stack.
+  if ! apt-cache show libwebkit2gtk-4.1-dev >/dev/null 2>&1; then
+    warn "libwebkit2gtk-4.1-dev is unavailable in this apt source. Use a newer Ubuntu/Debian image or add a repository that provides WebKitGTK 4.1/libsoup3 development packages."
+    return 1
+  fi
 
-  # Tauri v2 Linux builds need the WebKitGTK/AppIndicator/Rsvg stack. Some base
-  # images expose either the 4.1 or 4.0 WebKit development package, so try the
-  # modern package first and gracefully fall back.
   local common_packages=(
     build-essential
     curl
@@ -68,26 +85,22 @@ install_apt_packages() {
     librsvg2-dev
     patchelf
     ca-certificates
+    libwebkit2gtk-4.1-dev
   )
 
-  if apt-cache show libwebkit2gtk-4.1-dev >/dev/null 2>&1; then
+  "${apt_cmd[@]}" install -y --no-install-recommends "${common_packages[@]}"
-    sudo apt-get install -y --no-install-recommends "${common_packages[@]}" libwebkit2gtk-4.1-dev
-  else
-    sudo apt-get install -y --no-install-recommends "${common_packages[@]}" libwebkit2gtk-4.0-dev
-  fi
 }
 
 ensure_node_and_pnpm() {
   log "Preparing Node/pnpm"
 
   if ! command -v node >/dev/null 2>&1; then
-    warn "Node.js is not available in this image. Pin Node.js 20+ in the Codex environment settings or use a Codex universal image with Node installed."
+    warn "Node.js is not available in this image. Pin Node.js 20.19+ or 22.12+ in the Codex environment settings, or use a Codex universal image with Node installed."
     exit 1
   fi
 
-  node_major="$(node -p "process.versions.node.split('.')[0]")"
+  if ! node -e 'const [major, minor, patch] = process.versions.node.split(".").map(Number); const ok = (major === 20 && (minor > 19 || (minor === 19 && patch >= 0))) || major > 22 || (major === 22 && (minor > 12 || (minor === 12 && patch >= 0))); process.exit(ok ? 0 : 1);'; then
-  if [[ "$node_major" -lt 20 ]]; then
+    warn "Phokus' locked Vite version expects Node.js ^20.19.0 or >=22.12.0. Current version: $(node --version). Pin a compatible Node version in Codex environment settings."
-    warn "Phokus expects Node.js 20+. Current version: $(node --version). Pin Node.js 20+ in Codex environment settings."
     exit 1
   fi
 
@@ -95,22 +108,60 @@ ensure_node_and_pnpm() {
 
   if command -v corepack >/dev/null 2>&1; then
     corepack enable
-    corepack prepare pnpm@latest --activate
+    corepack prepare "pnpm@${PNPM_VERSION}" --activate
   fi
 
   if ! command -v pnpm >/dev/null 2>&1; then
-    npm install -g pnpm
+    npm install -g "pnpm@${PNPM_VERSION}"
   fi
 
   log "Node: $(node --version)"
   log "pnpm: $(pnpm --version)"
 }
 
+rustup_target_triple() {
+  case "$(uname -m)" in
+    x86_64 | amd64) printf 'x86_64-unknown-linux-gnu' ;;
+    aarch64 | arm64) printf 'aarch64-unknown-linux-gnu' ;;
+    *)
+      warn "Unsupported architecture for automatic rustup-init install: $(uname -m)"
+      return 1
+      ;;
+  esac
+}
+
+install_rustup_init() {
+  if ! command -v curl >/dev/null 2>&1; then
+    warn "curl is required to install rustup but was not found."
+    return 1
+  fi
+
+  local target_triple
+  target_triple="$(rustup_target_triple)"
+
+  local rustup_url="https://static.rust-lang.org/rustup/dist/${target_triple}/rustup-init"
+  local rustup_sha_url="${rustup_url}.sha256"
+  local tmp_dir
+  tmp_dir="$(mktemp -d)"
+
+  curl --proto '=https' --tlsv1.2 -fsSL "$rustup_url" -o "$tmp_dir/rustup-init"
+  curl --proto '=https' --tlsv1.2 -fsSL "$rustup_sha_url" -o "$tmp_dir/rustup-init.sha256"
+
+  (
+    cd "$tmp_dir"
+    sha256sum --check rustup-init.sha256
+    chmod +x rustup-init
+    ./rustup-init -y --profile minimal --no-modify-path
+  )
+
+  rm -rf "$tmp_dir"
+}
+
 ensure_rust() {
   log "Preparing Rust toolchain"
 
   if ! command -v rustup >/dev/null 2>&1; then
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
+    install_rustup_init
     # shellcheck source=/dev/null
     source "$HOME/.cargo/env"
   fi
@@ -161,7 +212,7 @@ Recommended Codex verification commands:
 
 For visual UI work in Codex/browser environments:
   pnpm dev:ui
-  open http://127.0.0.1:1422/?scenario=rich
+  Visit: http://127.0.0.1:1422/?scenario=rich
 
 Other useful UI Lab scenarios:
   http://127.0.0.1:1422/?scenario=empty