@deeeed/metamask-harness 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.6.1 - 2026-07-06
+
+Fresh-install fixes found live on a published-0.6.0 install.
+
+### Fixed
+- **Mobile `launch` no longer dies on empty `METAMASK_BUILD_TYPE`** — the quick-launch runs `expo start` directly (bypassing scripts/build.sh, which passes the build type as an arg); the fixture `.js.env` shipped `METAMASK_BUILD_TYPE=""`, which Metro's transform rejects (`Invalid METAMASK_BUILD_TYPE`). start-metro now defaults to the main dev client when unset, so already-installed slots launch without re-syncing fixtures.
+- **`doctor` no longer false-flags orphan Metros** — the detector matched any argv containing "metro" (caught the `tail -F metro.log` viewer) and reported the live, valid bundler as leaked. Now it matches only `expo start` bundlers and excludes the one serving the current port.
+
+### Internal
+- Reap-checkout-metros test hardened against a SIGTERM timing flake (polls for exit).
 ## 0.6.0 - 2026-07-06
 
 Minor release: CLI hardening (decomposed, single-parser, dist-only) plus a

package/adapters/mobile/start-metro.sh

@@ -117,6 +117,12 @@ printf '(Full log: %s — mm-harness logs | mm-harness logs --full)\n' "$LOG_FIL
   # shellcheck disable=SC1091
   [ ! -f .env.local ] || . ./.env.local
   set +a
+  # The quick-launch runs `expo start` directly, bypassing scripts/build.sh which
+  # passes the build type as an argument (start:ios = build.sh ios main dev). The
+  # fixture .js.env ships METAMASK_BUILD_TYPE="" (empty), which Metro's transform
+  # rejects. Default to the main dev client (what runway installs / launch targets)
+  # so already-installed slots work without re-syncing fixtures.
+  [ -n "${METAMASK_BUILD_TYPE:-}" ] || export METAMASK_BUILD_TYPE=main
   export EXPO_NO_TYPESCRIPT_SETUP=1
   export WATCHER_PORT="${PORT}" METRO_PORT="${PORT}"
   export METRO_MAX_WORKERS="${METRO_WORKERS}"

package/adapters/shared/reap-checkout-metros.sh

@@ -1,32 +1,38 @@
 #!/usr/bin/env bash
-# reap-checkout-metros.sh — kill EVERY Metro/Expo bundler bound to a given
-# checkout, regardless of port. Port-scoped stop leaks a bundler whenever a
-# launch drifts ports or fails to record its pid; this sweeps them by checkout
-# path so `stop` fully cleans up and `launch` starts from zero.
+# reap-checkout-metros.sh — find/kill Metro (Expo) bundlers bound to a checkout.
+# The harness starts Metro exactly one way: `yarn expo start`. Match ONLY that
+# signature — matching bare "metro" also caught the `tail -F …/metro.log` viewer
+# and other noise, producing false orphans.
 #
-#   reap_checkout_metros <checkout-abs-path> [keep-pid]
-# keep-pid (optional): a pid to spare (the bundler just started/handled).
+#   reap_checkout_metros  <checkout-abs-path> [keep-pid]
+#   detect_checkout_metros <checkout-abs-path> [live-port]
+# reap kills every bundler for the checkout (stop wants a clean slate), sparing
+# keep-pid. detect lists orphans for doctor and EXCLUDES the bundler serving
+# live-port (the currently-running valid Metro is not a leak).
+
+_checkout_metro_pids() {
+  # pids of `expo start` bundlers whose argv references this checkout (boundary
+  # anchored so /repos/mm-1 never matches /repos/mm-10).
+  local repo="$1" pid args
+  while IFS= read -r pid; do
+    [ -n "$pid" ] || continue
+    args="$(ps -o args= -p "$pid" 2>/dev/null || true)"
+    case "$args" in *"$repo/"*|*"$repo "*) : ;; *) continue ;; esac
+    case "$args" in *"expo start"*) printf '%s\n' "$pid" ;; esac
+  done <<LIST
+$(pgrep -f "expo start" 2>/dev/null)
+LIST
+}
+
 reap_checkout_metros() {
-  local repo="$1" keep="${2:-}" reaped=""
+  local repo="$1" keep="${2:-}" reaped="" pid
   [ -n "$repo" ] || return 0
-  # Match the bundler's argv: `expo start` / metro under this checkout. ps argv
-  # embeds the cwd-launched command; expo/metro run with the repo on the path.
-  local pid args
   while IFS= read -r pid; do
     [ -n "$pid" ] || continue
     [ "$pid" = "$keep" ] && continue
-    args="$(ps -o args= -p "$pid" 2>/dev/null || true)"
-    # Anchor to a path boundary so /repos/mm-1 does not match /repos/mm-10.
-    case "$args" in
-      *"$repo/"*|*"$repo "*) : ;;  # argv references this checkout
-      *) continue ;;
-    esac
-    case "$args" in
-      *"expo start"*|*"metro"*|*"react-native/cli"*|*"@react-native-community/cli"*)
-        kill "$pid" 2>/dev/null && reaped="$reaped $pid" ;;
-    esac
+    kill "$pid" 2>/dev/null && reaped="$reaped $pid"
   done <<LIST
