@deeeed/metamask-harness 0.67.0 → 0.68.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+## 0.68.0 - 2026-09-29
+
+### Changed
+
+- Verify Mobile readiness with one combined status/bridge recipe, retaining device-discovery retries and RPC checks; recognize Lite screens when the release hides the Pro toggle.
+- Restart Metro when build environment inputs change and select the matching transform-cache generation without clearing caches.
+- Forward child checklist progress through the public CLI while retaining the owning step's diff-validation gate.
+- Keep operation and checkout ownership records readable under restrictive umasks, and exclude observation updates from product provenance.
+- Retain command-specific logs and stage observations in `status --watch`; preserve nested operation and checkout ownership across long builds. Pin protocol 0.33.0, recipe-harness 0.21.1, agent-runtime 0.15.1 and expo-recipe 0.12.2 for a consistent runtime dependency tree.
+
+## 0.67.1 - 2026-09-29
+
+### Fixed
+
+- Prepare the selected Android display on cold and ready-path launches. Locked or unreadable states return `MOBILE_DEVICE_LOCKED` or `MOBILE_DEVICE_UI_UNAVAILABLE` without recovery; the internal `--ui-only` mode supports Android.
+- Honor the full Mobile bridge startup deadline with integer probe timeouts and aligned fixture-reset bounds, instead of restarting slow cold starts prematurely. Unresponsive runtimes still fail at the caller's deadline.
+
+### Removed
+
+- The undocumented `MOBILE_BRIDGE_AGENTIC_GRACE_MS` and `MOBILE_BRIDGE_UNRESPONSIVE_GRACE_MS` early-abort settings; use `MOBILE_BRIDGE_READY_TIMEOUT_MS` to set the startup budget.
+
 ## 0.67.0 - 2026-09-28
 
 ### Fixed

package/adapters/mobile/metro-config.cjs

@@ -84,8 +84,12 @@ module.exports = async function harnessMetroConfig(baseConfig) {
     `^${escapeRegExp(tempRoot)}(?:${escapeRegExp(path.sep)}|$)`,
     blockListFlags(existingBlockList),
   );
