@deeeed/metamask-harness 0.5.1 → 0.6.1

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

@@ -51,6 +51,7 @@ function scoreSlot(slot, slotSuffix) {
   const resources = slot.resources ?? {};
   const cdp = resources.browser?.cdp_port;
   const port = resources['dev-server']?.port;
+  const simulator = resources['ios-sim']?.simulator;
   const session = slot.session ?? '';
   const slotId = slot.id ?? '';
   let score = 0;
@@ -61,7 +62,7 @@ function scoreSlot(slot, slotSuffix) {
     if (slotId.endsWith(`mme-${slotSuffix}`) || slotId.includes(`-mme-${slotSuffix}`)) score += 40;
   }
   if (!slotId.toLowerCase().includes('demo')) score += 5;
-  return [score, cdp, port, slotId];
+  return [score, cdp, port, slotId, simulator];
 }
 
 export function resolveFarmslotPortsByRepo(repo) {
@@ -70,6 +71,12 @@ export function resolveFarmslotPortsByRepo(repo) {
 
   const slotSuffix = inferSlotSuffix(realRepo);
   const roots = [];
+  // A slot checkout lives at <workspace>/repos/<slot>; that workspace's own
+  // pool is the authoritative one for this repo — machine-global fallbacks
+  // (env root, dev checkout) apply only when the repo is not workspace-shaped.
+  if (path.basename(path.dirname(realRepo)) === 'repos') {
+    roots.push(path.join(path.dirname(path.dirname(realRepo)), 'farmslot'));
+  }
   if (process.env.FARMSLOT_ROOT) roots.push(process.env.FARMSLOT_ROOT);
   roots.push(path.join(os.homedir(), 'dev', 'farmslot'));
 
@@ -102,11 +109,12 @@ export function resolveFarmslotPortsByRepo(repo) {
     }
 
     if (best) {
-      const [, cdp, port, slotId] = best;
+      const [, cdp, port, slotId, simulator] = best;
       return formatKvLines({
         ...(cdp !== undefined ? { CDP_PORT: cdp } : {}),
         ...(port !== undefined ? { WATCHER_PORT: port } : {}),
         ...(slotId ? { SLOT_ID: slotId } : {}),
+        ...(simulator ? { IOS_SIMULATOR: simulator } : {}),
       });
     }
   }
@@ -142,9 +150,9 @@ export function resolveMobileRuntimeContext(repo) {
   if (fs.existsSync(ctxPath)) {
     try {
       const c = JSON.parse(fs.readFileSync(ctxPath, 'utf8'));
-      if (c.simulator || c.metroPort) {
+      if (c.simulator || (c.metroPort != null && c.metroPort !== '')) {
         return formatKvLines({
-          ...(c.metroPort !== undefined ? { WATCHER_PORT: c.metroPort } : {}),
+          ...(c.metroPort != null && c.metroPort !== '' ? { WATCHER_PORT: c.metroPort } : {}),
           ...(c.simulator ? { IOS_SIMULATOR: c.simulator } : {}),
           ...(c.slotId ? { SLOT_ID: c.slotId } : {}),
         });
@@ -166,9 +174,10 @@ function resolveMobileProvisionBaseline(repo) {
   try {
     const c = JSON.parse(fs.readFileSync(basePath, 'utf8'));
     const simulator = c.simulator?.name || c.simulator?.udid;
-    if (!simulator && c.watcherPort === undefined) return null;
+    const watcherPort = c.watcherPort != null && c.watcherPort !== '' ? c.watcherPort : undefined;
+    if (!simulator && watcherPort === undefined) return null;
     return formatKvLines({
-      ...(c.watcherPort !== undefined ? { WATCHER_PORT: c.watcherPort } : {}),
+      ...(watcherPort !== undefined ? { WATCHER_PORT: watcherPort } : {}),
       ...(simulator ? { IOS_SIMULATOR: simulator } : {}),
       ...(c.slotId ? { SLOT_ID: c.slotId } : {}),
     });

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/slot-ports.js

@@ -14,6 +14,7 @@ function applyKVLines(output, overwrite) {
     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"]) {
@@ -39,15 +40,9 @@ function applyKVLines(output, overwrite) {
 }
 function resolveMobileSlotPorts(target) {
   const ctxOut = resolveMobileRuntimeContext(target);
-  if (ctxOut?.trim()) {
-    applyKVLines(ctxOut, true);
-    return;
-  }
+  if (ctxOut?.trim()) applyKVLines(ctxOut, true);
   const poolOut = resolveFarmslotPortsByRepo(target);
-  if (poolOut?.trim()) {
-    applyKVLines(poolOut, true);
-    return;
-  }
+  if (poolOut?.trim()) applyKVLines(poolOut, false);
   const defOut = resolveMobileSlotDefaults(target);
   if (defOut?.trim()) applyKVLines(defOut, false);
 }