@deeeed/metamask-harness 0.47.4 → 0.49.0

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

@@ -1,3 +1,6 @@
+// Provide checkout-bound Extension CDP sessions, page actions and screenshot helpers.
+// Bind browser and service-worker observation to the selected runtime.
+
 import {
   constants,
   access,
@@ -240,32 +243,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 +285,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 +316,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 +342,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,45 +739,22 @@ 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 connectServiceWorker() {
+    const browserVersion = await jsonGet(`http://127.0.0.1:${this.port}/json/version`);
+    const current = extensionRuntimeIdentity({ port: this.port, target: this.target, browserVersion });
+    if (current.runtimeSessionId !== this.runtimeIdentity.runtimeSessionId) {
+      throw new Error('Extension browser changed before service-worker observation.');
+    }
+    const targets = await jsonGet(`http://127.0.0.1:${this.port}/json/list`);
+    const workers = targets.filter((target) => target.type === 'service_worker'
+      && String(target.url).startsWith(`${this.origin}/`));
+    if (workers.length !== 1) throw new Error('Extension requires one matching service worker for order observation.');
+    const worker = workers[0];
+    const socket = new URL(worker.webSocketDebuggerUrl);
+    if (socket.protocol !== 'ws:' || socket.hostname !== '127.0.0.1' || Number(socket.port) !== this.port) {
+      throw new Error('Extension service-worker observation requires this browser localhost endpoint.');
+    }
+    return { session: await CdpSession.connect(socket.href), targetId: worker.id };
   }
 
   async setInput(selector, value) {
@@ -863,8 +768,14 @@ export class ExtensionPage extends CdpWebPage {
       if (typeof element.select === 'function') element.select();
       return { tagName: element.tagName, previousLength: String(element.value ?? '').length };
     })()`);
-    await this.session.call('Input.dispatchKeyEvent', { type: 'keyDown', key: 'Backspace' });
-    await this.session.call('Input.dispatchKeyEvent', { type: 'keyUp', key: 'Backspace' });
+    await this.session.call('Input.dispatchKeyEvent', {
+      type: 'keyDown', key: 'Backspace', code: 'Backspace',
+      windowsVirtualKeyCode: 8, nativeVirtualKeyCode: 8,
+    });
+    await this.session.call('Input.dispatchKeyEvent', {
+      type: 'keyUp', key: 'Backspace', code: 'Backspace',
+      windowsVirtualKeyCode: 8, nativeVirtualKeyCode: 8,
+    });
     for (const character of input) {
       const upper = character.toUpperCase();
       const isLetter = /^[A-Z]$/u.test(upper);
@@ -947,22 +858,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/settings/set_basic_functionality.mjs

@@ -1,3 +1,4 @@
+// Sets Basic Functionality in Privacy settings, accepting the disable confirmation when needed.
 import { dataTestId, runAdapter, withExtensionPage } from '../platform/cdp.mjs';
 
 const TOGGLE_SELECTOR = dataTestId('basic-functionality-toggle');

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

@@ -0,0 +1,56 @@
+// Compares exposed bridge quote state with the selected assets and displayed amounts.
+// Requires debug store access to distinguish matching, stale, loading, and unavailable quotes.
+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,6 @@
+// Reads displayed swap/bridge inputs and quote details, optionally checking quote identity in the store.
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { readQuoteInputIdentity } from './quote-state.mjs';
 import {
   normalizeVisibleSwapBridgeState,
   resolveVisibleSwapBridgeOptions,
@@ -54,7 +56,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 +65,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

@@ -1,3 +1,4 @@
+// Opens Swap and selects source and destination assets by exact ID or unambiguous chain and symbol.
 import { runAdapter, withExtensionPage, dataTestId } from '../platform/cdp.mjs';
 import { openSwap } from '../ui/navigate.mjs';
 import { resolveAssetSelectionOptions } from '../../shared/swap-bridge/transaction.mjs';
@@ -57,7 +58,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,7 @@
+// Enters a swap/bridge amount and optionally waits for a matching usable quote or an unavailable route.
 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 +9,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 +25,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' };
 }));

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

@@ -1,5 +1,8 @@
+// Uses the visible Max control and optionally waits for a matching usable quote or an unavailable route.
 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 +14,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 +38,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

@@ -1,3 +1,4 @@
+// Saves custom swap/bridge slippage and waits for the displayed quote and submit control to refresh.
 import { dataTestId, runAdapter, withExtensionPage } from '../platform/cdp.mjs';
 
 async function pause(page) {
@@ -74,10 +75,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 +89,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/locators.mjs

@@ -1,3 +1,4 @@
+// Derives locator candidates from the Extension page's current visible-UI observation.
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
 import {
   locatorsFromObservation,