@deeeed/metamask-harness 0.47.4 → 0.48.0

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

@@ -1,10 +1,7 @@
 import { pathToFileURL } from 'node:url';
 
 import { dataTestId, runAdapter, withExtensionPage } from '../platform/cdp.mjs';
-import {
-  normalizeVisiblePerpsState,
-  resolveVisibleStateOptions,
-} from '../../shared/perps/visible-state.mjs';
+import { readVisiblePerpsState } from './read_visible_state.mjs';
 
 const FILTERS = new Map([
   ['all', 'all'],
@@ -34,21 +31,7 @@ async function visibleLabel(page, selector) {
   })()`);
 }
 
-export async function selectMarketFilter(page, input, pollOptions = {}) {
-  const filter = String(input.node?.filter ?? '').trim().toLowerCase();
-  const option = FILTERS.get(filter);
-  if (!option) {
-    throw new Error(`metamask.perps.select_market_filter received unsupported filter ${JSON.stringify(filter)}.`);
-  }
-  const options = resolveVisibleStateOptions({
-    surface: 'market-list',
-    include_offscreen: true,
-    max_items: input.node?.max_items ?? 100,
-    minimum_market_count: input.node?.minimum_market_count ?? 1,
-    maximum_market_count: input.node?.maximum_market_count ?? 200,
-  });
-  const timeoutMs = pollOptions.timeoutMs ?? input.node?.timeout_ms ?? 10_000;
-  const pollIntervalMs = pollOptions.pollIntervalMs ?? 100;
+async function selectDropdownFilter(page, filter, option, timeoutMs, pollIntervalMs) {
   await page.click(dataTestId('filter-select-button'));
   const optionSelector = dataTestId(`filter-select-option-${option}`);
   try {
@@ -76,37 +59,83 @@ export async function selectMarketFilter(page, input, pollOptions = {}) {
     }
     await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
   }
-  const raw = await page.evaluate(`(() => {
-    const maximum = ${JSON.stringify(options.maxItems)};
-    const items = [];
-    let matched = 0;
-    for (const element of document.querySelectorAll('[data-testid]')) {
-      const testId = element.getAttribute('data-testid');
-      if (!testId || !/^(?:market-list-view|market-row-|perps-token-logo-|filter-select-button)/u.test(testId)) continue;
-      const style = getComputedStyle(element);
-      const rect = element.getBoundingClientRect();
-      if (style.display === 'none' || style.visibility === 'hidden' || rect.width <= 0 || rect.height <= 0) continue;
-      matched += 1;
-      if (items.length >= maximum) break;
-      items.push({
-        testId,
-        label: String(element.getAttribute('aria-label') || element.innerText || element.getAttribute('value') || '')
-          .replace(/\\s+/gu, ' ')
-          .trim()
-          .slice(0, 500),
-        role: element.getAttribute('role') || element.tagName.toLowerCase(),
-        enabled: !element.disabled && element.getAttribute('aria-disabled') !== 'true',
-        visible: rect.bottom > 0 && rect.right > 0 && rect.top < innerHeight && rect.left < innerWidth,
-      });
+  return { selectedLabel: selectedState.label, controlKind: 'dropdown', alreadySelected: false };
+}
+
+async function categoryRailState(page) {
+  return page.evaluate(`(() => ({
+    active: [...document.querySelectorAll('[data-testid^="market-list-categories-pill-"][aria-pressed="true"]')].map((element) => ({
+      id: element.getAttribute('data-testid'),
+      option: element.getAttribute('data-testid').slice('market-list-categories-pill-'.length),
+      label: String(element.innerText || '').trim(),
+    })),
+    watchlist: document.querySelector('[data-testid="market-list-watchlist-toggle"]')?.getAttribute('aria-pressed') === 'true',
+  }))()`);
+}
+
+async function selectCategoryRail(page, option, timeoutMs, pollIntervalMs) {
+  const deadline = Date.now() + timeoutMs;
+  const matches = (state) => !state.watchlist && (option === 'all'
+    ? state.active.length === 0
+    : state.active.length === 1 && state.active[0].option === option);
+  const initial = await categoryRailState(page);
+  const alreadySelected = matches(initial);
+  if (!alreadySelected) {
+    if (option === 'all') {
+      if (initial.watchlist) await page.click(dataTestId('market-list-watchlist-toggle'));
+      for (const selected of initial.active) await page.click(dataTestId(selected.id));
+    } else {
+      let selector = dataTestId(`market-list-categories-pill-${option}`);
+      if (!(await visibleLabel(page, selector)).visible) {
+        const more = dataTestId('market-list-categories-more-button');
+        selector = dataTestId(`market-list-categories-more-option-${option}`);
+        if (!(await visibleLabel(page, selector)).visible) {
+          if (!(await visibleLabel(page, more)).visible) {
+            throw new Error(`Perps market filter ${JSON.stringify(option)} is not available in this release.`);
+          }
+          await page.click(more);
+        }
+        await page.waitForSelector(selector, { timeoutMs: Math.max(1, deadline - Date.now()) });
+      }
+      await page.click(selector);
     }
-    return { route: location.hash, title: document.title, items, offscreenItems: [], truncated: matched > items.length };
-  })()`);
+  }
+  let selected = await categoryRailState(page);
+  while (!matches(selected)) {
+    if (Date.now() >= deadline) {
+      throw new Error(`Perps category ${JSON.stringify(option)} did not become selected: ${JSON.stringify(selected)}.`);
+    }
+    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    selected = await categoryRailState(page);
+  }
+  return { selectedLabel: selected.active[0]?.label ?? null, controlKind: 'category-rail', alreadySelected };
+}
+
+export async function selectMarketFilter(page, input, pollOptions = {}) {
+  const filter = String(input.node?.filter ?? '').trim().toLowerCase();
+  const option = FILTERS.get(filter);
+  if (!option) {
+    throw new Error(`metamask.perps.select_market_filter received unsupported filter ${JSON.stringify(filter)}.`);
+  }
+  const timeoutMs = pollOptions.timeoutMs ?? input.node?.timeout_ms ?? 10_000;
+  const pollIntervalMs = pollOptions.pollIntervalMs ?? 100;
+  const rail = await visibleLabel(page, dataTestId('market-list-categories'));
+  const selection = rail.visible
+    ? await selectCategoryRail(page, option, timeoutMs, pollIntervalMs)
+    : await selectDropdownFilter(page, filter, option, timeoutMs, pollIntervalMs);
+  const state = await readVisiblePerpsState(page, {
+    surface: 'market-list',
+    include_offscreen: true,
+    max_items: input.node?.max_items ?? 100,
+    minimum_market_count: input.node?.minimum_market_count ?? 1,
+    maximum_market_count: input.node?.maximum_market_count ?? 200,
+  });
   return {
     action: input.action,
     filter,
     option,
-    selectedLabel: selectedState.label,
-    ...normalizeVisiblePerpsState(raw, options, 'extension'),
+    ...selection,
+    ...state,
     proofPath: 'trusted-pointer-visible-ui',
   };
 }

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

@@ -20,9 +20,15 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
     const button = document.querySelector(${JSON.stringify(selector)});
     if (!button) throw new Error('Perps favorite control is not visible.');
     const label = String(button.getAttribute('aria-label') || button.innerText || '').trim();
+    if (!/^(?:add to|remove from) favorites$/iu.test(label)) {
+      throw new Error('Perps favorite control has an unsupported label: ' + JSON.stringify(label));
+    }
     return { label, favorite: /^remove from favorites$/iu.test(label) };
   })()`);
   const before = await readState();
+  if (requireUnchanged && before.favorite !== desired) {
+    throw new Error(`Perps favorite state for ${market} did not persist across navigation; no change was made.`);
+  }
   if (before.favorite !== desired) {
     await page.click(selector);
   }
@@ -37,9 +43,6 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
     throw new Error(`Perps favorite state did not become ${desired}.`);
   }
   const changed = before.favorite !== after.favorite;
-  if (requireUnchanged && changed) {
-    throw new Error(`Perps favorite state for ${market} did not persist across navigation.`);
-  }
   return {
     action: input.action,
     market,

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

@@ -11,6 +11,7 @@ export function readPerpsRuntimeStateExpression() {
     return {
       available: typeof request === 'function',
       activeProvider: metamask.activeProvider || nestedPerps.activeProvider || 'hyperliquid',
+      providerKnown: typeof (metamask.activeProvider ?? nestedPerps.activeProvider) === 'string',
       networkKnown: typeof metamask.isTestnet === 'boolean' || typeof nestedPerps.isTestnet === 'boolean',
       isTestnet: Boolean(metamask.isTestnet ?? nestedPerps.isTestnet),
       initializationState: metamask.initializationState || nestedPerps.initializationState || null,

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

@@ -229,7 +229,6 @@ export async function updatePositionTpsl(input) {
       let dispatchTarget;
       try {
         await requireCurrentVisibleFundingBalance(input, page, timeoutMs, fundingBalance.observedBaseUnits);
-        await requirePerpsTradingContext(input, page);
         assertTrustedExternalMutationTarget(input, page, identity);
         const current = await readPosition(page, market);
         if (current.size !== before.size || current.direction !== before.direction
@@ -246,6 +245,7 @@ export async function updatePositionTpsl(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));

package/library/actions/extension/perps/visible-mutation-identity.mjs

@@ -129,10 +129,12 @@ export async function waitForStableGlobalPerpsHome(page, options = {}) {
         return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
       };
       const visibleCount = (selector) => [...document.querySelectorAll(selector)].filter(visible).length;
-      const balance = document.querySelector('[data-testid="perps-balance-dropdown-balance"]');
+      const balance = document.querySelector('[data-testid="perps-balance-actions-available-value"]')
+        ?? document.querySelector('[data-testid="perps-balance-dropdown-balance"]');
       return {
         route: String(location.hash),
-        viewVisible: visible(document.querySelector('[data-testid="perps-view"]')),
+        viewVisible: visible(document.querySelector('[data-testid="perps-home-page"]')
+          ?? document.querySelector('[data-testid="perps-view"]')),
         loading: visibleCount('[data-testid$="-skeleton"], [data-testid*="loading"]') > 0,
         marketCount: visibleCount('[data-testid="perps-explore-markets-row"]'),
         positionCount: visibleCount('[data-testid^="position-card-"]:not([data-testid^="position-card-roe-"])'),

package/library/actions/extension/platform/cdp.mjs

@@ -240,32 +240,31 @@ async function captureHelperBrowserPid(context, port) {
   );
 }
 
-async function captureCdpViewportSnapshot(page, context, relPath, metadata, captureHelperError = null) {
+async function captureCdpSnapshot(page, context, relPath, metadata, captureHelperError = null) {
   const { relative, absolute, artifactsRoot } = resolveRelativeArtifactPath(context.artifactsDir, relPath);
   const destination = await preparePrivateEvidenceDestination(absolute, artifactsRoot);
   let result;
   try {
-    const timeoutMs = Number(metadata?.cdpTimeoutMs ?? 5000);
-    result = await Promise.race([
-      page.session.call('Page.captureScreenshot', {
-        format: 'png',
-        fromSurface: true,
-        captureBeyondViewport: false,
-      }),
-      new Promise((_, reject) => setTimeout(() => reject(new Error(`Chrome Page.captureScreenshot timed out after ${timeoutMs}ms.`)), timeoutMs)),
-    ]);
-    if (typeof result?.data !== 'string' || result.data.length === 0) {
+    const timeoutMs = Number(metadata?.cdpTimeoutMs ?? metadata?.timeoutMs ?? 5000);
+    result = await CdpWebPage.prototype.screenshot.call(page, undefined, undefined, {
+      ...metadata,
+      timeoutMs,
+    });
+    if (typeof result !== 'string' || result.length === 0) {
       throw new Error('Chrome Page.captureScreenshot returned no image data.');
     }
   } catch (error) {
     await cleanupEvidenceStaging(destination.stagingDir);
     const cdpError = error instanceof Error ? error.message : String(error);
-    return captureDomRasterSnapshot(page, context, relPath, metadata, captureHelperError, cdpError);
+    throw new Error(
+      `Extension screenshot capture failed: ${captureHelperError ? 'native=' + captureHelperError + '; ' : ''}CDP=${cdpError}.\n` +
+        'Next: mm-harness doctor --adapter extension --json',
+    );
   }
   try {
     await writeFile(
       destination.stagedPath,
-      Buffer.from(result.data, 'base64'),
+      Buffer.from(result, 'base64'),
       { flag: 'wx', mode: 0o600 },
     );
   } catch (error) {
@@ -283,89 +282,15 @@ async function captureCdpViewportSnapshot(page, context, relPath, metadata, capt
     metadata: {
       provider: 'cdp',
       mode: 'Page.captureScreenshot',
+      fullPage: metadata?.fullPage === true,
       ...(captureHelperError ? { fallbackFrom: 'capture-helper', captureHelperError } : {}),
     },
   };
 }
 
-async function captureDomRasterSnapshot(page, context, relPath, metadata, captureHelperError, cdpError) {
-  const { relative, absolute, artifactsRoot } = resolveRelativeArtifactPath(context.artifactsDir, relPath);
-  const destination = await preparePrivateEvidenceDestination(absolute, artifactsRoot);
-  const dataUrlPromise = page.evaluate(`(async () => {
-    const width = Math.max(1, window.innerWidth);
-    const height = Math.max(1, window.innerHeight);
-    const source = document.documentElement;
-    const clone = source.cloneNode(true);
-    const sourceNodes = [source, ...source.querySelectorAll('*')];
-    const cloneNodes = [clone, ...clone.querySelectorAll('*')];
-    for (let index = 0; index < sourceNodes.length; index += 1) {
-      const sourceNode = sourceNodes[index];
-      const cloneNode = cloneNodes[index];
-      if (!(sourceNode instanceof Element) || !(cloneNode instanceof Element)) continue;
-      const computed = getComputedStyle(sourceNode);
-      cloneNode.setAttribute('style', Array.from(computed).map((name) => name + ':' + computed.getPropertyValue(name) + ';').join(''));
-      if ('value' in sourceNode && typeof sourceNode.value === 'string') cloneNode.setAttribute('value', sourceNode.value);
-      if (sourceNode instanceof HTMLCanvasElement) {
-        const image = document.createElement('img');
-        try { image.src = sourceNode.toDataURL('image/png'); } catch { image.alt = 'canvas'; }
-        image.setAttribute('style', cloneNode.getAttribute('style') || '');
-        cloneNode.replaceWith(image);
-      }
-    }
-    clone.querySelectorAll('script').forEach((node) => node.remove());
-    clone.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-    clone.style.width = width + 'px';
-    clone.style.height = height + 'px';
-    clone.style.overflow = 'hidden';
-    const serialized = new XMLSerializer().serializeToString(clone);
-    const svg = '<svg xmlns="http://www.w3.org/2000/svg" width="' + width + '" height="' + height + '"><foreignObject width="100%" height="100%">' + serialized + '</foreignObject></svg>';
-    const image = new Image();
-    const loaded = new Promise((resolve, reject) => { image.onload = resolve; image.onerror = () => reject(new Error('DOM raster image load failed.')); });
-    image.src = 'data:image/svg+xml;base64,' + btoa(unescape(encodeURIComponent(svg)));
-    await loaded;
-    const canvas = document.createElement('canvas');
-    canvas.width = width;
-    canvas.height = height;
-    const context = canvas.getContext('2d');
-    context.drawImage(image, 0, 0, width, height);
-    return canvas.toDataURL('image/png');
-  })()`);
-  let dataUrl;
-  try {
-    dataUrl = await dataUrlPromise;
-    if (typeof dataUrl !== 'string' || !dataUrl.startsWith('data:image/png;base64,')) {
-      throw new Error(`Extension screenshot fallbacks failed: capture-helper=${captureHelperError ?? 'not attempted'}; cdp=${cdpError}; DOM raster returned no PNG.`);
-    }
-    await writeFile(
-      destination.stagedPath,
-      Buffer.from(dataUrl.slice('data:image/png;base64,'.length), 'base64'),
-      { flag: 'wx', mode: 0o600 },
-    );
-  } catch (error) {
-    await cleanupEvidenceStaging(destination.stagingDir);
-    throw error;
-  }
-  await publishPrivateEvidence(destination);
-  return {
-    path: relative,
-    type: 'screenshot',
-    nodeId: context.nodeId,
-    label: metadata?.label ?? `${context.nodeId} screenshot`,
-    category: metadata?.category ?? 'evidence',
-    mimeType: 'image/png',
-    metadata: {
-      provider: 'dom-raster',
-      mode: 'computed-style-viewport',
-      fallbackFrom: captureHelperError ? 'capture-helper+cdp' : 'cdp',
-      ...(captureHelperError ? { captureHelperError } : {}),
-      cdpError,
-    },
-  };
-}
-
 export async function captureHelperSnapshot(page, context, relPath, metadata) {
-  if (process.platform !== 'darwin') {
-    return captureCdpViewportSnapshot(page, context, relPath, metadata);
+  if (metadata?.fullPage === true || process.platform !== 'darwin') {
+    return captureCdpSnapshot(page, context, relPath, metadata);
   }
   const { relative, absolute, artifactsRoot } = resolveRelativeArtifactPath(context.artifactsDir, relPath);
   const destination = await preparePrivateEvidenceDestination(absolute, artifactsRoot);
@@ -388,7 +313,7 @@ export async function captureHelperSnapshot(page, context, relPath, metadata) {
       parsePositivePid(process.env.METAMASK_RECIPE_EXTENSION_ACTIVE_RECORDING_PID) === pid
     ) {
       await cleanupEvidenceStaging(destination.stagingDir);
-      return captureCdpViewportSnapshot(
+      return captureCdpSnapshot(
         page,
         context,
         relPath,
@@ -414,7 +339,7 @@ export async function captureHelperSnapshot(page, context, relPath, metadata) {
   } catch (error) {
     await cleanupEvidenceStaging(destination.stagingDir);
     const message = error instanceof Error ? error.message : String(error);
-    return captureCdpViewportSnapshot(page, context, relPath, metadata, message);
+    return captureCdpSnapshot(page, context, relPath, metadata, message);
   }
   await publishPrivateEvidence(destination);
   return {
@@ -811,47 +736,6 @@ export class ExtensionPage extends CdpWebPage {
     });
   }
 
-  async click(selector) {
-    const target = await this.evaluate(`(() => {
-      const selector = ${JSON.stringify(selector)};
-      const element = document.querySelector(selector);
-      if (!element) throw new Error('Clickable element not found: ' + selector);
-      element.scrollIntoView({ block: 'center', inline: 'center' });
-      const rect = element.getBoundingClientRect();
-      const style = getComputedStyle(element);
-      if (style.display === 'none' || style.visibility === 'hidden' || rect.width <= 0 || rect.height <= 0) {
-        throw new Error('Clickable element is not visible: ' + selector);
-      }
-      return {
-        x: rect.left + (rect.width / 2),
-        y: rect.top + (rect.height / 2),
-        tagName: element.tagName,
-      };
-    })()`);
-    await this.session.call('Input.dispatchMouseEvent', {
-      type: 'mouseMoved',
-      x: target.x,
-      y: target.y,
-    });
-    await this.session.call('Input.dispatchMouseEvent', {
-      type: 'mousePressed',
-      x: target.x,
-      y: target.y,
-      button: 'left',
-      buttons: 1,
-      clickCount: 1,
-    });
-    await this.session.call('Input.dispatchMouseEvent', {
-      type: 'mouseReleased',
-      x: target.x,
-      y: target.y,
-      button: 'left',
-      buttons: 0,
-      clickCount: 1,
-    });
-    return { clicked: true, selector, tagName: target.tagName };
-  }
-
   async setInput(selector, value) {
     const input = String(value ?? '');
     const target = await this.evaluate(`(() => {
@@ -947,22 +831,19 @@ export class ExtensionPage extends CdpWebPage {
   }
 
   async screenshot(contextOrInput, relPath, metadata = {}) {
-    if (contextOrInput?.context) {
-      const options = {
+    const context = contextOrInput?.context ?? contextOrInput;
+    const options = contextOrInput?.context
+      ? {
         label: contextOrInput.node?.description || `${contextOrInput.action} screenshot`,
         category: 'evidence',
         timeoutMs: contextOrInput.node?.timeout_ms,
         ...metadata,
-      };
-      if (contextOrInput.node?.screenshot_mode === 'dom_raster' || process.env.METAMASK_RECIPE_EXTENSION_SCREENSHOT_MODE === 'dom-raster') {
-        throw new Error('Extension ui.screenshot no longer supports DOM raster screenshots. Use capture-helper snapshot evidence.');
       }
-      return captureHelperSnapshot(this, contextOrInput.context, relPath, options);
-    }
-    if (process.env.METAMASK_RECIPE_EXTENSION_SCREENSHOT_MODE === 'dom-raster') {
+      : metadata;
+    if (contextOrInput?.node?.screenshot_mode === 'dom_raster' || process.env.METAMASK_RECIPE_EXTENSION_SCREENSHOT_MODE === 'dom-raster') {
       throw new Error('Extension screenshots no longer support DOM raster mode. Use capture-helper snapshot evidence.');
     }
-    return captureHelperSnapshot(this, contextOrInput, relPath, metadata);
+    return captureHelperSnapshot(this, context, relPath, options);
   }
 }
 

package/library/actions/extension/swap_bridge/quote-state.mjs

@@ -0,0 +1,54 @@
+export async function readQuoteInputIdentity(page) {
+  return page.evaluate(`(() => {
+    const state = globalThis.stateHooks?.store?.getState?.();
+    if (!state?.bridge || !state?.metamask) {
+      throw new Error('Swap quote identity requires exposed bridge quote state on this build; UI amounts alone cannot bind a quote to its request.');
+    }
+    const value = (id) => {
+      const root = document.querySelector('[data-testid="' + id + '"]');
+      return String((root?.matches('input,textarea') ? root : root?.querySelector('input,textarea'))?.value ?? '').trim();
+    };
+    const amount = value('from-amount');
+    const destinationAmount = value('to-amount');
+    const from = state.bridge.fromToken, to = state.bridge.toToken;
+    const decimals = from?.decimals;
+    if (!from?.assetId || !to?.assetId || !Number.isInteger(decimals) || decimals < 0 || decimals > 36 || !/^\\d+(?:\\.\\d*)?$/u.test(amount)) {
+      return { status: 'unavailable', reason: 'Exact token-unit input and asset identities are required.' };
+    }
+    const [integer, fraction = ''] = amount.split('.');
+    if (fraction.length > decimals) return { status: 'unavailable', reason: 'Input exceeds token precision.' };
+    const sourceBaseUnits = BigInt(integer + fraction.padEnd(decimals, '0')).toString();
+    const request = state.metamask.quoteRequest?.[0];
+    const quotes = state.metamask.quotes ?? [];
+    const sameAsset = (left, right) => left === right || (
+      /^eip155:/u.test(String(left)) && String(left).toLowerCase() === String(right).toLowerCase()
+    );
+    const matches = quotes.length > 0 && quotes.every(({ quote }) =>
+      quote?.requestId && quote.src?.amount === sourceBaseUnits &&
+      sameAsset(quote.src?.asset?.assetId, from.assetId) &&
+      sameAsset(quote.dest?.asset?.assetId, to.assetId)
+    );
+    const destinationMatches = /^\\d+(?:\\.\\d*)?$/u.test(destinationAmount) && quotes.some(({ quote }) => {
+      const precision = quote?.dest?.asset?.decimals;
+      if (!Number.isInteger(precision) || precision < 0 || precision > 36 || !/^\\d+$/u.test(String(quote?.dest?.amount))) return false;
+      const [whole, part = ''] = destinationAmount.split('.');
+      if (part.length > precision) return false;
+      const displayed = BigInt(whole + part.padEnd(precision, '0'));
+      const quoted = BigInt(quote.dest.amount);
+      const difference = displayed > quoted ? displayed - quoted : quoted - displayed;
+      const displayUnit = 10n ** BigInt(precision - part.length);
+      return displayed > 0n && difference * 2n <= displayUnit;
+    });
+    return {
+      status: state.metamask.quotesLoadingStatus === 0 ? 'loading'
+        : request?.srcTokenAmount === sourceBaseUnits && matches && destinationMatches ? 'matching' : 'stale',
+      sourceAmount: amount,
+      destinationAmount,
+      destinationMatches,
+      sourceBaseUnits,
+      sourceAssetId: from.assetId,
+      destinationAssetId: to.assetId,
+      quoteCount: quotes.length,
+    };
+  })()`);
+}

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

@@ -1,4 +1,5 @@
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { readQuoteInputIdentity } from './quote-state.mjs';
 import {
   normalizeVisibleSwapBridgeState,
   resolveVisibleSwapBridgeOptions,
@@ -54,7 +55,8 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
   })()`);
   const state = normalizeVisibleSwapBridgeState(raw, options, 'extension');
   const requireQuote = input.node?.require_quote === true;
-  if (requireQuote && (!raw.quote.ctaEnabled || !(Number(state.destinationAmount) > 0)
+  const quoteIdentity = requireQuote ? await readQuoteInputIdentity(page) : undefined;
+  if (requireQuote && (quoteIdentity.status !== 'matching' || quoteIdentity.sourceAmount !== state.sourceAmount || quoteIdentity.destinationAmount !== state.destinationAmount || !raw.quote.ctaEnabled || !(Number(state.destinationAmount) > 0)
     || !/^(?:Swap|Bridge)$/iu.test(String(raw.quote.cta)))) {
     throw new Error('Swap quote is not ready for review.');
   }
@@ -62,6 +64,7 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
     action: input.action,
     ...state,
     quote: raw.quote,
+    ...(quoteIdentity ? { quoteIdentity } : {}),
     proofPath: 'visible-dom-accessibility',
   };
 }));

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

@@ -57,7 +57,17 @@ async function selectAsset(page, role, asset, deadline) {
   if (!(await isVisible(page, search))) {
     throw new Error(`Swap ${role} asset picker did not open.`);
   }
-  await page.setInput(search, asset.query);
+  const existing = await page.evaluate(`(() => {
+    const prefix = ${JSON.stringify(`bridge-asset--${asset.chain}/`)};
+    const exactId = ${JSON.stringify(asset.assetId ? `bridge-asset--${asset.assetId}` : null)};
+    return [...document.querySelectorAll('[data-testid^="bridge-asset--"]')]
+      .filter((row) => exactId
+        ? row.getAttribute('data-testid') === exactId
+        : String(row.getAttribute('data-testid') || '').startsWith(prefix)
+          && String(row.querySelector('[data-testid="bridge-asset-symbol"]')?.textContent || '').trim().toUpperCase() === ${JSON.stringify(asset.symbol)})
+      .map((row) => row.getAttribute('data-testid'));
+  })()`);
+  if (existing.length === 0) await page.setInput(search, asset.query);
   const testId = await findAsset(page, asset, deadline);
   await page.click(dataTestId(testId));
   while (Date.now() < deadline) {

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

@@ -1,5 +1,6 @@
 import { runAdapter, withExtensionPage, dataTestId } from '../platform/cdp.mjs';
 import { resolveAmountOptions } from '../../shared/swap-bridge/transaction.mjs';
+import { readQuoteInputIdentity } from './quote-state.mjs';
 
 runAdapter(async (input) => withExtensionPage(input, async (page) => {
   const options = resolveAmountOptions(input.node);
@@ -7,7 +8,6 @@ runAdapter(async (input) => withExtensionPage(input, async (page) => {
   await page.setInput(source, options.amount);
   const deadline = Date.now() + options.timeoutMs;
   let observed;
-  let lastRefreshAt = 0;
   do {
     observed = await page.evaluate(`(() => {
       const value = (testId) => {
@@ -24,22 +24,24 @@ 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 (!options.waitForQuote || observed.noQuote) break;
-    if (/^(?:Get new quote|Refresh quote)$/iu.test(String(observed.cta))
-      && observed.ctaEnabled && Date.now() - lastRefreshAt >= 1000) {
-      await page.click(dataTestId('bridge-cta-button'));
-      lastRefreshAt = Date.now();
+    if (observed.quoteIdentity.status === 'matching' && !observed.ctaEnabled && /^Insufficient funds$/iu.test(String(observed.cta))) {
+      throw new Error(`Swap quote matches the input but cannot be submitted: ${JSON.stringify(observed)}.`);
     }
-    if (Number(observed.destinationAmount) > 0 && observed.ctaEnabled
+    if (observed.quoteIdentity?.status === 'matching' && Number(observed.destinationAmount) > 0 && observed.ctaEnabled
       && /^(?:Swap|Bridge)$/iu.test(String(observed.cta))) break;
     await page.evaluate('new Promise((resolve) => setTimeout(resolve, 250))');
   } while (Date.now() < deadline);
   if (observed.sourceAmount !== options.amount) {
     throw new Error(`Swap source amount mismatch: expected ${options.amount}, observed ${observed.sourceAmount}.`);
   }
-  if (options.waitForQuote && !observed.noQuote && !(Number(observed.destinationAmount) > 0
+  if (options.waitForQuote && !observed.noQuote && !(observed.quoteIdentity?.status === 'matching' && Number(observed.destinationAmount) > 0
     && observed.ctaEnabled && /^(?:Swap|Bridge)$/iu.test(String(observed.cta)))) {
-    throw new Error(`Swap quote did not resolve within ${options.timeoutMs}ms.`);
+    throw new Error(`Swap quote did not resolve within ${options.timeoutMs}ms: ${JSON.stringify(observed)}.\nNext: mm-harness call metamask.swap_bridge.read_visible_state`);
   }
   return { action: input.action, ...observed, proofPath: 'visible-ui-amount' };
 }));