setup.sh: hf CLI migration + cached-login fallback + hard-fail downloads

setup.sh

@@ -59,6 +59,7 @@ done
 
 log() { printf '\n\033[1;36m==> %s\033[0m\n' "$1"; }
 warn() { printf '\033[1;33m!! %s\033[0m\n' "$1" >&2; }
+die()  { printf '\033[1;31mXX %s\033[0m\n' "$1" >&2; exit 1; }
 
 # ---------------------------------------------------------------------------
 # 1. Hugging Face token (needed for facebook/sam3 and nyu-visionx/VSI-Bench, both
@@ -266,8 +267,19 @@ fi
 #    checkpoints, the three VLMs -- all placed under their NATIVE hub repo basename
 #    (matching MODEL_PATHS / encoder.config / VSI_ROOT lookups elsewhere in this repo).
 # ---------------------------------------------------------------------------
-HF_CLI="$VENV_ROOT/bin/huggingface-cli"
-[ -x "$HF_CLI" ] || HF_CLI="${PERCEPTION_VENV_ROOT}/bin/huggingface-cli"
+# Newer huggingface_hub versions removed `huggingface-cli` entirely in favor of
+# `hf`; prefer `hf` wherever it exists and only fall back to the legacy name on
+# old installs. A silent legacy-CLI failure here previously left VSI-Bench and
+# every checkpoint undownloaded while the rest of setup continued.
+HF_CLI=""
+for candidate in "$VENV_ROOT/bin/hf" "${PERCEPTION_VENV_ROOT}/bin/hf" \
+    "$VENV_ROOT/bin/huggingface-cli" "${PERCEPTION_VENV_ROOT}/bin/huggingface-cli"; do
+  if [ -x "$candidate" ]; then HF_CLI="$candidate"; break; fi
+done
+if [ -z "$HF_CLI" ]; then
+  HF_CLI="$(command -v hf || command -v huggingface-cli || true)"
+fi
+[ -n "$HF_CLI" ] || { warn "no hf/huggingface-cli found; downloads will fail"; HF_CLI="hf"; }
 
 hf_download() {
   local repo_id="$1" repo_type="$2" dest="$3"
@@ -277,7 +289,16 @@ hf_download() {
   fi
   log "Downloading $repo_id ($repo_type) -> $dest"
   mkdir -p "$dest"
-  "$HF_CLI" download "$repo_id" --repo-type "$repo_type" --local-dir "$dest" --token "$HF_TOKEN"
+  # Pass --token only when HF_TOKEN is set -- otherwise defer to a cached
+  # `hf auth login`, instead of overriding it with an empty token (which broke
+  # gated downloads for logged-in users).
+  if [ -n "$HF_TOKEN" ]; then
+    "$HF_CLI" download "$repo_id" --repo-type "$repo_type" --local-dir "$dest" --token "$HF_TOKEN" \
+      || die "download failed: $repo_id"
+  else
+    "$HF_CLI" download "$repo_id" --repo-type "$repo_type" --local-dir "$dest" \
+      || die "download failed: $repo_id"
+  fi
 }
 
 if [ "$SKIP_DATA" -eq 0 ]; then