Addressed PR feedback

Author: pinebit

.claude/skills/add-operators/SKILL.md

@@ -43,6 +43,9 @@ Ask the user: **"Are you an existing operator in the cluster, or a new operator
     [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
+
 The script will export the anti-slashing database, run the P2P ceremony, update keys, and print commands to start containers manually. After completion, remind the user to **wait ~2 epochs before starting** containers.
 
 ### If New Operator
@@ -76,4 +79,6 @@ After the existing operators have the ENR, gather:
     [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 Remind the user that **all operators (existing AND new) must participate simultaneously** in the P2P ceremony. After completion, the script will print commands to start containers manually. The new operator does NOT have slashing protection history (fresh start).

.claude/skills/add-validators/SKILL.md

@@ -44,6 +44,8 @@ Run the script from the repository root:
     [--unverified] [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 The script will:
 1. Validate prerequisites
 2. Display current cluster info (operators, validators)

.claude/skills/recreate-private-keys/SKILL.md

@@ -34,6 +34,8 @@ Ask the user whether they want to run with `--dry-run` first to preview the oper
 ./scripts/edit/recreate-private-keys/recreate-private-keys.sh [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 The script will:
 1. Validate prerequisites
 2. Stop the VC container and export the anti-slashing database

.claude/skills/remove-operators/SKILL.md

@@ -54,6 +54,8 @@ Ask the user: **"Are you a remaining operator (staying in the cluster) or a remo
     [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 After completion, the script will print commands to start containers manually. Remind the user to **wait ~2 epochs before starting** containers.
 
 ### If Removed Operator
@@ -81,4 +83,6 @@ This is **only needed when the removal exceeds fault tolerance**. If within faul
     [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 The script will participate in the ceremony and then stop your charon and VC containers. No ASDB operations are needed since you're leaving the cluster.

.claude/skills/replace-operator/SKILL.md

@@ -47,6 +47,8 @@ Ask the user: **"Are you a remaining operator (performing the replacement) or th
     [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 After completion, the script will print commands to start containers manually. Remind the user to **wait ~2 epochs before starting** containers.
 
 ### If New Operator
@@ -80,6 +82,8 @@ After receiving the current `cluster-lock.json` from remaining operators:
     [--dry-run]
 ```
 
+Set `WORK_DIR` env var to override the repository root directory if running from a custom location.
+
 The new operator runs this **at the same time** as the remaining operators run their ceremony. All operators must participate together.
 
 After the ceremony completes, the script automatically:

scripts/edit/add-operators/README.md

@@ -44,6 +44,10 @@ Automates the complete workflow for operators already in the cluster:
 | `--dry-run` | No | Preview without executing |
 | `-h, --help` | No | Show help message |
 
+| Environment Variable | Description |
+|----------------------|-------------|
+| `WORK_DIR` | Override the repository root directory (defaults to auto-detected repo root) |
+
 ### Workflow
 
 1. **Export ASDB** - Stop VC if running and export anti-slashing database
@@ -88,6 +92,10 @@ curl -o .charon/cluster-lock.json https://example.com/cluster-lock.json
 | `--dry-run` | No | Preview without executing |
 | `-h, --help` | No | Show help message |
 
+| Environment Variable | Description |
+|----------------------|-------------|
+| `WORK_DIR` | Override the repository root directory (defaults to auto-detected repo root) |
+
 ## Related
 
 - [Add-Validators Workflow](../add-validators/README.md)

scripts/edit/add-operators/existing-operator.sh

@@ -179,7 +179,7 @@ log_step "Step 1: Exporting anti-slashing database..."
 
 # VC container must be stopped before export (Lodestar locks the database while running)
 if [ "$DRY_RUN" = false ]; then
-    if docker compose ps "$VC" 2>/dev/null | grep -q Up; then
+    if docker compose ps --format '{{.Status}}' "$VC" 2>/dev/null | grep -qi running; then
         log_info "Stopping VC container ($VC) for ASDB export..."
         docker compose stop "$VC"
     fi

scripts/edit/add-operators/new-operator.sh

@@ -57,7 +57,7 @@ Prerequisites:
   - .env file with NETWORK and VC variables set
   - For --generate-enr: Docker installed
   - For ceremony: .charon/charon-enr-private-key must exist
-  - For ceremony: Cluster-lock.json received from existing operators
+  - For ceremony: cluster-lock.json received from existing operators
 EOF
     exit 0
 }
@@ -207,6 +207,9 @@ if [ "$GENERATE_ENR" = true ]; then
         log_info "  ./scripts/edit/add-operators/new-operator.sh \\"
         log_info "      --new-operator-enrs \"<all-new-enrs>\" \\"
         log_info "      --cluster-lock <path-to-cluster-lock.json>"
+    else
+        log_error "ENR private key generation failed - .charon/charon-enr-private-key not found"
+        exit 1
     fi
 
     exit 0

scripts/edit/add-validators/README.md

@@ -43,6 +43,10 @@ All operators must run this script simultaneously:
 | `--dry-run` | No | Preview without executing |
 | `-h, --help` | No | Show help message |
 
+| Environment Variable | Description |
+|----------------------|-------------|
+| `WORK_DIR` | Override the repository root directory (defaults to auto-detected repo root) |
+
 ## Workflow
 
 The script performs the following steps:

scripts/edit/add-validators/add-validators.sh

@@ -173,10 +173,10 @@ fi
 # Check if containers are currently running
 CHARON_WAS_RUNNING=false
 VC_WAS_RUNNING=false
-if docker compose ps charon 2>/dev/null | grep -q Up; then
+if docker compose ps --format '{{.Status}}' charon 2>/dev/null | grep -qi running; then
     CHARON_WAS_RUNNING=true
 fi
-if docker compose ps "$VC" 2>/dev/null | grep -q Up; then
+if docker compose ps --format '{{.Status}}' "$VC" 2>/dev/null | grep -qi running; then
     VC_WAS_RUNNING=true
 fi