@deeeed/metamask-harness 0.33.0 → 0.33.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.33.1 - 2026-08-04
+
+### Fixed
+
+- Make Mobile onboarding deterministic by pinning provisioning, native builds, launch, and readiness to one simulator UDID and Metro port, while ensuring `doctor --fix` enables Perps without inventing `OVERRIDE_REMOTE_FEATURE_FLAGS`.
+
 ## 0.33.0 - 2026-08-03
 
 ### Added

package/adapters/mobile/open-device.sh

@@ -23,7 +23,7 @@ set -uo pipefail
 
 PLATFORM="ios"
 TARGET="$PWD"
-SIMULATOR="${IOS_SIMULATOR:-${SIM_UDID:-booted}}"
+SIMULATOR="${SIM_UDID:-${IOS_SIMULATOR:-booted}}"
 ADB_SERIAL_ARG="${ADB_SERIAL:-${ANDROID_SERIAL:-}}"
 ADB_BIN="${MM_HARNESS_ADB_PATH:-}"
 PREFLIGHT_MODE="${MOBILE_PREFLIGHT_MODE:-fast}"
@@ -89,15 +89,42 @@ ios_app_installed() {
   xcrun simctl get_app_container "$sim_target" "$bundle_id" app >/dev/null 2>&1
 }
 
