@deeeed/metamask-harness 0.47.4 → 0.48.0

package/library/actions/extension/swap_bridge/set_max_amount.mjs

@@ -1,5 +1,7 @@
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
 import { resolveAmountOptions } from '../../shared/swap-bridge/transaction.mjs';
+import { requireVisibleObservation } from '../../shared/ui/locators.mjs';
+import { readQuoteInputIdentity } from './quote-state.mjs';
 
 async function pause(page) {
   await page.evaluate('new Promise((resolve) => setTimeout(resolve, 250))');
@@ -11,21 +13,11 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
     wait_for_quote: input.node?.wait_for_quote,
     timeout_ms: input.node?.timeout_ms,
   });
-  const marker = `mm-harness-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-  const selector = await page.evaluate(`(() => {
-    const marker = ${JSON.stringify(marker)};
-    for (const element of document.querySelectorAll('button, [role="button"]')) {
-      const label = String(element.innerText || element.textContent || '').replace(/\\s+/gu, ' ').trim();
-      const style = getComputedStyle(element);
-      const rect = element.getBoundingClientRect();
-      if (label !== 'Max' || style.display === 'none' || style.visibility === 'hidden' || rect.width <= 0 || rect.height <= 0) continue;
-      element.setAttribute('data-mm-harness-target', marker);
-      return '[data-mm-harness-target="' + marker + '"]';
-    }
-    return null;
-  })()`);
-  if (!selector) throw new Error('Swap Max control was not visible.');
-  await page.click(selector);
+  const visible = requireVisibleObservation(await page.observe(['ui.visible']));
+  const controls = visible.items.filter((item) =>
+    item.label === 'Max' && item.selector && item.enabled !== false);
+  if (controls.length !== 1) throw new Error('Swap requires exactly one visible, enabled Max control.');
+  await page.click(controls[0].selector);
   const deadline = Date.now() + options.timeoutMs;
   let observed = null;
   while (Date.now() < deadline) {
@@ -45,14 +37,21 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
         noQuote: document.body.innerText.includes("This trade route isn't available right now"),
       };
     })()`);
+    if (options.waitForQuote) {
+      observed.quoteIdentity = await readQuoteInputIdentity(page);
+      if (observed.quoteIdentity.sourceAmount !== observed.sourceAmount || observed.quoteIdentity.destinationAmount !== observed.destinationAmount) observed.quoteIdentity.status = 'stale';
+    }
+    if (observed.quoteIdentity?.status === 'matching' && !observed.loading && !observed.ctaEnabled && /^Insufficient funds$/iu.test(String(observed.cta))) {
+      throw new Error(`Swap Max quote matches the input but cannot be submitted: ${JSON.stringify(observed)}.`);
+    }
     if (Number(observed.sourceAmount) > 0
-      && (!options.waitForQuote || observed.noQuote || (!observed.loading && Number(observed.destinationAmount) > 0 && observed.ctaEnabled))) break;
+      && (!options.waitForQuote || observed.noQuote || (observed.quoteIdentity?.status === 'matching' && !observed.loading && Number(observed.destinationAmount) > 0 && observed.ctaEnabled && /^(?:Swap|Bridge)$/iu.test(String(observed.cta))))) break;
     await pause(page);
   }
   if (!(Number(observed?.sourceAmount) > 0)) throw new Error('Swap Max did not populate a positive source amount.');
   if (options.waitForQuote && !observed.noQuote
-    && (observed.loading || !(Number(observed.destinationAmount) > 0) || !observed.ctaEnabled)) {
-    throw new Error(`Swap Max quote did not resolve within ${options.timeoutMs}ms.`);
+    && (observed.quoteIdentity?.status !== 'matching' || observed.loading || !(Number(observed.destinationAmount) > 0) || !observed.ctaEnabled || !/^(?:Swap|Bridge)$/iu.test(String(observed.cta)))) {
+    throw new Error(`Swap Max quote did not resolve within ${options.timeoutMs}ms: ${JSON.stringify(observed)}.`);
   }
   return { action: input.action, ...observed, proofPath: 'trusted-pointer-visible-ui' };
 }));

package/library/actions/extension/swap_bridge/set_slippage.mjs