+  // Inline environment values affect transformed JavaScript. Keep separate
+  // cache generations for those inputs instead of deleting the shared cache.
+  const envFingerprint = process.env.MM_HARNESS_METRO_ENV_FINGERPRINT;
   return {
     ...productConfig,
+    ...(envFingerprint ? { cacheVersion: `${productConfig.cacheVersion ?? ''}:mm-env:${envFingerprint}` } : {}),
     resolver: {
       ...productConfig.resolver,
       blockList: appendBlockList(existingBlockList, tempPattern),

package/adapters/mobile/open-device.sh

@@ -14,7 +14,7 @@
 #   --adb-serial <serial>               Android device serial (default: ADB_SERIAL env)
 #   --preflight-mode fast|auto|rebuild-native|clean  (default: fast; env MOBILE_PREFLIGHT_MODE)
 #   --restart                            terminate the selected app before opening it
-#   --ui-only                           iOS only: show the assigned simulator window without relaunching the app
+#   --ui-only                           prepare the selected device UI without launching the app
 #   MM_HARNESS_SIMULATOR_APP             absolute Simulator.app or DeviceHub.app path; GUI only
 #   MM_HARNESS_SHOW_SIMULATOR=0          opt out of automatic GUI opening
 #   MM_HARNESS_FOCUS_SIMULATOR=1         explicitly open/activate the GUI, even with SHOW_SIMULATOR=0
@@ -69,10 +69,6 @@ if [ "$PLATFORM" = "android" ]; then
   fi
   export MM_HARNESS_ADB_PATH="$ADB_BIN"
 fi
-if $UI_ONLY && [ "$PLATFORM" != "ios" ]; then
-  printf 'open-device: --ui-only is supported only for ios.\n' >&2
-  exit 2
-fi
 
 TARGET="$(cd "$TARGET" && pwd)"
 
@@ -345,6 +341,52 @@ focus_simulator() {
 
 # --- Android helpers ----------------------------------------------------------
 
+prepare_android_display() {
+  local power_state="" wake_state="" trust_state="" lock_state="" _attempt
+  printf 'Waking selected Android device before launch\n' >&2
+  if ! "$ADB_BIN" "${ADB_ARGS[@]}" shell input keyevent KEYCODE_WAKEUP >&2; then
+    printf 'open-device: Android display preparation failed.\nNext: wake and unlock the selected device, then retry.\n' >&2
+    return 1
+  fi
+  for _attempt in {1..12}; do
+    if ! power_state="$("$ADB_BIN" "${ADB_ARGS[@]}" shell dumpsys power)"; then
+      break
+    fi
+    wake_state="$(printf '%s\n' "$power_state" | tr -d '\r' | sed -nE 's/^[[:space:]]*mWakefulness=([^[:space:]]+).*/\1/p' | head -1)"
+    case "$wake_state" in
+      Awake|1) break ;;
+      Asleep|Dozing|Dreaming|0|2|3) sleep 0.25 ;;
+      *) break ;;
+    esac
+  done
+  if [ "$wake_state" != Awake ] && [ "$wake_state" != 1 ]; then
+    printf 'open-device: Android display preparation failed.\nNext: wake the selected device and check adb access, then retry.\n' >&2
+    return 1
+  fi
+  if ! "$ADB_BIN" "${ADB_ARGS[@]}" shell wm dismiss-keyguard >&2; then
+    printf 'open-device: Android display preparation failed.\nNext: unlock the selected device, then retry.\n' >&2
+    return 1
+  fi
+  # OS dismissal can finish asynchronously, and cannot unlock a secure keyguard.
+  for _attempt in {1..12}; do
+    if ! trust_state="$("$ADB_BIN" "${ADB_ARGS[@]}" shell dumpsys trust)"; then
+      printf 'open-device: Android lock state unavailable.\nNext: check adb access and the selected device screen, then retry.\n' >&2
+      return 1
+    fi
+    lock_state="$(printf '%s\n' "$trust_state" | tr -d '\r' | sed -nE '/\(current\):/s/.*deviceLocked=([01]|true|false)(,.*)?$/\1/p')"
+    case "$lock_state" in
+      0|false) return 0 ;;
+      1|true) sleep 0.25 ;;
+      *)
+        printf 'open-device: Android lock state unavailable.\nNext: check adb access and the selected device screen, then retry.\n' >&2
+        return 1
+        ;;
+    esac
+  done
+  printf 'open-device: Android device is locked.\nNext: unlock the selected device, then retry; credentials are never entered automatically.\n' >&2
+  return 1
+}
+
 android_app_installed() {
   local pkg="$1"
   shift
@@ -597,6 +639,10 @@ if [ "$PLATFORM" = "ios" ]; then
 else
   ADB_ARGS=()
   [ -n "$ADB_SERIAL_ARG" ] && ADB_ARGS+=("-s" "$ADB_SERIAL_ARG")
+  if $UI_ONLY; then
+    prepare_android_display
+    exit $?
+  fi
 
   LAUNCHED=false
   for PKG in "${ANDROID_PKGS[@]}"; do
@@ -621,6 +667,8 @@ else
       || printf 'http%%3A%%2F%%2Flocalhost%%3A%s%%3FdisableOnboarding%%3D1' "$PORT")"
     DEEP_LINK="expo-metamask://expo-development-client/?url=${ENCODED_URL}"
 
+    prepare_android_display || exit 1
+
     printf 'Launching Android dev client %s\n' "$PKG" >&2
     if "$ADB_BIN" "${ADB_ARGS[@]}" shell am start \
         -a android.intent.action.VIEW \

package/adapters/mobile/start-metro.sh

@@ -10,6 +10,7 @@
 # Inputs:
 #   --target <metamask-mobile dir>  (default $PWD)
 #   --port <number>                 (default: WATCHER_PORT env, else METRO_PORT, else 8081)
+#   --restart                       restart Metro while retaining its transform cache
 #   --clear                         reset Metro bundler cache before starting
 # Outputs:
 #   Progress on stderr; exit 0 Metro ready; 1 failed to start; 2 bad args.
@@ -20,16 +21,19 @@ set -uo pipefail
 TARGET="$PWD"
 PORT="${WATCHER_PORT:-${METRO_PORT:-8081}}"
 CLEAR=false
+RESTART=false
 
 while [ "$#" -gt 0 ]; do
   case "$1" in
     --target) TARGET="$2"; shift 2 ;;
     --port)   PORT="$2"; shift 2 ;;
     --clear)  CLEAR=true; shift ;;
