@deeeed/metamask-harness 0.28.0 → 0.29.0

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

@@ -1,5 +1,6 @@
 import { pathToFileURL } from 'node:url';
 import { dataTestId, marketSymbol, normalizeMarketSymbol, runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { readPerpsRuntimeStateExpression } from './state.mjs';
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -704,22 +705,7 @@ async function applyStateNavigation(input, config) {
 
 
 async function readPerpsRuntimeState(page) {
-  return page.evaluate(`(async () => {
-    const hooks = globalThis.stateHooks || {};
-    const request = hooks.submitRequestToBackground;
-    const reduxState = hooks.store?.getState?.() || {};
-    const cleanState = (await hooks.getCleanAppState?.()) || hooks.getState?.() || {};
-    const metamask = reduxState.metamask || cleanState.metamask || {};
-    const nestedPerps = metamask.PerpsController || cleanState.PerpsController || cleanState.perps || {};
-    return {
-      available: typeof request === 'function',
-      activeProvider: metamask.activeProvider || nestedPerps.activeProvider || 'hyperliquid',
-      networkKnown: typeof nestedPerps.isTestnet === 'boolean',
-      isTestnet: Boolean(nestedPerps.isTestnet),
-      initializationState: metamask.initializationState || nestedPerps.initializationState || null,
-      isEligible: Boolean(metamask.isEligible ?? nestedPerps.isEligible),
-    };
-  })()`);
+  return page.evaluate(readPerpsRuntimeStateExpression());
 }
 
 async function ensureProvider(input, config) {

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

@@ -0,0 +1,20 @@
+export function readPerpsRuntimeStateExpression() {
+  return `(async () => {
+    const hooks = globalThis.stateHooks || {};
+    const request = hooks.submitRequestToBackground;
+    const reduxState = hooks.store?.getState?.() || {};
+    const cleanState = (await hooks.getCleanAppState?.()) || hooks.getState?.() || {};
+    const reduxMetamask = reduxState.metamask || {};
+    const cleanMetamask = cleanState.metamask || {};
+    const metamask = { ...cleanMetamask, ...reduxMetamask };
+    const nestedPerps = reduxMetamask.PerpsController || cleanMetamask.PerpsController || cleanState.PerpsController || cleanState.perps || {};
+    return {
+      available: typeof request === 'function',
+      activeProvider: metamask.activeProvider || nestedPerps.activeProvider || 'hyperliquid',
+      networkKnown: typeof metamask.isTestnet === 'boolean' || typeof nestedPerps.isTestnet === 'boolean',
+      isTestnet: Boolean(metamask.isTestnet ?? nestedPerps.isTestnet),
+      initializationState: metamask.initializationState || nestedPerps.initializationState || null,
+      isEligible: Boolean(metamask.isEligible ?? nestedPerps.isEligible),
+    };
+  })()`;
+}

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

@@ -1,37 +1,15 @@
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { listWalletAccountsExpression } from './state.mjs';
 
 runAdapter((input) => withExtensionPage(input, async (page) => {
   const scope = input.node?.scope == null ? 'named' : String(input.node.scope);
   if (scope !== 'selected' && scope !== 'named' && scope !== 'evm' && scope !== 'all') {
     throw new Error('metamask.wallet.list_accounts scope must be selected, named, evm, or all.');
   }
-  const result = await page.evaluate(`(() => {
-    const store = globalThis.stateHooks?.store;
-    if (!store || typeof store.getState !== 'function') {
-      throw new Error('stateHooks.store.getState is unavailable.');
-    }
-    const internal = store.getState()?.metamask?.internalAccounts || {};
-    const selectedId = internal.selectedAccount || null;
-    const scope = ${JSON.stringify(scope)};
-    const accounts = Object.entries(internal.accounts || {})
-      .map(([id, account]) => ({
-        id,
-        address: account?.address || null,
-        name: account?.metadata?.name || null,
-        type: account?.type || null,
-        selected: id === selectedId
-      }))
-      .filter((account) => {
-        if (scope === 'selected') return account.selected;
-        if (scope === 'all') return true;
-        if (scope === 'evm') return /^0x[0-9a-f]{40}$/iu.test(account.address || '');
-        return account.selected || Boolean(String(account.name || '').trim());
-      });
-    return { accounts };
-  })()`);
+  const result = await page.evaluate(listWalletAccountsExpression(scope), { awaitPromise: true });
   return {
     action: input.action,
-    source: 'extension-stateHooks-store',
+    source: 'extension-stateHooks-clean-state',
     scope,
     ...result,
     count: result.accounts.length,

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

@@ -1,27 +1,7 @@
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { readWalletStateExpression } from './state.mjs';
 
 runAdapter((input) => withExtensionPage(input, async (page) => {
-  const state = await page.evaluate(`(() => {
-    const hooks = globalThis.stateHooks;
-    const store = hooks && hooks.store;
-    const root = store && typeof store.getState === 'function' ? store.getState() : {};
-    const metamask = root.metamask || {};
-    const internal = metamask.internalAccounts || {};
-    const accounts = internal.accounts || {};
-    const selectedId = internal.selectedAccount || null;
-    const selected = selectedId && accounts[selectedId] ? accounts[selectedId] : null;
-    const metadata = selected && selected.metadata ? selected.metadata : {};
-    return {
-      href: String(globalThis.location && globalThis.location.href || ''),
-      selectedAccount: selected ? {
-        id: selectedId,
-        address: selected.address || null,
-        name: metadata.name || null,
-        type: selected.type || null
-      } : null,
-      completedOnboarding: Boolean(metamask.completedOnboarding),
-      selectedNetworkClientId: metamask.selectedNetworkClientId || null
-    };
-  })()`);
-  return { action: input.action, source: 'extension-stateHooks-store', state, redacted: true, proofPath: 'extension-wallet-state' };
+  const state = await page.evaluate(readWalletStateExpression(), { awaitPromise: true });
+  return { action: input.action, source: 'extension-stateHooks-clean-state', state, redacted: true, proofPath: 'extension-wallet-state' };
 }));

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

@@ -1,4 +1,5 @@
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { selectWalletAccountExpression } from './state.mjs';
 
 function normalize(value) {
   return String(value ?? '').toLowerCase();
@@ -11,38 +12,10 @@ runAdapter((input) => withExtensionPage(input, async (page) => {
   if (!requestedAddress && !requestedId && !requestedName) {
     throw new Error('metamask.wallet.select_account extension live adapter requires node.address, node.id, or node.name.');
   }
-  const selected = await page.evaluate(`(async () => {
-    const hooks = globalThis.stateHooks;
-    const store = hooks && hooks.store;
-    const request = hooks && hooks.submitRequestToBackground;
-    if (!store || typeof store.getState !== 'function') throw new Error('stateHooks.store.getState is unavailable.');
-    if (typeof request !== 'function') throw new Error('stateHooks.submitRequestToBackground is unavailable.');
-    const state = store.getState() || {};
-    const internal = state.metamask?.internalAccounts || {};
-    const accounts = internal.accounts || {};
-    const requestedAddress = ${JSON.stringify(requestedAddress)};
-    const requestedId = ${JSON.stringify(requestedId)};
-    const requestedName = ${JSON.stringify(requestedName)};
-    const entries = Object.entries(accounts);
-    const match = entries.find(([id, account]) => {
-      const metadata = account?.metadata || {};
-      return (requestedId && id === requestedId) ||
-        (requestedAddress && String(account?.address || '').toLowerCase() === requestedAddress) ||
-        (requestedName && metadata.name === requestedName);
-    });
-    if (!match) throw new Error('Requested account was not found in internalAccounts.');
-    const [id, account] = match;
-    await request('setSelectedInternalAccount', [id]);
-    const after = store.getState()?.metamask?.internalAccounts || {};
-    const selectedId = after.selectedAccount;
-    const selected = after.accounts?.[selectedId];
-    if (selectedId !== id) throw new Error('Expected selected account ' + id + ', got ' + selectedId);
-    return {
-      id: selectedId,
-      address: selected?.address || null,
-      name: selected?.metadata?.name || null,
-      type: selected?.type || null
-    };
-  })()`, { awaitPromise: true });
+  const selected = await page.evaluate(selectWalletAccountExpression({
+    address: requestedAddress,
+    id: requestedId,
+    name: requestedName,
+  }), { awaitPromise: true });
   return { action: input.action, selected, proofPath: 'extension-account-selection' };
 }));

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

@@ -1,26 +1,8 @@
 import { runAdapter, withExtensionPage } from '../platform/cdp.mjs';
+import { readWalletStateExpression } from './state.mjs';
 
 runAdapter((input) => withExtensionPage(input, async (page) => {
-  const state = await page.evaluate(`(() => {
-    const passwordInput = Boolean(document.querySelector('input[type="password"]'));
-    const hooks = globalThis.stateHooks;
-    const store = hooks && hooks.store;
-    const root = store && typeof store.getState === 'function' ? store.getState() : {};
-    const metamask = root.metamask || {};
-    const internal = metamask.internalAccounts || {};
-    const accounts = internal.accounts || {};
-    const selectedId = internal.selectedAccount || null;
-    const selected = selectedId && accounts[selectedId] ? accounts[selectedId] : null;
-    return {
-      href: String(globalThis.location && globalThis.location.href || ''),
-      passwordInput,
-      completedOnboarding: Boolean(metamask.completedOnboarding),
-      selectedAccount: selected ? {
-        id: selectedId,
-        address: selected.address || null,
-      } : null,
-    };
-  })()`);
+  const state = await page.evaluate(readWalletStateExpression(), { awaitPromise: true });
   const seededProfilePresent = Boolean(state?.passwordInput || (state?.completedOnboarding && state?.selectedAccount?.address));
   if (!seededProfilePresent) {
     throw new Error(`Extension fixture profile is not ready; expected a locked password screen or completed onboarding with a selected account, got ${JSON.stringify(state)}`);

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

@@ -0,0 +1,111 @@
+const walletStatePreamble = `
+    const readWalletState = async () => {
+      const hooks = globalThis.stateHooks || {};
+      let root = null;
+      if (typeof hooks.getCleanAppState === 'function') {
+        root = await hooks.getCleanAppState();
+      }
+      if ((!root || typeof root !== 'object') && typeof hooks.store?.getState === 'function') {
+        root = hooks.store.getState();
+      }
+      if (!root || typeof root !== 'object') {
+        throw new Error('stateHooks.getCleanAppState and stateHooks.store.getState are unavailable.');
+      }
+      const metamask = root.metamask || root;
+      return {
+        hooks,
+        metamask,
+        internal: metamask.internalAccounts || {},
+      };
+    };
+`;
+
+export function readWalletStateExpression() {
+  return `(async () => {
+    ${walletStatePreamble}
+    const { metamask, internal } = await readWalletState();
+    const accounts = internal.accounts || {};
+    const selectedId = internal.selectedAccount || null;
+    const selected = selectedId && accounts[selectedId] ? accounts[selectedId] : null;
+    const metadata = selected?.metadata || {};
+    return {
+      href: String(globalThis.location?.href || ''),
+      passwordInput: Boolean(globalThis.document?.querySelector?.('input[type="password"]')),
+      selectedAccount: selected ? {
+        id: selectedId,
+        address: selected.address || null,
+        name: metadata.name || null,
+        type: selected.type || null,
+      } : null,
+      completedOnboarding: Boolean(metamask.completedOnboarding),
+      selectedNetworkClientId: metamask.selectedNetworkClientId || null,
+    };
+  })()`;
+}
+
+export function listWalletAccountsExpression(scope) {
+  return `(async () => {
+    ${walletStatePreamble}
+    const { internal } = await readWalletState();
+    const selectedId = internal.selectedAccount || null;
+    const scope = ${JSON.stringify(scope)};
+    const accounts = Object.entries(internal.accounts || {})
+      .map(([id, account]) => ({
+        id,
+        address: account?.address || null,
+        name: account?.metadata?.name || null,
+        type: account?.type || null,
+        selected: id === selectedId,
+      }))
+      .filter((account) => {
+        if (scope === 'selected') return account.selected;
+        if (scope === 'all') return true;
+        if (scope === 'evm') return /^0x[0-9a-f]{40}$/iu.test(account.address || '');
+        return account.selected || Boolean(String(account.name || '').trim());
+      });
+    return { accounts };
+  })()`;
+}
+
+export function selectWalletAccountExpression(criteria, timeoutMs = 5000) {
+  return `(async () => {
+    ${walletStatePreamble}
+    const before = await readWalletState();
+    const accounts = before.internal.accounts || {};
+    const requestedAddress = ${JSON.stringify(criteria.address)};
+    const requestedId = ${JSON.stringify(criteria.id)};
+    const requestedName = ${JSON.stringify(criteria.name)};
+    const match = Object.entries(accounts).find(([id, account]) => {
+      const metadata = account?.metadata || {};
+      return (requestedId && id === requestedId) ||
+        (requestedAddress && String(account?.address || '').toLowerCase() === requestedAddress) ||
+        (requestedName && metadata.name === requestedName);
+    });
+    if (!match) throw new Error('Requested account was not found in internalAccounts.');
+    if (typeof before.hooks.submitRequestToBackground !== 'function') {
+      throw new Error('stateHooks.submitRequestToBackground is unavailable.');
+    }
+    const [id] = match;
+    await before.hooks.submitRequestToBackground('setSelectedInternalAccount', [id]);
+    const deadline = Date.now() + ${Number(timeoutMs)};
+    let observedId = before.internal.selectedAccount || null;
+    while (Date.now() <= deadline) {
+      const after = await readWalletState();
+      observedId = after.internal.selectedAccount || null;
+      if (observedId === id) {
+        const selected = after.internal.accounts?.[observedId];
+        return {
+          id: observedId,
+          address: selected?.address || null,
+          name: selected?.metadata?.name || null,
+          type: selected?.type || null,
+        };
+      }
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    throw new Error(
+      'Expected selected account ' + id + ', got ' + String(observedId) +
+      ' after ${Number(timeoutMs)}ms.',
+    );
+  })()`;
+}

package/library/recipes/runner/action-validation.extension.recipe.json

@@ -7,7 +7,7 @@
     "nodes": {
       "prepare-files": {
         "action": "command",
-        "cmd": "mkdir -p temp/recipe-runner.action-validation && printf 'E2E_ACTION_VALIDATION extension\\n' > temp/recipe-runner.action-validation/probe.txt && printf '{\"platform\":\"extension\",\"ok\":true}\n' > temp/recipe-runner.action-validation/probe.json && printf 'extension log E2E_ACTION_VALIDATION\\n' > temp/recipe-runner.action-validation/validation.log && echo E2E_ACTION_VALIDATION extension",
+        "cmd": "mkdir -p temp/recipe-runner.action-validation && printf 'E2E_ACTION_VALIDATION extension\\n' > temp/recipe-runner.action-validation/probe.txt && printf '{\"platform\":\"extension\",\"ok\":true}\n' > temp/recipe-runner.action-validation/probe.json && printf 'extension log E2E_ACTION_VALIDATION\\n' >> temp/recipe-runner.action-validation/validation.log && echo E2E_ACTION_VALIDATION extension",
         "next": "assert-command-exit",
         "intent": "Prepare runner.action-validation probe files"
       },

package/library/recipes/runner/action-validation.mobile.recipe.json

@@ -7,7 +7,7 @@
     "nodes": {
       "prepare-files": {
         "action": "command",
-        "cmd": "mkdir -p temp/recipe-runner.action-validation && printf 'E2E_ACTION_VALIDATION mobile\\n' > temp/recipe-runner.action-validation/probe.txt && printf '{\"platform\":\"mobile\",\"ok\":true}\n' > temp/recipe-runner.action-validation/probe.json && printf 'mobile log E2E_ACTION_VALIDATION\\n' > temp/recipe-runner.action-validation/validation.log && echo E2E_ACTION_VALIDATION mobile",
+        "cmd": "mkdir -p temp/recipe-runner.action-validation && printf 'E2E_ACTION_VALIDATION mobile\\n' > temp/recipe-runner.action-validation/probe.txt && printf '{\"platform\":\"mobile\",\"ok\":true}\n' > temp/recipe-runner.action-validation/probe.json && printf 'mobile log E2E_ACTION_VALIDATION\\n' >> temp/recipe-runner.action-validation/validation.log && echo E2E_ACTION_VALIDATION mobile",
         "next": "assert-command-exit",
         "intent": "Prepare runner.action-validation probe files"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deeeed/metamask-harness",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "type": "module",
   "bin": {
     "mm-harness": "bin/mm-harness"
@@ -13,16 +13,17 @@
     "test:unit": "vitest run --config scripts/vitest.config.mjs",
     "test:coverage": "vitest run --coverage --config scripts/vitest.config.mjs",
     "qa:human": "node scripts/validate-human-outcomes.mjs",
+    "site:contrast": "node scripts/site-contrast.mjs",
     "self-test": "bin/mm-harness self-test",
     "manifest:mobile": "bin/mm-harness actions --raw --adapter mobile --json",
     "manifest:extension": "bin/mm-harness actions --raw --adapter extension --json",
     "check:syntax": "find . -name '*.mjs' -print0 | xargs -0 -n1 node --check"
   },
   "dependencies": {
-    "@farmslot/agent-runtime": "^0.4.0",
+    "@farmslot/agent-runtime": "^0.5.0",
     "@farmslot/handoff": "^0.3.1",
-    "@farmslot/protocol": "^0.14.0",
-    "@farmslot/recipe-harness": "^0.10.4",
+    "@farmslot/protocol": "^0.15.0",
+    "@farmslot/recipe-harness": "^0.11.0",
     "commander": "^12.0.0",
     "es-module-lexer": "2.3.1",
     "esbuild": "0.28.1",
@@ -61,8 +62,10 @@
     "dist",
     "adapters",
     "library",
+    "site",
     "scripts/completions.sh",
     "scripts/install-completions.sh",
+    "scripts/site-contrast.mjs",
     "scripts/validate-human-outcomes.mjs",
     "!scripts/README.md",
     "docs",