@@ -74,10 +74,8 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
   if (!observed?.includes(`${percent}%`)) {
     throw new Error(`Swap quote did not display Slippage: ${percent}%.`);
   }
-  await page.evaluate('new Promise((resolve) => setTimeout(resolve, 500))');
   let stableSince = null;
   let quote = null;
-  let lastRefreshAt = 0;
   while (Date.now() < deadline) {
     quote = await page.evaluate(`(() => {
       const destination = document.querySelector('[data-testid="to-amount"]');
@@ -90,13 +88,6 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
         ctaEnabled: Boolean(cta && !cta.disabled),
       };
     })()`);
-    if (/^(?:Get new quote|Refresh quote)$/iu.test(quote.cta) && quote.ctaEnabled && Date.now() - lastRefreshAt >= 1000) {
-      await page.click(dataTestId('bridge-cta-button'));
-      lastRefreshAt = Date.now();
-      stableSince = null;
-      await pause(page);
-      continue;
-    }
     const ready = !quote.loading && Number(quote.destinationAmount) > 0 && quote.ctaEnabled
       && /^(?:Swap|Bridge)$/iu.test(quote.cta);
     if (ready) {

package/library/actions/extension/ui/navigate.mjs

@@ -8,6 +8,7 @@ import {
 } from '../platform/cdp.mjs';
 
 const BACK_CONTROLS = [
+  'custom-token-import-close-button',
   'perps-order-entry-back-button',
   'perps-market-detail-back-button',
   'perps-activity-back-button',
@@ -23,6 +24,18 @@ const BACK_CONTROLS = [
 ].map(dataTestId).concat('button[aria-label="Back"]');
 const UI_POLL_MS = 200;
 const PERPS_HOME_SETTLE_MS = 1000;
+const PERPS_MARKET_LIST = [
+  'market-list-view',
+  'parent-selector-perps-market-list',
+].map(dataTestId).join(',');
+const PERPS_MARKET_DETAIL = [
+  'perps-market-detail-page',
+  'parent-selector-perps-market-detail',
+].map(dataTestId).join(',');
+const PERPS_ACTIVITY = [
+  'perps-activity-page',
+  'parent-selector-perps-activity',
+].map(dataTestId).join(',');
 
 function text(value) {
   return typeof value === 'string' && value.length > 0 ? value : undefined;
@@ -68,6 +81,7 @@ async function hasVisibleSelector(page, selector) {
   return page.evaluate(`(() => {
     const element = document.querySelector(${JSON.stringify(selector)});
     if (!element) return false;
+    if (element.closest('dialog')?.open === false) return false;
     const style = getComputedStyle(element);
     const rect = element.getBoundingClientRect();
     return style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0;
@@ -116,6 +130,13 @@ export async function openHome(page, timeoutMs) {
   let pendingActivation;
 
   while (Date.now() < deadline) {
+    const importNetworkClose = '[data-testid="custom-token-import-network-selector"] button[aria-label="Close"]';
+    if (await hasVisibleSelector(page, importNetworkClose)) {
+      await activateSemanticControl(page, importNetworkClose);
+      steps.push(importNetworkClose);
+      await pauseForUi(page);
+      continue;
+    }
     if (await hasVisibleSelector(page, drawerClose)) {
       await activateSemanticControl(page, drawerClose);
       steps.push(drawerClose);
@@ -274,11 +295,11 @@ export async function openPerpsHome(page, timeoutMs) {
 export async function openPerpsMarket(page, market, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   const normalizedMarket = normalizeMarketSymbol(market.trim());
-  if (await hasVisibleSelector(page, dataTestId('market-list-view'))) {
+  if (await hasVisibleSelector(page, PERPS_MARKET_LIST)) {
     const marketRow = dataTestId(`market-row-${normalizedMarket.replace(':', '-')}`);
     await page.waitForSelector(marketRow, { timeoutMs: Math.max(1, deadline - Date.now()) });
     const navigation = await activateSemanticControl(page, marketRow);
-    await page.waitForSelector(dataTestId('perps-market-detail-page'), {
+    await page.waitForSelector(PERPS_MARKET_DETAIL, {
       timeoutMs: Math.max(1, deadline - Date.now()),
     });
     return {
@@ -308,7 +329,7 @@ export async function openPerpsMarket(page, market, timeoutMs) {
     );
   }
   const navigation = await activateSemanticControl(page, marketControl);
-  await page.waitForSelector(dataTestId('perps-market-detail-page'), {
+  await page.waitForSelector(PERPS_MARKET_DETAIL, {
     timeoutMs: Math.max(1, deadline - Date.now()),
   });
   return {
@@ -321,7 +342,7 @@ export async function openPerpsMarket(page, market, timeoutMs) {
 }
 
 export async function openPerpsActivity(page, timeoutMs) {
-  if (await hasVisibleSelector(page, dataTestId('perps-activity-page'))) {
+  if (await hasVisibleSelector(page, PERPS_ACTIVITY)) {
     return { method: 'visible-ui', href: await currentHref(page), steps: [] };
   }
   const deadline = Date.now() + timeoutMs;
@@ -329,7 +350,7 @@ export async function openPerpsActivity(page, timeoutMs) {
   const activity = dataTestId('perps-recent-activity-see-all');
   await page.waitForSelector(activity, { timeoutMs: Math.max(1, deadline - Date.now()) });
   const navigation = await activateSemanticControl(page, activity);
-  await page.waitForSelector(dataTestId('perps-activity-page'), {
+  await page.waitForSelector(PERPS_ACTIVITY, {
     timeoutMs: Math.max(1, deadline - Date.now()),
   });
   return {
@@ -342,7 +363,7 @@ export async function openPerpsActivity(page, timeoutMs) {
 }
 
 export async function openPerpsMarketList(page, timeoutMs) {
-  const marketList = dataTestId('market-list-view');
+  const marketList = PERPS_MARKET_LIST;
   if (await hasVisibleSelector(page, marketList)) {
     return { method: 'visible-ui', href: await currentHref(page), steps: [] };
   }
@@ -417,17 +438,37 @@ export async function openNetwork(page, network, chainId, addIfMissing, timeoutM
       throw new Error('Token assets did not become selected before network navigation.');
     }
   }
-  await activateSemanticControl(page, sort);
-  steps.push(sort);
+  if (!(await hasVisibleSelector(page, dataTestId('home-network-filter-all-default')))) {
+    await activateSemanticControl(page, sort);
+    steps.push(sort);
+  }
   let choice = await waitForFirstVisible(page, [installed, custom, additional, manage], deadline);
   if (!choice) throw new Error(`Network filter did not show ${network} (${chainId}) before timeout.`);
-  if (choice !== manage) {
+  if (!addIfMissing && (choice === additional || choice === manage)) {
+    throw new Error(`Network ${network} (${chainId}) is not added to the wallet.`);
+  }
+  let added = false;
+  if (choice === additional) {
+    await page.scroll({ selector: additional, intoView: true });
+    await page.waitFor({ selector: additional, expected: 'visible', timeoutMs: Math.max(1, deadline - Date.now()) });
+    await activateSemanticControl(page, additional);
+    steps.push(additional);
+    await page.waitFor({ selector: additional, expected: 'hidden', timeoutMs: Math.max(1, deadline - Date.now()) });
+    await activateSemanticControl(page, sort);
+    steps.push(sort);
+    choice = await waitForFirstVisible(page, [installed, custom], deadline);
+    if (!choice) throw new Error(`Added network ${network} (${chainId}) did not appear in the wallet filter.`);
+    await page.scroll({ selector: choice, intoView: true });
+    await page.waitFor({ selector: choice, expected: 'visible', timeoutMs: Math.max(1, deadline - Date.now()) });
+    await activateSemanticControl(page, choice);
+    steps.push(choice);
+    added = true;
+  } else if (choice !== manage) {
+    await page.scroll({ selector: choice, intoView: true });
+    await page.waitFor({ selector: choice, expected: 'visible', timeoutMs: Math.max(1, deadline - Date.now()) });
     await activateSemanticControl(page, choice);
     steps.push(choice);
   } else {
-    if (!addIfMissing) {
-      throw new Error(`Network ${network} (${chainId}) is not added to the wallet.`);
-    }
     await activateSemanticControl(page, manage);
     steps.push(manage);
     const listItem = dataTestId(`network-list-item-eip155:${chainId}`);
@@ -437,6 +478,7 @@ export async function openNetwork(page, network, chainId, addIfMissing, timeoutM
       await activateSemanticControl(page, popular);
       steps.push(popular);
       await page.waitForSelector(listItem, { timeoutMs: Math.max(1, deadline - Date.now()) });
+      added = true;
     }
     const back = dataTestId('page-header-back-button');
     await activateSemanticControl(page, back);
@@ -444,15 +486,17 @@ export async function openNetwork(page, network, chainId, addIfMissing, timeoutM
     await page.waitForSelector(sort, { timeoutMs: Math.max(1, deadline - Date.now()) });
     await activateSemanticControl(page, sort);
     steps.push(sort);
-    choice = await waitForFirstVisible(page, [installed, custom, additional], deadline);
+    choice = await waitForFirstVisible(page, [installed, custom], deadline);
     if (!choice) throw new Error(`Added network ${network} (${chainId}) did not appear in the wallet filter.`);
+    await page.scroll({ selector: choice, intoView: true });
+    await page.waitFor({ selector: choice, expected: 'visible', timeoutMs: Math.max(1, deadline - Date.now()) });
     await activateSemanticControl(page, choice);
     steps.push(choice);
   }
   while (Date.now() < deadline) {
     const label = await page.evaluate(`String(document.querySelector(${JSON.stringify(sort)})?.innerText || '')`);
     if (label.toLowerCase().includes(network.toLowerCase())) {
-      return { method: 'visible-ui', href: await currentHref(page), network, chainId, steps };
+      return { method: 'visible-ui', href: await currentHref(page), network, chainId, added, steps };
     }
     await pauseForUi(page);
   }

package/library/actions/extension/wallet/lock.mjs

@@ -21,6 +21,7 @@ async function clickUncovered(page, selector, deadline) {
     point = await page.evaluate(`(() => {
       const element = document.querySelector(${JSON.stringify(selector)});
       if (!element) return null;
+      element.scrollIntoView({ block: 'center', inline: 'center' });
       const style = getComputedStyle(element);
       const rect = element.getBoundingClientRect();
       if (style.display === 'none' || style.visibility === 'hidden' || rect.width <= 0 || rect.height <= 0) return null;
@@ -74,7 +75,7 @@ export async function lockWallet(page, timeoutMs = 15_000) {
     if (Date.now() >= deadline) throw new Error('Wallet lock control did not become visible.');
     await page.evaluate('new Promise((resolve) => setTimeout(resolve, 100))');
   }
-  await page.click(LOCK);
+  await clickUncovered(page, LOCK, deadline);
   while (!(await visible(page, UNLOCK_PAGE))) {
     if (Date.now() >= deadline) throw new Error('Wallet did not reach the unlock page after locking.');
     await page.evaluate('new Promise((resolve) => setTimeout(resolve, 100))');

package/library/actions/mobile/assets/import_custom_token.mjs

@@ -168,6 +168,7 @@ runAdapter(async (input) => {
     const token = await findTokenRow(session, expectedSymbol, timeoutMs);
     return {
       action: input.action,
+      changed: true,
       network,
       chainId,
       address,

package/library/actions/mobile/assets/read_visible_state.mjs

@@ -17,7 +17,7 @@ runAdapter(async (input) => {
     const warning = observed.warnings?.map((entry) => entry.message).filter(Boolean).join('; ');
     throw new Error(`Mobile visible Assets state is unavailable${warning ? `: ${warning}` : '.'}`);
   }
-  const items = [...(visible.items ?? []), ...(visible.hidden_or_offscreen ?? [])]
+  const items = (visible.items ?? [])
     .filter((item) => String(item.test_id ?? '').startsWith('asset-'))
     .map((item) => ({
       testId: item.test_id,
@@ -32,6 +32,8 @@ runAdapter(async (input) => {
       items,
       truncated: visible.truncated,
     }, options, 'mobile'),
+    observationProvider: visible.provider ?? screen.provider,
+    deviceId: screen.deviceId,
     proofPath: 'native-accessibility',
   };
 });

package/library/actions/mobile/assets/set_token_visibility.mjs

@@ -25,25 +25,24 @@ function descendants(snapshot, root) {
 
 function searchedToken(snapshot, query) {
   const normalized = query.toUpperCase();
-  const rows = snapshot.nodes.filter((node) => node.identifier === 'searched-token-result');
+  const rows = snapshot.nodes.filter((node) => node.identifier === 'searched-token-result' && node.visibleToUser !== false);
+  const matches = [];
   for (const row of rows) {
     const children = descendants(snapshot, row);
-    const label = children.map(nativeLabel).find((value) => {
+    const label = [nativeLabel(row), ...children.map(nativeLabel)].find((value) => {
       const parts = value.split(',').map((part) => part.trim().toUpperCase());
       return parts.includes(normalized);
     });
     if (label) {
-      return {
+      matches.push({
         row,
         label,
         imported: row.enabled === false && children.some((node) => /CheckBox$/u.test(String(node.type))),
-      };
+      });
     }
   }
-  const imported = rows.find((row) =>
-    row.enabled === false && descendants(snapshot, row).some((node) => /CheckBox$/u.test(String(node.type)))
-  );
-  return imported ? { row: imported, label: query, imported: true } : null;
+  if (matches.length > 1) throw new Error(`Mobile token search matched ${matches.length} rows for ${query}; token identity is ambiguous.\nNext: mm-harness actions --action metamask.assets.set_token_visibility --json`);
+  return matches[0] ?? null;
 }
 
 function visibleNode(snapshot, identifier) {
@@ -201,7 +200,9 @@ async function findVisibleAsset(session, query, timeoutMs) {
     )).snapshot;
   }
   for (let attempt = 0; attempt < 8; attempt += 1) {
-    if (nativeNode(snapshot, `asset-${query.toUpperCase()}`)) return true;
+    const matches = snapshot.nodes.filter(node => node.identifier === `asset-${query.toUpperCase()}` && node.visibleToUser !== false);
+    if (matches.length > 1) throw new Error(`Mobile token list matched ${matches.length} rows for ${query}; removal is ambiguous.\nNext: mm-harness actions --action metamask.assets.set_token_visibility --json`);
+    if (matches.length === 1) return true;
     await session.execute('ui.scroll', { direction: 'down', timeout_ms: timeoutMs, settle: false });
     snapshot = await session.snapshot();
   }
@@ -271,6 +272,9 @@ async function disableToken(session, query, requireUnchanged, requireChange, tim
 }
 
 runAdapter(async (input) => {
+  if (String(input.node?.asset_id ?? '').trim()) {
+    throw new Error('Exact asset-ID corroboration is not supported on Mobile.\nNext: mm-harness actions --adapter mobile --action metamask.assets.set_token_visibility --json');
+  }
   const query = String(input.node?.query ?? '').trim();
   const timeoutMs = Number(input.node?.timeout_ms ?? 45_000);
   const requested = input.node?.visible;

package/library/actions/mobile/networks/network-management.mjs

@@ -26,6 +26,10 @@ export async function waitForSnapshot(session, timeoutMs, predicate, message) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() <= deadline) {
     const snapshot = await session.snapshot();
+    const labels = snapshot.nodes.map(nativeLabel);
+    if (labels.includes('Reload') && labels.includes('Go home') && labels.includes('Tools button')) {
+      throw new Error('Mobile network navigation opened the Expo developer menu instead of the requested control.\nNext: mm-harness call ui.key_press key=BACK --adapter mobile');
+    }
     const value = predicate(snapshot);
     if (value) return { snapshot, value };
     await new Promise((resolve) => setTimeout(resolve, 200));
@@ -42,23 +46,26 @@ async function systemBack(session) {
 }
 
 export async function openNetworkManager(session, timeoutMs) {
-  for (let attempt = 0; attempt < 8; attempt += 1) {
-    const snapshot = await session.snapshot();
-    if (visibleNode(snapshot, IDS.manager)) return snapshot;
-    if (visibleNode(snapshot, IDS.details)) {
-      await systemBack(session);
-      continue;
-    }
-    if (visibleNode(snapshot, IDS.menu)) {
-      await session.execute('ui.press', { test_id: IDS.menu, timeout_ms: timeoutMs, settle: false });
-      continue;
-    }
-    if (IDS.wallet.some((identifier) => nativeNode(snapshot, identifier))) {
-      await session.execute('ui.press', { test_id: IDS.hamburger, timeout_ms: timeoutMs, settle: false });
-      continue;
-    }
+  const snapshot = await session.snapshot();
+  if (visibleNode(snapshot, IDS.manager)) return snapshot;
+  if (visibleNode(snapshot, IDS.details)) {
     await systemBack(session);
+    return (await waitForSnapshot(
+      session, timeoutMs, (current) => visibleNode(current, IDS.manager),
+      'Mobile Networks settings did not return from network details.',
+    )).snapshot;
+  }
+  if (!visibleNode(snapshot, IDS.menu)) {
+    if (!IDS.wallet.some((identifier) => nativeNode(snapshot, identifier))) {
+      throw new Error('Mobile network navigation requires Home, the account menu, or network settings.');
+    }
+    await session.execute('ui.press', { test_id: IDS.hamburger, timeout_ms: timeoutMs, settle: false });
+    await waitForSnapshot(
+      session, timeoutMs, (current) => visibleNode(current, IDS.menu),
+      'The Mobile account menu did not expose the Networks control after opening.',
+    );
   }
+  await session.execute('ui.press', { test_id: IDS.menu, timeout_ms: timeoutMs, settle: false });
   return (await waitForSnapshot(
     session,
     timeoutMs,

package/library/actions/mobile/networks/remove_custom.mjs

@@ -32,6 +32,8 @@ runAdapter(async (input) => {
       (snapshot) => {
         const container = nativeNode(snapshot, 'network-details-view-container');
         if (!container) return null;
+        const remove = nativeNode(snapshot, 'network-details-view-remove-network-button');
+        if (remove?.enabled === true && remove.visibleToUser !== false && remove.hittable === true) return remove;
         const labeled = snapshot.nodes.find((node) =>
           node.hittable === true && /delete|remove|trash/iu.test(nativeLabel(node))
         );
@@ -84,8 +86,10 @@ runAdapter(async (input) => {
       (snapshot) => nativeNode(snapshot, 'networks-settings-container'),
       'Mobile Networks settings did not reopen after deletion.',
     );
-    if (await findNetwork(session, network, chainId, timeoutMs)) {
-      throw new Error(`${network} (${chainId}) remained after deletion.`);
+    const removalDeadline = Date.now() + timeoutMs;
+    while (await findNetwork(session, network, chainId, Math.max(1, removalDeadline - Date.now()))) {
+      if (Date.now() >= removalDeadline) throw new Error(`${network} (${chainId}) remained after deletion.`);
+      await new Promise((resolve) => setTimeout(resolve, 250));
     }
     return {
       action: input.action,

package/library/actions/mobile/perps/perps.mjs

@@ -1770,6 +1770,9 @@ async function applyTutorialState(input, config) {
 
 
 export async function startState(input) {
+  if (input.node?.account !== undefined && (typeof input.node.account !== 'string' || !input.node.account.trim())) {
+    throw new Error('Perps start state requires a non-empty named account when account is supplied.\nNext: mm-harness actions metamask.perps.start_state --adapter mobile --json');
+  }
   const params = paramsForState(input);
   const config = applyTradingStatePolicy(
     mergeStateConfig(profileDefaults(params.profile), params),

package/library/actions/mobile/perps/read-visible-state-loop.mjs

@@ -47,6 +47,7 @@ export async function readVisiblePerpsState(
             truncated: visible.truncated,
           }, options, 'mobile'),
           proofPath: 'native-accessibility',
+          observationProvider: visible.provider,
         };
       } catch (error) {
         lastAssertionError = error;

package/library/actions/mobile/perps/set_market_favorite.mjs

@@ -11,7 +11,14 @@ const FAVORITE_IDS = [
   'perps-pro-market-header-favorite-button',
 ];
 
-function favoriteControl(snapshot) {
+function favoriteControl(snapshot, market) {
+  const subtitle = nativeLabel(
+    nativeNode(snapshot, 'perps-market-header-subtitle')
+    ?? nativeNode(snapshot, 'perps-pro-market-header-subtitle'),
+  ).toUpperCase();
+  if (!subtitle.startsWith(`${market}-`)) {
+    throw new Error(`Visible Perps market ${JSON.stringify(subtitle)} does not match ${market}.`);
+  }
   for (const testId of FAVORITE_IDS) {
     const node = nativeNode(snapshot, testId);
     if (/(?:add to|remove from) watchlist/iu.test(nativeLabel(node))) {
@@ -39,18 +46,11 @@ runAdapter(async (input) => {
   if (typeof desired !== 'boolean') {
     throw new Error('metamask.perps.set_market_favorite requires favorite=true or false.');
   }
-  let session = createNativeSession(input, 'Perps', `favorite-${process.pid}`);
+  const session = createNativeSession(input, 'Perps', `favorite-${process.pid}`);
   try {
     await session.open();
     let snapshot = await session.snapshot();
-    const subtitle = nativeLabel(
-      nativeNode(snapshot, 'perps-market-header-subtitle')
-      ?? nativeNode(snapshot, 'perps-pro-market-header-subtitle'),
-    ).toUpperCase();
-    if (!subtitle.startsWith(`${market}-`)) {
-      throw new Error(`Visible Perps market ${JSON.stringify(subtitle)} does not match ${market}.`);
-    }
-    let control = favoriteControl(snapshot);
+    let control = favoriteControl(snapshot, market);
     const controlDeadline = Date.now() + timeoutMs;
     let lastControls = [];
     while (Date.now() <= controlDeadline && !control) {
@@ -60,37 +60,33 @@ runAdapter(async (input) => {
         .filter((node) => /(?:favorite|mode-toggle|market-header)/iu.test(String(node.identifier ?? '')))
         .map((node) => ({ id: String(node.identifier ?? ''), label: nativeLabel(node) }))
         .slice(0, 20);
-      control = favoriteControl(snapshot);
+      control = favoriteControl(snapshot, market);
     }
     if (!control) {
       throw new Error(`Perps favorite control is not visible in Lite or Pro mode; observed ${JSON.stringify(lastControls)}.`);
     }
     const before = favoriteState(control);
+    if (requireUnchanged && before !== desired) {
+      throw new Error(`Perps favorite state for ${market} did not persist across navigation; no change was made.`);
+    }
     if (before !== desired) {
       await session.execute('ui.press', {
         test_id: control.testId,
         timeout_ms: timeoutMs,
         settle: false,
       });
-      await closeNativeSession(session);
-      await new Promise((resolve) => setTimeout(resolve, 500));
-      session = createNativeSession(input, 'Perps', `favorite-proof-${process.pid}`);
-      await session.open();
     }
     const deadline = Date.now() + timeoutMs;
     let after = before;
     while (Date.now() <= deadline) {
       snapshot = await session.snapshot();
-      control = favoriteControl(snapshot);
+      control = favoriteControl(snapshot, market);
       if (control) after = favoriteState(control);
       if (after === desired) break;
       await new Promise((resolve) => setTimeout(resolve, 200));
     }
     if (after !== desired) throw new Error(`Perps favorite state did not become ${desired}.`);
     const changed = before !== after;
-    if (requireUnchanged && changed) {
-      throw new Error(`Perps favorite state for ${market} did not persist across navigation.`);
-    }
     return {
       action: input.action,
       market,

package/library/actions/mobile/platform/native-session.mjs

@@ -1,6 +1,9 @@
 import { createAgentDeviceUiTransport } from '@farmslot/expo-recipe';
 import { createAgentDeviceClient } from 'agent-device';
 
+import { resolveMobileTarget } from './bridge.mjs';
+import { hideAccessibilityMaskingHud } from './observe-ui.mjs';
+
 import {
   nativeAgentDeviceStateDir,
   nativeSessionName,
@@ -8,17 +11,27 @@ import {
 
 export function createNativeSession(input, domain, sessionSuffix = '') {
   const env = { ...process.env, ...(input.context?.env ?? {}) };
-  const device = String(env.ADB_SERIAL ?? env.ANDROID_SERIAL ?? '').trim();
-  if (!device) throw new Error(`Mobile ${domain} native actions require one explicit Android device serial.`);
-  const app = String(env.ANDROID_PACKAGE_ID ?? 'io.metamask');
+  const target = resolveMobileTarget(input);
+  const platform = target.requestedPlatform || (target.adbSerial ? 'android' : 'ios');
+  const device = String(platform === 'android'
+    ? target.adbSerial ?? ''
+    : input.node?.sim_udid ?? env.SIM_UDID ?? target.iosSimulator ?? '').trim();
+  if (!device) throw new Error(`Mobile ${domain} native actions require one explicit ${platform} device. Next: pass --device <device>.`);
+  const app = String(platform === 'android'
+    ? env.ANDROID_PACKAGE_ID ?? 'io.metamask'
+    : env.IOS_BUNDLE_ID ?? 'io.metamask.MetaMask');
   const baseSession = nativeSessionName(env, device, app);
   const session = sessionSuffix
     ? `${baseSession}-${String(sessionSuffix).replace(/[^A-Za-z0-9._-]/gu, '-')}`.slice(0, 120)
     : baseSession;
   const stateDir = nativeAgentDeviceStateDir(env, input.context.projectRoot, device);
-  const client = createAgentDeviceClient({ session, stateDir, lockPolicy: 'reject', lockPlatform: 'android' });
-  const selection = { platform: 'android', target: 'mobile', serial: device, session };
-  const transport = createAgentDeviceUiTransport({ platform: 'android', device, app, session, stateDir, client });
+  const client = createAgentDeviceClient({ session, stateDir, lockPolicy: 'reject', lockPlatform: platform });
+  const selection = {
+    platform, target: 'mobile', session,
+    ...(platform === 'android' ? { serial: device }
+      : /^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/iu.test(device) ? { udid: device } : { device }),
+  };
+  const transport = createAgentDeviceUiTransport({ platform, device, app, session, stateDir, client });
   const context = {
     nodeId: String(input.context?.nodeId ?? 'action'),
     projectRoot: input.context.projectRoot,
@@ -31,23 +44,19 @@ export function createNativeSession(input, domain, sessionSuffix = '') {
     selection,
     context,
     app,
-    open: () => client.apps.open({ ...selection, app, noRecord: true }),
+    open: async () => {
+      if (platform === 'ios' && env.METAMASK_RECIPE_MOBILE_OPAQUE_RUNTIME !== '1') {
+        await hideAccessibilityMaskingHud({ node: input.node }, input.context);
+      }
+      await transport.open();
+    },
     execute: (action, node) => transport.execute(action, node, context),
     snapshot: () => client.capture.snapshot({ ...selection, app, interactiveOnly: false, forceFull: true }),
   };
 }
 
 export async function closeNativeSession(session) {
-  try {
-    await session.transport.close();
-  } catch (error) {
-    if (!/No active session|SESSION_NOT_FOUND/iu.test(String(error?.message ?? error))) throw error;
-  }
-  try {
-    await session.client.sessions.close();
-  } catch (error) {
-    if (!/No active session|SESSION_NOT_FOUND/iu.test(String(error?.message ?? error))) throw error;
-  }
+  await session.transport.close();
 }
 
 export function nativeNode(snapshot, identifier) {

package/library/actions/mobile/platform/observe-ui.mjs

@@ -45,7 +45,7 @@ export async function observeNativeUi(payload, context) {
   }
 }
 
-async function hideAccessibilityMaskingHud(payload, context) {
+export async function hideAccessibilityMaskingHud(payload, context) {
   try {
     await bridgeCommand(
       {
@@ -429,7 +429,7 @@ function parseAndroidHierarchy(output) {
       isActionableRole(role) ||
       attributes.clickable === 'true' ||
       attributes['long-clickable'] === 'true';
-    if (isActionable) {
+    if (isActionable || item.test_id) {
       if (isVisible) {
         visible.push(item);
       } else {

package/library/actions/mobile/ui/navigate.mjs

@@ -12,7 +12,7 @@ import {
 const PAGE_ROUTES = {
   home: { route: 'WalletView', params: {} },
   perps: { route: 'PerpsMarketListView', params: {} },
-  'perps-market-list': { route: 'PerpsMarketListView', params: {} },
+  'perps-market-list': { route: 'PerpsTrendingView', params: {} },
   swap: { route: 'BridgeView', params: {} },
 };