@deeeed/metamask-harness 0.40.0 → 0.41.0

package/library/actions/mobile/platform/bridge.mjs

@@ -145,6 +145,7 @@ export async function bridgeEnv(input) {
   if (adbPath) env.MM_HARNESS_ADB_PATH = adbPath;
   if (idbPath) env.MM_HARNESS_IDB_PATH = idbPath;
   const target = resolveMobileTarget(input);
+  const requestedPlatform = target.requestedPlatform;
   const watcherPort = target.watcherPort;
   const simulator = target.iosSimulator;
   const androidDevice = target.androidDevice;
@@ -160,6 +161,12 @@ export async function bridgeEnv(input) {
     env.ADB_SERIAL = String(adbSerial);
     env.ANDROID_SERIAL = String(adbSerial);
   }
+  if (requestedPlatform === 'ios') {
+    env.ADB_SERIAL = '';
+    env.ANDROID_SERIAL = '';
+    env.ANDROID_DEVICE = '';
+    env.ANDROID_TARGET_DEVICE_NAME = '';
+  }
   // When --device passes an adb serial, device-target.ts sets both ANDROID_DEVICE and
   // ADB_SERIAL to the same value. ANDROID_DEVICE must be the Metro deviceName for
   // target-discovery to select the right CDP target; it cannot be a raw adb serial.
@@ -210,12 +217,55 @@ export function shouldResolveAndroidTargetModel(
 
 function resolveMobileTarget(input) {
   const contextEnv = input.context?.env || {};
+  const explicitSimulatorUdid =
+    input.node?.sim_udid ?? contextEnv.SIM_UDID ?? process.env.SIM_UDID;
+  const configuredPlatform = String(
+    input.node?.platform ??
+      contextEnv.MM_HARNESS_EXPLICIT_PLATFORM ??
+      process.env.MM_HARNESS_EXPLICIT_PLATFORM ??
+      contextEnv.PLATFORM ??
+      process.env.PLATFORM ??
+      '',
+  ).toLowerCase();
+  const requestedPlatform =
+    configuredPlatform === 'ios' || configuredPlatform === 'android'
+      ? configuredPlatform
+      : explicitSimulatorUdid
+        ? 'ios'
+        : configuredPlatform;
   const watcherPort = input.node?.watcher_port ?? input.node?.metro_port ?? input.node?.cdp_port ?? contextEnv.WATCHER_PORT ?? contextEnv.CDP_PORT ?? contextEnv.RECIPE_CDP_PORT ?? process.env.WATCHER_PORT ?? process.env.CDP_PORT ?? process.env.RECIPE_CDP_PORT;
   const iosSimulator = input.node?.simulator ?? input.node?.ios_simulator ?? contextEnv.IOS_SIMULATOR ?? process.env.IOS_SIMULATOR;
   const androidDevice = input.node?.android_device ?? contextEnv.ANDROID_DEVICE ?? process.env.ANDROID_DEVICE;
   const androidTargetDeviceName = input.node?.android_target_device_name ?? input.node?.androidTargetDeviceName ?? contextEnv.ANDROID_TARGET_DEVICE_NAME ?? process.env.ANDROID_TARGET_DEVICE_NAME;
   const adbSerial = input.node?.adb_serial ?? contextEnv.ADB_SERIAL ?? contextEnv.ANDROID_SERIAL ?? process.env.ADB_SERIAL ?? process.env.ANDROID_SERIAL ?? androidDevice;
-  return { watcherPort, iosSimulator, androidDevice, androidTargetDeviceName, adbSerial };
+  if (requestedPlatform === 'ios') {
+    return {
+      watcherPort,
+      iosSimulator,
+      androidDevice: undefined,
+      androidTargetDeviceName: undefined,
+      adbSerial: undefined,
+      requestedPlatform,
+    };
+  }
+  if (requestedPlatform === 'android') {
+    return {
+      watcherPort,
+      iosSimulator: undefined,
+      androidDevice,
+      androidTargetDeviceName,
+      adbSerial,
+      requestedPlatform,
+    };
+  }
+  return {
+    watcherPort,
+    iosSimulator,
+    androidDevice,
+    androidTargetDeviceName,
+    adbSerial,
+    requestedPlatform,
+  };
 }
 
 export async function openExternalDeeplink(input, url, timeout = 15000) {
@@ -353,6 +403,14 @@ export function selectBridgeStatusEntry(status, input) {
   if (iosSimulator) {
     const sim = entries.find((entry) => entry.deviceName === iosSimulator);
     if (sim) return sim;
+    if (target.requestedPlatform === 'ios') {
+      throw coded(new Error(
+        `Pinned iOS simulator ${iosSimulator} has no responding bridge status entry.\n` +
+        `  Bridge status entries:\n` +
+        entries.map((entry) => `    - ${entry.deviceName ?? '?'} [${entry.platform || 'unknown'}]`).join('\n') +
+        `\n  Next: mm-harness launch ios   # bring the pinned app back to the foreground`,
+      ), BRIDGE_ERROR_CODES.NO_TARGET);
+    }
   }
   if (androidDevice) {
     const byName = entries.find(

package/library/actions/mobile/wallet/ensure_unlocked.mjs

@@ -56,7 +56,8 @@ async function statusBeforeDeadline(input, deadline) {
       30000,
   );
   const probeTimeoutMs = Math.min(
-    5000,
+    15000,
+    Math.max(5000, Math.floor(remainingMs / 3)),
     remainingMs,
     Number.isFinite(configuredMs) && configuredMs > 0 ? configuredMs : 30000,
   );
@@ -153,7 +154,7 @@ async function waitForStableUnlocked(input, initialStatus, stableMs = 750) {
       if (transientDrops > 2) return null;
     }
   }
-  return last;
+  return isUnlockedStatus(last, input) ? last : null;
 }
 
 export async function ensureUnlocked(input) {
@@ -188,37 +189,70 @@ export async function ensureUnlocked(input) {
       unlocked: true,
       alreadyUnlocked: true,
       account: selectedAccount(stableBefore, input),
+      deviceName: selectedStatus(stableBefore, input)?.deviceName ?? null,
+      platform: selectedStatus(stableBefore, input)?.platform ?? null,
       redacted: true,
       proofPath: 'agentic-wallet-status',
     };
   }
 
   const password = input.node?.password ?? await fixturePassword(input.context.projectRoot);
-  try {
-    const result = await bridgeCommand(input, ['unlock', String(password)]);
-    const after = await waitForUnlocked(input, Number(input.node?.unlock_timeout_ms ?? 30000));
-    const stableAfter = await waitForStableUnlocked(input, after, Number(input.node?.stable_unlocked_ms ?? 750)) ?? after;
-    return {
-      action: input.action,
-      unlocked: Boolean(result?.ok ?? result?.unlocked ?? true),
-      account: selectedAccount(stableAfter, input),
-      route: selectedStatus(stableAfter, input)?.route ?? null,
-      redacted: true,
-      proofPath: 'agentic-wallet-unlock',
-    };
-  } catch (error) {
-    if (!String(error?.message ?? error).includes('login-password-input not found')) throw error;
-    const after = await status(input);
-    if (!selectedAccount(after, input) || routeName(after, input) === 'Login') throw error;
-    return {
-      action: input.action,
-      unlocked: true,
-      alreadyUnlocked: true,
-      account: selectedAccount(after, input),
-      redacted: true,
-      proofPath: 'agentic-wallet-status-after-missing-login-input',
-    };
+  const unlockTimeoutMs = Number(input.node?.unlock_timeout_ms ?? 30000);
+  const unlockDeadline = Date.now() + unlockTimeoutMs;
+  let result;
+  while (result === undefined && Date.now() < unlockDeadline) {
+    try {
+      result = await bridgeCommand(input, ['unlock', String(password)]);
+    } catch (error) {
+      if (!String(error?.message ?? error).includes('login-password-input not found')) {
+        throw error;
+      }
+      try {
+        const current = await statusBeforeDeadline(input, unlockDeadline);
+        if (selectedAccount(current, input) && routeName(current, input) !== 'Login') {
+          return {
+            action: input.action,
+            unlocked: true,
+            alreadyUnlocked: true,
+            account: selectedAccount(current, input),
+            deviceName: selectedStatus(current, input)?.deviceName ?? null,
+            platform: selectedStatus(current, input)?.platform ?? null,
+            redacted: true,
+            proofPath: 'agentic-wallet-status-after-missing-login-input',
+          };
+        }
+      } catch {
+        // The bridge target can rotate while the login input mounts. Keep the
+        // retry bounded by the same unlock deadline.
+      }
+      await new Promise((resolve) => setTimeout(resolve, 250));
+    }
+  }
+  if (result === undefined) {
+    throw new Error(
+      `Timed out waiting ${unlockTimeoutMs}ms for the Mobile login password input.`,
+    );
+  }
+  const remainingUnlockMs = Math.max(1, unlockDeadline - Date.now());
+  const after = await waitForUnlocked(input, remainingUnlockMs);
+  const stableAfter = await waitForStableUnlocked(
+    input,
+    after,
+    Number(input.node?.stable_unlocked_ms ?? 750),
+  );
+  if (!stableAfter) {
+    throw new Error('Mobile wallet did not remain unlocked for the required stability window.');
   }
+  return {
+    action: input.action,
+    unlocked: Boolean(result?.ok ?? result?.unlocked ?? true),
+    account: selectedAccount(stableAfter, input),
+    route: selectedStatus(stableAfter, input)?.route ?? null,
+    deviceName: selectedStatus(stableAfter, input)?.deviceName ?? null,
+    platform: selectedStatus(stableAfter, input)?.platform ?? null,
+    redacted: true,
+    proofPath: 'agentic-wallet-unlock',
+  };
 }
 
 if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {

package/library/actions/mobile/wallet/import.mjs

@@ -319,6 +319,8 @@ runAdapter(async (input) => {
     ...input,
     node: {
       ...input.node,
+      target_timeout_ms: input.node?.target_timeout_ms ?? timeoutMs,
+      unlock_timeout_ms: input.node?.unlock_timeout_ms ?? timeoutMs,
       ...(route === 'Login' ? { password: credentials.password } : {}),
     },
   });

package/library/actions/mobile/wallet/select_account.mjs

@@ -1,8 +1,9 @@
+import { pathToFileURL } from 'node:url';
 import { bridgeCommand, runAdapter } from '../platform/bridge.mjs';
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
-runAdapter(async (input) => {
+export async function selectAccount(input) {
   const requestedAddress = input.node?.address ? String(input.node.address).toLowerCase() : null;
   const requestedId = input.node?.id ? String(input.node.id) : null;
   const requestedName = input.node?.name ? String(input.node.name) : null;
@@ -24,6 +25,20 @@ runAdapter(async (input) => {
   if (!match?.address) {
     throw new Error(`Requested mobile account was not found in list-accounts: ${JSON.stringify({ address: requestedAddress, id: requestedId, name: requestedName })}`);
   }
+  const current = await bridgeCommand(input, ['get-selected-account']);
+  const matchAddress = String(match.address).toLowerCase();
+  if (String(current?.address ?? current ?? '').toLowerCase() === matchAddress) {
+    return {
+      action: input.action,
+      selected: {
+        address: current?.address ?? match.address,
+        id: current?.id ?? match.id,
+        name: current?.name ?? match.name,
+      },
+      alreadySelected: true,
+      proofPath: 'agentic-account-selection',
+    };
+  }
   const result = await bridgeCommand(input, ['switch-account', String(match.address)]);
   const timeoutMs = Number(input.node?.timeout_ms ?? 5000);
   const deadline = Date.now() + timeoutMs;
@@ -49,4 +64,8 @@ runAdapter(async (input) => {
     },
     proofPath: 'agentic-account-selection',
   };
-});
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  runAdapter(selectAccount);
+}

package/library/manifests/mobile.action-manifest.json

@@ -1395,6 +1395,11 @@
           },
           "unlock_timeout_ms": {
             "type": "number"
+          },
+          "stable_unlocked_ms": {
+            "type": "number",
+            "minimum": 0,
+            "description": "How long the unlocked route must remain stable before the action succeeds; zero disables the extra stability window."
           }
         },
         "additionalProperties": false
@@ -1445,6 +1450,11 @@
             "type": "number",
             "minimum": 1,
             "description": "Maximum time in milliseconds for the mobile CDP command."
+          },
+          "timeout_ms": {
+            "type": "number",
+            "minimum": 1,
+            "description": "Maximum time in milliseconds to observe the requested account as selected."
           }
         },
         "additionalProperties": false
@@ -2877,7 +2887,7 @@
       "execution_capabilities": ["app-mutation", "external-mutation"]
     },
     "metamask.perps.capture_performance": {
-      "description": "Capture run-window [HomepagePerf] and optional [StartupPerf] DevLogger records with parsed Perps on-device validation summaries.",
+      "description": "Capture a bounded app-console window, summarize production [PerpsLoadProof]/WebSocket milestones, and optionally parse detailed [PerpsPerf]/[StartupPerf] records when a build emits them.",
       "schema": {
         "type": "object",
         "properties": {
@@ -2891,6 +2901,24 @@
           "artifact_prefix": {
             "type": "string"
           },
+          "wait_for_stage": {
+            "type": "string",
+            "description": "For phase=end, optionally poll until this detailed PerpsPerf stage exists before writing artifacts."
+          },
+          "wait_for_source": {
+            "type": "string"
+          },
+          "wait_for_lifecycle": {
+            "type": "string"
+          },
+          "wait_timeout_ms": {
+            "type": "number",
+            "minimum": 1
+          },
+          "wait_poll_interval_ms": {
+            "type": "number",
+            "minimum": 10
+          },
           "require_records": {
             "type": "boolean"
           },
@@ -2906,6 +2934,18 @@
               "type": "string"
             }
           },
+          "require_perps_bootstrap_start_before_demand": {
+            "type": "boolean",
+            "description": "Require the first Perps surface demand to occur after a captured PerpsLoadProof perps_bootstrap_start boundary."
+          },
+          "required_live_streams": {
+            "type": "array",
+            "description": "Require values_ready records sourced from fresh_socket for each named Perps stream.",
+            "items": {
+              "type": "string",
+              "enum": ["prices", "positions", "orders", "account"]
+            }
+          },
           "required_lifecycles": {
             "type": "array",
             "items": {
@@ -2969,8 +3009,9 @@
         {
           "action": "metamask.perps.capture_performance",
           "phase": "end",
-          "required_stages": ["viewport_demand", "next_frame_checkpoint"],
-          "intent": "Preserve the Perps Homepage performance evidence emitted during this run",
+          "require_records": false,
+          "required_live_streams": ["positions", "orders", "account"],
+          "intent": "Preserve production Perps loading and live-stream evidence emitted during this run",
           "next": "done"
         }
       ],
@@ -3094,9 +3135,9 @@
             }
           },
           "page": {
-            "description": "Initial Perps page target; omit it to use the profile or market default.",
-            "type": "string",
-            "enum": ["home", "perps", "perps_home", "market", "market_details"]
+            "description": "Initial Perps page target; omit it to use the profile or market default, or set false without market/symbol to preserve the current route.",
+            "type": ["string", "boolean"],
+            "enum": [false, "home", "perps", "perps_home", "market", "market_details"]
           },
           "positions": {
             "type": ["object", "boolean"],