@deeeed/metamask-harness 0.50.4 → 0.50.6

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## 0.50.6 - 2026-09-11
+
+### Fixed
+
+- Stop every Extension Chrome whose `--user-data-dir` is under this checkout's `temp/recipe/runtime/`, including uniquely named recipe profiles. The previous allow-list of `chrome-profile`, `chrome-profile-recipe`, and `chrome-profile-pw` left leftovers that `mm-harness stop` reported as already stopped. Nested `console-tail.mjs` log paths under that runtime dir are reaped the same way. Personal Chrome and other checkouts stay untouched.
+- Close extra MetaMask home tabs after an Extension browser launch. `open -n` with a start URL against a still-live profile was stacking unlock tabs.
+- Reap every Chrome process that still owns the Extension profile before relaunch, and kill a macOS `open -n` browser that never exposes CDP, so repeated launches cannot stack headed Chrome instances on the same user-data-dir.
+- Keep the Extension Chrome window visible, but restore the previously focused macOS app through Launch Services while Chrome starts so the window does not come to the front or take the keyboard. System Events hangs during that activation, so osascript restore cannot hold focus.
+
+## 0.50.5 - 2026-09-10
+
+### Fixed
+
+- Avoid disabling and re-enabling the Extension after a fresh browser launch, which could cause `No SW` storage errors in reused wallet profiles. Keep build handoff for updates in an already-running browser.
+- Keep the previously focused macOS app in front while Chrome starts, instead of restoring only after CDP is up. Do not let caffeinate declare user activity during that launch.
+
 ## 0.50.4 - 2026-09-10
 
 - Distinguish Extension startup/provider absence from attempted RPC failures and preserve diagnosed failed tabs during verification.

package/adapters/extension/ensure-browser.sh

@@ -301,7 +301,8 @@ const {
   runtimeIdentityArgs,
   writeRuntimeIdentity,
 } = require(path.join('${SCRIPT_DIR}', 'lib/chrome-args.cjs'));
-const { captureMacFrontmostProcess, restoreMacFrontmostProcess } = require(path.join('${SCRIPT_DIR}', 'lib/macos-focus.cjs'));
+const { captureMacFrontmost, macBackgroundOpenArgs, preserveMacFrontmost, startMacFocusHold, stopMacFocusHold } = require(path.join('${SCRIPT_DIR}', 'lib/macos-focus.cjs'));
+const { stopProfileProcessesSync } = require(path.join('${SCRIPT_DIR}', 'lib/validation-process-ownership.cjs'));
 
 const SLOT_ID = '${SLOT_ID}';
 const AGENT_DIR = '${AGENT_DIR}';
@@ -322,6 +323,13 @@ const resumeWebpack = () => {
   if (WEBPACK_PID) { try { process.kill(-Number(WEBPACK_PID), 'SIGCONT'); } catch { try { process.kill(Number(WEBPACK_PID), 'SIGCONT'); } catch {} } }
 };
 
