@deeeed/metamask-harness 0.5.0 → 0.6.0

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

@@ -1,4 +1,5 @@
-# resolve-farmslot-ports.sh — resolve CDP + watcher ports for an extension checkout
+#!/usr/bin/env bash
+# resolve-farmslot-ports.sh — bash-compat wrapper over resolve-farmslot-ports.mjs
 #
 # Farmslot pool JSON is authoritative when a slot repo matches; otherwise fall back
 # to the local-extension-N formula (6660+N / 9010+N).
@@ -8,85 +9,15 @@
 #   resolve_extension_runtime_ports /path/to/metamask-extension-N
 #     -> prints CDP_PORT=... WATCHER_PORT=... SLOT_ID=... lines
 
-resolve_farmslot_ports_by_repo() {
-  local repo="$1"
-  local farmslot_root="${FARMSLOT_ROOT:-}"
-  [ -n "$repo" ] || return 1
-  repo="$(cd "$repo" && pwd -P)"
-
-  local root candidate match
-  for root in "$farmslot_root" "$HOME/dev/farmslot"; do
-    [ -n "$root" ] && [ -d "$root/pool" ] || continue
-    match="$(POOL_ROOT="$root" REPO_TARGET="$repo" python3 - <<'PY'
-import glob, json, os, re, sys
-
-pool_root = os.environ["POOL_ROOT"]
-repo = os.path.realpath(os.environ["REPO_TARGET"])
-base = os.path.basename(repo)
-slot_suffix = None
-m = re.search(r"-(\d+)$", base)
-if m:
-    slot_suffix = m.group(1)
-
-def score_slot(slot):
-    resources = slot.get("resources") or {}
-    cdp = (resources.get("browser") or {}).get("cdp_port")
-    port = (resources.get("dev-server") or {}).get("port")
-    session = slot.get("session") or ""
-    slot_id = slot.get("id") or ""
-    score = 0
-    if cdp is not None:
-        score += 100
-    if port is not None:
-        score += 10
-    if slot_suffix:
-        if session == f"mme-{slot_suffix}":
-            score += 50
-        if slot_id.endswith(f"mme-{slot_suffix}") or f"-mme-{slot_suffix}" in slot_id:
-            score += 40
-    if "demo" not in slot_id.lower():
-        score += 5
-    return score, cdp, port, slot_id
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+_RESOLVE_PORTS_MJS="$SCRIPT_DIR/resolve-farmslot-ports.mjs"
 
-best = None
-for path in sorted(glob.glob(os.path.join(pool_root, "pool", "*.json"))):
-    if ".bak." in os.path.basename(path):
-        continue
-    try:
-        data = json.load(open(path, encoding="utf-8"))
-    except Exception:
-        continue
-    for slot in data.get("slots") or []:
-        slot_repo = slot.get("repo") or ""
-        if not slot_repo:
-            continue
-        try:
-            if os.path.realpath(slot_repo) != repo:
-                continue
-        except Exception:
-            continue
-        scored = score_slot(slot)
-        if best is None or scored[0] > best[0]:
-            best = scored
-
-if best is None:
-    sys.exit(1)
+_resolve_ports_cli() {
+  node "$_RESOLVE_PORTS_MJS" "$1" "${2:-.}"
+}
 
-_, cdp, port, slot_id = best
-if cdp is not None:
-    print(f"CDP_PORT={cdp}")
-if port is not None:
-    print(f"WATCHER_PORT={port}")
-if slot_id:
-    print(f"SLOT_ID={slot_id}")
-sys.exit(0)
-PY
-)" || continue
-    [ -n "$match" ] || continue
-    printf '%s\n' "$match"
-    return 0
-  done
-  return 1
+resolve_farmslot_ports_by_repo() {
+  _resolve_ports_cli resolve_farmslot_ports_by_repo "$1"
 }
 
 infer_extension_slot_suffix() {
@@ -100,27 +31,18 @@ infer_extension_slot_suffix() {
 }
 
 resolve_default_extension_ports() {
-  local repo="$1" n
-  n="$(infer_extension_slot_suffix "$repo" || true)"
-  [ -n "$n" ] || return 1
-  printf 'CDP_PORT=%s\n' "$((6660 + n))"
-  printf 'WATCHER_PORT=%s\n' "$((9010 + n))"
-  printf 'SLOT_ID=local-extension-%s\n' "$n"
+  _resolve_ports_cli resolve_default_extension_ports "$1"
 }
 
 resolve_extension_runtime_ports() {
-  local repo="${1:-.}"
-  if resolve_farmslot_ports_by_repo "$repo"; then
-    return 0
-  fi
-  resolve_default_extension_ports "$repo"
+  _resolve_ports_cli resolve_extension_runtime_ports "${1:-.}"
 }
 
 apply_resolved_extension_ports() {
   local repo="${1:-.}" line key val from_pool=false resolved=""
-  if resolved="$(resolve_farmslot_ports_by_repo "$repo" 2>/dev/null)"; then
+  if resolved="$(_resolve_ports_cli resolve_farmslot_ports_by_repo "$repo" 2>/dev/null)"; then
     from_pool=true
-  elif resolved="$(resolve_default_extension_ports "$repo" 2>/dev/null)"; then
+  elif resolved="$(_resolve_ports_cli resolve_default_extension_ports "$repo" 2>/dev/null)"; then
     from_pool=false
   else
     return 0
@@ -143,52 +65,23 @@ apply_resolved_extension_ports() {
   done <<< "$resolved"
 }
 
-# Mobile slot defaults: derive Metro port + iOS simulator name from directory suffix.
-# Port formula: 8060 + N (slot 1 → 8061). iOS simulator: mm-N.
-# Mirrors the extension convention (6660+N / 9010+N) for multi-slot mobile farms.
 resolve_mobile_slot_defaults() {
-  local repo="$1" n
-  n="$(infer_extension_slot_suffix "$repo" || true)"
-  [ -n "$n" ] || return 1
-  printf 'WATCHER_PORT=%s\n' "$((8060 + n))"
-  printf 'IOS_SIMULATOR=mm-%s\n' "$n"
-  printf 'SLOT_ID=local-mobile-%s\n' "$n"
+  _resolve_ports_cli resolve_mobile_slot_defaults "$1"
 }
 
-# Slot context the orchestrator's prepare wrote INTO the checkout — the
-# authoritative device/port mapping for this repo (survives pool renames that
-# break any naming formula). Highest-priority detection source.
 resolve_mobile_runtime_context() {
-  local repo="$1" ctx
-  ctx="$repo/${RECIPE_RUNTIME_DIR:-temp/recipe/runtime}/agentic-runtime.json"
-  [ -f "$ctx" ] || return 1
-  node -e '
-    try {
-      const c = JSON.parse(require("fs").readFileSync(process.argv[1], "utf8"));
-      if (!c.simulator && !c.metroPort) process.exit(1);
-      if (c.metroPort) console.log(`WATCHER_PORT=${c.metroPort}`);
-      if (c.simulator) console.log(`IOS_SIMULATOR=${c.simulator}`);
-      if (c.slotId) console.log(`SLOT_ID=${c.slotId}`);
-    } catch { process.exit(1); }
-  ' "$ctx" 2>/dev/null
+  _resolve_ports_cli resolve_mobile_runtime_context "$1"
 }
 
 resolve_mobile_runtime_ports() {
-  local repo="${1:-.}"
-  if resolve_mobile_runtime_context "$repo"; then
-    return 0
-  fi
-  if resolve_farmslot_ports_by_repo "$repo"; then
-    return 0
-  fi
-  resolve_mobile_slot_defaults "$repo"
+  _resolve_ports_cli resolve_mobile_runtime_ports "${1:-.}"
 }
 
 apply_resolved_mobile_ports() {
   local repo="${1:-.}" line key val from_pool=false resolved=""
-  if resolved="$(resolve_farmslot_ports_by_repo "$repo" 2>/dev/null)"; then
+  if resolved="$(_resolve_ports_cli resolve_farmslot_ports_by_repo "$repo" 2>/dev/null)"; then
     from_pool=true
-  elif resolved="$(resolve_mobile_slot_defaults "$repo" 2>/dev/null)"; then
+  elif resolved="$(_resolve_ports_cli resolve_mobile_slot_defaults "$repo" 2>/dev/null)"; then
     from_pool=false
   else
     return 0
@@ -209,4 +102,4 @@ apply_resolved_mobile_ports() {
         ;;
     esac
   done <<< "$resolved"
-}
+}

package/bin/mm-harness

@@ -50,15 +50,27 @@ if [ -n "${MM_HARNESS_BIN:-}" ]; then
   fi
 fi
 
+ENTRY_TS="$RUNNER_DIR/src/mm-harness-cli.ts"
+ENTRY_DIST="$RUNNER_DIR/dist/mm-harness-cli.js"
+
+# Published installs ship dist/ only. Teach before deps work so a broken global
+# install never runs ensure-runner-deps against a partial node_modules tree.
+case "$RUNNER_DIR/" in
+  */node_modules/*)
+    if [ ! -f "$ENTRY_DIST" ]; then
+      echo "mm-harness: installed package is missing dist/mm-harness-cli.js." >&2
+      echo "  Next: reinstall @deeeed/metamask-harness@latest (npm i -g @deeeed/metamask-harness@latest)" >&2
+      exit 1
+    fi
+    ;;
+esac
+
 ENSURE_DEPS="$RUNNER_DIR/adapters/shared/ensure-runner-deps.sh"
 if [ -f "$ENSURE_DEPS" ]; then
   # shellcheck disable=SC1090
   bash "$ENSURE_DEPS" "$RUNNER_DIR"
 fi
 
-ENTRY_TS="$RUNNER_DIR/src/mm-harness-cli.ts"
-ENTRY_DIST="$RUNNER_DIR/dist/mm-harness-cli.js"
-
 find_protocol_root() {
   local start="$1"
   local dir
@@ -97,10 +109,38 @@ node_can_run_source_typescript() {
   rm -rf "$probe_dir"
 }
 
+# In a source checkout dist wins when present — make that visible, and warn when
+# the compiled entry is older than the sources it shadows (a stale dist silently
+# runs old code while you edit src/).
+if [ -f "$ENTRY_DIST" ] && [ -f "$ENTRY_TS" ]; then
+  export MM_HARNESS_RUN_MODE="dist"
+  if find "$RUNNER_DIR/src" -name '*.ts' -newer "$ENTRY_DIST" 2>/dev/null | head -1 | grep -q .; then
+    echo "mm-harness: dist/ is OLDER than src/ — this run uses the stale compiled code." >&2
+    echo "  Next: npm run build   (or: trash dist/ to run straight from src via tsx)" >&2
+  fi
+elif [ -f "$ENTRY_TS" ]; then
+  export MM_HARNESS_RUN_MODE="src"
+fi
+
 if [ -f "$ENTRY_DIST" ]; then
   exec node "$ENTRY_DIST" "$@"
 fi
 
+if [ -f "$ENTRY_TS" ]; then
+  case " ${NODE_OPTIONS:-} " in
+    *" --conditions=development "*) ;;
+    *)
+      export NODE_OPTIONS="${NODE_OPTIONS:+$NODE_OPTIONS }--conditions=development"
+      ;;
+  esac
+fi
+
+if [ ! -f "$ENTRY_TS" ]; then
+  echo "mm-harness: no CLI entry found (expected dist/mm-harness-cli.js or src/mm-harness-cli.ts)." >&2
+  echo "  Next: from a source checkout run npm run build, or install dependencies (tsx) for the dev path" >&2
+  exit 1
+fi
+
 TSX_BIN="${TSX_BIN:-$RUNNER_DIR/node_modules/.bin/tsx}"
 if [ ! -x "$TSX_BIN" ] && [ -x "$RUNNER_DIR/../../.bin/tsx" ]; then
   TSX_BIN="$RUNNER_DIR/../../.bin/tsx"
@@ -126,5 +166,6 @@ if [ -x "$TSX_BIN" ]; then
   exec "$TSX_BIN" "$ENTRY_TS" "$@"
 fi
 
-echo "mm-harness source checkout requires dist/mm-harness-cli.js, Node.js TypeScript type stripping, or a local tsx binary. Install dependencies normally, or set TSX_BIN/FARMSLOT_ROOT for local protocol co-development." >&2
+echo "mm-harness: source checkout requires dist/mm-harness-cli.js, Node.js TypeScript type stripping, or a local tsx binary." >&2
+echo "  Next: npm run build   or   yarn install (tsx devDependency)   or   set TSX_BIN for local protocol co-development" >&2
 exit 1

package/dist/adapters/extension/runtime.js

@@ -43,6 +43,7 @@ async function assertHealthyExtensionRuntime(options) {
 }
 async function checkExtensionRuntimeHealth(projectRoot, cdpPort) {
   const findings = [];
+  const warnings = [];
   let targets = [];
   try {
     await jsonGet(`http://127.0.0.1:${cdpPort}/json/version`);
@@ -87,11 +88,12 @@ async function checkExtensionRuntimeHealth(projectRoot, cdpPort) {
       findings.push("stateHooks.getPerpsStreamManager is unavailable.");
     }
     if (runtime.backgroundProbeOk !== true) {
-      findings.push(`Perps background read probe failed: ${runtime.backgroundProbeError ?? "unknown error"}.`);
+      warnings.push(`Perps background read probe failed: ${runtime.backgroundProbeError ?? "unknown error"}.`);
     }
     const extensionId = safeExtensionId(target);
     return {
       status: findings.length === 0 ? "PASS" : "FAIL",
+      warnings,
       cdpPort,
       targetUrl: target.url,
       extensionId,

package/dist/adapters/mobile/provision.js

@@ -4,6 +4,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { recipeRuntimeDir } from "../../paths.js";
+import { resolveFarmslotPortsByRepo } from "../../../adapters/shared/resolve-farmslot-ports-core.mjs";
 const RUNWAY_IOS_METADATA = {
   artifactName: "ios-app-main-dev-expo",
   workflow: "expo-dev-build.yml",
@@ -11,6 +12,19 @@ const RUNWAY_IOS_METADATA = {
   appDirName: "MetaMask.app",
   fallbackRepo: "MetaMask/metamask-mobile"
 };
+function resolvePoolIdentity(target) {
+  const out = resolveFarmslotPortsByRepo(target);
+  const id = {};
+  if (!out) return id;
+  for (const line of String(out).split("\n")) {
+    const m = /^([A-Z_]+)=(.+)$/u.exec(line.trim());
+    if (!m || m[2] === "null" || m[2] === "") continue;
+    if (m[1] === "IOS_SIMULATOR") id.simulator = m[2];
+    else if (m[1] === "WATCHER_PORT") id.watcherPort = m[2];
+    else if (m[1] === "SLOT_ID") id.slotId = m[2];
+  }
+  return id;
+}
 async function provisionRunwayMobile(target, options) {
   const resolvedTarget = path.resolve(target);
   const platform = options.platform ?? "ios";
@@ -21,7 +35,14 @@ 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);
   }
-  const simulator = options.simulator ?? slot.simulator ?? process.env.IOS_SIMULATOR;
+  let simulator = options.simulator ?? slot.simulator ?? process.env.IOS_SIMULATOR;
+  try {
+    const pool = resolvePoolIdentity(resolvedTarget);
+    if (!simulator && pool.simulator) simulator = pool.simulator;
+    if (!slot.slotId && pool.slotId) slot.slotId = pool.slotId;
+    if (!slot.watcherPort && pool.watcherPort) slot.watcherPort = pool.watcherPort;
+  } catch {
+  }
   if (!simulator && !options.resolveOnly) {
     return fail(resolvedTarget, platform, "SIMULATOR_MISSING", "no simulator was resolved from agentic-runtime.json, --simulator, or IOS_SIMULATOR.", command, slot);
   }
@@ -72,6 +93,7 @@ async function provisionRunwayMobile(target, options) {
     const cacheRoot = options.cacheRoot ?? defaultRunwayCacheRoot();
     const cache = ensureCachedArtifact(repo, resolved.branch, resolved.runId, cacheRoot, options);
     log(options, `runway: installing ${cache.artifact.appPath} on ${sim.name}`);
+    bootSimulator(sim.udid ?? sim.name, options);
     execFileSync("xcrun", ["simctl", "install", sim.udid ?? sim.name, cache.artifact.appPath], { stdio: ["ignore", "ignore", "pipe"] });
     const baselinePath = writeRunwayBaseline(resolvedTarget, slot, platform, resolved, cache.artifact, sim, false, options.runtimeDir);
     return {
@@ -379,6 +401,17 @@ function hashPath(root) {
   visitDirectory(root);
   return { sizeBytes, sha256: hash.digest("hex") };
 }
+function bootSimulator(device, options) {
+  try {
+    execFileSync("xcrun", ["simctl", "boot", device], { stdio: ["ignore", "ignore", "ignore"] });
+  } catch {
+  }
+  try {
+    execFileSync("xcrun", ["simctl", "bootstatus", device, "-b"], { stdio: ["ignore", "ignore", "ignore"], timeout: 12e4 });
+  } catch {
+    log(options, `runway: bootstatus wait for ${device} did not confirm; continuing to install`);
+  }
+}
 function ensureSimulator(name, runtime, deviceType) {
   const existing = findSimulator(name);
   if (existing) return { name, udid: existing, created: false, runtime, deviceType };

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

@@ -103,6 +103,8 @@ async function decideMobileReadiness(target, options = {}) {
   const fast = options.preflightMode === "fast";
   const report = await computeMobileReadiness(resolved, options, fast);
   if (fast && report.decision === "install") {
+    const hasNodeModules = fs.existsSync(path.join(resolved, "node_modules"));
+    const standalone = hasNodeModules ? "`yarn setup:expo --no-build-ios --no-build-android`" : "`yarn install --immutable && yarn setup:expo --no-build-ios --no-build-android`";
     return {
       ...report,
       decision: "blocked",
@@ -111,7 +113,7 @@ async function decideMobileReadiness(target, options = {}) {
         "Fast preflight found dependencies not ready and does not install them (the orchestrator deps phase owns installation).",
         ...report.reasons
       ],
-      userAction: "run the slot deps/prepare phase; standalone: `yarn setup:expo --no-build-ios --no-build-android` in the checkout, or `mm-harness launch <platform> --build` to install and build",
+      userAction: `run the slot deps/prepare phase; standalone: ${standalone} in the checkout, then re-run \`mm-harness launch <platform>\``,
       actions: []
     };
   }

package/dist/adapters/resolve-farmslot-ports.js

@@ -0,0 +1,22 @@
+import {
+  formatKvLines,
+  inferSlotSuffix,
+  realRepoPath,
+  resolveDefaultExtensionPorts,
+  resolveExtensionRuntimePorts,
+  resolveFarmslotPortsByRepo,
+  resolveMobileRuntimeContext,
+  resolveMobileRuntimePorts,
+  resolveMobileSlotDefaults
+} from "../../adapters/shared/resolve-farmslot-ports-core.mjs";
+export {
+  formatKvLines,
+  inferSlotSuffix,
+  realRepoPath,
+  resolveDefaultExtensionPorts,
+  resolveExtensionRuntimePorts,
+  resolveFarmslotPortsByRepo,
+  resolveMobileRuntimeContext,
+  resolveMobileRuntimePorts,
+  resolveMobileSlotDefaults
+};

package/dist/adapters/slot-ports.js

@@ -2,12 +2,19 @@ import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { readRuntimeContextField, resolveRuntimeContextPath } from "../harness.js";
-import { recipeRuntimeDir, runnerDir } from "../paths.js";
+import { recipeRuntimeDir } from "../paths.js";
+import {
+  resolveDefaultExtensionPorts,
+  resolveFarmslotPortsByRepo,
+  resolveMobileRuntimeContext,
+  resolveMobileSlotDefaults
+} from "./resolve-farmslot-ports.js";
 function applyKVLines(output, overwrite) {
   for (const line of output.split("\n")) {
     const m = /^([A-Z_]+)=(.+)$/u.exec(line.trim());
     if (!m) continue;
     const [, key, val] = m;
+    if (val === "null" || val === "undefined" || val === "") continue;
     switch (key) {
       case "WATCHER_PORT":
         if (overwrite || !process.env["WATCHER_PORT"]) {
@@ -31,31 +38,13 @@ function applyKVLines(output, overwrite) {
     }
   }
 }
-function sourceResolve(fn, target) {
-  const resolveScript = path.join(runnerDir, "adapters/shared/resolve-farmslot-ports.sh");
-  try {
-    return execFileSync("bash", ["-c", `source "${resolveScript}" && ${fn} "${target}"`], {
-      encoding: "utf8",
-      timeout: 5e3,
-      stdio: ["ignore", "pipe", "ignore"]
-    });
-  } catch {
-    return "";
-  }
-}
 function resolveMobileSlotPorts(target) {
-  const ctxOut = sourceResolve("resolve_mobile_runtime_context", target);
-  if (ctxOut.trim()) {
-    applyKVLines(ctxOut, true);
-    return;
-  }
-  const poolOut = sourceResolve("resolve_farmslot_ports_by_repo", target);
-  if (poolOut.trim()) {
-    applyKVLines(poolOut, true);
-    return;
-  }
-  const defOut = sourceResolve("resolve_mobile_slot_defaults", target);
-  if (defOut.trim()) applyKVLines(defOut, false);
+  const ctxOut = resolveMobileRuntimeContext(target);
+  if (ctxOut?.trim()) applyKVLines(ctxOut, true);
+  const poolOut = resolveFarmslotPortsByRepo(target);
+  if (poolOut?.trim()) applyKVLines(poolOut, false);
+  const defOut = resolveMobileSlotDefaults(target);
+  if (defOut?.trim()) applyKVLines(defOut, false);
 }
 function resolveExtensionSlotPorts(target) {
   const contextPath = resolveRuntimeContextPath(target);
@@ -70,13 +59,13 @@ function resolveExtensionSlotPorts(target) {
     process.env["RECIPE_WATCHER_PORT"] = dev;
   }
   if (process.env["CDP_PORT"]) return;
-  const poolOut = sourceResolve("resolve_farmslot_ports_by_repo", target);
-  if (poolOut.trim()) {
+  const poolOut = resolveFarmslotPortsByRepo(target);
+  if (poolOut?.trim()) {
     applyKVLines(poolOut, true);
     return;
   }
-  const defOut = sourceResolve("resolve_default_extension_ports", target);
-  if (defOut.trim()) applyKVLines(defOut, false);
+  const defOut = resolveDefaultExtensionPorts(target);
+  if (defOut?.trim()) applyKVLines(defOut, false);
 }
 function stopExtensionWatcher(target) {
   const runtimeAbs = path.join(target, recipeRuntimeDir());