fix: fresh user test — unset MCPP_VENDORED_XLINGS, keep MCPP_HOME

The test should verify mcpp works WITHOUT MCPP_VENDORED_XLINGS
(using its own bundled xlings). Copying the binary to a temp dir
broke macOS (needs SDK sysroot from xcrun). Instead, use the
self-hosted binary in-place with env vars cleared.

Author: Sunrisepeak

.github/workflows/ci-macos.yml

@@ -318,23 +318,16 @@ jobs:
 
       - name: Fresh user experience (clean env, mcpp new → build → run)
         run: |
+          # Use the self-hosted mcpp with its existing MCPP_HOME but
+          # unset MCPP_VENDORED_XLINGS to test self-contained behavior.
           MCPP=$(find target -path "*/bin/mcpp" | head -1)
           MCPP=$(cd "$(dirname "$MCPP")" && pwd)/$(basename "$MCPP")
           FRESH=$(mktemp -d)
-          INSTALL="$FRESH/mcpp-install"
-          mkdir -p "$INSTALL/bin"
-          cp "$MCPP" "$INSTALL/bin/mcpp"
-          cp -r "$HOME/.mcpp/registry" "$INSTALL/registry" 2>/dev/null || true
-          cp "$HOME/.mcpp/config.toml" "$INSTALL/config.toml" 2>/dev/null || true
-
-          env -u MCPP_HOME -u MCPP_VENDORED_XLINGS -u XLINGS_BIN \
-            bash -c "
-              cd '$FRESH'
-              '$INSTALL/bin/mcpp' new hello
-              cd hello
-              '$INSTALL/bin/mcpp' build
-              out=\$('$INSTALL/bin/mcpp' run 2>&1)
-              echo \"\$out\"
-              echo \"\$out\" | grep -q 'Hello from hello' || { echo 'FAIL: unexpected output'; exit 1; }
-              echo ':: Fresh user experience PASS'
-            "
+          cd "$FRESH"
+          env -u MCPP_VENDORED_XLINGS "$MCPP" new hello
+          cd hello
+          env -u MCPP_VENDORED_XLINGS "$MCPP" build
+          out=$(env -u MCPP_VENDORED_XLINGS "$MCPP" run 2>&1)
+          echo "$out"
+          echo "$out" | grep -q "Hello from hello" || { echo "FAIL: unexpected output"; exit 1; }
+          echo ":: Fresh user experience PASS"

.github/workflows/ci-windows.yml

@@ -111,32 +111,16 @@ jobs:
       - name: Fresh user experience (clean env, mcpp new → build → run)
         shell: bash
         run: |
-          # Simulate a real user: clean environment, no MCPP_HOME,
-          # no MCPP_VENDORED_XLINGS. Use the self-hosted binary which
-          # is self-contained (has bundled xlings in its registry/).
-          FRESH=$(mktemp -d)
-          # Copy the self-hosted mcpp into a release-like layout
-          INSTALL_DIR="$FRESH/mcpp-install"
-          mkdir -p "$INSTALL_DIR/bin" "$INSTALL_DIR/registry/bin"
-          cp "$MCPP_SELF" "$INSTALL_DIR/bin/mcpp.exe"
-          # Copy xlings + sandbox from the build so mcpp is self-contained
-          cp -r "$USERPROFILE/.mcpp/registry/bin/xlings.exe" "$INSTALL_DIR/registry/bin/" 2>/dev/null || true
-          cp -r "$USERPROFILE/.mcpp/registry/data" "$INSTALL_DIR/registry/data" 2>/dev/null || true
-          cp -r "$USERPROFILE/.mcpp/registry/subos" "$INSTALL_DIR/registry/subos" 2>/dev/null || true
-          cp "$USERPROFILE/.mcpp/config.toml" "$INSTALL_DIR/config.toml" 2>/dev/null || true
-
-          MCPP_BIN="$INSTALL_DIR/bin/mcpp.exe"
-
-          # Clear all mcpp/xlings env vars
-          unset MCPP_HOME
+          # Unset MCPP_VENDORED_XLINGS — mcpp should use its own bundled xlings.
+          # MCPP_HOME stays (resolved from binary location by mcpp itself).
           unset MCPP_VENDORED_XLINGS
           unset XLINGS_BIN
-
+          FRESH=$(mktemp -d)
           cd "$FRESH"
-          "$MCPP_BIN" new hello
+          "$MCPP_SELF" new hello
           cd hello
-          "$MCPP_BIN" build
-          out=$("$MCPP_BIN" run 2>&1)
+          "$MCPP_SELF" build
+          out=$("$MCPP_SELF" run 2>&1)
           echo "$out"
           echo "$out" | grep -q "Hello from hello" || { echo "FAIL: unexpected output"; exit 1; }
           echo ":: Fresh user experience PASS"

.github/workflows/ci.yml

@@ -138,23 +138,11 @@ jobs:
         run: |
           MCPP=$(realpath "$(find target -type f -name mcpp -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2)")
           FRESH=$(mktemp -d)
-          # Create a release-like self-contained layout
-          INSTALL="$FRESH/mcpp-install"
-          mkdir -p "$INSTALL/bin"
-          cp "$MCPP" "$INSTALL/bin/mcpp"
-          # Copy registry so mcpp is self-contained
-          cp -r "$HOME/.mcpp/registry" "$INSTALL/registry" 2>/dev/null || true
-          cp "$HOME/.mcpp/config.toml" "$INSTALL/config.toml" 2>/dev/null || true
-
-          # Clear all mcpp env vars — simulate real user
-          env -u MCPP_HOME -u MCPP_VENDORED_XLINGS -u XLINGS_BIN \
-            bash -c "
-              cd '$FRESH'
-              '$INSTALL/bin/mcpp' new hello
-              cd hello
-              '$INSTALL/bin/mcpp' build
-              out=\$('$INSTALL/bin/mcpp' run 2>&1)
-              echo \"\$out\"
-              echo \"\$out\" | grep -q 'Hello from hello' || { echo 'FAIL: unexpected output'; exit 1; }
-              echo ':: Fresh user experience PASS'
-            "
+          cd "$FRESH"
+          env -u MCPP_VENDORED_XLINGS "$MCPP" new hello
+          cd hello
+          env -u MCPP_VENDORED_XLINGS "$MCPP" build
+          out=$(env -u MCPP_VENDORED_XLINGS "$MCPP" run 2>&1)
+          echo "$out"
+          echo "$out" | grep -q "Hello from hello" || { echo "FAIL: unexpected output"; exit 1; }
+          echo ":: Fresh user experience PASS"