feat(security): dedicated install flags decoupled from security_level (#2991)

* feat(security): add dedicated install flags decoupled from security_level

Gate 'install via git URL' and 'install via pip' with dedicated opt-in
boolean flags (allow_git_url_install / allow_pip_install) in config.ini
[default], fully replacing the security_level term on those surfaces
(REPLACE, not AND — a strict level no longer denies when the flag is on;
a weak level no longer allows when the flag is off).

- glob/manager_server.py: pure predicate is_dedicated_install_allowed
  (flag AND loopback, request-time args.listen); REPLACE gates at
  /customnode/install/git_url and /customnode/install/pip; batch
  unknown-URL arm routes through the same full predicate at the risky
  position (loopback term is load-bearing — the middle entry gate has
  no network-position term; the entry gate itself stays in force);
  unknown-pip in batch stays unconditionally blocked; new
  SECURITY_MESSAGE_FLAG_* denial constants name the responsible flag;
  security_403_response gains flag_token (comfyui_outdated keeps precedence)
- glob/manager_core.py: register both keys (read via get_bool default-false,
  write list, exception fallback); "true"-only truthy; restart-only activation
- js/common.js: 403 dialog copy names the responsible flag at the two
  install call sites
- README.md: security-policy docs for both flags (per-surface scope incl.
  the batch entry-gate qualifier, REPLACE decoupling, loopback bound,
  opt-in config snippet, default-deny + migration note); stale tier lists
  corrected against the actual gates
- CHANGELOG.md: opt-in migration note + accepted residual risk (flags
  bypass the forced-strong outdated-ComfyUI hardening on loopback,
  opt-in only), decoupling claim qualified for the batch entry gate

Tests: unit suite (predicate truth table, REPLACE litmus both directions,
AST binding-proofs against live handlers, subprocess-isolated config
contract) plus a real-server E2E suite that mounts the Manager-under-test
via git worktree (exact-SHA pin, detached) against a real ComfyUI and
exercises both flag surfaces and both arms — deny arms (403 + flag-naming
body/log + no install artifact), git-URL allow arm (real clone), pip allow
arm as a two-phase reservation oracle — with zero-residual self-clean.
Module skips without E2E_COMFYUI_ROOT; unit suite unaffected.

The manager-v4 branch ships the identical policy (shared invariants +
config contract); this tree uses the degraded predicate 'flag AND
loopback' (no personal_cloud-equivalent mode here).

* bump version to v3.41

tests/e2e/scripts/setup_e2e_env.sh

@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+# setup_e2e_env.sh — E2E environment builder for GOAL #60 (T1, spec §2).
+#
+# Builds the DISPOSABLE test ComfyUI root used by
+# tests/e2e/test_e2e_install_flags.py. ENV BUILD ONLY: donor steps 4-5
+# (editable pip install of the Manager + custom_nodes symlink) are
+# deliberately DROPPED — the Manager is mounted via `git worktree add`
+# by the `mount_worktree` session fixture in the test module, which is
+# the SOLE owner of mount create/reuse/teardown (spec §2 T1
+# single-ownership rule). This script never touches the Manager repo.
+#
+# Idempotent: re-run is a no-op when the marker + key artifacts exist
+# (E2E-SC-01).
+#
+# Input env vars:
+#   E2E_COMFYUI_ROOT — target directory (default: mktemp -d)
+#   COMFYUI_BRANCH   — ComfyUI clone ref (default: master; Q-2)
+#   PYTHON           — python executable for version probe (default: python3)
+#
+# Output (last line of stdout):
+#   E2E_COMFYUI_ROOT=/path/to/environment
+#
+# Exit: 0=success, 1=failure
+
+set -euo pipefail
+
+COMFYUI_REPO="https://github.com/comfyanonymous/ComfyUI.git"
+PYTORCH_CPU_INDEX="https://download.pytorch.org/whl/cpu"
+# Minimal seed config. use_uv=false: the venv is seeded with pip
+# (`uv venv --seed`), so the Manager's make_pip_cmd resolves to
+# `<venv-python> -m pip` and the suite's pip-uninstall hygiene helpers
+# work without uv on PATH at server runtime. The install flags are NOT
+# seeded here — stage_flags.sh stages them per launch identity (SC-06).
+CONFIG_INI_CONTENT="[default]
+file_logging = false
+use_uv = false"
+
+log()  { echo "[setup_e2e] $*"; }
+err()  { echo "[setup_e2e] ERROR: $*" >&2; }
+die()  { err "$@"; exit 1; }
+
+validate_prerequisites() {
+    local py="${PYTHON:-python3}"
+    local missing=()
+    command -v git   >/dev/null 2>&1 || missing+=("git")
+    command -v uv    >/dev/null 2>&1 || missing+=("uv")
+    command -v "$py" >/dev/null 2>&1 || missing+=("$py")
+    if [[ ${#missing[@]} -gt 0 ]]; then
+        die "Missing prerequisites: ${missing[*]}"
+    fi
+    local py_version major minor
+    py_version=$("$py" -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
+    major="${py_version%%.*}"
+    minor="${py_version##*.}"
+    if [[ "$major" -lt 3 ]] || { [[ "$major" -eq 3 ]] && [[ "$minor" -lt 9 ]]; }; then
+        die "Python 3.9+ required, found $py_version"
+    fi
+    log "Prerequisites OK (python=$py_version)"
+}
+
+check_already_setup() {
+    local root="$1"
+    if [[ -f "$root/.e2e_setup_complete" ]] \
+        && [[ -d "$root/comfyui" ]] \
+        && [[ -d "$root/venv" ]] \
+        && [[ -f "$root/comfyui/user/__manager/config.ini" ]]; then
+        log "Environment already set up at $root (marker exists). Skipping. (E2E-SC-01 idempotence)"
+        echo "E2E_COMFYUI_ROOT=$root"
+        exit 0
+    fi
+}
+
+verify_setup() {
+    local root="$1"
+    local venv_py="$root/venv/bin/python"
+    local errors=0
+    log "Running verification checks..."
+    [[ -f "$root/comfyui/main.py" ]] || { err "Verification FAIL: comfyui/main.py not found"; ((errors+=1)); }
+    [[ -x "$venv_py" ]] || { err "Verification FAIL: venv python not executable"; ((errors+=1)); }
+    [[ -f "$root/comfyui/user/__manager/config.ini" ]] || { err "Verification FAIL: config.ini not found"; ((errors+=1)); }
+    # venv must carry pip (uv venv --seed) — the suite's hygiene helpers
+    # and the Manager's reservation-consuming boot both call `-m pip`.
+    if ! "$venv_py" -m pip --version >/dev/null 2>&1; then
+        err "Verification FAIL: venv pip not available"
+        ((errors+=1))
+    fi
+    # comfy is a local package inside the ComfyUI checkout
+    if ! PYTHONPATH="$root/comfyui" "$venv_py" -c "import comfy" 2>/dev/null; then
+        err "Verification FAIL: 'import comfy' failed"
+        ((errors+=1))
+    fi
+    # [D2] half-check at setup time: the Manager must NOT be pip-installed
+    # into this venv (the worktree mount is the only delivery mechanism).
+    if "$venv_py" -m pip show comfyui-manager >/dev/null 2>&1 \
+        || "$venv_py" -m pip show ComfyUI-Manager >/dev/null 2>&1; then
+        err "Verification FAIL: a pip-installed Manager exists in the venv (wrong layout for [D2])"
+        ((errors+=1))
+    fi
+    if [[ "$errors" -gt 0 ]]; then
+        die "Verification failed with $errors error(s)"
+    fi
+    log "Verification OK: all checks passed"
+}
+
+# ===== Main =====
+validate_prerequisites
+
+PYTHON="${PYTHON:-python3}"
+COMFYUI_BRANCH="${COMFYUI_BRANCH:-master}"
+
+CREATED_BY_US=false
+if [[ -z "${E2E_COMFYUI_ROOT:-}" ]]; then
+    E2E_COMFYUI_ROOT="$(mktemp -d -t e2e_comfyui_XXXXXX)"
+    CREATED_BY_US=true
+    log "Created E2E_COMFYUI_ROOT=$E2E_COMFYUI_ROOT"
+else
+    mkdir -p "$E2E_COMFYUI_ROOT"
+    log "Using E2E_COMFYUI_ROOT=$E2E_COMFYUI_ROOT"
+fi
+
+check_already_setup "$E2E_COMFYUI_ROOT"
+
+cleanup_on_failure() {
+    local exit_code=$?
+    if [[ "$exit_code" -ne 0 ]] && [[ "$CREATED_BY_US" == "true" ]]; then
+        err "Setup failed. Cleaning up $E2E_COMFYUI_ROOT"
+        rm -rf "$E2E_COMFYUI_ROOT"
+    fi
+}
+trap cleanup_on_failure EXIT
+
+log "Step 1/5: Cloning ComfyUI (branch=$COMFYUI_BRANCH)..."
+if [[ -d "$E2E_COMFYUI_ROOT/comfyui/.git" ]]; then
+    log "  ComfyUI already cloned, skipping"
+else
+    git clone --depth=1 --branch "$COMFYUI_BRANCH" "$COMFYUI_REPO" "$E2E_COMFYUI_ROOT/comfyui"
+fi
+
+log "Step 2/5: Creating virtual environment (seeded with pip)..."
+if [[ -d "$E2E_COMFYUI_ROOT/venv" ]]; then
+    log "  venv already exists, skipping"
+else
+    uv venv --seed "$E2E_COMFYUI_ROOT/venv"
+fi
+VENV_PY="$E2E_COMFYUI_ROOT/venv/bin/python"
+
+log "Step 3/5: Installing ComfyUI dependencies (CPU-only torch index)..."
+uv pip install \
+    --python "$VENV_PY" \
+    -r "$E2E_COMFYUI_ROOT/comfyui/requirements.txt" \
+    --extra-index-url "$PYTORCH_CPU_INDEX"
+
+log "Step 4/5: Writing seed config.ini + HOME isolation dirs..."
+mkdir -p "$E2E_COMFYUI_ROOT/comfyui/user/__manager"
+echo "$CONFIG_INI_CONTENT" > "$E2E_COMFYUI_ROOT/comfyui/user/__manager/config.ini"
+mkdir -p "$E2E_COMFYUI_ROOT/home/.config"
+mkdir -p "$E2E_COMFYUI_ROOT/home/.local/share"
+mkdir -p "$E2E_COMFYUI_ROOT/logs"
+mkdir -p "$E2E_COMFYUI_ROOT/comfyui/custom_nodes"
+
+log "Step 5/5: Verifying setup..."
+verify_setup "$E2E_COMFYUI_ROOT"
+
+# Marker written ONLY after verification passes (E2E-SC-01)
+date -Iseconds > "$E2E_COMFYUI_ROOT/.e2e_setup_complete"
+
+trap - EXIT
+log "Setup complete."
+echo "E2E_COMFYUI_ROOT=$E2E_COMFYUI_ROOT"

tests/e2e/scripts/stage_flags.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+# stage_flags.sh — Per-launch-identity config staging (T4, spec §1.4).
+#
+# Analog of the donor's start_comfyui_strict.sh config patching, split
+# out as a pure staging script (launch is a separate step; the pytest
+# fixture owns restore+delete of the backup at teardown — donor
+# symmetry, spec §1.4).
+#
+# Modes (arg $1):
+#   deny  — REMOVE both flag keys (L-D: flags ABSENT also live-proves
+#           "missing key reads false")
+#   allow — set allow_git_url_install = true AND allow_pip_install = true
+#           (L-A / L-P)
+#
+# Backup: config.ini.before-flags, created ONLY if not already present
+# (crashed-run-safe — preserves the true baseline across crashed runs).
+# Restore + DELETE of the backup happens in the pytest fixture teardown,
+# NOT here (E2E-SC-06/07).
+#
+# Input env vars:
+#   E2E_COMFYUI_ROOT — (required)
+#
+# Exit: 0=staged, 1=failure
+
+set -euo pipefail
+
+MODE="${1:-}"
+
+log()  { echo "[stage_flags] $*"; }
+err()  { echo "[stage_flags] ERROR: $*" >&2; }
+die()  { err "$@"; exit 1; }
+
+[[ -n "${E2E_COMFYUI_ROOT:-}" ]] || die "E2E_COMFYUI_ROOT is not set"
+[[ "$MODE" == "deny" || "$MODE" == "allow" ]] || die "usage: stage_flags.sh deny|allow"
+
+CONFIG="$E2E_COMFYUI_ROOT/comfyui/user/__manager/config.ini"
+BACKUP="$CONFIG.before-flags"
+
+[[ -f "$CONFIG" ]] || die "config not found at $CONFIG (run setup_e2e_env.sh first)"
+
+# Backup ONLY if absent (crashed-run-safe; SC-06)
+if [[ ! -f "$BACKUP" ]]; then
+    cp "$CONFIG" "$BACKUP"
+    log "Backed up original config to $BACKUP"
+else
+    log "Backup already present at $BACKUP (preserving original baseline)"
+fi
+
+stage_key() {
+    local key="$1" value="$2"
+    if grep -qE "^${key}\s*=" "$CONFIG"; then
+        sed -i -E "s|^${key}\s*=.*|${key} = ${value}|" "$CONFIG"
+    else
+        # The append-after target MUST exist, otherwise the sed below is a
+        # silent no-op and the flag never lands (false-PASS for the allow arm).
+        grep -qE "^\[default\]" "$CONFIG" \
+            || die "no [default] section in $CONFIG — cannot stage '${key}' (would silently no-op)"
+        sed -i -E "/^\[default\]/a ${key} = ${value}" "$CONFIG"
+    fi
+}
+
+remove_key() {
+    local key="$1"
+    sed -i -E "/^${key}\s*=/d" "$CONFIG"
+}
+
+case "$MODE" in
+    deny)
+        remove_key "allow_git_url_install"
+        remove_key "allow_pip_install"
+        log "Staged DENY config (both flags ABSENT — missing key reads false)"
+        ;;
+    allow)
+        stage_key "allow_git_url_install" "true"
+        stage_key "allow_pip_install" "true"
+        log "Staged ALLOW config (both flags = true)"
+        ;;
+esac
+
+# The staged value takes effect ONLY on the NEXT launch (restart-only
+# cached_config — by construction, no hot-reload assumption; SC-06).
+log "Staged config at $CONFIG (effective on next launch)"

tests/e2e/scripts/start_comfyui.sh

@@ -0,0 +1,142 @@
+#!/usr/bin/env bash
+# start_comfyui.sh — Foreground-blocking ComfyUI launcher (T2, spec §1.3).
+#
+# Starts ComfyUI in the background and blocks until the server answers
+# GET /system_stats (or timeout). Deltas vs the donor script (binding,
+# spec §1.3):
+#   - NO --enable-manager: the Manager is a custom-node-style plugin
+#     activated by ComfyUI's custom_nodes scan of the worktree mount.
+#   - NO COMFYUI_MANAGER_SKIP_MANAGER_REQUIREMENTS: that belt does not
+#     exist in this repo (Q-6 verified); watchdog row E2E-SC-42 covers
+#     the residual.
+#   - --listen is ALWAYS passed explicitly (LISTEN env): the predicate
+#     under test is request-time `flag AND is_loopback(args.listen)` —
+#     the listener value is LOAD-BEARING.
+#   - Per-launch log isolation (E2E-SC-04, MANDATORY): each launch
+#     identity writes a FRESH log file comfyui.<port>.<launch-id>.log,
+#     so a deny-copy substring from L-D is unfindable by L-A/R-A log
+#     assertions (stale-substring false-PASS class).
+#   - Readiness = poll GET /system_stats == 200; child exit code 0
+#     during the wait = Manager-triggered restart -> KEEP polling;
+#     non-zero exit -> fail fast with log tail.
+#
+# Input env vars:
+#   E2E_COMFYUI_ROOT — (required) root from setup_e2e_env.sh
+#   PORT             — listen port (default: 8189)
+#   TIMEOUT          — max seconds to readiness (default: 120)
+#   LISTEN           — listener address (default: 127.0.0.1)
+#   LAUNCH_ID        — launch identity tag for the log file (default: default)
+#
+# Output (last line on success):
+#   COMFYUI_PID=<pid> PORT=<port> LOG_FILE=<path>
+#
+# Exit: 0=ready, 1=timeout/failure
+
+set -euo pipefail
+
+PORT="${PORT:-8189}"
+TIMEOUT="${TIMEOUT:-120}"
+LISTEN="${LISTEN:-127.0.0.1}"
+LAUNCH_ID="${LAUNCH_ID:-default}"
+
+log()  { echo "[start_comfyui] $*"; }
+err()  { echo "[start_comfyui] ERROR: $*" >&2; }
+die()  { err "$@"; exit 1; }
+
+[[ -n "${E2E_COMFYUI_ROOT:-}" ]]                  || die "E2E_COMFYUI_ROOT is not set"
+[[ -d "$E2E_COMFYUI_ROOT/comfyui" ]]              || die "ComfyUI not found at $E2E_COMFYUI_ROOT/comfyui"
+[[ -x "$E2E_COMFYUI_ROOT/venv/bin/python" ]]      || die "venv python not found"
+[[ -f "$E2E_COMFYUI_ROOT/.e2e_setup_complete" ]]  || die "Setup marker not found. Run setup_e2e_env.sh first."
+
+PY="$E2E_COMFYUI_ROOT/venv/bin/python"
+COMFY_DIR="$E2E_COMFYUI_ROOT/comfyui"
+LOG_DIR="$E2E_COMFYUI_ROOT/logs"
+LOG_FILE="$LOG_DIR/comfyui.${PORT}.${LAUNCH_ID}.log"
+# Port-namespaced PID file (donor WI-CC incident: shared PID file caused
+# a cross-port kill).
+PID_FILE="$LOG_DIR/comfyui.${PORT}.pid"
+
+mkdir -p "$LOG_DIR"
+
+# --- Pre-launch port clear ---
+if ss -tlnp 2>/dev/null | grep -q ":${PORT}\b"; then
+    log "Port $PORT is in use. Attempting to stop existing process..."
+    if [[ -f "$PID_FILE" ]]; then
+        OLD_PID="$(cat "$PID_FILE")"
+        if kill -0 "$OLD_PID" 2>/dev/null; then
+            kill "$OLD_PID" 2>/dev/null || true
+            sleep 2
+        fi
+    fi
+    if ss -tlnp 2>/dev/null | grep -q ":${PORT}\b"; then
+        pkill -f "main\\.py.*--port $PORT" 2>/dev/null || true
+        sleep 2
+    fi
+    if ss -tlnp 2>/dev/null | grep -q ":${PORT}\b"; then
+        die "Port $PORT is still in use after cleanup attempt"
+    fi
+    log "Port $PORT cleared."
+fi
+
+# --- Launch (FRESH per-launch log file) ---
+log "Starting ComfyUI on port $PORT (listen=$LISTEN, launch_id=$LAUNCH_ID)..."
+: > "$LOG_FILE"
+
+PYTHONUNBUFFERED=1 \
+HOME="$E2E_COMFYUI_ROOT/home" \
+    nohup "$PY" -u "$COMFY_DIR/main.py" \
+        --cpu \
+        --port "$PORT" \
+        --listen "$LISTEN" \
+    > "$LOG_FILE" 2>&1 &
+COMFYUI_PID=$!
+
+echo "$COMFYUI_PID" > "$PID_FILE"
+log "ComfyUI PID=$COMFYUI_PID, log=$LOG_FILE"
+
+# --- Block until ready: poll /system_stats (restart-tolerant) ---
+log "Waiting up to ${TIMEOUT}s for ComfyUI readiness (GET /system_stats)..."
+DEADLINE=$(( $(date +%s) + TIMEOUT ))
+READY=0
+while [[ "$(date +%s)" -lt "$DEADLINE" ]]; do
+    if curl -sf --max-time 2 "http://127.0.0.1:${PORT}/system_stats" >/dev/null 2>&1; then
+        READY=1
+        break
+    fi
+    # Child exit handling: exit 0 = Manager-triggered restart -> keep
+    # polling (a restarted process will bind the port); non-zero -> fail fast.
+    if ! kill -0 "$COMFYUI_PID" 2>/dev/null; then
+        if wait "$COMFYUI_PID" 2>/dev/null; then
+            : # exit 0 — restart class, keep polling
+        else
+            RC=$?
+            err "ComfyUI exited with code $RC. Last 30 lines of log:"
+            tail -n 30 "$LOG_FILE" >&2
+            rm -f "$PID_FILE"
+            exit 1
+        fi
+    fi
+    sleep 1
+done
+
+if [[ "$READY" -ne 1 ]]; then
+    err "Timeout (${TIMEOUT}s) waiting for ComfyUI. Last 30 lines of log:"
+    tail -n 30 "$LOG_FILE" >&2
+    kill "$COMFYUI_PID" 2>/dev/null || true
+    rm -f "$PID_FILE"
+    exit 1
+fi
+
+# A Manager-triggered restart (child exit 0 above) leaves COMFYUI_PID pointing
+# at the dead original child while a FRESH process now owns the port. Re-resolve
+# the live listener PID so PID_FILE (consumed by stop_comfyui.sh) targets the
+# process that must actually be killed at teardown.
+LISTENER_PID="$(ss -tlnp 2>/dev/null | grep ":${PORT}\b" | grep -oE 'pid=[0-9]+' | head -n1 | cut -d= -f2)"
+if [[ -n "$LISTENER_PID" && "$LISTENER_PID" != "$COMFYUI_PID" ]]; then
+    log "Listener PID $LISTENER_PID differs from launched PID $COMFYUI_PID (restart). Updating PID file."
+    COMFYUI_PID="$LISTENER_PID"
+    echo "$COMFYUI_PID" > "$PID_FILE"
+fi
+
+log "ComfyUI is ready."
+echo "COMFYUI_PID=$COMFYUI_PID PORT=$PORT LOG_FILE=$LOG_FILE"

tests/e2e/scripts/stop_comfyui.sh

@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+# stop_comfyui.sh — Graceful ComfyUI shutdown (T3, spec §1.3 stop contract).
+#
+# Donor mirror: SIGTERM -> 10s grace -> SIGKILL -> port-pattern pkill
+# fallback -> port-free verify (incl. the legacy-PID-file warning from
+# the donor WI-CC cross-port-kill incident).
+#
+# Input env vars:
+#   E2E_COMFYUI_ROOT — (required) path to the E2E environment
+#   PORT             — ComfyUI port (default: 8189)
+#
+# Exit: 0=stopped, 1=failed
+
+set -euo pipefail
+
+PORT="${PORT:-8189}"
+GRACE_PERIOD=10
+
+log()  { echo "[stop_comfyui] $*"; }
+err()  { echo "[stop_comfyui] ERROR: $*" >&2; }
+die()  { err "$@"; exit 1; }
+
+[[ -n "${E2E_COMFYUI_ROOT:-}" ]] || die "E2E_COMFYUI_ROOT is not set"
+
+# Ownership guard: only signal a PID whose cmdline references THIS E2E root.
+# On shared runners a bare "main.py --port N" pattern (or a reused PID) could
+# otherwise match an unrelated process; the launcher invokes
+# "$E2E_COMFYUI_ROOT/venv/bin/python $E2E_COMFYUI_ROOT/comfyui/main.py", so the
+# root path is always present in our process's cmdline.
+belongs_to_root() {
+    local pid="$1"
+    [[ -n "$pid" && -r "/proc/$pid/cmdline" ]] || return 1
+    tr '\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null | grep -qF "$E2E_COMFYUI_ROOT"
+}
+
+# PIDs currently listening on PORT (deduped).
+listener_pids() {
+    ss -tlnp 2>/dev/null | grep ":${PORT}\b" | grep -oE 'pid=[0-9]+' | cut -d= -f2 | sort -u
+}
+
+PID_FILE="$E2E_COMFYUI_ROOT/logs/comfyui.${PORT}.pid"
+LEGACY_PID_FILE="$E2E_COMFYUI_ROOT/logs/comfyui.pid"
+if [[ -f "$LEGACY_PID_FILE" ]] && [[ ! -f "$PID_FILE" ]]; then
+    log "WARN: found legacy unported PID file $LEGACY_PID_FILE but no ${PID_FILE}. Cross-port risk — ignoring legacy file."
+fi
+
+COMFYUI_PID=""
+if [[ -f "$PID_FILE" ]]; then
+    COMFYUI_PID="$(cat "$PID_FILE")"
+    log "Read PID=$COMFYUI_PID from $PID_FILE"
+fi
+
+if [[ -n "$COMFYUI_PID" ]] && kill -0 "$COMFYUI_PID" 2>/dev/null; then
+    if belongs_to_root "$COMFYUI_PID"; then
+        log "Sending SIGTERM to PID $COMFYUI_PID..."
+        kill "$COMFYUI_PID" 2>/dev/null || true
+        elapsed=0
+        while kill -0 "$COMFYUI_PID" 2>/dev/null && [[ "$elapsed" -lt "$GRACE_PERIOD" ]]; do
+            sleep 1
+            elapsed=$((elapsed + 1))
+        done
+        if kill -0 "$COMFYUI_PID" 2>/dev/null; then
+            log "Process still alive after ${GRACE_PERIOD}s. Sending SIGKILL..."
+            kill -9 "$COMFYUI_PID" 2>/dev/null || true
+            sleep 1
+        fi
+    else
+        log "WARN: PID $COMFYUI_PID does NOT belong to $E2E_COMFYUI_ROOT (reused/stale PID). Refusing to kill it."
+    fi
+fi
+
+# Fallback: kill the port listener(s) (covers Manager-restarted processes whose
+# PID differs from the recorded one) — but ONLY those verified to belong to this
+# E2E root, never a broad pattern pkill that could hit unrelated CI processes.
+if ss -tlnp 2>/dev/null | grep -q ":${PORT}\b"; then
+    log "Port $PORT still in use. Killing verified-own listener(s)..."
+    for pid in $(listener_pids); do
+        if belongs_to_root "$pid"; then
+            log "Sending SIGTERM to listener PID $pid..."
+            kill "$pid" 2>/dev/null || true
+        else
+            log "WARN: PID $pid on port $PORT is not part of $E2E_COMFYUI_ROOT — leaving it alone."
+        fi
+    done
+    sleep 2
+    for pid in $(listener_pids); do
+        if belongs_to_root "$pid"; then
+            log "Listener PID $pid still alive. Sending SIGKILL..."
+            kill -9 "$pid" 2>/dev/null || true
+        fi
+    done
+    sleep 1
+fi
+
+rm -f "$PID_FILE"
+
+if ss -tlnp 2>/dev/null | grep -q ":${PORT}\b"; then
+    die "Port $PORT is still in use after shutdown"
+fi
+
+log "ComfyUI stopped."