+    --restart) RESTART=true; shift ;;
     -h|--help)
-      printf 'Usage: start-metro.sh [--target <dir>] [--port <port>] [--clear]\n'
+      printf 'Usage: start-metro.sh [--target <dir>] [--port <port>] [--restart] [--clear]\n'
       printf '  --target  MetaMask Mobile checkout directory\n'
       printf '  --port    Metro port (default: WATCHER_PORT env or 8081)\n'
+      printf '  --restart restart while preserving the transform cache\n'
       printf '  --clear   restart with cleared cache\n'
       exit 0
       ;;
@@ -60,6 +64,9 @@ export MM_HARNESS_METRO_PROJECT_ROOT="$TARGET"
 export MM_HARNESS_METRO_BASE_CONFIG="$PRODUCT_METRO_CONFIG"
 export EXPO_OVERRIDE_METRO_CONFIG="$HARNESS_METRO_CONFIG"
 MOBILE_METRO_REQUIRED_ENV="${MOBILE_METRO_REQUIRED_ENV:-MM_INFURA_PROJECT_ID METAMASK_BUILD_TYPE METAMASK_ENVIRONMENT} MM_HARNESS_METRO_PROJECT_ROOT MM_HARNESS_METRO_BASE_CONFIG EXPO_OVERRIDE_METRO_CONFIG"
+if [ -n "${MM_HARNESS_METRO_ENV_FINGERPRINT:-}" ]; then
+  MOBILE_METRO_REQUIRED_ENV="$MOBILE_METRO_REQUIRED_ENV MM_HARNESS_METRO_ENV_FINGERPRINT"
+fi
 
 # RECIPE_RUNTIME_DIR (relative, validated) makes runtime state per-run so jobs
 # sharing one checkout do not collide on metro.log / metro.pid / metro.tmux.
@@ -212,8 +219,12 @@ fi
 
 # Decide whether to (re)start or skip.
 if metro_ready; then
-  if [ "$CLEAR" = true ]; then
-    printf 'Restarting Metro on port %s with cleared cache\n' "$PORT" >&2
+  if [ "$CLEAR" = true ] || [ "$RESTART" = true ]; then
+    if [ "$CLEAR" = true ]; then
+      printf 'Restarting Metro on port %s with cleared cache\n' "$PORT" >&2
+    else
+      printf 'Restarting Metro on port %s with its transform cache preserved\n' "$PORT" >&2
+    fi
     stop_metro_listener || exit 1
     rm -f "$PID_FILE"
   elif metro_listener_valid; then

package/adapters/mobile/wait-for-bridge.cjs

