consolidate sfw wrapper logic

Author: masenf

.github/workflows/integration_tests.yml

@@ -124,31 +124,10 @@ jobs:
         with:
           mode: firewall-free
 
-      - name: Create sfw wrapper scripts for npm and bun
+      - name: Activate sfw shims for npm and bun
         run: |
-          mkdir -p "$RUNNER_TEMP/sfw-wrappers"
-          cat > "$RUNNER_TEMP/sfw-wrappers/npm" <<'SHIM'
-#!/usr/bin/env bash
-SHIM_DIR="$(cd "$(dirname "$0")" && pwd)"
-export PATH="${PATH//$SHIM_DIR:/}"
-export PATH="${PATH//:$SHIM_DIR/}"
-case "${1-}" in
-  install|ci|update|audit|pack|publish|fund|outdated) exec sfw npm "$@" ;;
-  *) exec npm "$@" ;;
-esac
-SHIM
-          cat > "$RUNNER_TEMP/sfw-wrappers/bun" <<'SHIM'
-#!/usr/bin/env bash
-SHIM_DIR="$(cd "$(dirname "$0")" && pwd)"
-export PATH="${PATH//$SHIM_DIR:/}"
-export PATH="${PATH//:$SHIM_DIR/}"
-case "${1-}" in
-  install|add|update|pm) exec sfw bun "$@" ;;
-  *) exec bun "$@" ;;
-esac
-SHIM
-          chmod +x "$RUNNER_TEMP/sfw-wrappers/npm" "$RUNNER_TEMP/sfw-wrappers/bun"
-          echo "$RUNNER_TEMP/sfw-wrappers" >> "$GITHUB_PATH"
+          SHIM_DIR="$(cd scripts/sfw-shims && pwd)"
+          echo "$SHIM_DIR" >> "$GITHUB_PATH"
           echo "REFLEX_USE_SYSTEM_BUN=1" >> "$GITHUB_ENV"
 
       # Inline setup_build_env steps so all installs go through sfw.

scripts/sfw-shims/bun

@@ -4,10 +4,17 @@ SHIM_DIR="$(cd "$(dirname "$0")" && pwd)"
 export PATH="${PATH//$SHIM_DIR:/}"
 export PATH="${PATH//:$SHIM_DIR/}"
 
+# Use sfw directly if available, otherwise fall back to npx sfw
+if command -v sfw >/dev/null 2>&1; then
+  SFW=sfw
+else
+  SFW="npx sfw"
+fi
+
 # Only route registry-touching commands through sfw
 case "${1-}" in
   install|add|update|pm)
-    exec npx sfw bun "$@" ;;
+    exec $SFW bun "$@" ;;
   *)
     exec bun "$@" ;;
 esac

scripts/sfw-shims/npm

@@ -4,10 +4,17 @@ SHIM_DIR="$(cd "$(dirname "$0")" && pwd)"
 export PATH="${PATH//$SHIM_DIR:/}"
 export PATH="${PATH//:$SHIM_DIR/}"
 
+# Use sfw directly if available, otherwise fall back to npx sfw
+if command -v sfw >/dev/null 2>&1; then
+  SFW=sfw
+else
+  SFW="npx sfw"
+fi
+
 # Only route registry-touching commands through sfw
 case "${1-}" in
   install|ci|update|audit|pack|publish|fund|outdated)
-    exec npx sfw npm "$@" ;;
+    exec $SFW npm "$@" ;;
   *)
     exec npm "$@" ;;
 esac