@deeeed/metamask-harness 0.73.0 → 0.75.0

package/dist/pr-body/render.js

@@ -37,6 +37,8 @@ function countRecipeNodes(recipe) {
   if (Array.isArray(record.steps)) return record.steps.length;
   const workflow = record.workflow;
   if (!workflow || typeof workflow !== "object") return 0;
+  const graph = workflow.nodes;
+  if (graph && typeof graph === "object" && !Array.isArray(graph)) return Object.keys(graph).length;
   return Object.values(workflow).reduce(
     (total, value) => total + (Array.isArray(value) ? value.length : 0),
     0
@@ -47,7 +49,7 @@ function recipeSection(file) {
   const nodes = countRecipeNodes(recipe);
   const record = recipe && typeof recipe === "object" ? recipe : {};
   const title = typeof record.title === "string" ? record.title : typeof record.description === "string" ? record.description : "";
-  const summary = escapeHtml(`recipe.json (${nodes} steps${title ? ` \u2014 ${title.slice(0, 120)}` : ""})`);
+  const summary = escapeHtml(`recipe.json (${nodes} nodes${title ? ` \u2014 ${title.slice(0, 120)}` : ""})`);
   return {
     nodes,
     body: [`<details><summary>${summary}</summary>`, "", fenced(JSON.stringify(recipe, null, 2), "json"), "</details>"].join("\n")

package/dist/recording-target.js

@@ -6,45 +6,10 @@ const IOS_SIMULATOR_RECORDING_TARGET_PREFIX = "ios-simulator:";
 function createMetaMaskRecordingTargetProvider(adapter) {
   return {
     async resolveRecordingTarget(context) {
-      if (adapter === "extension") {
-        const pid = resolveExtensionBrowserPid(
-          context.projectRoot,
-          context.artifactsDir,
-          context.env.CDP_PORT ?? context.env.RECIPE_CDP_PORT ?? process.env.CDP_PORT ?? process.env.RECIPE_CDP_PORT
-        );
-        if (!pid) {
-          throw new Error(
-            "Could not resolve the extension browser PID for --record-video. Ensure the slot browser is running and CDP_PORT is set."
-          );
-        }
-        return { kind: "pid", pid };
-      }
-      if (adapter === "mobile") {
-        const platform = (context.env.PLATFORM ?? process.env.PLATFORM ?? "ios").trim().toLowerCase();
-        const androidSerial = resolveAndroidDeviceSerial(context.env);
-        if (platform === "android" || androidSerial) {
-          if (!androidSerial) {
-            throw new Error(
-              "Could not resolve an Android device for --record-video. Set ADB_SERIAL or pass --device to mm-harness run."
-            );
-          }
-          return {
-            kind: "android-device",
-            serial: androidSerial
-          };
-        }
-        const simulator = resolveMobileIosSimulatorName(context.env);
-        if (!simulator) {
-          throw new Error(
-            "Could not resolve an iOS simulator name for --record-video. Set IOS_SIMULATOR or pass --simulator to the recipe hook."
-          );
-        }
-        return {
-          kind: "window-id",
-          windowId: `${IOS_SIMULATOR_RECORDING_TARGET_PREFIX}${simulator}`
-        };
-      }
-      throw new Error(`--record-video is not implemented for the ${adapter} adapter.`);
+      const { getAdapterSurface } = await import("./adapters/surface.js");
+      const recording = getAdapterSurface(adapter).recording;
+      if (!recording) throw new Error(`--record-video is not implemented for the ${adapter} adapter.`);
+      return recording.target(context);
     }
   };
 }

package/dist/run-diagnostics.js

@@ -1,20 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
 import { createHash } from "node:crypto";
-import { spawnSync } from "node:child_process";
 import { getAdapterSurface } from "./adapters/surface.js";
-import { recipeRuntimePath, runnerDir } from "./paths.js";
-import { ensureExtensionConsoleCapture, extensionCaptureFiles, extensionCdpPort } from "./adapters/extension/console-capture.js";
-import {
-  ensureTerminalConsoleCapture,
-  terminalCaptureFiles,
-  terminalCdpPort,
-  terminalRuntimeFile
-} from "./adapters/terminal/console-capture.js";
 import {
   collectorOwnerMarker,
-  collectorStatus,
-  verifyCapture
+  collectorStatus
 } from "../library/actions/shared/console-collector.mjs";
 import {
   allowlistMatch,
@@ -39,7 +29,7 @@ function readRunDiagnosticsDocument(diagnosticsPath) {
 }
 function formatRunDiagnosticsForHuman(diagnostics, adapter) {
   if (!diagnostics) {
-    return [adapter === "core" ? "N/A \u2014 Core is headless and has no application log source." : "UNAVAILABLE \u2014 application diagnostics could not be collected for this run."];
+    return [getAdapterSurface(adapter).headless ? `N/A \u2014 ${adapter.charAt(0).toUpperCase()}${adapter.slice(1)} is headless and has no application log source.` : "UNAVAILABLE \u2014 application diagnostics could not be collected for this run."];
   }
   const status = diagnostics.status === "clean" ? "CLEAN" : diagnostics.status === "review" ? "REVIEW" : "UNAVAILABLE";
   const lines = [`${status} \u2014 ${diagnostics.note}`];
@@ -52,25 +42,27 @@ function formatRunDiagnosticsForHuman(diagnostics, adapter) {
   return lines;
 }
 async function beginRunDiagnostics(adapter, projectRoot) {
-  const source = getAdapterSurface(adapter).appLogSource(projectRoot);
+  const surface = getAdapterSurface(adapter);
+  const source = surface.appLogSource(projectRoot);
   if (!source) return null;
-  const mobileIssueBuffer = adapter === "mobile" && process.env.METAMASK_RECIPE_MOBILE_OPAQUE_RUNTIME !== "1" && armMobileIssueBuffer(projectRoot) ? { projectRoot } : void 0;
+  const diagnostics = surface.diagnostics;
+  const issueBuffer = diagnostics?.issueBuffer?.arm(projectRoot) ? { adapter, projectRoot } : void 0;
   let capture;
-  if (adapter === "extension" || adapter === "terminal") {
-    const start = adapter === "extension" ? ensureExtensionConsoleCapture : ensureTerminalConsoleCapture;
-    const startError = await start(projectRoot).then(() => void 0, (error) => error instanceof Error ? error.message : String(error));
-    const { extensionLog, pageLog, pidFile } = adapter === "extension" ? extensionCaptureFiles(projectRoot) : terminalCaptureFiles(projectRoot);
-    const cdpPort = adapter === "extension" ? extensionCdpPort() : terminalCdpPort();
+  if (diagnostics?.console) {
+    const collector = diagnostics.console;
+    const startError = await collector.start(projectRoot).then(() => void 0, (error) => error instanceof Error ? error.message : String(error));
+    const { extensionLog, pageLog, pidFile } = collector.files(projectRoot);
+    const cdpPort = collector.cdpPort();
     capture = { adapter, projectRoot, extensionLog, pageLog, pidFile, ...cdpPort ? { cdpPort } : {}, ...startError ? { startError } : {} };
   }
-  const walletLogPath = adapter === "terminal" ? terminalRuntimeFile(projectRoot, "wallet-requests.jsonl") : null;
+  const walletLogPath = diagnostics?.walletLog?.(projectRoot) ?? null;
   const walletStat = walletLogPath ? safeStat(walletLogPath) : null;
   const stat = safeStat(source.path);
   return {
     source,
     offset: stat?.size ?? 0,
     ...stat ? { inode: stat.ino } : {},
-    ...mobileIssueBuffer ? { mobileIssueBuffer } : {},
+    ...issueBuffer ? { issueBuffer } : {},
     ...capture ? { capture } : {},
     ...walletLogPath ? { walletLog: { path: walletLogPath, offset: walletStat?.size ?? 0, ...walletStat ? { inode: walletStat.ino } : {} } } : {}
   };
@@ -85,20 +77,13 @@ async function verifyConsoleCapture(capture) {
     cdpPort: capture.cdpPort
   });
   if (!status.ok) return { verified: false, detail: status.detail };
-  let control;
-  if (capture.adapter === "extension") {
-    let extensionId = null;
-    try {
-      extensionId = fs.readFileSync(recipeRuntimePath(capture.projectRoot, "extension.id"), "utf8").trim();
-    } catch {
-      extensionId = null;
-    }
-    control = await verifyCapture({ cdpPort: capture.cdpPort, log: capture.extensionLog, target: "extension", extensionId });
-  } else {
-    const browser = readJsonRecord(terminalRuntimeFile(capture.projectRoot, "browser.json"));
-    if (typeof browser?.appOrigin !== "string") return { verified: false, detail: "no slot browser state (browser.json) to verify the page console capture against" };
-    control = await verifyCapture({ cdpPort: capture.cdpPort, log: capture.pageLog, target: "page", appOrigin: browser.appOrigin });
-  }
+  const control = await getAdapterSurface(capture.adapter).diagnostics.console.verifyControl({
+    projectRoot: capture.projectRoot,
+    cdpPort: capture.cdpPort,
+    extensionLog: capture.extensionLog,
+    pageLog: capture.pageLog,
+    pidFile: capture.pidFile
+  });
   return { verified: control.ok, detail: control.ok ? `${status.detail}; ${control.detail}` : control.detail };
 }
 function isRunDiagnosticsDocument(value) {
@@ -109,7 +94,7 @@ function isRunDiagnosticsDocument(value) {
 async function finishRunDiagnostics(baseline, result) {
   if (!baseline) return result;
   try {
-    const bufferedIssues = baseline.mobileIssueBuffer ? collectMobileIssueBuffer(baseline.mobileIssueBuffer.projectRoot) : void 0;
+    const bufferedIssues = baseline.issueBuffer ? getAdapterSurface(baseline.issueBuffer.adapter).diagnostics?.issueBuffer?.collect(baseline.issueBuffer.projectRoot) : void 0;
     const allowlist = loadConsoleAllowlist(recipeLibraryRoots(result.summaryPath));
     const capture = baseline.capture ? await verifyConsoleCapture(baseline.capture) : void 0;
     const { diagnostics, rawAppLog } = collectRunDiagnosticsCapture(baseline, bufferedIssues, allowlist, capture);
@@ -271,30 +256,6 @@ function applyConsoleAllowlist(findings, allowlist) {
     finding.fingerprint = createHash("sha256").update(`${finding.fingerprint}|info|${match.file}#${match.index}`).digest("hex").slice(0, 12);
   }
 }
-function armMobileIssueBuffer(projectRoot) {
-  const armed = runMobileIssueCommand(projectRoot, "issues-arm");
-  if (!armed) return false;
-  return runMobileIssueCommand(projectRoot, "issues-collect") !== null;
-}
-function collectMobileIssueBuffer(projectRoot) {
-  const result = runMobileIssueCommand(projectRoot, "issues-collect");
-  return isRecord(result) && Array.isArray(result.entries) ? result.entries : null;
-}
-function runMobileIssueCommand(projectRoot, command) {
-  const bridge = path.join(runnerDir, "adapters", "mobile", "bridge-runtime", "cdp-bridge.cjs");
-  const result = spawnSync(process.execPath, [bridge, command], {
-    cwd: projectRoot,
-    env: { ...process.env, APP_ROOT: projectRoot, CDP_TIMEOUT: "5000" },
-    encoding: "utf8",
-    timeout: 1e4
-  });
-  if (result.status !== 0) return null;
-  try {
-    return JSON.parse(result.stdout.trim());
-  } catch {
-    return null;
-  }
-}
 function redactPreview(value) {
   return redactDiagnosticText(value).slice(0, MAX_PREVIEW_CHARS);
 }

package/dist/run-recording.js

@@ -2,10 +2,10 @@ import { spawn, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { optionalVideoTiming, readCaptureHelperTiming, writeRecordingTimeline } from "@farmslot/recipe-harness";
+import { getAdapterSurface } from "./adapters/surface.js";
 import {
   captureHelperSupportsRecordSessionSnapshots,
-  captureHelperSupportsCapability,
-  resolveExtensionBrowserPid
+  captureHelperSupportsCapability
 } from "./recording-target.js";
 const activeRecordingsByPid = /* @__PURE__ */ new Map();
 const ACTIVE_EXTENSION_RECORDING_PID = "METAMASK_RECIPE_EXTENSION_ACTIVE_RECORDING_PID";
@@ -17,7 +17,8 @@ async function startRecipeRecording(adapter, projectRoot, artifactsDir, options)
     );
     return void 0;
   }
-  if (adapter !== "extension") return void 0;
+  const framed = getAdapterSurface(adapter).recording?.framed;
+  if (!framed) return void 0;
   const cdpPort = options.cdpPort ?? process.env.CDP_PORT ?? process.env.RECIPE_CDP_PORT;
   if (!captureHelperSupportsRecordSessionSnapshots(projectRoot)) {
     console.error(
@@ -25,7 +26,7 @@ async function startRecipeRecording(adapter, projectRoot, artifactsDir, options)
     );
     return void 0;
   }
-  const pid = resolveExtensionBrowserPid(projectRoot, artifactsDir, cdpPort);
+  const pid = framed.browserPid(projectRoot, artifactsDir, cdpPort);
   if (!pid) {
     console.error(
       `WARN: framed extension recording could not resolve browser PID from CDP port ${cdpPort ?? "<unset>"}; falling back to harness --record-video.`