@deeeed/metamask-harness 0.47.4 → 0.48.0

package/library/actions/extension/perps/perps.mjs

@@ -1,4 +1,5 @@
 import { pathToFileURL } from 'node:url';
+import { createHash } from 'node:crypto';
 import { dataTestId, marketSymbol, normalizeMarketSymbol, runAdapter, withExtensionPage } from '../platform/cdp.mjs';
 import {
   assertTrustedExternalMutationTarget,
@@ -14,6 +15,7 @@ import {
 } from './mutation-receipt.mjs';
 import { readSnapshot } from './read_snapshot.mjs';
 import { readPerpsRuntimeStateExpression } from './state.mjs';
+import { readWalletStateExpression } from '../wallet/state.mjs';
 import {
   orderIdentityMatches,
   parseOrderCard,
@@ -25,6 +27,8 @@ import {
   waitForStableGlobalPerpsHome,
 } from './visible-mutation-identity.mjs';
 
+const ORDER_ENTRY = '[data-testid="parent-selector-perps-order-entry"], [data-testid="perps-order-entry-page"]';
+
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -117,6 +121,17 @@ export function positionSelectionState(input, positions) {
   return { hasMatching: selectedItems(input, positions).length > 0 };
 }
 
+export function placementReceiptSelection(input) {
+  const reference = input.node?.placement_node;
+  if (reference == null) return {};
+  if (typeof reference !== 'string' || !/^[A-Za-z0-9][A-Za-z0-9_./:-]{0,255}$/u.test(reference)
+    || reference.split('/').some((part) => !part || part === '.' || part === '..')) {
+    throw new Error('placement_node must reference a placement node in the current recipe call.');
+  }
+  const current = String(input.context?.nodeId ?? '');
+  return { nodeId: current.slice(0, current.lastIndexOf('/') + 1) + reference };
+}
+
 async function navigatePerps(input) {
   const selected = String(input.node?.target ?? input.node?.destination ?? (input.node?.market || input.node?.symbol ? 'market' : 'home')).toLowerCase();
   return withExtensionPage(input, async (page) => {
@@ -135,7 +150,7 @@ async function navigatePerps(input) {
     if (selected === 'trade' || selected === 'order') {
       const side = String(input.node?.side ?? 'long').toLowerCase();
       const navigation = await page.navigateHash(`#/perps/trade/${encodeURIComponent(symbol)}?direction=${encodeURIComponent(side)}&mode=new`);
-      await page.waitForSelector(dataTestId('perps-order-entry-page'), { timeoutMs: 20000 });
+      await page.waitForSelector(ORDER_ENTRY, { timeoutMs: 20000 });
       return { action: input.action, target: selected, market: symbol, side, navigation, proofPath: 'ui-navigation' };
     }
     throw new Error(`Unsupported extension Perps navigation target: ${selected}`);
@@ -144,18 +159,20 @@ async function navigatePerps(input) {
 
 export async function readPositions(input) {
   return withExtensionPage(input, async (page) => {
+    const network = await assertNetwork(page, input.node?.network);
     const state = await page.readPositions();
     if (!state.available) throw new Error('stateHooks.submitRequestToBackground is unavailable; cannot read live Perps positions.');
     const matching = selectedItems(input, state.positions);
-    return { action: input.action, source: state.source ?? 'perps-stream-manager-cache', count: state.positions.length, matchingCount: matching.length, positions: matching.map(redactPosition) };
+    return { action: input.action, source: state.source ?? 'perps-stream-manager-cache', network, count: state.positions.length, matchingCount: matching.length, positions: matching.map(redactPosition) };
   });
 }
 
 export async function readOrders(input) {
   return withExtensionPage(input, async (page) => {
+    const network = await assertNetwork(page, input.node?.network);
     const state = await readOpenOrdersState(page);
     const matching = selectedItems(input, state.orders);
-    return { action: input.action, source: state.source, count: state.orders.length, matchingCount: matching.length, orders: matching.map(redactOrder) };
+    return { action: input.action, source: state.source, network, count: state.orders.length, matchingCount: matching.length, orders: matching.map(redactOrder) };
   });
 }
 
@@ -313,8 +330,10 @@ export async function closeOrders(input) {
     const hasBackgroundRequest = await page.evaluate(
       `typeof globalThis.stateHooks?.submitRequestToBackground === 'function'`,
     );
-    if (hasBackgroundRequest) return closeOrderThroughBackground(input, page, timeoutMs);
-    if (!hasBackgroundRequest) {
+    if (hasBackgroundRequest && input.node?.placement_node == null) {
+      return closeOrderThroughBackground(input, page, timeoutMs);
+    }
+    if (!hasBackgroundRequest || input.node?.placement_node != null) {
       if (input.node?.confirm_live !== true) {
         throw new Error('metamask.perps.close_orders requires confirm_live=true for visible live cancellation.');
       }
@@ -352,6 +371,7 @@ export async function closeOrders(input) {
         input,
         priorLookupIdentity,
         'metamask.perps.place_order',
+        placementReceiptSelection(input),
       );
       const expectedOrder = {
         market: symbol,
@@ -414,7 +434,6 @@ export async function closeOrders(input) {
           let dispatchTarget;
           try {
             await requireCurrentVisibleFundingBalance(input, page, timeoutMs, fundingBalance.observedBaseUnits);
-            await requirePerpsTradingContext(input, page);
             assertTrustedExternalMutationTarget(input, page, identity);
             await page.navigateHash(`#/perps/market/${encodeURIComponent(symbol)}`);
             await page.waitForSelector(dataTestId('perps-market-detail-pair'), { timeoutMs });
@@ -435,6 +454,7 @@ export async function closeOrders(input) {
               const rect = element.getBoundingClientRect();
               return { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 };
             })()`);
+            await requirePerpsTradingContext(input, page);
             assertTrustedExternalMutationTarget(input, page, identity);
           } catch (error) {
             throw externalMutationNotDispatched(error instanceof Error ? error.message : String(error));
@@ -888,7 +908,9 @@ async function observePolicyViolationCleanupCandidate(page, expected, receipt, t
 }
 
 async function observeExactVisibleOrderResult(page, expected, receipt, timeoutMs) {
-  await page.navigateHash(`#/perps/market/${encodeURIComponent(expected.market)}`);
+  if (!expected.fromCurrentForm) {
+    await page.navigateHash(`#/perps/market/${encodeURIComponent(expected.market)}`);
+  }
   await page.waitForSelector(dataTestId('perps-market-detail-pair'), { timeoutMs: 20_000 });
   const deadline = Date.now() + timeoutMs;
   let stableIdentity = null;
@@ -1085,12 +1107,28 @@ export async function requirePerpsTradingContext(input, page) {
   }
   const actualProvider = String(state.activeProvider || '').toLowerCase();
   const actualNetwork = state.isTestnet === true ? 'testnet' : 'mainnet';
+  const trusted = input.context?.trustedMutation;
+  if (trusted?.proofLane === 'source-dev') {
+    if (state.providerKnown !== true || provider !== 'hyperliquid' || network !== 'testnet'
+      || actualProvider !== 'hyperliquid' || actualNetwork !== 'testnet') {
+      throw new Error('Source-dev funded mutations require independently verified Hyperliquid testnet.');
+    }
+    const wallet = await page.evaluate(readWalletStateExpression());
+    const address = String(wallet?.selectedAccount?.address ?? '').toLowerCase();
+    if (!/^0x[0-9a-f]{40}$/u.test(address)
+      || createHash('sha256').update(address).digest('hex') !== trusted.selectedIdentitySha256) {
+      throw new Error('Source-dev funded mutation selected account changed after its visible identity proof.');
+    }
+  }
   if (actualProvider !== provider || actualNetwork !== network) {
     throw new Error(
       `Perps mutation expected ${provider}/${network}, got ${actualProvider || 'unknown'}/${actualNetwork}.`,
     );
   }
-  return { provider, network };
+  return {
+    provider, network,
+    ...(trusted?.proofLane === 'source-dev' ? { selectedIdentitySha256: trusted.selectedIdentitySha256 } : {}),
+  };
 }
 
 export async function requireCurrentVisibleFundingBalance(input, page, timeoutMs, expectedBaseUnits) {
@@ -1137,7 +1175,7 @@ async function requireCurrentOrderEntryFundingBalance(input, page, expectedBaseU
   if (BigInt(observedBaseUnits) < BigInt(requirement.minBaseUnits)) {
     throw new Error('Current visible Perps balance is below the runner-trusted funding minimum.');
   }
-  if (observedBaseUnits !== expectedBaseUnits) {
+  if (expectedBaseUnits != null && observedBaseUnits !== expectedBaseUnits) {
     throw new Error('Current visible Perps balance changed after receipt publication.');
   }
   return {
@@ -1149,6 +1187,23 @@ async function requireCurrentOrderEntryFundingBalance(input, page, expectedBaseU
   };
 }
 
+async function readPreparedOrderConfiguration(page) {
+  return page.evaluate(`(() => {
+    const value = (testId) => document.querySelector('[data-testid="' + testId + '"] input')?.value ?? null;
+    const submit = document.querySelector('[data-testid="submit-order-button"]');
+    const direction = String(submit?.innerText || '').match(/\\b(long|short)\\b/iu)?.[1]?.toLowerCase() ?? null;
+    return {
+      route: String(location.hash),
+      direction,
+      autoCloseEnabled: Boolean(document.querySelector('input[data-testid="auto-close-toggle"]')?.checked),
+      takeProfitPrice: value('tp-price-input'),
+      stopLossPrice: value('sl-price-input'),
+      takeProfitPercent: value('tp-percent-input'),
+      stopLossPercent: value('sl-percent-input'),
+    };
+  })()`);
+}
+
 export async function placeOrder(input) {
   requirePlaceOrderInputs(input);
   const symbol = marketSymbol(input);
@@ -1159,6 +1214,10 @@ export async function placeOrder(input) {
   const orderType = resolveOrderType(input);
   const positionMode = String(input.node?.position_mode ?? 'new').toLowerCase();
   const submitAttempts = Number(input.node?.submit_attempts ?? 1);
+  const fromCurrentForm = input.node?.from_current_form === true;
+  if (fromCurrentForm && (positionMode !== 'new' || submitAttempts !== 1)) {
+    throw new Error('Prepared-form placement requires position_mode=new and submit_attempts=1.');
+  }
   const roundingToleranceBaseUnits = String(input.node?.identity_rounding_tolerance_base_units ?? '10000');
   if (!/^(?:0|[1-9][0-9]{0,6})$/u.test(roundingToleranceBaseUnits)
     || BigInt(roundingToleranceBaseUnits) > 1_000_000n) {
@@ -1197,6 +1256,7 @@ export async function placeOrder(input) {
       throw new Error('Requested Perps order exposure exceeds the runner-trusted operation cap.');
     }
     const expectedVisibleIdentity = {
+      fromCurrentForm,
       market: symbol,
       side,
       leverage,
@@ -1213,7 +1273,7 @@ export async function placeOrder(input) {
     const hasBackgroundRequest = await page.evaluate(
       `typeof globalThis.stateHooks?.submitRequestToBackground === 'function'`,
     );
-    if (hasBackgroundRequest) {
+    if (hasBackgroundRequest && !fromCurrentForm) {
       await requirePerpsTradingContext(input, page);
       const resolvedPrice = await readCurrentMarketPrice(
         page,
@@ -1243,7 +1303,9 @@ export async function placeOrder(input) {
     const existingReceipt = await readExternalMutationReceipt(input, identity);
     if (existingReceipt) {
       return withExternalMutationRecovery(existingReceipt, async () => {
-        await page.navigateHash(`#/perps/market/${encodeURIComponent(symbol)}`);
+        if (!fromCurrentForm) {
+          await page.navigateHash(`#/perps/market/${encodeURIComponent(symbol)}`);
+        }
         await page.waitForSelector(dataTestId('perps-market-detail-pair'), { timeoutMs: 20_000 });
         if (positionMode !== 'new') {
           throw new Error('resumed funded position modification requires manual visible inspection');
@@ -1320,21 +1382,35 @@ export async function placeOrder(input) {
         };
       });
     }
-    await page.navigateHash('#/perps-home');
-    const initialClean = await waitForStableGlobalPerpsHome(page, {
-      timeoutMs: Number(input.node?.timeout_ms ?? 45_000),
-      requireZero: true,
-    });
-    const fundingBalance = await requireCurrentVisibleFundingBalance(
-      input,
-      page,
-      Number(input.node?.timeout_ms ?? 45_000),
-      initialClean.balanceBaseUnits,
-    );
+    let initialClean;
+    let fundingBalance;
+    if (fromCurrentForm) {
+      await page.waitForSelector(ORDER_ENTRY, { timeoutMs: 20_000 });
+      const [positions, orders] = await Promise.all([page.readPositions(), readOpenOrders(page)]);
+      if (!positions.available || positions.positions.length !== 0 || orders.length !== 0) {
+        throw new Error('Prepared-form placement requires an independently verified empty position/order baseline.');
+      }
+      initialClean = { positionCount: 0, orderCount: 0 };
+      fundingBalance = await requireCurrentOrderEntryFundingBalance(input, page);
+    } else {
+      await page.navigateHash('#/perps-home');
+      initialClean = await waitForStableGlobalPerpsHome(page, {
+        timeoutMs: Number(input.node?.timeout_ms ?? 45_000),
+        requireZero: true,
+      });
+      fundingBalance = await requireCurrentVisibleFundingBalance(
+        input,
+        page,
+        Number(input.node?.timeout_ms ?? 45_000),
+        initialClean.balanceBaseUnits,
+      );
+    }
     const tradingContext = await requirePerpsTradingContext(input, page);
     const balanceBeforeBaseUnits = fundingBalance.observedBaseUnits;
-    await page.navigateHash(`#/perps/market/${encodeURIComponent(symbol)}`);
-    await page.waitForSelector(dataTestId('perps-market-detail-pair'), { timeoutMs: 20_000 });
+    if (!fromCurrentForm) {
+      await page.navigateHash(`#/perps/market/${encodeURIComponent(symbol)}`);
+      await page.waitForSelector(dataTestId('perps-market-detail-pair'), { timeoutMs: 20_000 });
+    }
     const resolvedPrice = await readCurrentMarketPrice(
       page,
       symbol,
@@ -1343,19 +1419,21 @@ export async function placeOrder(input) {
     const limitPrice = orderType === 'limit'
       ? resolveLimitPrice(input, isBuy, resolvedPrice)
       : null;
-    const baselineOrderIds = orderType === 'limit'
+    const baselineOrderIds = orderType === 'limit' && !fromCurrentForm
       ? (await readVisibleOrderCards(page, symbol)).map((order) => order.id)
       : [];
     const initialOpenOrderCount = baselineOrderIds.length;
-    await page.navigateHash(`#/perps/trade/${encodeURIComponent(symbol)}?direction=${encodeURIComponent(side)}&mode=${positionMode}`);
-    await page.waitForSelector(dataTestId('perps-order-entry-page'), { timeoutMs: 20000 });
+    if (!fromCurrentForm) {
+      await page.navigateHash(`#/perps/trade/${encodeURIComponent(symbol)}?direction=${encodeURIComponent(side)}&mode=${positionMode}`);
+      await page.waitForSelector(ORDER_ENTRY, { timeoutMs: 20000 });
+    }
     const lateBackgroundRequest = await page.evaluate(
       `typeof globalThis.stateHooks?.submitRequestToBackground === 'function'`,
     );
-    if (lateBackgroundRequest) {
+    if (lateBackgroundRequest && !fromCurrentForm) {
       throw new Error('Background Perps placement appeared after visible setup; refusing an ambiguous dispatch.');
     }
-    if (!lateBackgroundRequest) {
+    if (!lateBackgroundRequest || fromCurrentForm) {
       if (input.node?.confirm_live !== true) {
         throw new Error('metamask.perps.place_order requires confirm_live=true for visible live submission.');
       }
@@ -1363,9 +1441,11 @@ export async function placeOrder(input) {
       if (submitAttempts !== 1) {
         throw new Error('Visible funded Perps submission requires submit_attempts=1.');
       }
-      await page.setInput(`${dataTestId('amount-input-field')} input`, amount);
-      await page.setInput(`${dataTestId('leverage-input')} input`, String(leverage));
-      if (orderType === 'limit') {
+      if (!fromCurrentForm) {
+        await page.setInput(`${dataTestId('amount-input-field')} input`, amount);
+        await page.setInput(`${dataTestId('leverage-input')} input`, String(leverage));
+      }
+      if (orderType === 'limit' && !fromCurrentForm) {
         await page.click(dataTestId('order-type-limit'));
         const limitInput = `${dataTestId('limit-price-input')} input`;
         await page.waitForSelector(limitInput, { timeoutMs: 10000 });
@@ -1379,6 +1459,7 @@ export async function placeOrder(input) {
             const submit = document.querySelector('[data-testid="submit-order-button"]');
             return {
               amount: value('amount-input-field'),
+              denomination: document.querySelector('[data-testid="amount-input-denomination-unit"]')?.textContent?.trim() ?? null,
               leverage: value('leverage-input'),
               limitPrice: limit,
               limitSelected: document.querySelector('[data-testid="order-type-limit"]')?.getAttribute('aria-pressed') === 'true',
@@ -1391,19 +1472,29 @@ export async function placeOrder(input) {
       if (Number(configured.amount) !== Number(amount) || Number(configured.leverage) !== leverage) {
         throw new Error('Visible Perps order inputs did not retain the requested values.');
       }
+      if (configured.denomination !== null && configured.denomination !== 'USD') {
+        throw new Error('Visible Perps amount must be denominated in USD before funded submission.');
+      }
       if (orderType === 'limit' && (!configured.limitSelected || Number(configured.limitPrice) !== limitPrice)) {
         throw new Error('Visible Perps limit inputs did not retain the requested values.');
       }
       if (!configured.submitEnabled) throw new Error('Visible Perps order is not submittable.');
+      const preparedConfiguration = fromCurrentForm ? await readPreparedOrderConfiguration(page) : null;
+      if (preparedConfiguration && (preparedConfiguration.route.split('?')[0] !== `#/perps/trade/${encodeURIComponent(symbol)}`
+        || preparedConfiguration.direction !== side)) {
+        throw new Error('Prepared Perps form does not match the requested market and direction.');
+      }
       const mutation = await runGuardedExternalMutation({
         input,
         identity,
-        publicationFacts: { balanceBeforeBaseUnits, baselineOrderIds, fundingBalance, tradingContext },
+        publicationFacts: {
+          balanceBeforeBaseUnits, baselineOrderIds, fundingBalance, tradingContext,
+          ...(preparedConfiguration ? { preparedConfiguration } : {}),
+        },
         dispatch: async () => {
           let dispatchTarget;
           try {
             await requireCurrentOrderEntryFundingBalance(input, page, fundingBalance.observedBaseUnits);
-            await requirePerpsTradingContext(input, page);
             const currentConfiguration = await page.evaluate(`(() => {
               const value = (testId) => document.querySelector('[data-testid="' + testId + '"] input')?.value ?? null;
               const limitSelected = document.querySelector('[data-testid="order-type-limit"]')?.getAttribute('aria-pressed') === 'true';
@@ -1415,20 +1506,26 @@ export async function placeOrder(input) {
               const rect = element.getBoundingClientRect();
               return {
                 amount: value('amount-input-field'),
+                denomination: document.querySelector('[data-testid="amount-input-denomination-unit"]')?.textContent?.trim() ?? null,
                 leverage: value('leverage-input'),
                 limitPrice: value('limit-price-input'),
                 orderType: limitSelected ? 'limit' : 'market',
                 target: { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 },
               };
             })()`);
-            if (currentConfiguration.amount !== amount
-              || currentConfiguration.leverage !== String(leverage)
+            if (parseUsdBaseUnits(currentConfiguration.amount) !== identity.amountBaseUnits
+              || (currentConfiguration.denomination !== null && currentConfiguration.denomination !== 'USD')
+              || Number(currentConfiguration.leverage) !== leverage
               || currentConfiguration.orderType !== orderType
-              || (orderType === 'limit' && currentConfiguration.limitPrice !== String(limitPrice))
+              || (orderType === 'limit' && parseUsdBaseUnits(currentConfiguration.limitPrice) !== expectedVisibleIdentity.limitPriceBaseUnits)
               || (orderType === 'market' && currentConfiguration.limitPrice != null)) {
               throw new Error('Visible Perps order inputs changed before dispatch.');
             }
+            if (preparedConfiguration && JSON.stringify(await readPreparedOrderConfiguration(page)) !== JSON.stringify(preparedConfiguration)) {
+              throw new Error('Prepared Perps direction or protection changed before dispatch.');
+            }
             dispatchTarget = currentConfiguration.target;
+            await requirePerpsTradingContext(input, page);
             assertTrustedExternalMutationTarget(input, page, identity);
           } catch (error) {
             throw externalMutationNotDispatched(error instanceof Error ? error.message : String(error));
@@ -1603,16 +1700,22 @@ async function ensureProvider(input, config) {
   });
 }
 
+async function assertNetwork(page, network) {
+  if (!network) return { skipped: true };
+  const before = await readPerpsRuntimeState(page);
+  if (!before.available || !before.networkKnown) {
+    throw new Error('Cannot verify the current Perps network.\nNext: mm-harness verify');
+  }
+  const actual = before.isTestnet ? 'testnet' : 'mainnet';
+  if (actual !== network) {
+    throw new Error(`Expected Perps network ${network}, got ${actual}.\nNext: select ${network} through the supported product UI, then rerun the recipe.`);
+  }
+  return { requested: network, isTestnet: before.isTestnet, changed: false };
+}
+
 async function ensureNetwork(input, config) {
   if (!config.network) return { skipped: true };
-  const expectedTestnet = String(config.network).toLowerCase() === 'testnet';
-  return withExtensionPage(input, async (page) => {
-    const before = await readPerpsRuntimeState(page);
-    if (!before.available) throw new Error('stateHooks.submitRequestToBackground is unavailable; cannot enforce Perps network.');
-    if (!before.networkKnown) throw new Error('Unable to read the current Perps network from persisted controller state.');
-    if (Boolean(before.isTestnet) === expectedTestnet) return { requested: config.network, isTestnet: before.isTestnet, changed: false };
-    throw new Error(`Expected Perps network ${config.network}, got isTestnet=${before.isTestnet}. Automatic background network toggles are forbidden without a durable receipt; select the network through a supported visible action before running.`);
-  });
+  return withExtensionPage(input, (page) => assertNetwork(page, config.network));
 }
 
 async function assertReadyToTrade(input, config) {
@@ -1678,12 +1781,14 @@ export async function teardownState(input) {
     orders: params.market || params.symbol || params.markets || params.symbols ? { state: 'none', mode: 'matching' } : false,
   };
   const config = mergeStateConfig(defaults, params);
+  const network = await ensureNetwork(input, config);
   const orders = await applyOrdersState(input, config.orders);
   const positions = await applyPositionsState(input, config.positions);
   const navigation = config.page === false ? { skipped: true } : await applyStateNavigation(input, config);
   return {
     action: input.action,
     phase: 'teardown',
+    network,
     market: config.market ?? config.symbol ?? null,
     orders,
     positions,

package/library/actions/extension/perps/read_funds_confirmation.mjs

@@ -117,6 +117,14 @@ export async function readFundsConfirmation(page, node, mode, timeoutMs = 30_000
   if (observed?.title !== expectedTitle || observed?.amount === null) {
     throw new Error(`Perps ${mode} confirmation did not finish loading.`);
   }
+  if (node.require_preview_fields === true) {
+    const missing = ['transactionFee', 'estimatedTime', 'receive'].filter((field) => !observed[field]);
+    if (!observed.payToken && !observed.receiveToken) missing.push('payToken/receiveToken');
+    if (observed.loadingVisible) missing.push('loading not settled');
+    if (missing.length > 0) {
+      throw new Error(`Perps ${mode} preview is incomplete: ${missing.join(', ')}.\nNext: mm-harness logs --full`);
+    }
+  }
   if (node.require_no_horizontal_overflow === true && (
     observed.layout.horizontalOverflow || observed.layout.clippedTestIds.length > 0
   )) {

package/library/actions/extension/perps/read_snapshot.mjs

@@ -499,7 +499,8 @@ async function visibleActivityCards(page) {
     return {
       testId: String(element.getAttribute('data-testid') || '').slice(0, 500),
       label: String(element.innerText || '').replace(/\\s+/gu, ' ').trim().slice(0, 500),
-      visible: style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0,
+      visible: style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0 &&
+        rect.bottom > 0 && rect.right > 0 && rect.top < innerHeight && rect.left < innerWidth,
     };
   })`);
 }

package/library/actions/extension/perps/read_visible_state.mjs

@@ -1,3 +1,5 @@
+import { pathToFileURL } from 'node:url';
+
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
 import {
   normalizeVisiblePerpsState,
@@ -38,7 +40,7 @@ export async function readVisiblePerpsState(page, node = {}) {
   const raw = await page.evaluate(`(() => {
     const includeOffscreen = ${JSON.stringify(options.includeOffscreen)};
     const maximum = ${JSON.stringify(options.maxItems)};
-    const relevant = /^(?:perps-|explore-markets-|market-list-view|market-row-|filter-select-button|sort-dropdown-button|search-input|position-card-|order-card-|transaction-card-|bottom-nav-|back-button|direction-|order-type-|amount-|balance-percent-|leverage-|auto-close|submit-order-button|limit-price-|tp-|sl-|custom-amount-|pay-with-|confirm-footer-button|wallet-initiated-header-back-button|transaction-fee-|bridge-(?:fee|time)-|receive-(?:row|value))/u;
+    const relevant = /^(?:perps-|parent-selector-perps-(?:market-list|order-entry)|explore-markets-|market-list-view|market-row-|filter-select-button|sort-dropdown-button|search-input|position-card-|order-card-|transaction-card-|bottom-nav-|back-button|direction-|order-type-|amount-|balance-percent-|leverage-|auto-close|submit-order-button|limit-price-|tp-|sl-|custom-amount-|pay-with-|confirm-footer-button|wallet-initiated-header-back-button|transaction-fee-|bridge-(?:fee|time)-|receive-(?:row|value))/u;
     const items = [];
     const offscreenItems = [];
     const clippedTestIds = [];
@@ -115,7 +117,7 @@ export async function readVisiblePerpsState(page, node = {}) {
       items,
       offscreenItems,
       truncated: matched > items.length + offscreenItems.length,
-      orderEntry: document.querySelector('[data-testid="perps-order-entry-page"]') ? {
+      orderEntry: document.querySelector('[data-testid="parent-selector-perps-order-entry"], [data-testid="perps-order-entry-page"]') ? {
         symbol: field('perps-order-entry-asset-symbol')?.label || null,
         direction,
         orderType: field('order-type-limit')?.pressed === 'true' ? 'limit' : 'market',
@@ -150,7 +152,9 @@ export async function readVisiblePerpsState(page, node = {}) {
   };
 }
 
-runAdapter(async (input) => withExtensionPage(input, async (page) => ({
-  action: input.action,
-  ...await readVisiblePerpsState(page, input.node),
-})));
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  runAdapter(async (input) => withExtensionPage(input, async (page) => ({
+    action: input.action,
+    ...await readVisiblePerpsState(page, input.node),
+  })));
+}

package/library/actions/extension/perps/search_markets.mjs

@@ -4,7 +4,12 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
   const query = String(input.node?.query ?? '').trim();
   const timeoutMs = Number(input.node?.timeout_ms ?? 30_000);
   if (!query) throw new Error('metamask.perps.search_markets requires a non-empty query.');
-  await page.setInput(dataTestId('search-input'), query);
+  const searchInput = dataTestId('search-input');
+  if (!await page.evaluate(`Boolean(document.querySelector(${JSON.stringify(searchInput)}))`)) {
+    await page.click(dataTestId('market-list-search-toggle'));
+    await page.waitForSelector(searchInput, { timeoutMs });
+  }
+  await page.setInput(searchInput, query);
   const deadline = Date.now() + timeoutMs;
   let marketIds = [];
   while (Date.now() <= deadline) {
@@ -18,7 +23,7 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
       .filter(Boolean)
       .slice(0, 100))()`);
     if (marketIds.length > 0) break;
-    await page.evaluate('new Promise((resolve) => setTimeout(resolve, 200))');
+    await new Promise((resolve) => setTimeout(resolve, 200));
   }
   if (marketIds.length === 0) {
     throw new Error(`Perps market search returned no visible rows for ${JSON.stringify(query)}.`);

package/library/actions/extension/perps/select_activity_filter.mjs

@@ -62,7 +62,7 @@ export async function selectActivityFilter(page, input, options = {}) {
         entries: cards.map((card) => card.label),
         loadedBoundary: visible(document.querySelector('[data-testid="perps-activity-page-skeleton"]'))
           ? null
-          : visible(document.querySelector('[data-testid="perps-activity-page"]'))
+          : visible(document.querySelector('[data-testid="perps-activity-page"],[data-testid="parent-selector-perps-activity"]'))
             ? cards.length > 0 ? 'visible-cards' : 'loaded-empty'
             : null,
         empty: String(document.body?.innerText || '').replace(/\\s+/gu, ' ').trim().slice(0, 2_000),