-run_ios_native_build() {
-  local sim_target="$1" reason="$2"
+run_ios_native_build() (
+  local sim_target="$1" reason="$2" build_env=""
   printf '%s; installing with yarn start:ios (WATCHER_PORT=%s)\n' "$reason" "$PORT" >&2
+  build_env="$(mktemp "${TMPDIR:-/tmp}/mm-harness-ios-build-env.XXXXXX")" || return 1
+  chmod 600 "$build_env" || { rm -f "$build_env"; return 1; }
+  trap 'rm -f "$build_env"' EXIT HUP INT TERM
+  {
+    printf 'export MM_HARNESS_BUILD_WATCHER_PORT=%q\n' "$PORT"
+    printf 'export MM_HARNESS_BUILD_IOS_SIMULATOR=%q\n' "$sim_target"
+    cat <<'BUILD_ENV'
+mm_harness_restore_build_target() {
+  export WATCHER_PORT="$MM_HARNESS_BUILD_WATCHER_PORT"
+  export METRO_PORT="$MM_HARNESS_BUILD_WATCHER_PORT"
+  export IOS_SIMULATOR="$MM_HARNESS_BUILD_IOS_SIMULATOR"
+}
+eval() {
+  builtin eval "$@"
+  local status=$?
+  mm_harness_restore_build_target
+  return "$status"
+}
+source() {
+  builtin source "$@"
+  local status=$?
+  mm_harness_restore_build_target
+  return "$status"
+}
+mm_harness_restore_build_target
+BUILD_ENV
+  } > "$build_env"
   (
     cd "$TARGET"
     command -v activate_repo_ruby_best_effort >/dev/null 2>&1 && activate_repo_ruby_best_effort "$TARGET"
-    WATCHER_PORT="$PORT" METRO_PORT="$PORT" IOS_SIMULATOR="$sim_target" EXPO_NO_TYPESCRIPT_SETUP=1 yarn start:ios 2>&1
+    BASH_ENV="$build_env" WATCHER_PORT="$PORT" METRO_PORT="$PORT" IOS_SIMULATOR="$sim_target" EXPO_NO_TYPESCRIPT_SETUP=1 yarn start:ios 2>&1
   )
-}
+)
 
 ensure_ios_app_for_mode() {
   local sim_target="$1" bundle_id="$2" mode="$3"
@@ -107,7 +134,6 @@ ensure_ios_app_for_mode() {
       printf >&2 'open-device: fast mode requires an installed iOS dev client (%s) on %s.\n' \
         "$bundle_id" "$sim_target"
       printf >&2 'Fast mode only prewarms the bundle and opens the existing client.\n'
-      printf >&2 'Next: use --preflight-mode auto to install if missing.\n'
       return 1
       ;;
     auto|default)
@@ -124,10 +150,6 @@ ensure_ios_app_for_mode() {
 
 sim_udid_for_target() {
   local target="$1"
-  # Already a UDID
-  if printf '%s' "$target" | grep -Eq '^[0-9A-Fa-f-]{36}$'; then
-    printf '%s\n' "$target"; return 0
-  fi
   xcrun simctl list devices available --json 2>/dev/null | TARGET_SIMULATOR="$target" node -e '
 let input = "";
 process.stdin.setEncoding("utf8");
@@ -136,34 +158,54 @@ process.stdin.on("end", () => {
   const target = process.env.TARGET_SIMULATOR || "";
   try {
     const parsed = JSON.parse(input);
-    for (const devices of Object.values(parsed.devices || {})) {
-      const found = Array.isArray(devices)
-        ? devices.find((device) => device && device.isAvailable !== false && device.name === target)
-        : null;
-      if (found && found.udid) {
-        process.stdout.write(`${found.udid}\n`);
-        return;
+    const devices = Object.values(parsed.devices || {}).flatMap((value) => Array.isArray(value) ? value : [])
+      .filter((device) => device && device.isAvailable !== false && device.udid);
+    const matches = /^[0-9A-Fa-f-]{36}$/.test(target)
+      ? devices.filter((device) => device.udid.toLowerCase() === target.toLowerCase())
+      : target === "booted"
+        ? devices.filter((device) => device.state === "Booted")
+        : devices.filter((device) => device.name === target);
+    const booted = matches.filter((device) => device.state === "Booted");
+    const found = matches.length === 1 ? matches[0] : booted.length === 1 ? booted[0] : null;
+    if (found) {
+      process.stdout.write(`${found.udid}\n`);
+      return;
+    }
+    if (matches.length > 1) {
+      process.stderr.write(`open-device: iOS simulator target ${JSON.stringify(target)} is ambiguous; use one UDID:\n`);
+      for (const device of matches) {
+        process.stderr.write(`  - ${device.udid} (${device.name}) [${device.state || "unknown"}]\n`);
       }
+      process.exit(2);
     }
+    process.exit(1);
   } catch {
-    // Empty stdout means unresolved; callers print the teaching error.
+    process.exit(1);
   }
 });
 '
 }
 
+print_missing_simulator_recovery() {
+  local target="$1"
+  if printf '%s' "$target" | grep -Eq '^[0-9A-Fa-f-]{36}$'; then
+    printf "Next: mm-harness status --adapter mobile --target '%s' --all-devices --json\n" "$TARGET" >&2
+  else
+    printf "Next: mm-harness provision runway ios --adapter mobile --target '%s' --device '%s'\n" "$TARGET" "$target" >&2
+  fi
+}
+
 boot_simulator_if_needed() {
   local target="$1" state=""
-  [ "$target" != "booted" ] || return 0
   local udid=""
   udid="$(sim_udid_for_target "$target")"
   if [ -z "$udid" ]; then
     printf "open-device: configured iOS simulator '%s' does not exist.\n" "$target" >&2
-    printf "Next: mm-harness provision runway ios --adapter mobile --target '%s' --device '%s'\n" "$TARGET" "$target" >&2
+    print_missing_simulator_recovery "$target"
     return 1
   fi
   local line=""
-  line="$(xcrun simctl list devices available 2>/dev/null | grep -F "${target} (" | head -1 || true)"
+  line="$(xcrun simctl list devices available 2>/dev/null | grep -F "(${udid})" | head -1 || true)"
   case "$line" in *"(Booted)"*) state="Booted" ;; *"(Shutdown)"*) state="Shutdown" ;; esac
   [ "$state" = "Booted" ] && return 0
   printf 'Booting iOS simulator %s%s\n' "$target" "${state:+ ($state)}" >&2
@@ -235,7 +277,6 @@ ensure_android_app_for_mode() {
     fast)
       if android_app_installed "$pkg" "$@"; then return 0; fi
       printf >&2 'open-device: fast mode requires an installed Android dev client (%s).\n' "$pkg"
-      printf >&2 'Next: use --preflight-mode auto to install if missing.\n'
       return 1
       ;;
     auto|default)
@@ -264,7 +305,17 @@ BUNDLE_IDS=("${IOS_BUNDLE_ID:-io.metamask.MetaMask}" "io.metamask" "io.metamask.
 ANDROID_PKGS=("${ANDROID_PACKAGE_ID:-io.metamask}" "io.metamask.flask" "io.metamask.qa")
 
 if [ "$PLATFORM" = "ios" ]; then
-  SIM_TARGET="$SIMULATOR"
+  SIM_TARGET="$(sim_udid_for_target "$SIMULATOR")"
+  SIM_RESOLVE_STATUS=$?
+  if [ "$SIM_RESOLVE_STATUS" -ne 0 ]; then
+    if [ "$SIM_RESOLVE_STATUS" -eq 1 ]; then
+      printf "open-device: configured iOS simulator '%s' does not exist.\n" "$SIMULATOR" >&2
+      print_missing_simulator_recovery "$SIMULATOR"
+    else
+      printf "Next: mm-harness status --adapter mobile --target '%s' --all-devices --json\n" "$TARGET" >&2
+    fi
+    exit 1
+  fi
   # Expo dev-client URL scheme — drives both the deep link and the scheme-approval key.
   DEV_CLIENT_SCHEME="${IOS_DEV_CLIENT_SCHEME:-expo-metamask}"
 
@@ -319,6 +370,7 @@ if [ "$PLATFORM" = "ios" ]; then
   if [ "$LAUNCHED" = false ]; then
     printf 'open-device: no MetaMask bundle found on simulator %s\n' "$SIM_TARGET" >&2
     printf '  tried: %s\n' "${BUNDLE_IDS[*]}" >&2
+    printf "Next: mm-harness provision runway ios --adapter mobile --target '%s' --device '%s' --force\n" "$TARGET" "$SIM_TARGET" >&2
     exit 1
   fi
 
@@ -356,6 +408,11 @@ else
     printf 'open-device: no MetaMask package found on Android device %s\n' \
       "${ADB_SERIAL_ARG:-<default>}" >&2
     printf '  tried: %s\n' "${ANDROID_PKGS[*]}" >&2
+    if [ -n "$ADB_SERIAL_ARG" ]; then
+      printf "Next: mm-harness launch android --build --target '%s' --device '%s'\n" "$TARGET" "$ADB_SERIAL_ARG" >&2
+    else
+      printf "Next: mm-harness launch android --build --target '%s'\n" "$TARGET" >&2
+    fi
     exit 1
   fi
 fi

package/adapters/shared/resolve-slot-ports-core.mjs

@@ -2,6 +2,7 @@
 // Reads the orchestrator's pool JSON (the on-disk `pool/` directory) when a slot
 // repo matches, else the local-extension-N suffix formula.
 
+import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -31,6 +32,7 @@ export function formatKvLines(kv) {
   if (kv.WATCHER_PORT !== undefined) lines.push(`WATCHER_PORT=${kv.WATCHER_PORT}`);
   if (kv.SLOT_ID) lines.push(`SLOT_ID=${kv.SLOT_ID}`);
   if (kv.IOS_SIMULATOR) lines.push(`IOS_SIMULATOR=${kv.IOS_SIMULATOR}`);
+  if (kv.SIM_UDID) lines.push(`SIM_UDID=${kv.SIM_UDID}`);
   if (kv.ADB_SERIAL) lines.push(`ADB_SERIAL=${kv.ADB_SERIAL}`);
   if (kv.ANDROID_DEVICE) lines.push(`ANDROID_DEVICE=${kv.ANDROID_DEVICE}`);
   return lines.length ? `${lines.join('\n')}\n` : '';
@@ -239,10 +241,15 @@ export function resolveMobileRuntimeContext(repo) {
       const c = JSON.parse(fs.readFileSync(ctxPath, 'utf8'));
       const adbSerial = c.adbSerial ?? c.androidSerial;
       const androidDevice = c.androidDevice;
-      if (c.simulator || adbSerial || androidDevice || (c.metroPort != null && c.metroPort !== '')) {
+      const contextUdid = c.simulatorUdid && iosSimulatorExists(c.simulatorUdid)
+        ? c.simulatorUdid
+        : matchingProvisionedSimulatorUdid(repo, c.simulator);
+      const simulator = c.simulator ?? contextUdid;
+      if (simulator || adbSerial || androidDevice || (c.metroPort != null && c.metroPort !== '')) {
         return formatKvLines({
           ...(c.metroPort != null && c.metroPort !== '' ? { WATCHER_PORT: c.metroPort } : {}),
-          ...(c.simulator ? { IOS_SIMULATOR: c.simulator } : {}),
+          ...(simulator ? { IOS_SIMULATOR: simulator } : {}),
+          ...(contextUdid ? { SIM_UDID: contextUdid } : {}),
           ...(adbSerial ? { ADB_SERIAL: adbSerial } : {}),
           ...(androidDevice ? { ANDROID_DEVICE: androidDevice } : {}),
           ...(c.slotId ? { SLOT_ID: c.slotId } : {}),
@@ -255,6 +262,21 @@ export function resolveMobileRuntimeContext(repo) {
   return resolveMobileProvisionBaseline(repo);
 }
 
+function matchingProvisionedSimulatorUdid(repo, simulator) {
+  if (!simulator) return undefined;
+  const basePath = path.join(repo, recipeRuntimeDir(), 'runway-provision.json');
+  try {
+    const c = JSON.parse(fs.readFileSync(basePath, 'utf8'));
+    const recordedUdid = c.simulator?.udid;
+    const recordedName = c.simulator?.name;
+    const matches = simulator === recordedName ||
+      (recordedUdid && simulator.toLowerCase() === recordedUdid.toLowerCase());
+    return matches && recordedUdid && iosSimulatorExists(recordedUdid) ? recordedUdid : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 // A provisioned-but-unprepared slot has no agentic-runtime.json yet, but the
 // provision baseline records the same authoritative simulator/port identity —
 // without it, a fresh slot's first launch degrades to the simctl `booted`
@@ -264,12 +286,16 @@ function resolveMobileProvisionBaseline(repo) {
   if (!fs.existsSync(basePath)) return null;
   try {
     const c = JSON.parse(fs.readFileSync(basePath, 'utf8'));
-    const simulator = c.simulator?.name || c.simulator?.udid;
+    const recordedUdid = c.simulator?.udid;
+    const recordedName = c.simulator?.name;
+    const validUdid = recordedUdid && iosSimulatorExists(recordedUdid) ? recordedUdid : undefined;
+    const simulator = recordedName || validUdid || recordedUdid;
     const watcherPort = c.watcherPort != null && c.watcherPort !== '' ? c.watcherPort : undefined;
     if (!simulator && watcherPort === undefined) return null;
     return formatKvLines({
       ...(watcherPort !== undefined ? { WATCHER_PORT: watcherPort } : {}),
       ...(simulator ? { IOS_SIMULATOR: simulator } : {}),
+      ...(validUdid ? { SIM_UDID: validUdid } : {}),
       ...(c.slotId ? { SLOT_ID: c.slotId } : {}),
     });
   } catch {
@@ -277,6 +303,21 @@ function resolveMobileProvisionBaseline(repo) {
   }
 }
 
+function iosSimulatorExists(udid) {
+  try {
+    const output = execFileSync(
+      'xcrun',
+      ['simctl', 'list', 'devices', 'available', '--json'],
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000 },
+    );
+    const devices = Object.values(JSON.parse(output).devices ?? {}).flat();
+    return devices.some((device) =>
+      device?.udid?.toLowerCase() === String(udid).toLowerCase() && device.isAvailable !== false);
+  } catch {
+    return false;
+  }
+}
+
 export function resolveMobileRuntimePorts(repo) {
   return (
     resolveMobileRuntimeContext(repo)

package/adapters/shared/resolve-slot-ports.sh

@@ -118,6 +118,9 @@ apply_resolved_mobile_ports() {
       IOS_SIMULATOR)
         if [ "$from_pool" = true ] || [ -z "${IOS_SIMULATOR:-}" ]; then IOS_SIMULATOR="$val"; fi
         ;;
+      SIM_UDID)
+        if [ "$from_pool" = true ] || [ -z "${SIM_UDID:-}" ]; then SIM_UDID="$val"; fi
+        ;;
       SLOT_ID)
         if [ "$from_pool" = true ] || [ -z "${RECIPE_SLOT_ID:-}" ]; then RECIPE_SLOT_ID="$val"; fi
         ;;

package/dist/adapters/mobile/perps-env.js

@@ -2,8 +2,7 @@ import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 const DEFAULTS = {
-  MM_PERPS_ENABLED: "true",
-  OVERRIDE_REMOTE_FEATURE_FLAGS: "true"
+  MM_PERPS_ENABLED: "true"
 };
 function mobilePerpsEnvironment(target) {
   const file = path.join(target, ".js.env");
@@ -14,16 +13,14 @@ function mobilePerpsEnvironment(target) {
   return {
     file: ".js.env",
     fileExists,
-    status: perpsEnabled.status === "missing" || remoteFeatureFlagOverride.status === "missing" ? "incomplete" : "ready",
+    status: perpsEnabled.status === "missing" ? "incomplete" : "ready",
     perpsEnabled,
     remoteFeatureFlagOverride
   };
 }
 function ensureMobilePerpsEnvironment(target) {
   const current = mobilePerpsEnvironment(target);
-  const missing = Object.keys(DEFAULTS).filter(
-    (key) => settingForKey(current, key).status === "missing"
-  );
+  const missing = current.perpsEnabled.status === "missing" ? ["MM_PERPS_ENABLED"] : [];
   if (missing.length === 0) return [];
   const file = path.join(fs.realpathSync(target), current.file);
   const snapshot = readEnvironmentSnapshot(file);
@@ -84,9 +81,6 @@ function readSetting(source, key) {
   if (value === "false") return { status: "disabled", value };
   return { status: "configured", value };
 }
-function settingForKey(environment, key) {
-  return key === "MM_PERPS_ENABLED" ? environment.perpsEnabled : environment.remoteFeatureFlagOverride;
-}
 function normalizeValue(raw) {
   const value = raw.trim();
   if (value.length >= 2) {

package/dist/adapters/mobile/prepare.js

@@ -402,6 +402,7 @@ async function dispatchAction(action, target, platform, json, preflightMode = "f
     }
     case "launch-mobile-runtime": {
       const leaf = path.join(runnerDir, "adapters/mobile/open-device.sh");
+      const simulatorArgs = platform === "ios" ? ["--simulator", process.env.SIM_UDID || process.env.IOS_SIMULATOR || "booted"] : [];
       return spawnScriptStreaming(
         leaf,
         withWatcherPort(
@@ -412,6 +413,7 @@ async function dispatchAction(action, target, platform, json, preflightMode = "f
             cwd,
             "--preflight-mode",
             preflightMode,
+            ...simulatorArgs,
             ...action.argv ?? []
           ],
           watcherPort
@@ -422,10 +424,11 @@ async function dispatchAction(action, target, platform, json, preflightMode = "f
     }
     case "ensure-device-ui": {
       const leaf = path.join(runnerDir, "adapters/mobile/open-device.sh");
+      const simulatorArgs = platform === "ios" ? ["--simulator", process.env.SIM_UDID || process.env.IOS_SIMULATOR || "booted"] : [];
       return spawnScriptStreaming(
         leaf,
         withWatcherPort(
-          ["--platform", platform, "--target", cwd, "--ui-only"],
+          ["--platform", platform, "--target", cwd, ...simulatorArgs, "--ui-only"],
           watcherPort
         ),
         target,

package/dist/adapters/mobile/provision.js

@@ -12,6 +12,8 @@ const RUNWAY_IOS_METADATA = {
   appDirName: "MetaMask.app",
   fallbackRepo: "MetaMask/metamask-mobile"
 };
+class SimulatorTargetError extends Error {
+}
 function resolvePoolIdentity(target) {
   const out = resolveSlotPortsByRepo(target);
   const id = {};
@@ -35,7 +37,7 @@ async function provisionRunwayMobile(target, options) {
   if (platform !== "ios") {
     return fail(resolvedTarget, platform, "UNSUPPORTED_PLATFORM", "runway provisioning currently installs the iOS .app artifact only.", command, slot);
   }
-  let simulator = options.simulator ?? slot.simulator ?? process.env.IOS_SIMULATOR;
+  let simulator = options.simulator ?? slot.simulatorUdid ?? slot.simulator ?? process.env.SIM_UDID ?? process.env.IOS_SIMULATOR;
   try {
     const pool = resolvePoolIdentity(resolvedTarget);
     if (!simulator && pool.simulator) simulator = pool.simulator;
@@ -133,6 +135,16 @@ async function provisionRunwayMobile(target, options) {
       reason
     };
   } catch (error) {
+    if (error instanceof SimulatorTargetError) {
+      return fail(
+        resolvedTarget,
+        platform,
+        "SIMULATOR_AMBIGUOUS",
+        error.message,
+        `mm-harness status --adapter mobile --target ${JSON.stringify(resolvedTarget)} --all-devices --json`,
+        slot
+      );
+    }
     return fail(resolvedTarget, platform, "PROVISION_FAILED", errorMessage(error), command, slot);
   }
 }
@@ -178,6 +190,7 @@ function readSlotContext(target, runtimeDir) {
         slotId: stringField(data, "slotId"),
         platform: stringField(data, "platform"),
         simulator: stringField(data, "simulator") ?? stringField(data, "iosSimulator"),
+        simulatorUdid: stringField(data, "simulatorUdid"),
         runtime: stringField(data, "runtime") ?? stringField(data, "iosRuntime"),
         deviceType: stringField(data, "deviceType") ?? stringField(data, "iosDeviceType"),
         watcherPort: stringField(data, "watcherPort") ?? stringField(data, "metroPort") ?? stringField(data, "devServerPort"),
@@ -456,7 +469,7 @@ function preapproveDeepLinkScheme(device, bundleId, options) {
 }
 function ensureSimulator(name, runtime, deviceType) {
   const existing = findSimulator(name);
-  if (existing) return { name, udid: existing, created: false, runtime, deviceType };
+  if (existing) return { name: existing.name, udid: existing.udid, created: false, runtime, deviceType };
   const resolvedRuntime = runtime || latestIosRuntime();
   const resolvedDeviceType = deviceType || preferredIphoneDeviceType();
   if (!resolvedRuntime || !resolvedDeviceType) {
@@ -465,11 +478,23 @@ function ensureSimulator(name, runtime, deviceType) {
   const udid = execFileSync("xcrun", ["simctl", "create", name, resolvedDeviceType, resolvedRuntime], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
   return { name, udid: udid || name, created: true, runtime: resolvedRuntime, deviceType: resolvedDeviceType };
 }
-function findSimulator(name) {
-  const data = execJson("xcrun", ["simctl", "list", "devices", "--json"]);
-  for (const devices of Object.values(data.devices ?? {})) {
-    const found = devices.find((device) => device.name === name || device.udid === name);
-    if (found?.udid) return found.udid;
+function findSimulator(target) {
+  const data = execJson(
+    "xcrun",
+    ["simctl", "list", "devices", "--json"]
+  );
+  const devices = Object.values(data.devices ?? {}).flat().filter((device) => device.isAvailable !== false && Boolean(device.name && device.udid));
+  const exact = devices.find((device) => device.udid.toLowerCase() === target.toLowerCase());
+  if (exact) return exact;
+  const matches = target === "booted" ? devices.filter((device) => device.state === "Booted") : devices.filter((device) => device.name === target);
+  if (matches.length === 1) return matches[0];
+  const booted = matches.filter((device) => device.state === "Booted");
+  if (booted.length === 1) return booted[0];
+  if (matches.length > 1) {
+    throw new SimulatorTargetError(
+      `iOS simulator target '${target}' is ambiguous; use one UDID:
+` + matches.map((device) => `  - ${device.udid} (${device.name}) [${device.state ?? "unknown"}]`).join("\n")
+    );
   }
   return void 0;
 }

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

@@ -78,7 +78,7 @@ function appRunningOnDevice(platform) {
       });
       return out2.includes("io.metamask");
     }
-    const device = process.env.IOS_SIMULATOR || "booted";
+    const device = process.env.SIM_UDID || process.env.IOS_SIMULATOR || "booted";
     const out = execFileSync("xcrun", ["simctl", "spawn", device, "launchctl", "list"], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],

package/dist/adapters/slot-ports.js

@@ -22,7 +22,14 @@ function applyKVLines(output, overwrite) {
         }
         break;
       case "IOS_SIMULATOR":
-        if (overwrite || !process.env["IOS_SIMULATOR"]) process.env["IOS_SIMULATOR"] = val;
+        if (overwrite || !process.env["IOS_SIMULATOR"]) {
+          process.env["IOS_SIMULATOR"] = val;
+          if (/^[0-9A-Fa-f-]{36}$/u.test(val)) process.env["SIM_UDID"] = val;
+          else delete process.env["SIM_UDID"];
+        }
+        break;
+      case "SIM_UDID":
+        if (overwrite || !process.env["SIM_UDID"]) process.env["SIM_UDID"] = val;
         break;
       case "ADB_SERIAL":
         if (overwrite || !process.env["ADB_SERIAL"]) {

package/dist/commands/launch/index.js

@@ -269,6 +269,28 @@ async function handleLaunchLocked(argv, stream) {
       originalError: rebuildAttempt.output.trim() || void 0
     });
   }
+  const missingIosSimulator = adapter === "mobile" ? missingConfiguredIosSimulator(attempt.output) : void 0;
+  const ambiguousIosSimulator = adapter === "mobile" ? ambiguousConfiguredIosSimulator(attempt.output) : void 0;
+  if (ambiguousIosSimulator) {
+    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+      code: "MOBILE_DEVICE_AMBIGUOUS",
+      message: `more than one iOS simulator matches ${ambiguousIosSimulator}.`,
+      recoverable: false,
+      userAction: `mm-harness status --adapter mobile --target ${shellQuote(target)} --all-devices --json`,
+      exitCode: EXIT.runtime,
+      originalError: attempt.output.trim() || void 0
+    });
+  }
+  if (missingIosSimulator && isIosSimulatorUdid(missingIosSimulator)) {
+    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+      code: "MOBILE_DEVICE_NOT_FOUND",
+      message: `the configured iOS simulator ${missingIosSimulator} no longer exists.`,
+      recoverable: false,
+      userAction: `mm-harness status --adapter mobile --target ${shellQuote(target)} --all-devices --json`,
+      exitCode: EXIT.runtime,
+      originalError: attempt.output.trim() || void 0
+    });
+  }
   if (adapter === "mobile" && mobileProvisioningBlocked(attempt.output)) {
     return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
       code: "MOBILE_PROVISION_REQUIRED",
@@ -331,12 +353,18 @@ function extensionProductConfigMissing(output) {
 function mobileProvisioningBlocked(output) {
   return /open-device: configured iOS simulator '.+' does not exist|open-device: no MetaMask bundle found|fast mode requires an installed (?:iOS dev client|Android dev client)/u.test(output);
 }
+function missingConfiguredIosSimulator(output) {
+  return /open-device: configured iOS simulator '([^']+)' does not exist/u.exec(output)?.[1];
+}
+function ambiguousConfiguredIosSimulator(output) {
+  return /open-device: iOS simulator target ("[^"]+") is ambiguous/u.exec(output)?.[1];
+}
 function mobileBridgeTargetMissing(output) {
   return /no bridge target matched/iu.test(output);
 }
 function mobileProvisionCommand(target, mobileTarget) {
   const platform = mobileTarget === "android" ? "android" : "ios";
-  const device = platform === "ios" ? process.env.IOS_SIMULATOR || process.env.SIM_UDID : process.env.ADB_SERIAL || process.env.ANDROID_SERIAL || process.env.ANDROID_DEVICE;
+  const device = platform === "ios" ? process.env.SIM_UDID || process.env.IOS_SIMULATOR : process.env.ADB_SERIAL || process.env.ANDROID_SERIAL || process.env.ANDROID_DEVICE;
   const parts = ["mm-harness", "provision", "runway", platform, "--adapter", "mobile", "--target", shellQuote(target)];
   if (device) parts.push("--device", shellQuote(device));
   return parts.join(" ");

package/dist/commands/provision.js

@@ -46,19 +46,21 @@ async function handleProvision({ positional, options, rawArgv }) {
     resolveOnly: optionFlag(options, "resolveOnly"),
     rerunCommand
   });
-  const next = result.status === "pass" && adapter === "mobile" && result.resolveOnly !== true ? `mm-harness launch ${String(result.platform ?? platform)} --adapter mobile --target ${shellQuote(target)}` : void 0;
+  const provisionedSimulator = typeof result.simulator === "object" && result.simulator ? result.simulator : void 0;
+  const provisionedDevice = typeof provisionedSimulator?.udid === "string" ? provisionedSimulator.udid : typeof provisionedSimulator?.name === "string" ? provisionedSimulator.name : void 0;
+  const next = result.status === "pass" && adapter === "mobile" && result.resolveOnly !== true ? `mm-harness launch ${String(result.platform ?? platform)} --adapter mobile --target ${shellQuote(target)}` + (provisionedDevice ? ` --device ${shellQuoteArg(provisionedDevice)}` : "") : void 0;
   const output = next ? { ...result, next } : result;
   if (json) {
     console.log(JSON.stringify(output, null, 2));
   } else if (result.status === "pass") {
     const cache = typeof result.cache === "object" && result.cache ? result.cache : void 0;
-    const simulator = typeof result.simulator === "object" && result.simulator ? result.simulator : void 0;
+    const simulator = provisionedSimulator;
     const artifact = typeof result.artifact === "object" && result.artifact ? result.artifact : void 0;
     if (result.resolveOnly) {
       console.error(`\u2713 resolved ${adapter} ${result.platform ?? ""} run=${artifact?.runId ?? "unknown"} revision=${artifact?.revision ?? "unknown"} artifact=${artifact?.artifactName ?? "unknown"}`);
     } else {
       const action = result.skipped ? "already provisioned" : "provisioned";
-      console.error(`\u2713 ${action} ${adapter} ${result.platform ?? ""} simulator=${simulator?.name ?? "unknown"} cache=${cache?.status ?? "unknown"}`);
+      console.error(`\u2713 ${action} ${adapter} ${result.platform ?? ""} simulator=${simulator?.name ?? "unknown"} udid=${simulator?.udid ?? "unknown"} cache=${cache?.status ?? "unknown"}`);
     }
     if (next) console.error(`  Next: ${next}`);
   } else {

package/dist/harness.js

@@ -428,19 +428,21 @@ async function handleRunwayInstall(adapter, target, forward, json) {
     resolveOnly: hasArg(forward, "--resolve-only"),
     rerunCommand
   });
-  const next = result.status === "pass" && adapter === "mobile" && result.resolveOnly !== true ? `mm-harness launch ${String(result.platform ?? "ios")} --adapter mobile --target ${shellQuote(target)}` : void 0;
+  const provisionedSimulator = typeof result.simulator === "object" && result.simulator ? result.simulator : void 0;
+  const provisionedDevice = typeof provisionedSimulator?.udid === "string" ? provisionedSimulator.udid : typeof provisionedSimulator?.name === "string" ? provisionedSimulator.name : void 0;
+  const next = result.status === "pass" && adapter === "mobile" && result.resolveOnly !== true ? `mm-harness launch ${String(result.platform ?? "ios")} --adapter mobile --target ${shellQuote(target)}` + (provisionedDevice ? ` --device ${shellQuote(provisionedDevice)}` : "") : void 0;
   const output = next ? { ...result, next } : result;
   if (json) {
     console.log(JSON.stringify(output, null, 2));
   } else if (result.status === "pass") {
     const cache = typeof result.cache === "object" && result.cache ? result.cache : void 0;
-    const simulator = typeof result.simulator === "object" && result.simulator ? result.simulator : void 0;
+    const simulator = provisionedSimulator;
     const artifact = typeof result.artifact === "object" && result.artifact ? result.artifact : void 0;
     if (result.resolveOnly) {
       console.error(`\u2713 resolved Runway app for ${adapter} ${result.platform ?? ""} run=${artifact?.runId ?? "unknown"} revision=${artifact?.revision ?? "unknown"} artifact=${artifact?.artifactName ?? "unknown"}`);
     } else {
       const action = result.skipped ? "already provisioned" : "installed Runway app";
-      console.error(`\u2713 ${action} for ${adapter} ${result.platform ?? ""} simulator=${simulator?.name ?? "unknown"} cache=${cache?.status ?? "skip"}`);
+      console.error(`\u2713 ${action} for ${adapter} ${result.platform ?? ""} simulator=${simulator?.name ?? "unknown"} udid=${simulator?.udid ?? "unknown"} cache=${cache?.status ?? "skip"}`);
     }
     if (next) console.error(`  Next: ${next}`);
   } else {

package/dist/runtime-context.js

@@ -65,6 +65,7 @@ function validExistingContext(context, repoRoot, runtimeDir, adapter) {
     "machine",
     "runtimeOwner",
     "simulator",
+    "simulatorUdid",
     "adbSerial",
     "distDir",
     "extensionId",
@@ -90,7 +91,7 @@ function validExistingContext(context, repoRoot, runtimeDir, adapter) {
       if (runtimeStart[field] !== void 0 && (typeof runtimeStart[field] !== "string" || runtimeStart[field].length === 0)) return false;
     }
   }
-  const forbiddenResources = adapter === "core" ? ["cdpPort", "watcherPort", "metroPort", "devServerPort", "simulator", "adbSerial", "extensionId"] : adapter === "extension" ? ["metroPort", "simulator", "adbSerial"] : ["cdpPort", "extensionId"];
+  const forbiddenResources = adapter === "core" ? ["cdpPort", "watcherPort", "metroPort", "devServerPort", "simulator", "simulatorUdid", "adbSerial", "extensionId"] : adapter === "extension" ? ["metroPort", "simulator", "simulatorUdid", "adbSerial"] : ["cdpPort", "extensionId"];
   if (forbiddenResources.some((field) => context[field] !== void 0)) return false;
   return true;
 }
@@ -168,6 +169,7 @@ function runtimeResources(adapter, existing, defaults) {
   } else {
     shared.metroPort = watcherPort;
     shared.simulator = process.env.IOS_SIMULATOR || existing.simulator;
+    shared.simulatorUdid = process.env.SIM_UDID || existing.simulatorUdid;
     shared.adbSerial = process.env.ADB_SERIAL || process.env.ANDROID_SERIAL || existing.adbSerial;
   }
   return shared;
@@ -217,6 +219,7 @@ function hydrateRuntimeEnv(contextPath, context) {
   setEnv("RECIPE_WATCHER_PORT", context.watcherPort);
   setEnv("METRO_PORT", context.metroPort ?? context.watcherPort);
   setEnv("IOS_SIMULATOR", context.simulator);
+  setEnv("SIM_UDID", context.simulatorUdid);
   setEnv("ADB_SERIAL", context.adbSerial);
   setEnv("ANDROID_SERIAL", context.adbSerial);
 }

package/package.json

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