+const previousFrontmost = captureMacFrontmost();
+let focusHold = null;
+const releaseFocusHold = () => {
+  stopMacFocusHold(focusHold);
+  preserveMacFrontmost(previousFrontmost);
+};
+
 (async () => {
   const runtimeNonce = createRuntimeIdentityNonce();
   const startedAt = Date.now();
@@ -344,8 +352,8 @@ const resumeWebpack = () => {
   }
 
   const chromiumApp = path.dirname(path.dirname(path.dirname(chromium.executablePath())));
-  const previousFrontmostPid = captureMacFrontmostProcess();
-  execFileSync('open', ['-g', '-n', '-a', chromiumApp, '--args', ...args], { stdio: 'ignore' });
+  focusHold = startMacFocusHold(previousFrontmost);
+  execFileSync('open', macBackgroundOpenArgs(chromiumApp, args), { stdio: 'ignore' });
   for (let i = 0; i < 60; i++) {
     try {
       const version = await new Promise((resolve, reject) => {
@@ -396,6 +404,7 @@ const resumeWebpack = () => {
     } catch {}
   }
   if (!browserPid) {
+    stopProfileProcessesSync(PROFILE, { waitForAppearanceMs: 400 });
     throw new Error(
       'Reopened Chrome did not expose an owned CDP listener on port ' + CDP_PORT +
       '. Next: inspect the slot browser process, then rerun: mm-harness launch --adapter extension --build'
@@ -428,11 +437,12 @@ const resumeWebpack = () => {
   try {
     extId = execFileSync(RUNNER_BIN, ['resolve-extension', '--adapter', 'extension', '--target', REPO], { encoding: 'utf8' }).trim();
   } catch (err) {
+    releaseFocusHold();
     resumeWebpack();
     console.error('[FAIL] runner resolve-extension failed: ' + (err && err.message ? err.message : String(err)));
     process.exit(1);
   }
-  if (!/^[a-p]{32}$/.test(extId)) { resumeWebpack(); console.error('[FAIL] runner returned invalid extension id: ' + JSON.stringify(extId)); process.exit(1); }
+  if (!/^[a-p]{32}$/.test(extId)) { releaseFocusHold(); resumeWebpack(); console.error('[FAIL] runner returned invalid extension id: ' + JSON.stringify(extId)); process.exit(1); }
   console.log('[reopen] Extension: ' + extId + ' (via runner resolve-extension)');
 
   // Navigate to MetaMask home
@@ -498,8 +508,10 @@ const resumeWebpack = () => {
   if (process.env.MM_HARNESS_FOCUS_BROWSER === '1') {
     await page.bringToFront().catch(() => {});
   } else {
-    restoreMacFrontmostProcess(previousFrontmostPid);
+    await new Promise(r => setTimeout(r, 1000));
+    preserveMacFrontmost(previousFrontmost);
   }
+  releaseFocusHold();
 
   fs.writeFileSync(path.join(AGENT_DIR, 'extension.id'), extId);
   console.log('[reopen] Ready \u2014 ' + SLOT_ID + (CDP_PORT ? ' CDP:' + CDP_PORT : ''));
@@ -509,6 +521,7 @@ const resumeWebpack = () => {
   if (WEBPACK_PID) console.log('[webpack] Resumed');
   process.exit(0);
 })().catch(e => {
+  releaseFocusHold();
   resumeWebpack();
   try { removeRuntimeIdentity(AGENT_DIR); } catch {}
   try { fs.unlinkSync(path.join(AGENT_DIR, 'browser.pid')); } catch {}

package/adapters/extension/launch-browser.cjs

@@ -24,7 +24,7 @@ const os = require('node:os');
 const path = require('node:path');
 const { execFileSync, spawn, spawnSync } = require('node:child_process');
 const { extensionIdFromExtensionDir } = require('./lib/extension-id.cjs');
-const { profileProcessPids } = require('./lib/validation-process-ownership.cjs');
+const { profileProcessPids, stopProfileProcessesSync } = require('./lib/validation-process-ownership.cjs');
 const { acquireBuildHandoff } = require('./build-handoff.cjs');
 const {
   automationRuntimeArgs,
@@ -42,7 +42,13 @@ const {
   validationLaunchQuarantineError,
   writeRuntimeIdentity,
 } = require('./lib/chrome-args.cjs');
-const { captureMacFrontmostProcess, restoreMacFrontmostProcess } = require('./lib/macos-focus.cjs');
+const {
+  captureMacFrontmost,
+  macBackgroundOpenArgs,
+  preserveMacFrontmost,
+  startMacFocusHold,
+  stopMacFocusHold,
+} = require('./lib/macos-focus.cjs');
 
 if (process.argv.includes('--help') || process.argv.includes('-h')) {
   console.log(
@@ -107,7 +113,7 @@ try {
       'Next: remove the invalid runtime identity and fix owner permissions, then rerun: mm-harness launch --adapter extension --build',
   );
 }
-terminatePids([...ownedPids]);
+stopProfileProcessesSync(args.profile, { extraPids: [...ownedPids] });
 if (args['reset-profile'] !== undefined) {
   fs.rmSync(args.profile, { recursive: true, force: true });
   fs.mkdirSync(args.profile, { recursive: true });
@@ -164,70 +170,83 @@ const chromeArgs = [
   initialUrl,
 ];
 const logFd = fs.openSync(args['chrome-log'], 'a');
-const previousFrontmostPid = captureMacFrontmostProcess();
+const previousFrontmost = captureMacFrontmost();
+const focusHold = startMacFocusHold(previousFrontmost);
 let browserPid;
 try {
-  const application = process.platform === 'darwin' ? macApplicationForExecutable(args['chrome-bin']) : null;
-  if (application) {
-    beginDetachedLaunch(cdpPort, args.profile, activeValidationLease);
-    execFileSync('open', ['-g', '-n', '-a', application, '--args', ...chromeArgs], {
-      env: sanitizedChildEnv(),
-      stdio: ['ignore', logFd, logFd],
+  try {
+    const application = process.platform === 'darwin' ? macApplicationForExecutable(args['chrome-bin']) : null;
+    if (application) {
+      beginDetachedLaunch(cdpPort, args.profile, activeValidationLease);
+      execFileSync('open', macBackgroundOpenArgs(application, chromeArgs), {
+        env: sanitizedChildEnv(),
+        stdio: ['ignore', logFd, logFd],
+      });
+      browserPid = waitForOwnedCdpPid(cdpPort, args.profile, args['extension-dir']);
+      if (browserPid === null) {
+        stopProfileProcessesSync(args.profile, { waitForAppearanceMs: 400 });
+        throw new Error(
+          `Chrome launched but did not expose an owned CDP listener on 127.0.0.1:${cdpPort}. ` +
+            `Next: inspect ${args['chrome-log']}, then rerun: mm-harness launch --adapter extension --build`,
+        );
+      }
+    } else {
+      beginDetachedLaunch(cdpPort, args.profile, activeValidationLease);
+      const child = spawn(args['chrome-bin'], chromeArgs, {
+        detached: true,
+        env: sanitizedChildEnv(),
+        stdio: ['ignore', logFd, logFd],
+      });
+      child.unref();
+      browserPid = waitForOwnedCdpPid(cdpPort, args.profile, args['extension-dir']);
+      if (browserPid === null) {
+        stopProfileProcessesSync(args.profile, { extraPids: child.pid ? [child.pid] : [] });
+        throw new Error(
+          `Chrome launched but did not expose an owned CDP listener on 127.0.0.1:${cdpPort}. ` +
+            `Next: inspect ${args['chrome-log']}, then rerun: mm-harness launch --adapter extension --build`,
+        );
+      }
+    }
+    pruneExtraHomeTabs(cdpPort, args['extension-dir']);
+  } finally {
+    fs.closeSync(logFd);
+  }
+  fs.writeFileSync(args['chrome-pid'], `${browserPid}\n`);
+  try {
+    writeRuntimeIdentity(runtimeDir, {
+      port: cdpPort,
+      pid: browserPid,
+      startedAt,
+      nonce: runtimeNonce,
     });
-    browserPid = waitForOwnedCdpPid(cdpPort, args.profile, args['extension-dir']);
-    if (browserPid === null) {
-      throw new Error(`Chrome launched but did not expose CDP on 127.0.0.1:${cdpPort}`);
+    clearDetachedLaunchUnproven(args.profile);
+    if (!activeValidationLease) {
+      clearValidationPortQuarantine(cdpPort, args.profile);
     }
-  } else {
-    beginDetachedLaunch(cdpPort, args.profile, activeValidationLease);
-    const child = spawn(args['chrome-bin'], chromeArgs, {
+  } catch (error) {
+    terminatePids([browserPid]);
+    fs.rmSync(args['chrome-pid'], { force: true });
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Failed to persist Extension runtime identity under ${runtimeDir}: ${detail}. ` +
+        'Next: fix owner write permissions for the runtime directory, then rerun: mm-harness launch --adapter extension --build',
+    );
+  }
+  if (process.platform === 'darwin') {
+    const wake = spawn('caffeinate', ['-dims', '-w', String(browserPid)], {
       detached: true,
-      env: sanitizedChildEnv(),
-      stdio: ['ignore', logFd, logFd],
+      stdio: 'ignore',
     });
-    child.unref();
-    browserPid = waitForOwnedCdpPid(cdpPort, args.profile, args['extension-dir']);
-    if (browserPid === null) {
-      if (child.pid) terminatePids([child.pid]);
-      throw new Error(
-        `Chrome launched but did not expose an owned CDP listener on 127.0.0.1:${cdpPort}. ` +
-          `Next: inspect ${args['chrome-log']}, then rerun: mm-harness launch --adapter extension --build`,
-      );
-    }
+    wake.unref();
+    // Chrome often activates when the first window paints, which can be after CDP
+    // is already listening. Keep the previous app frontmost through that paint.
+    const settleMs = Number(process.env.MM_HARNESS_FOCUS_SETTLE_MS);
+    const waitSec = Number.isFinite(settleMs) && settleMs >= 0 ? settleMs / 1000 : 1;
+    if (waitSec > 0) spawnSync('sleep', [String(waitSec)]);
   }
 } finally {
-  fs.closeSync(logFd);
-}
-fs.writeFileSync(args['chrome-pid'], `${browserPid}\n`);
-try {
-  writeRuntimeIdentity(runtimeDir, {
-    port: cdpPort,
-    pid: browserPid,
-    startedAt,
-    nonce: runtimeNonce,
-  });
-  clearDetachedLaunchUnproven(args.profile);
-  if (!activeValidationLease) {
-    clearValidationPortQuarantine(cdpPort, args.profile);
-  }
-} catch (error) {
-  terminatePids([browserPid]);
-  fs.rmSync(args['chrome-pid'], { force: true });
-  const detail = error instanceof Error ? error.message : String(error);
-  throw new Error(
-    `Failed to persist Extension runtime identity under ${runtimeDir}: ${detail}. ` +
-      'Next: fix owner write permissions for the runtime directory, then rerun: mm-harness launch --adapter extension --build',
-  );
-}
-if (process.platform === 'darwin') {
-  const wake = spawn('caffeinate', ['-dimsu', '-w', String(browserPid)], {
-    detached: true,
-    stdio: 'ignore',
-  });
-  wake.unref();
-}
-if (process.env.MM_HARNESS_FOCUS_BROWSER !== '1') {
-  restoreMacFrontmostProcess(previousFrontmostPid);
+  stopMacFocusHold(focusHold);
+  preserveMacFrontmost(previousFrontmost);
 }
 
 function sanitizedChildEnv() {
@@ -426,3 +445,64 @@ function extensionHomeUrl(extensionDir) {
   const id = extensionIdFromExtensionDir(extensionDir);
   return id ? `chrome-extension://${id}/home.html` : '';
 }
+
+function cdpHttp(port, pathname) {
+  const result = spawnSync(process.execPath, ['-e', `
+    const http = require('http');
+    http.get('http://127.0.0.1:${Number(port)}${pathname}', (res) => {
+      let body = '';
+      res.on('data', (chunk) => { body += chunk; });
+      res.on('end', () => process.stdout.write(body));
+    }).on('error', () => process.exit(1));
+  `], { encoding: 'utf8', timeout: 4000 });
+  if (result.status !== 0) return null;
+  return result.stdout;
+}
+
+function pruneExtraHomeTabs(port, extensionDir) {
+  const id = extensionIdFromExtensionDir(extensionDir);
+  const raw = cdpHttp(port, '/json/list');
+  if (!id || !raw) return;
+  let targets;
+  try {
+    targets = JSON.parse(raw);
+  } catch {
+    return;
+  }
+  if (!Array.isArray(targets)) return;
+  const homes = targets.filter((target) => (
+    target &&
+    target.type === 'page' &&
+    typeof target.id === 'string' &&
+    typeof target.url === 'string' &&
+    target.url.includes(`chrome-extension://${id}/`) &&
+    target.url.includes('/home.html')
+  ));
+  const strays = targets.filter((target) => (
+    target &&
+    target.type === 'page' &&
+    typeof target.id === 'string' &&
+    typeof target.url === 'string' &&
+    (
+      target.url === 'about:blank' ||
+      target.url === 'chrome://newtab/' ||
+      target.url.startsWith('chrome://new-tab-page')
+    )
+  ));
+  if (homes.length === 0) return;
+  const keeper = homes.find((target) => (
+    typeof target.title === 'string' &&
+    target.title.trim() !== '' &&
+    target.title.trim() !== 'MetaMask'
+  )) ?? homes[0];
+  if (homes.length > 1) {
+    for (const extra of homes) {
+      if (keeper && extra.id === keeper.id) continue;
+      cdpHttp(port, `/json/close/${extra.id}`);
+    }
+  }
+  for (const stray of strays) {
+    if (keeper && stray.id === keeper.id) continue;
+    cdpHttp(port, `/json/close/${stray.id}`);
+  }
+}

package/adapters/extension/lib/macos-focus.cjs

@@ -1,32 +1,197 @@
 'use strict';
 
-const { execFileSync } = require('node:child_process');
+const { execFileSync, spawn } = require('node:child_process');
 
-function captureMacFrontmostProcess() {
+const HOLD_INTERVAL_MS = 20;
+const toolEnv = () => ({ ...process.env });
+
+function captureMacFrontmost() {
   if (process.platform !== 'darwin') return null;
   try {
-    const value = execFileSync('osascript', [
-      '-e',
-      'tell application "System Events" to get unix id of first application process whose frontmost is true',
-    ], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 1_000 }).trim();
-    const pid = Number.parseInt(value, 10);
+    const asn = execFileSync('lsappinfo', ['front'], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }).trim();
+    if (!asn) return null;
+    return parseLsappinfo(execFileSync('lsappinfo', ['info', asn], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }));
+  } catch {
+    return null;
+  }
+}
+
+function captureMacFrontmostProcess() {
+  return captureMacFrontmost()?.pid ?? null;
+}
+
+function parseLsappinfo(info) {
+  const pid = Number.parseInt((info.match(/\bpid\s*=\s*(\d+)/u) || info.match(/"pid"=(\d+)/u) || [])[1], 10);
+  const bundlePath = (info.match(/bundle path="([^"]+)"/u) || info.match(/"LSBundlePath"="([^"]+)"/u) || [])[1];
+  const name = (info.match(/^"([^"]+)"/mu) || info.match(/"LSDisplayName"="([^"]+)"/u) || [])[1];
+  if (!Number.isInteger(pid) || pid <= 0 || !bundlePath) return null;
+  return { pid, bundlePath, name: name || bundlePath };
+}
+
+function currentFrontmostPid() {
+  try {
+    const asn = execFileSync('lsappinfo', ['front'], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }).trim();
+    if (!asn) return null;
+    const value = execFileSync('lsappinfo', ['info', '-only', 'pid', asn], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }).trim();
+    const pid = Number.parseInt((value.match(/"pid"=(\d+)/u) || [])[1], 10);
     return Number.isInteger(pid) && pid > 0 ? pid : null;
   } catch {
     return null;
   }
 }
 
+function restoreMacFrontmost(target) {
+  if (process.platform !== 'darwin' || !target?.bundlePath) return false;
+  try {
+    execFileSync('open', ['-a', target.bundlePath], {
+      env: toolEnv(),
+      stdio: 'ignore',
+      timeout: 500,
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function restoreMacFrontmostProcess(pid) {
   if (process.platform !== 'darwin' || !Number.isInteger(pid) || pid <= 0) return false;
   try {
-    execFileSync('osascript', [
-      '-e',
-      `tell application "System Events" to set frontmost of first application process whose unix id is ${pid} to true`,
-    ], { stdio: 'ignore', timeout: 1_000 });
+    const asn = execFileSync('lsappinfo', ['find', `pid=${pid}`], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }).trim();
+    if (!asn) return false;
+    return restoreMacFrontmost(parseLsappinfo(execFileSync('lsappinfo', ['info', asn], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    })));
+  } catch {
+    return false;
+  }
+}
+
+function preserveMacFrontmost(target) {
+  if (process.env.MM_HARNESS_FOCUS_BROWSER === '1') return false;
+  if (process.platform !== 'darwin' || !target?.bundlePath || !Number.isInteger(target.pid) || target.pid <= 0) {
+    return false;
+  }
+  const current = currentFrontmostPid();
+  if (current === target.pid) return true;
+  return restoreMacFrontmost(target);
+}
+
+function preserveMacFrontmostProcess(pid) {
+  if (process.env.MM_HARNESS_FOCUS_BROWSER === '1') return false;
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  const current = currentFrontmostPid();
+  if (current === pid) return true;
+  return restoreMacFrontmostProcess(pid);
+}
+
+function macBackgroundOpenArgs(application, chromeArgs) {
+  return ['-g', '-n', '-a', application, '--args', ...chromeArgs];
+}
+
+function startMacFocusHold(targetOrPid) {
+  if (process.env.MM_HARNESS_FOCUS_BROWSER === '1') return null;
+  if (process.platform !== 'darwin') return null;
+  const target = typeof targetOrPid === 'number'
+    ? { pid: targetOrPid, bundlePath: bundlePathForPid(targetOrPid) }
+    : targetOrPid;
+  if (!target?.bundlePath || !Number.isInteger(target.pid) || target.pid <= 0) return null;
+  return spawn(process.execPath, [
+    __filename,
+    '--hold',
+    String(target.pid),
+    target.bundlePath,
+    String(process.pid),
+  ], { stdio: 'ignore', env: toolEnv() });
+}
+
+function bundlePathForPid(pid) {
+  try {
+    const asn = execFileSync('lsappinfo', ['find', `pid=${pid}`], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }).trim();
+    return parseLsappinfo(execFileSync('lsappinfo', ['info', asn], {
+      encoding: 'utf8',
+      env: toolEnv(),
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 200,
+    }))?.bundlePath ?? null;
+  } catch {
+    return null;
+  }
+}
+
+function stopMacFocusHold(child) {
+  if (!child || !Number.isInteger(child.pid) || child.pid <= 0) return;
+  try {
+    process.kill(child.pid, 'SIGTERM');
+  } catch (error) {
+    if (error.code !== 'ESRCH') throw error;
+  }
+}
+
+function parentAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
     return true;
   } catch {
     return false;
   }
 }
 
-module.exports = { captureMacFrontmostProcess, restoreMacFrontmostProcess };
+if (require.main === module && process.argv[2] === '--hold') {
+  const pid = Number.parseInt(process.argv[3], 10);
+  const bundlePath = process.argv[4];
+  const parentPid = Number.parseInt(process.argv[5], 10);
+  const target = { pid, bundlePath };
+  const hold = () => {
+    if (!parentAlive(parentPid)) process.exit(0);
+    preserveMacFrontmost(target);
+  };
+  hold();
+  setInterval(hold, HOLD_INTERVAL_MS);
+}
+
+module.exports = {
+  captureMacFrontmost,
+  captureMacFrontmostProcess,
+  macBackgroundOpenArgs,
+  preserveMacFrontmost,
+  preserveMacFrontmostProcess,
+  restoreMacFrontmost,
+  restoreMacFrontmostProcess,
+  startMacFocusHold,
+  stopMacFocusHold,
+};

package/adapters/extension/lib/validation-process-ownership.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const { execFileSync } = require('node:child_process');
+const { execFileSync, spawnSync } = require('node:child_process');
 
 function commandHasExactProfile(command, profile) {
   const expected = `--user-data-dir=${profile}`;
@@ -43,6 +43,53 @@ function delay(milliseconds) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
 
+function pidAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    if (error.code === 'ESRCH') return false;
+    throw error;
+  }
+}
+
+function uniquePids(pids) {
+  return [...new Set(pids)].filter((pid) => Number.isInteger(pid) && pid > 0 && pid !== process.pid);
+}
+
+// Reap every live process that still owns this profile, then refuse to continue
+// if any survive. `open -n` otherwise starts a second headed Chrome on the same
+// user-data-dir while the previous instance is still dying.
+function stopProfileProcessesSync(profile, { extraPids = [], timeoutMs = 5_000, waitForAppearanceMs = 0 } = {}) {
+  const deadline = Date.now() + timeoutMs;
+  const appearUntil = Date.now() + Math.max(0, waitForAppearanceMs);
+  let ownersSince = 0;
+  while (Date.now() < deadline) {
+    const pids = uniquePids([
+      ...profileProcessPids(profile),
+      ...extraPids.filter(pidAlive),
+    ]);
+    if (pids.length === 0) {
+      if (Date.now() >= appearUntil) return;
+    } else {
+      if (ownersSince === 0) ownersSince = Date.now();
+      signalPids(pids, Date.now() - ownersSince >= 500 ? 'SIGKILL' : 'SIGTERM');
+    }
+    spawnSync('sleep', ['0.1']);
+  }
+  const remaining = uniquePids([
+    ...profileProcessPids(profile),
+    ...extraPids.filter(pidAlive),
+  ]);
+  if (remaining.length > 0) {
+    throw new Error(
+      `Owned Chrome processes survived stop (pid ${remaining.join(', ')}). ` +
+        'Next: mm-harness stop --adapter extension --target <checkout>',
+    );
+  }
+}
+
 async function stopProfileProcesses(profile, { quietMs = 0, timeoutMs = 5_000 } = {}) {
   const deadline = Date.now() + timeoutMs;
   let quietSince = Date.now();
@@ -66,4 +113,4 @@ async function stopProfileProcesses(profile, { quietMs = 0, timeoutMs = 5_000 }
   throw new Error(`Extension validation profile did not remain quiescent for ${quietMs}ms.`);
 }
 
-module.exports = { profileProcessPids, stopProfileProcesses };
+module.exports = { profileProcessPids, stopProfileProcesses, stopProfileProcessesSync };

package/adapters/extension/live.sh

@@ -228,7 +228,6 @@ NODE
   quoted_check_infura="$(printf '%q' "$SCRIPT_DIR/check-infura-readiness.cjs")"
   quoted_stamp_title="$(printf '%q' "$SCRIPT_DIR/stamp-runtime-title.cjs")"
   quoted_chrome_launcher="$(printf '%q' "$SCRIPT_DIR/launch-browser.cjs")"
-  quoted_build_handoff="$(printf '%q' "$SCRIPT_DIR/build-handoff.cjs")"
   quoted_artifact_state="$(printf '%q' "$SCRIPT_DIR/artifact-runtime-state.cjs")"
   quoted_fixture_state="$(printf '%q' "$FIXTURE_STATE_ABS")"
   quoted_fixture_validation="$(printf '%q' "$FIXTURE_VALIDATION_ABS")"
@@ -353,7 +352,6 @@ NODE
   fi
   prepare_parts+=("$chrome_launch_cmd")
   prepare_parts+=("for i in {1..60}; do curl -fsS --max-time 1 http://127.0.0.1:${CDP_PORT}/json/version >/dev/null 2>&1 && break; sleep 1; done; curl -fsS --max-time 1 http://127.0.0.1:${CDP_PORT}/json/version >/dev/null")
-  prepare_parts+=("node ${quoted_build_handoff} --target ${quoted_target} --runtime-dist ${quoted_runtime_dist} --cdp-port ${CDP_PORT}")
   if [ -n "$WALLET_FIXTURE_ABS" ]; then
     prepare_parts+=("bash ${quoted_seed_fixture} seed-cdp --target ${quoted_target} --fixture ${quoted_wallet_fixture} --state ${quoted_fixture_state} --cdp-port ${CDP_PORT} --extension-dir ${quoted_runtime_dist} --extension-id-file ${quoted_extension_id_file} --out ${quoted_fixture_validation}")
   fi

package/adapters/extension/stop-viewers.sh

@@ -29,7 +29,6 @@ done
 unset _tv_src
 
 runtime_dir="$TARGET/$(recipe_runtime_dir)"
-console_log="$runtime_dir/extension-console.log"
 set +e
 
 if command -v tmux_viewer_close_marker >/dev/null 2>&1; then
@@ -48,7 +47,7 @@ ps -axo pid=,command= 2>/dev/null | while read -r pid command; do
     *) continue ;;
   esac
   case "$command" in
-    *"--log $console_log"*|*"$console_log"*) kill "$pid" 2>/dev/null || true ;;
+    *"$runtime_dir/"*) kill "$pid" 2>/dev/null || true ;;
   esac
 done
 

package/dist/adapters/extension/validation-process-ownership.js

@@ -3,8 +3,9 @@ const require2 = createRequire(import.meta.url);
 const processOwnership = require2(
   "../../../adapters/extension/lib/validation-process-ownership.cjs"
 );
-const { profileProcessPids, stopProfileProcesses } = processOwnership;
+const { profileProcessPids, stopProfileProcesses, stopProfileProcessesSync } = processOwnership;
 export {
   profileProcessPids,
-  stopProfileProcesses
+  stopProfileProcesses,
+  stopProfileProcessesSync
 };

package/dist/adapters/slot-ports.js

@@ -1,5 +1,6 @@
 import { execFileSync } from "node:child_process";
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 import { recipeRuntimeDir } from "../paths.js";
 import {
@@ -131,11 +132,53 @@ function stopExtensionWatcher(target) {
   }
   return ownedPids.length;
 }
+function commandFlagValue(command, flag) {
+  const escaped = escapeRegex(flag);
+  const patterns = [
+    new RegExp(`(?:^|\\s)${escaped}=([^\\s"]+)`, "u"),
+    new RegExp(`(?:^|\\s)${escaped}="([^"]+)"`, "u"),
+    new RegExp(`(?:^|\\s)${escaped}='([^']+)'`, "u"),
+    new RegExp(`(?:^|\\s)${escaped}\\s+([^\\s"]+)`, "u")
+  ];
+  for (const pattern of patterns) {
+    const match = pattern.exec(command);
+    if (match?.[1]) return match[1];
+  }
+  return null;
+}
+function pathIsInsideDir(candidate, root) {
+  const resolved = path.resolve(candidate);
+  const base = path.resolve(root);
+  return resolved === base || resolved.startsWith(`${base}${path.sep}`);
+}
+function chromeUserDataDirOwnedByCheckout(command, runtimeAbs) {
+  const value = commandFlagValue(command, "--user-data-dir");
+  if (!value) return false;
+  return pathIsInsideDir(value, runtimeAbs);
+}
+function commandLoadsCheckoutExtension(command, targetAbs) {
+  const loaded = commandFlagValue(command, "--load-extension") ?? commandFlagValue(command, "--disable-extensions-except");
+  if (!loaded) return false;
+  return pathIsInsideDir(loaded, targetAbs);
+}
+function isSharedOrDefaultBrowserProfile(profile) {
+  const resolved = path.resolve(profile);
+  const home = os.homedir();
+  const osDefaults = [
+    path.join(home, "Library/Application Support/Google/Chrome"),
+    path.join(home, "Library/Application Support/Chromium"),
+    path.join(home, "Library/Application Support/Microsoft Edge"),
+    path.join(home, ".config/google-chrome"),
+    path.join(home, ".config/chromium"),
+    path.join(home, ".config/microsoft-edge")
+  ];
+  const underDefault = (dir) => resolved === dir || resolved.startsWith(`${dir}${path.sep}`);
+  return resolved === home || resolved.includes(`${path.sep}.chrome-farmslot`) || osDefaults.some(underDefault);
+}
 function stopExtensionRuntime(target) {
   const resolved = path.resolve(target);
   const runtimeAbs = path.join(resolved, recipeRuntimeDir());
-  const configuredProfile = process.env.CHROME_USER_DATA_DIR || path.join(runtimeAbs, process.env.RECIPE_CHROME_PROFILE_NAME || "chrome-profile");
-  const profiles = process.env.CHROME_USER_DATA_DIR ? [path.resolve(configuredProfile)] : [configuredProfile, path.join(runtimeAbs, "chrome-profile-recipe"), path.join(runtimeAbs, "chrome-profile-pw")].map((value) => path.resolve(value));
+  const extraProfile = process.env.CHROME_USER_DATA_DIR ? path.resolve(process.env.CHROME_USER_DATA_DIR) : null;
   let signalled = stopExtensionWatcher(resolved);
   const ownedBrowserPids = /* @__PURE__ */ new Set();
   try {
@@ -144,7 +187,16 @@ function stopExtensionRuntime(target) {
       const match = /^\s*(\d+)\s+(.*)$/u.exec(line);
       if (!match) continue;
       const pid = Number(match[1]);
-      if (pid !== process.pid && profiles.some((profile) => commandHasExactArg(match[2], "--user-data-dir", profile))) ownedBrowserPids.add(pid);
+      if (pid === process.pid) continue;
+      if (chromeUserDataDirOwnedByCheckout(match[2], runtimeAbs)) {
+        ownedBrowserPids.add(pid);
+        continue;
+      }
+      if (!extraProfile || pathIsInsideDir(extraProfile, runtimeAbs) || isSharedOrDefaultBrowserProfile(extraProfile)) continue;
+      const configured = commandFlagValue(match[2], "--user-data-dir");
+      if (configured && path.resolve(configured) === extraProfile && commandLoadsCheckoutExtension(match[2], resolved)) {
+        ownedBrowserPids.add(pid);
+      }
     }
   } catch {
   }
@@ -203,22 +255,16 @@ function processAlive(pid) {
     return error.code === "EPERM";
   }
 }
-function commandHasExactArg(command, flag, value) {
-  const escapedFlag = escapeRegex(flag);
-  const escapedValue = escapeRegex(value);
-  return [
-    new RegExp(`(?:^|\\s)${escapedFlag}=${escapedValue}(?=\\s|$)`, "u"),
-    new RegExp(`(?:^|\\s)${escapedFlag}="${escapedValue}"(?=\\s|$)`, "u"),
-    new RegExp(`(?:^|\\s)${escapedFlag}='${escapedValue}'(?=\\s|$)`, "u"),
-    new RegExp(`(?:^|\\s)${escapedFlag}\\s+${escapedValue}(?=\\s|$)`, "u")
-  ].some((pattern) => pattern.test(command));
-}
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 }
 export {
   applyKVLines,
+  chromeUserDataDirOwnedByCheckout,
+  commandFlagValue,
   isExtensionWatcherLive,
+  isSharedOrDefaultBrowserProfile,
+  pathIsInsideDir,
   resolveExtensionSlotPorts,
   resolveMobileSlotPorts,
   stopExtensionRuntime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deeeed/metamask-harness",
-  "version": "0.50.4",
+  "version": "0.50.6",
   "type": "module",
   "bin": {
     "mm-harness": "bin/mm-harness"