@@ -22,8 +22,6 @@ const {
 const DEFAULT_MAX_POLLS = 90;
 const DEFAULT_POLL_INTERVAL_MS = 2_000;
 const DEFAULT_PROBE_TIMEOUT_MS = 1_500;
-const DEFAULT_AGENTIC_GRACE_MS = 15_000;
-const DEFAULT_UNRESPONSIVE_GRACE_MS = 12_000;
 const PROGRESS_INTERVAL_MS = 10_000;
 const MAX_HTTP_BODY_BYTES = 2 * 1024 * 1024;
 
@@ -76,15 +74,6 @@ function parseArgs(argv, env = process.env) {
     env.MOBILE_BRIDGE_PROBE_TIMEOUT_MS || String(DEFAULT_PROBE_TIMEOUT_MS),
     'MOBILE_BRIDGE_PROBE_TIMEOUT_MS',
   );
-  const agenticGraceMs = parsePositiveInteger(
-    env.MOBILE_BRIDGE_AGENTIC_GRACE_MS || String(DEFAULT_AGENTIC_GRACE_MS),
-    'MOBILE_BRIDGE_AGENTIC_GRACE_MS',
-  );
-  const unresponsiveGraceMs = parsePositiveInteger(
-    env.MOBILE_BRIDGE_UNRESPONSIVE_GRACE_MS ||
-      String(DEFAULT_UNRESPONSIVE_GRACE_MS),
-    'MOBILE_BRIDGE_UNRESPONSIVE_GRACE_MS',
-  );
 
   return {
     ...options,
@@ -93,8 +82,6 @@ function parseArgs(argv, env = process.env) {
     timeoutMs,
     pollIntervalMs,
     probeTimeoutMs,
-    agenticGraceMs,
-    unresponsiveGraceMs,
   };
 }
 
@@ -128,15 +115,17 @@ function fetchJson(port, pathname, timeoutMs) {
 }
 
 function runBridgeStatus({ bridgePath, target, timeoutMs, env }) {
+  // performance.now() leaves fractional milliseconds near the deadline.
+  const budgetMs = Math.max(1, Math.floor(timeoutMs));
   const result = spawnSync(process.execPath, [bridgePath, 'status'], {
     cwd: target,
     env: {
       ...env,
       APP_ROOT: target,
-      CDP_TIMEOUT: String(timeoutMs),
+      CDP_TIMEOUT: String(budgetMs),
     },
     encoding: 'utf8',
-    timeout: timeoutMs,
+    timeout: budgetMs,
     killSignal: 'SIGTERM',
     maxBuffer: MAX_HTTP_BODY_BYTES,
   });
@@ -154,7 +143,7 @@ function runBridgeStatus({ bridgePath, target, timeoutMs, env }) {
       stdout || stderr
         ? `${stdout}${stderr}`.trimEnd()
         : result.error?.code === 'ETIMEDOUT'
-          ? `bridge status probe exceeded ${timeoutMs}ms`
+          ? `bridge status probe exceeded ${budgetMs}ms`
           : '',
     timedOut: result.error?.code === 'ETIMEDOUT',
   };
@@ -270,26 +259,15 @@ function waitReason(observation, state, config) {
   if (observation.metro === 'no-target') {
     return 'Metro running; no React Native debug target yet';
   }
-  if (state.agenticMissingSince !== null) {
+  if (state.agenticMissing) {
     return 'React Native target answered; in-app bridge not installed yet';
   }
-  if (state.unresponsiveSince !== null) {
+  if (state.unresponsive) {
     return 'React Native target visible; CDP is not answering';
   }
   return 'React Native target answered; waiting for an in-app route';
 }
 
-function failure(kind, startedAt, deadline, now, attempts, lastObservation) {
-  return {
-    ok: false,
-    kind,
-    attempts,
-    elapsedMs: Math.max(0, now - startedAt),
-    remainingMs: Math.max(0, deadline - now),
-    lastObservation,
-  };
-}
-
 async function waitForBridge(config, dependencies = {}) {
   const now = dependencies.now || (() => performance.now());
   const sleep =
@@ -299,11 +277,13 @@ async function waitForBridge(config, dependencies = {}) {
   const progress = dependencies.progress || (() => undefined);
   const status = dependencies.status || (() => undefined);
   const startedAt = now();
+  // Native inspector discovery can precede JavaScript and bridge installation.
+  // Only the caller's startup deadline bounds those intermediate states.
   const deadline = startedAt + config.timeoutMs;
   const state = {
     readyStreak: 0,
-    unresponsiveSince: null,
-    agenticMissingSince: null,
+    unresponsive: false,
+    agenticMissing: false,
   };
   let attempts = 0;
   let nextProgressAt = startedAt;
@@ -328,8 +308,8 @@ async function waitForBridge(config, dependencies = {}) {
 
     if (hasMatchingRoute(lastObservation.statusValue, config.env)) {
       state.readyStreak += 1;
-      state.unresponsiveSince = null;
-      state.agenticMissingSince = null;
+      state.unresponsive = false;
+      state.agenticMissing = false;
       if (state.readyStreak >= 2) {
         return {
           ok: true,
@@ -345,37 +325,13 @@ async function waitForBridge(config, dependencies = {}) {
         (snapshot) => snapshot.agenticPresent === false,
       );
       if (agenticMissing) {
-        state.agenticMissingSince ??= afterProbe;
-        state.unresponsiveSince = null;
-        if (afterProbe - state.agenticMissingSince >= config.agenticGraceMs) {
-          return failure(
-            'agentic-missing',
-            startedAt,
-            deadline,
-            afterProbe,
-            attempts,
-            lastObservation,
-          );
-        }
+        state.agenticMissing = true;
+        state.unresponsive = false;
       } else {
-        state.agenticMissingSince = null;
+        state.agenticMissing = false;
         const targetUnresponsive =
           lastObservation.metro === 'target-visible' && snapshots.length === 0;
-        if (targetUnresponsive) state.unresponsiveSince ??= afterProbe;
-        else state.unresponsiveSince = null;
-        if (
-          state.unresponsiveSince !== null &&
-          afterProbe - state.unresponsiveSince >= config.unresponsiveGraceMs
-        ) {
-          return failure(
-            'target-unresponsive',
-            startedAt,
-            deadline,
-            afterProbe,
-            attempts,
-            lastObservation,
-          );
-        }
+        state.unresponsive = targetUnresponsive;
       }
     }
 
@@ -394,14 +350,15 @@ async function waitForBridge(config, dependencies = {}) {
   }
 
   const endedAt = now();
-  return failure(
-    'deadline',
-    startedAt,
-    deadline,
-    endedAt,
+  return {
+    ok: false,
+    kind: 'deadline',
     attempts,
+    elapsedMs: Math.max(0, endedAt - startedAt),
+    remainingMs: Math.max(0, deadline - endedAt),
+    reason: waitReason(lastObservation, state, config),
     lastObservation,
-  );
+  };
 }
 
 function bundleProgress(logPath) {
@@ -507,21 +464,11 @@ async function main() {
     process.stderr.write(fs.readFileSync(statusLog, 'utf8'));
   } catch {}
   const requested = describeRequested(env);
-  if (result.kind === 'target-unresponsive') {
-    process.stderr.write(
-      `wait-for-bridge: React Native target for ${requested} was visible but CDP did not answer for ${formatSeconds(parsed.unresponsiveGraceMs)} (${formatSeconds(result.elapsedMs)} elapsed, ${formatSeconds(result.remainingMs)} remaining).\n`,
-    );
-  } else if (result.kind === 'agentic-missing') {
-    process.stderr.write(
-      `wait-for-bridge: React Native target for ${requested} answered without __AGENTIC__ for ${formatSeconds(parsed.agenticGraceMs)}.\n`,
-    );
-  } else {
-    process.stderr.write(
-      `wait-for-bridge: readiness deadline expired after ${formatSeconds(result.elapsedMs)} on port ${parsed.port}.\n`,
-    );
-  }
   process.stderr.write(
-    `wait-for-bridge: no bridge target matched the requested ${requested} on port ${parsed.port}.\n`,
+    `wait-for-bridge: readiness deadline expired after ${formatSeconds(result.elapsedMs)} on port ${parsed.port}: ${result.reason}.\n`,
+  );
+  process.stderr.write(
+    `wait-for-bridge: no bridge target matched the requested ${requested} on port ${parsed.port}: ${result.reason}.\n`,
   );
   process.stderr.write(`  requested: ${requested}\n`);
   process.stderr.write(

package/dist/adapters/mobile/prepare.js

@@ -242,7 +242,6 @@ function startMobileConsoleForwarder(target, platform, json, watcherPort) {
   );
 }
 function ensureMobileHumanSurface(target, platform, json, watcherPort) {
-  if (platform !== "ios") return Promise.resolve({ status: 0, output: "" });
   return dispatchAction(
     { id: "ensure-device-ui", cwd: target },
     target,
@@ -271,7 +270,8 @@ async function dispatchActionSequence(requestedActions, target, platform, json,
       platform,
       json,
       preflightMode,
-      watcherPort
+      watcherPort,
+      pendingMetroEnvFingerprint
     );
     if (result.status !== 0) return result;
     if (action.id === "yarn-setup") recordDepsBaseline(resolved);
@@ -379,7 +379,7 @@ function enableIosAccessibility(json) {
     return false;
   }
 }
-async function dispatchAction(action, target, platform, json, preflightMode = "fast", watcherPort) {
+async function dispatchAction(action, target, platform, json, preflightMode = "fast", watcherPort, metroEnvFingerprint) {
   const cwd = action.cwd ?? target;
   switch (action.id) {
     case "yarn-setup": {
@@ -397,7 +397,8 @@ async function dispatchAction(action, target, platform, json, preflightMode = "f
       return spawnScriptStreaming(
         leaf,
         withWatcherPort(["--target", cwd, ...extra], watcherPort),
-        target
+        target,
+        { MM_HARNESS_METRO_ENV_FINGERPRINT: metroEnvFingerprint ?? mobileMetroEnvCheck(path.resolve(target)).fingerprint }
       );
     }
     case "start-console-forwarder": {

package/dist/adapters/mobile/runtime-decision.js

@@ -184,7 +184,9 @@ async function decideMobileReadiness(target, options = {}) {
       env.status === "missing" ? "Metro environment has no successful bundle baseline; restart Metro to load the current environment without clearing its transform cache." : "Metro environment inputs changed since the successful bundle baseline; restart Metro without clearing its transform cache. Pass --clear-metro only if stale transforms are observed.",
       ...report.reasons
     ],
-    actions: report.decision === "ready" ? launchActions(resolved) : report.actions
+    actions: (report.decision === "ready" ? launchActions(resolved) : report.actions).map(
+      (action) => action.id === "start-metro" && !action.argv?.includes("--clear") && !action.argv?.includes("--restart") ? { ...action, argv: [...action.argv ?? [], "--restart"] } : action
+    )
   };
 }
 function writeDepsNote(resolved) {

package/dist/adapters/mobile/verify.js

@@ -1,7 +1,8 @@
-import { execFileSync, spawnSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { spawnScriptStreaming } from "../../commands/shared.js";
 import { readRuntimeContextField } from "../../harness.js";
 import { recipeHarnessPath, recipeHarnessRoot, recipeRuntimeDir, runnerDir } from "../../paths.js";
 const USAGE = "Usage: mm-harness verify --adapter mobile -- [--target <metamask-mobile>] [--artifacts-dir <dir>] [--static-only] [--platform ios|android] [--preflight-mode fast|auto|default|rebuild-native|clean] [--no-auto-start]";
@@ -11,19 +12,6 @@ const AUTO_START_TRUE = ["1", "true", "TRUE", "True", "yes", "YES", "Yes", "on",
 const AUTO_START_FALSE = ["0", "false", "FALSE", "False", "no", "NO", "No", "off", "OFF", "Off", ""];
 const AUTO_START_REFUSAL = "Mobile auto-start is not allowed from product-local scripts. Start or prepare the app through the runner/slot runtime, then rerun verify with --no-auto-start.";
 const EVM_READINESS_EXPRESSION = "(async function(){try{var engine=globalThis.Engine;var controller=engine&&engine.context&&engine.context.NetworkController;if(!controller||typeof controller.getSelectedNetworkClient!=='function')throw new Error('NetworkController selected client is unavailable');var client=controller.getSelectedNetworkClient();if(!client||!client.provider||typeof client.provider.request!=='function')throw new Error('selected EVM provider is unavailable');var result=await client.provider.request({method:'eth_blockNumber'});if(typeof result!=='string'||!/^0x[0-9a-f]+$/i.test(result))throw new Error('eth_blockNumber returned an invalid result');return {ok:true,result:result};}catch(error){return {ok:false,error:error&&(error.message||String(error))};}})()";
-const STATUS_SMOKE_RECIPE = `{
-  "$schema": "https://farmslot.io/schemas/recipe-v1.schema.json",
-  "title": "Mobile runner status smoke",
-  "description": "Checks that the installed runner can read Mobile app status before live verification.",
-  "workflow": {
-    "entry": "status",
-    "nodes": {
-      "status": { "action": "app.status", "intent": "Read Mobile app status through the runner-owned bridge", "next": "done" },
-      "done": { "action": "end", "status": "pass" }
-    }
-  }
-}
-`;
 const LIVE_SMOKE_RECIPE = `{
   "$schema": "https://farmslot.io/schemas/recipe-v1.schema.json",
   "title": "Mobile v1 runner live bridge smoke",
@@ -241,30 +229,21 @@ function mobilePortHolder(port) {
     note: "HTTP /status probing is skipped during live verify because the React Native bridge is the authoritative readiness path for Mobile."
   };
 }
-function spawnToLog(logPath, command, args, options = {}) {
+async function spawnToLog(logPath, command, args, options = {}) {
   fs.mkdirSync(path.dirname(logPath), { recursive: true });
-  const fd = fs.openSync(logPath, "w");
-  try {
-    const result = spawnSync(command, args, {
-      cwd: options.cwd,
-      env: options.env ?? process.env,
-      stdio: ["ignore", fd, fd],
-      ...options.timeoutMs === void 0 ? {} : { timeout: options.timeoutMs }
-    });
-    if (result.error) {
-      const timedOut = result.error.code === "ETIMEDOUT";
-      fs.writeSync(
-        fd,
-        timedOut ? `Timed out after ${(options.timeoutMs ?? 0) / 1e3}s: ${[command, ...args].join(" ")}
-` : `${result.error.message}
-`
-      );
-      return timedOut ? 124 : 127;
-    }
-    return result.status ?? 1;
-  } finally {
-    fs.closeSync(fd);
+  const result = await spawnScriptStreaming(command, args, options.cwd ?? process.cwd(), {
+    env: Object.fromEntries(Object.entries(options.env ?? process.env).filter((entry) => entry[1] !== void 0)),
+    timeoutMs: options.timeoutMs,
+    forward: "none",
+    stage: path.basename(logPath, ".log")
+  });
+  fs.writeFileSync(logPath, result.output);
+  if (result.error) {
+    fs.appendFileSync(logPath, `${result.error.message}
+`);
+    return 127;
   }
+  return result.timedOut ? 124 : result.status;
 }
 function readJsonFile(file) {
   try {
@@ -372,42 +351,6 @@ async function runMobileVerify(argv, io = defaultIo) {
       deviceTarget = platform === "android" ? resolveJsEnvValue(target, "ADB_SERIAL") || resolveJsEnvValue(target, "ANDROID_DEVICE") : resolveJsEnvValue(target, "IOS_SIMULATOR");
     }
     const deviceArgs = deviceTarget ? ["--device", deviceTarget] : [];
-    const statusSmokeRecipe = path.join(artifacts, "mobile-status-smoke.recipe.json");
-    const precheckLog = path.join(artifacts, "logs/app-status-precheck.log");
-    let liveRuntimeOk = false;
-    for (let attempt = 1; attempt <= 5; attempt += 1) {
-      fs.writeFileSync(statusSmokeRecipe, STATUS_SMOKE_RECIPE);
-      const code = spawnToLog(precheckLog, runnerBin, [
-        "run",
-        statusSmokeRecipe,
-        "--adapter",
-        "mobile",
-        "--target",
-        target,
-        ...deviceArgs,
-        "--watcher-port",
-        port,
-        "--artifacts-dir",
-        path.join(artifacts, "runner-status-smoke"),
-        "--json"
-      ], { cwd: target });
-      if (code === 0) {
-        liveRuntimeOk = true;
-        break;
-      }
-      const deviceNotFound = /"code"[ \t]*:[ \t]*"DEVICE_NOT_FOUND"/u.test(
-        fs.readFileSync(precheckLog, "utf8")
-      );
-      if (attempt < 5 && deviceNotFound) {
-        io.err(`Waiting for Mobile device discovery (${attempt}/5): ${deviceTarget || "configured target"}`);
-        await sleep(1e3);
-        continue;
-      }
-      break;
-    }
-    if (!liveRuntimeOk && autoStart) io.err(AUTO_START_REFUSAL);
-    checks.push(liveRuntimeOk ? { name: "mobile runtime controllable precheck", status: "pass" } : { name: "mobile runtime controllable precheck", status: "fail", detail: "see logs/app-status-precheck.log" });
-    if (!liveRuntimeOk) status = "fail";
     fixtureStatus = mobileFixtureStatus(target);
     fs.writeFileSync(path.join(artifacts, "logs/fixture-status.json"), `${JSON.stringify(fixtureStatus)}
 `);
@@ -423,20 +366,19 @@ async function runMobileVerify(argv, io = defaultIo) {
     portHolder = mobilePortHolder(port);
     fs.writeFileSync(path.join(artifacts, "logs/port-holder.json"), `${JSON.stringify(portHolder)}
 `);
-    if (status !== "fail" && portHolder.listening) {
+    if (!checks.some((check) => check.status === "fail") && portHolder.listening) {
       const waiter = path.join(runnerDir, "adapters/mobile/wait-for-bridge.sh");
       if (!fs.existsSync(waiter)) {
         addNote("Mobile bridge settle skipped: wait-for-bridge.sh not found under the runner adapters; reinstall the runner.");
       } else {
-        const waiterCode = spawnToLog(
+        const waiterCode = await spawnToLog(
           path.join(artifacts, "logs/wait-for-bridge.log"),
           "bash",
           [waiter, "--target", target, "--port", port, "--platform", platform],
           {
             env: {
               ...process.env,
-              MOBILE_BRIDGE_READY_TIMEOUT_MS: process.env.MOBILE_BRIDGE_READY_TIMEOUT_MS || "90000",
-              MOBILE_BRIDGE_UNRESPONSIVE_GRACE_MS: process.env.MOBILE_BRIDGE_UNRESPONSIVE_GRACE_MS || "90000"
+              MOBILE_BRIDGE_READY_TIMEOUT_MS: process.env.MOBILE_BRIDGE_READY_TIMEOUT_MS || "90000"
             }
           }
         );
@@ -447,34 +389,45 @@ async function runMobileVerify(argv, io = defaultIo) {
     fs.writeFileSync(liveSmokeRecipe, LIVE_SMOKE_RECIPE);
     const iosSimulatorResolved = resolveJsEnvValue(target, "IOS_SIMULATOR");
     const adbSerialResolved = resolveJsEnvValue(target, "ADB_SERIAL");
-    const liveSmokeCode = spawnToLog(
-      path.join(artifacts, "logs/runner-live-smoke.log"),
-      runnerBin,
-      [
-        "run",
-        liveSmokeRecipe,
-        "--adapter",
-        "mobile",
-        "--target",
-        target,
-        ...deviceArgs,
-        "--watcher-port",
-        port,
-        "--artifacts-dir",
-        path.join(artifacts, "runner-live-smoke"),
-        "--json"
-      ],
-      {
-        cwd: target,
-        env: {
-          ...process.env,
-          METAMASK_RECIPE_AUTO_HUD: "0",
-          IOS_SIMULATOR: process.env.IOS_SIMULATOR || iosSimulatorResolved,
-          ADB_SERIAL: process.env.ADB_SERIAL || adbSerialResolved,
-          ANDROID_SERIAL: process.env.ANDROID_SERIAL || adbSerialResolved
+    let liveSmokeCode = 1;
+    for (let attempt = 1; attempt <= 5; attempt += 1) {
+      liveSmokeCode = await spawnToLog(
+        path.join(artifacts, "logs/runner-live-smoke.log"),
+        runnerBin,
+        [
+          "run",
+          liveSmokeRecipe,
+          "--adapter",
+          "mobile",
+          "--target",
+          target,
+          ...deviceArgs,
+          "--watcher-port",
+          port,
+          "--artifacts-dir",
+          path.join(artifacts, "runner-live-smoke"),
+          "--json"
+        ],
+        {
+          cwd: target,
+          env: {
+            ...process.env,
+            METAMASK_RECIPE_AUTO_HUD: "0",
+            IOS_SIMULATOR: process.env.IOS_SIMULATOR || iosSimulatorResolved,
+            ADB_SERIAL: process.env.ADB_SERIAL || adbSerialResolved,
+            ANDROID_SERIAL: process.env.ANDROID_SERIAL || adbSerialResolved
+          }
         }
-      }
-    );
+      );
+      if (liveSmokeCode === 0) break;
+      const deviceNotFound = /"code"[ \t]*:[ \t]*"DEVICE_NOT_FOUND"/u.test(
+        fs.readFileSync(path.join(artifacts, "logs/runner-live-smoke.log"), "utf8")
+      );
+      if (!deviceNotFound || attempt === 5) break;
+      io.err(`Waiting for Mobile device discovery (${attempt}/5): ${deviceTarget || "configured target"}`);
+      await sleep(1e3);
+    }
+    if (liveSmokeCode !== 0 && autoStart) io.err(AUTO_START_REFUSAL);
     if (liveSmokeCode === 0) {
       checks.push({ name: "runner v1 live bridge smoke", status: "pass" });
     } else {
@@ -489,7 +442,7 @@ async function runMobileVerify(argv, io = defaultIo) {
       fs.writeFileSync(evmLog, `Mobile bridge is missing at ${bridge}
 `);
     } else {
-      const evmCode = spawnToLog(evmLog, process.execPath, [bridge, "eval-async", EVM_READINESS_EXPRESSION], {
+      const evmCode = await spawnToLog(evmLog, process.execPath, [bridge, "eval-async", EVM_READINESS_EXPRESSION], {
         timeoutMs: 25e3,
         env: {
           ...process.env,