-$(pgrep -f "expo start|metro" 2>/dev/null)
+$(_checkout_metro_pids "$repo")
 LIST
   if [ -n "$reaped" ]; then
     printf 'Reaped leaked Metro bundler(s) for this checkout:%s\n' "$reaped" >&2
@@ -34,20 +40,19 @@ LIST
   return 0
 }
 
-# detect_checkout_metros <checkout-abs-path> — print pids of every metro/expo
-# bundler bound to the checkout, one per line, WITHOUT killing. Powers doctor's
-# orphan visibility so leaked bundlers are surfaced without a launch.
 detect_checkout_metros() {
-  local repo="$1" pid args
+  local repo="$1" live_port="${2:-}" pid args
   [ -n "$repo" ] || return 0
   while IFS= read -r pid; do
     [ -n "$pid" ] || continue
-    args="$(ps -o args= -p "$pid" 2>/dev/null || true)"
-    case "$args" in *"$repo/"*|*"$repo "*) : ;; *) continue ;; esac
-    case "$args" in
-      *"expo start"*|*"metro"*|*"react-native/cli"*|*"@react-native-community/cli"*) printf '%s\n' "$pid" ;;
-    esac
+    # A bundler serving the currently-managed port is the LIVE valid Metro, not
+    # an orphan — exclude it so doctor never flags the running server.
+    if [ -n "$live_port" ]; then
+      args="$(ps -o args= -p "$pid" 2>/dev/null || true)"
+      case "$args" in *"--port $live_port"*|*"--port=$live_port"*) continue ;; esac
+    fi
+    printf '%s\n' "$pid"
   done <<LIST
-$(pgrep -f "expo start|metro" 2>/dev/null)
+$(_checkout_metro_pids "$repo")
 LIST
 }

package/dist/commands/doctor.js

@@ -43,7 +43,7 @@ async function handleDoctor({ options }) {
     runtime = await surface.runtimeStatus(target);
   } catch {
   }
-  const orphanMetros = adapter === "mobile" ? detectOrphanMetros(target) : [];
+  const orphanMetros = adapter === "mobile" ? detectOrphanMetros(target, process.env.WATCHER_PORT) : [];
   if (json) console.log(JSON.stringify({ ...result, runtime, orphanMetros }, null, 2));
   else {
     const out = (style, text) => color(style, text, { stream: process.stdout });
@@ -70,10 +70,10 @@ async function handleDoctor({ options }) {
   }
   return result.status === "pass" ? 0 : 1;
 }
-function detectOrphanMetros(target) {
+function detectOrphanMetros(target, livePort) {
   try {
     const script = path.join(runnerDir, "adapters/shared/reap-checkout-metros.sh");
-    const out = execFileSync("bash", ["-c", `. "$1"; detect_checkout_metros "$2"`, "mm-harness-doctor", script, target], {
+    const out = execFileSync("bash", ["-c", `. "$1"; detect_checkout_metros "$2" "$3"`, "mm-harness-doctor", script, target, livePort ?? ""], {
       encoding: "utf8",
       timeout: 5e3
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deeeed/metamask-harness",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "bin": {
     "mm-harness": "bin/mm-harness"