@deeeed/metamask-harness 0.83.0 → 0.85.0

package/dist/commands/check.js

@@ -1,8 +1,7 @@
-import { detectAdapter, EXIT, usageOut, optionFlag, optionString, parseArgs, shellQuote } from "@farmslot/recipe-cli/harness";
+import { EXIT, contextAdapter, usageOut, optionFlag, optionString, parseArgs, shellQuote } from "@farmslot/recipe-cli/harness";
 import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import "../adapters/surface.js";
 const USAGE = "mm-harness check diff [--fix] [--target <repo>] [--adapter <adapter>] [--base <ref>] [--profile fast|full] [--artifacts-dir <dir>] [--json]";
 const JS_TS_EXT_RE = /\.(?:c|m)?jsx?$|\.tsx?$/u;
 const FORMAT_EXT_RE = /\.(?:c|m)?jsx?$|\.tsx?$|\.json$|\.md$|\.css$|\.scss$|\.ya?ml$/u;
@@ -20,12 +19,11 @@ async function handleCheck(argv) {
     return usageOut(json, "check", message, USAGE);
   }
   const target = path.resolve(optionString(options, "target") ?? process.cwd());
-  const explicitAdapter = optionString(options, "adapter") ?? optionString(options, "platform");
-  const detected = explicitAdapter ?? detectAdapter(target);
-  if (detected === "ios" || detected === "android") {
-    return usageOut(json, "check", `unsupported adapter '${detected}'`, USAGE);
+  const platform = optionString(options, "adapter") ? void 0 : optionString(options, "platform");
+  if (platform === "ios" || platform === "android") {
+    return usageOut(json, "check", `unsupported adapter '${platform}'`, USAGE);
   }
-  const adapter = detected;
+  const adapter = contextAdapter(target);
   const profileInput = optionString(options, "profile");
   if (profileInput && profileInput !== "fast" && profileInput !== "full") {
     return usageOut(json, "check", "--profile must be fast or full", USAGE);

package/dist/commands/debug.js

@@ -1,4 +1,4 @@
-import { adapterDetectNext, EXIT, flag, parseFlags, resolveFlagsAdapter, spawnScript, targetOf, usageOut } from "@farmslot/recipe-cli/harness";
+import { adapterDetectNext, EXIT, flag, parseFlags, contextAdapter, spawnScript, targetOf, usageOut } from "@farmslot/recipe-cli/harness";
 import path from "node:path";
 import { runnerDir } from "../paths.js";
 import { getAdapterSurface } from "../adapters/surface.js";
@@ -7,7 +7,7 @@ async function handleDebug(argv) {
   const { options } = parseFlags(argv, DEBUG_BOOLEANS);
   const json = flag(options, "json");
   const target = targetOf(options);
-  const adapter = resolveFlagsAdapter(options, target);
+  const adapter = contextAdapter(target);
   if (!adapter) return usageOut(json, "debug", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   const surface = getAdapterSurface(adapter);
   if (surface.headless) return usageOut(json, "debug", `${adapter} is headless; there is no debug console.`, surface.hints.relaunch);

package/dist/commands/doctor.js

@@ -2,7 +2,7 @@ import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { featureFlagReport } from "../feature-flags.js";
-import { adapterPluginChecks, color, acquireCheckoutLock, detectAdapter, resolveRuntimeContextPath, ensureOverlay, newHealState, recipeRunning, adapterDetectNext, checkoutBusyOut, EXIT, usageOut, actionManifestPathOption, applyRuntimeDirOption, optionFlag, optionString, shellQuote, targetPath } from "@farmslot/recipe-cli/harness";
+import { adapterPluginChecks, color, acquireCheckoutLock, contextAdapter, resolveRuntimeContextPath, ensureOverlay, newHealState, recipeRunning, adapterDetectNext, checkoutBusyOut, EXIT, usageOut, actionManifestPathOption, applyRuntimeDirOption, optionFlag, optionString, shellQuote, targetPath } from "@farmslot/recipe-cli/harness";
 import { collectCheckoutView, renderCheckoutView } from "../checkout-view.js";
 import { createDoctorReport, fixtureSummary, requiredDoctorCheckSummary } from "../doctor.js";
 import { assertAdapter, runnerDir } from "../paths.js";
@@ -18,7 +18,7 @@ function applyDoctorRuntimePorts(options) {
     process.env.CDP_PORT = cdpPort;
     process.env.RECIPE_CDP_PORT = cdpPort;
   }
-  const watcherPort = optionString(options, "watcherPort") ?? optionString(options, "port") ?? optionString(options, "metroPort");
+  const watcherPort = optionString(options, "watcherPort") ?? optionString(options, "port");
   if (watcherPort) {
     process.env.WATCHER_PORT = watcherPort;
     process.env.METRO_PORT = watcherPort;
@@ -33,8 +33,7 @@ async function handleDoctor({ options }) {
   const expectLive = optionFlag(options, "expectLive") || printReady;
   const allDevices = optionFlag(options, "allDevices");
   const platformOption = optionString(options, "platform");
-  const explicitAdapter = optionString(options, "adapter") ?? (platformOption === "ios" || platformOption === "android" ? "mobile" : platformOption);
-  const adapter = explicitAdapter ?? detectAdapter(target);
+  const adapter = contextAdapter(target);
   if (!adapter) {
     return usageOut(json, "doctor", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   }

package/dist/commands/domain.js

@@ -4,7 +4,8 @@ import {
   classifyDomain,
   configPath,
   discoverLibraries,
-  readConfig
+  readConfig,
+  REVIEW_ADAPTERS
 } from "../review/knowledge.js";
 import { adapterFromOptions } from "./review.js";
 async function handleDomain(argv) {
@@ -12,14 +13,14 @@ async function handleDomain(argv) {
   const target = targetPath(parsed.options);
   const json = optionFlag(parsed.options, "json");
   const declared = optionString(parsed.options, "domain") ?? process.env.MM_HARNESS_DOMAIN;
-  const detected = adapterFromOptions(parsed.options, target);
+  const detected = adapterFromOptions();
   const adapter = detected === "unscoped" ? void 0 : detected;
   if (declared) {
     emit(json, { domain: declared, source: "declared", adapter: adapter ?? null, target });
     return 0;
   }
   if (!adapter) {
-    throw usageError("No MetaMask checkout detected: pass --adapter <mobile|extension|core|terminal> or --domain <name>.");
+    throw usageError(`No MetaMask checkout detected: pass --adapter <${REVIEW_ADAPTERS.join("|")}> or --domain <name>.`);
   }
   const config = readConfig(configPath());
   const libraries = discoverLibraries({ target, config });

package/dist/commands/fixtures.js

@@ -4,7 +4,7 @@ import path from "node:path";
 import { runnerDir, walletFixturePath } from "../paths.js";
 import { getAdapterSurface } from "../adapters/surface.js";
 import { fixtureFileSummary, fixtureSummary } from "../doctor.js";
-import { acquireCheckoutLock, adapterDetectNext, checkoutBusyOut, EXIT, flag, parseFlags, resolveFlagsAdapter, scriptOverride, spawnScript, spawnScriptStreaming, str, targetOf, usageOut } from "@farmslot/recipe-cli/harness";
+import { acquireCheckoutLock, adapterDetectNext, checkoutBusyOut, EXIT, flag, parseFlags, contextAdapter, scriptOverride, spawnScript, spawnScriptStreaming, str, targetOf, usageOut } from "@farmslot/recipe-cli/harness";
 import { applyDeviceTargeting } from "./device-target.js";
 import { FeatureFlagSpecError, fixtureFeatureFlags, parseRemoteFlagSpec } from "../feature-flags.js";
 const FIXTURES_BOOLEANS = /* @__PURE__ */ new Set(["dev", "force", "json"]);
@@ -38,7 +38,7 @@ function fixturesStatus(options) {
     );
   }
   const target = targetOf(options);
-  const adapter = resolveFlagsAdapter(options, target);
+  const adapter = contextAdapter(target);
   if (!adapter) {
     return usageOut(json, "fixtures", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   }
@@ -114,7 +114,7 @@ async function handleFixturesLocked(argv) {
     );
   }
   const target = targetOf(options);
-  const adapter = resolveFlagsAdapter(options, target);
+  const adapter = contextAdapter(target);
   if (!adapter) {
     return usageOut(json, "fixtures", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   }

package/dist/commands/help.js

@@ -1,9 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
-import { color, detectAdapter, optionString, parseArgs, targetPath } from "@farmslot/recipe-cli/harness";
+import { color, contextAdapter, parseArgs, targetPath } from "@farmslot/recipe-cli/harness";
+import { selectableAdapters } from "../command-contract.js";
 import { handleHelpReview } from "./review.js";
 import "../adapters/surface.js";
-const UNSCOPED_NEXT = "cd into a MetaMask checkout or pass --adapter <mobile|extension|core|terminal>";
+const unscopedNext = () => `cd into a MetaMask checkout or pass --adapter <${selectableAdapters().join("|")}>`;
 function validHelpLine(value) {
   return typeof value === "string" || Boolean(value && typeof value.text === "string" && Array.isArray(value.adapters) && value.adapters.length > 0 && value.adapters.every((adapter) => ["mobile", "extension", "core", "web-dapp"].includes(adapter)));
 }
@@ -35,7 +36,7 @@ function recipeHelpPayload(topic, harnessVersion, adapter, target) {
     harnessVersion,
     recipeProtocolVersion: topic.recipeProtocolVersion,
     adapter,
-    ...adapter === "unscoped" ? { next: UNSCOPED_NEXT } : {},
+    ...adapter === "unscoped" ? { next: unscopedNext() } : {},
     target,
     topic: topic.topic,
     title: topic.title,
@@ -58,7 +59,7 @@ function renderRecipeHelp(topic, harnessVersion, adapter) {
     paint("warn", topic.scopeNotice),
     `Visual tutorial: ${paint("cmd", "mm-harness tutorial")}`
   ];
-  if (adapter === "unscoped") lines.push(paint("warn", `No MetaMask checkout detected. Next: ${UNSCOPED_NEXT}.`));
+  if (adapter === "unscoped") lines.push(paint("warn", `No MetaMask checkout detected. Next: ${unscopedNext()}.`));
   for (const [index, section] of scopedSections(topic, adapter).entries()) {
     lines.push("", paint("label", `${index + 1}. ${section.title}`), `   ${section.instruction}`);
     for (const detail of section.details) lines.push(`   - ${detail}`);
@@ -72,7 +73,7 @@ function handleHelp(argv, context) {
   const parsed = parseArgs(argv);
   if (parsed.positional[0] === "review") return handleHelpReview(argv, context.harnessVersion);
   const target = targetPath(parsed.options);
-  const adapter = optionString(parsed.options, "adapter") ?? detectAdapter(target) ?? "unscoped";
+  const adapter = contextAdapter(target) ?? "unscoped";
   const topic = loadRecipeHelp(context.packageRoot);
   const payload = recipeHelpPayload(topic, context.harnessVersion, adapter, target);
   if (parsed.options.json === true) {

package/dist/commands/launch/device.js

@@ -9,7 +9,7 @@ import {
   parseRemoteFlagSpec,
   remoteFlagRequestFor
 } from "../../feature-flags.js";
-import { webDappOnlyLaunchFlags } from "../../adapters/web-dapp/launch.js";
+import { webDappOnlyLaunchFlags } from "@farmslot/adapter-web/web-dapp";
 import { shellQuote } from "./quote.js";
 async function runDeviceLaunch(context, profile) {
   const { adapter, options, target, heal, jsonOutput, machine, stream, usage } = context;

package/dist/commands/launch/extension.js

@@ -24,6 +24,7 @@ import {
 import { checkExtensionRuntimeHealth } from "../../adapters/extension/runtime.js";
 import { ensureHarnessFresh } from "../../adapters/harness-freshness.js";
 import { isExtensionWatcherLive, stopExtensionWatcher } from "../../adapters/slot-ports.js";
+import { recordExtensionConsoleLaunch } from "../../adapters/extension/console-capture.js";
 import { readExtensionPinnedFlags } from "../../adapters/extension/feature-flags.js";
 import { sameFeatureFlags } from "../../feature-flags.js";
 const { CdpSession } = await importRecipeHarnessRuntimeCdp();
@@ -108,6 +109,14 @@ Next: ${block.userAction}`
   }
   await ensureHarnessFresh(target, "extension");
   restoreRequestedPorts();
+  if (!reusable && artifactLaunchable && remoteFlags) {
+    return {
+      status: EXIT.infra,
+      output: `REMOTE_FLAG_NOT_PINNABLE: the remote feature-flag pin '${remoteFlags.spec}' (from --remote-flag and the wallet fixture's remoteFeatureFlags) cannot be applied to a verified release artifact; the artifact's manifest is signed evidence and is never rewritten.
+Next: drop --remote-flag and remove remoteFeatureFlags from the wallet fixture to validate the artifact as shipped, or validate the variant on a source checkout launched without the artifact.`
+    };
+  }
+  recordExtensionConsoleLaunch(target);
   if (wantWatch) {
     const startWatchSh = path.join(runnerDir, "adapters/extension/start-watch.sh");
     const watchArgs = ["--target", target, "--runner-bin", path.join(runnerDir, "bin/mm-harness")];
@@ -128,13 +137,6 @@ Next: ${block.userAction}`
     return extensionReattach(target, displayMode);
   }
   if (artifactLaunchable) {
-    if (remoteFlags) {
-      return {
-        status: EXIT.infra,
-        output: `REMOTE_FLAG_NOT_PINNABLE: the remote feature-flag pin '${remoteFlags.spec}' (from --remote-flag and the wallet fixture's remoteFeatureFlags) cannot be applied to a verified release artifact; the artifact's manifest is signed evidence and is never rewritten.
-Next: drop --remote-flag and remove remoteFeatureFlags from the wallet fixture to validate the artifact as shipped, or validate the variant on a source checkout launched without the artifact.`
-      };
-    }
     return extensionLaunchReleaseArtifact(target, artifact);
   }
   return extensionLaunchDevelopment(target, remoteFlags);

package/dist/commands/logs.js

@@ -1,4 +1,4 @@
-import { adapterDetectNext, EXIT, flag, parseFlags, resolveFlagsAdapter, spawnInherit, spawnScript, str, targetOf, usageOut } from "@farmslot/recipe-cli/harness";
+import { adapterDetectNext, EXIT, flag, parseFlags, contextAdapter, spawnInherit, spawnScript, str, targetOf, usageOut } from "@farmslot/recipe-cli/harness";
 import fs from "node:fs";
 import path from "node:path";
 import { runnerDir } from "../paths.js";
@@ -8,7 +8,7 @@ async function handleLogs(argv) {
   const { options } = parseFlags(argv, LOGS_BOOLEANS);
   const json = flag(options, "json");
   const target = targetOf(options);
-  const adapter = resolveFlagsAdapter(options, target);
+  const adapter = contextAdapter(target);
   if (!adapter) {
     return usageOut(json, "logs", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   }

package/dist/commands/prepare.js

@@ -1,4 +1,4 @@
-import { acquireCheckoutLock, trackCheckoutChild, recordCommandStage, color, stripAnsi, harnessExecutable, recipeRuntimeDir, detectAdapter, optionFlag, optionString, parseArgs, targetPath, usageError, EXIT } from "@farmslot/recipe-cli/harness";
+import { acquireCheckoutLock, trackCheckoutChild, recordCommandStage, color, stripAnsi, harnessExecutable, recipeRuntimeDir, contextAdapter, optionFlag, optionString, parseArgs, targetPath, usageError, EXIT } from "@farmslot/recipe-cli/harness";
 import { spawn } from "node:child_process";
 import { OperationOutputTail } from "@farmslot/recipe-runner/runtime/operation";
 import fs from "node:fs";
@@ -265,8 +265,8 @@ function mobilePlatformOption(value) {
   Next: ${USAGE}`
   );
 }
-function resolvePlatform(requested, target) {
-  const platform = requested ?? detectAdapter(target);
+function resolvePlatform(target) {
+  const platform = contextAdapter(target);
   const surface = platform && adapterRegistry.has(platform) ? getAdapterSurface(platform) : void 0;
   if (surface?.prepare) {
     return surface;
@@ -296,7 +296,7 @@ async function handlePrepareLocked(argv) {
   const { options } = parseArgs(argv);
   const json = optionFlag(options, "json");
   const target = targetPath(options);
-  const surface = resolvePlatform(optionString(options, "platform"), target);
+  const surface = resolvePlatform(target);
   const platform = surface.id;
   const artifactsDir = path.resolve(
     optionString(options, "artifactsDir") ?? path.join(target, recipeRuntimeDir())

package/dist/commands/provision.js

@@ -1,11 +1,11 @@
-import { detectAdapter, adapterDetectNext, usageOut, applyWatcherPortOption, optionFlag, optionString, shellQuote, shellQuoteArg, targetPath } from "@farmslot/recipe-cli/harness";
+import { contextAdapter, adapterDetectNext, usageOut, applyWatcherPortOption, optionFlag, optionString, shellQuote, shellQuoteArg, targetPath } from "@farmslot/recipe-cli/harness";
 import { assertAdapter } from "../paths.js";
 import { getAdapterSurface } from "../adapters/surface.js";
 async function handleProvision({ positional, options, rawArgv }) {
   applyWatcherPortOption(options);
   const json = optionFlag(options, "json");
   const target = targetPath(options);
-  const adapter = optionString(options, "adapter") ?? detectAdapter(target);
+  const adapter = contextAdapter(target);
   if (!adapter) {
     return usageOut(json, "provision", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   }

package/dist/commands/review.js

@@ -1,4 +1,4 @@
-import { detectAdapter, optionFlag, optionString, parseArgs, targetPath, usageError } from "@farmslot/recipe-cli/harness";
+import { harnessContext, optionFlag, optionString, parseArgs, targetPath, usageError } from "@farmslot/recipe-cli/harness";
 import fs from "node:fs";
 import path from "node:path";
 import { runnerDir } from "../paths.js";
@@ -15,7 +15,6 @@ import {
   resolveReference,
   defaultBaseRef
 } from "../review/knowledge.js";
-import "../adapters/surface.js";
 const EXIT_OK = 0;
 let cachedHarnessVersion;
 function harnessVersion() {
@@ -25,18 +24,17 @@ function harnessVersion() {
   }
   return cachedHarnessVersion;
 }
-function adapterFromOptions(options, target) {
-  const raw = optionString(options, "adapter") ?? optionString(options, "platform");
-  if (raw !== void 0) {
-    if (raw !== "mobile" && raw !== "extension" && raw !== "core" && raw !== "terminal") throw usageError(`--adapter must be mobile, extension, core, or terminal (got ${raw}).`);
-    return raw;
+function adapterFromOptions() {
+  const adapter = harnessContext()?.adapter;
+  const scope = REVIEW_ADAPTERS.find((id) => id === adapter?.value);
+  if (adapter?.source === "flag" && !scope) {
+    throw usageError(`--adapter must be one of ${REVIEW_ADAPTERS.join(", ")} (got ${adapter.value}).`);
   }
-  const detected = detectAdapter(target);
-  return REVIEW_ADAPTERS.find((adapter) => adapter === detected) ?? "unscoped";
+  return scope ?? "unscoped";
 }
 function resolveReviewContext(options, { fetch = true } = {}) {
   const target = targetPath(options);
-  const adapter = adapterFromOptions(options, target);
+  const adapter = adapterFromOptions();
   const domain = optionString(options, "domain") ?? process.env.MM_HARNESS_DOMAIN;
   const config = readConfig(configPath());
   const context = { target, adapter, ...domain ? { domain } : {} };

package/dist/commands/runtime-launch.js

@@ -10,6 +10,7 @@ import {
   writeMobileReleaseArtifactState
 } from "../adapters/mobile/release-artifact-state.js";
 import { extensionDepsBlock } from "./launch/extension.js";
+import { recordExtensionConsoleLaunch } from "../adapters/extension/console-capture.js";
 import { isExtensionDistStale } from "../adapters/extension/runtime-decision.js";
 import { FeatureFlagSpecError, parseRemoteFlagSpec } from "../feature-flags.js";
 async function handleRuntimeLaunch(args) {
@@ -186,6 +187,7 @@ async function handleRuntimeLaunchLocked({ options }) {
       cdpPort
     }));
   }
+  recordExtensionConsoleLaunch(target);
   const result = await spawnScriptStreaming(command[0], command.slice(1), target, {
     forward: jsonMode ? "stderr" : "original",
     stdin: jsonMode ? "ignore" : "inherit",

package/dist/commands/status.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { featureFlagReport } from "../feature-flags.js";
-import { color, detectAdapter, adapterDetectNext, EXIT, usageOut, optionFlag, optionString, targetPath } from "@farmslot/recipe-cli/harness";
+import { color, contextAdapter, harnessContextField, adapterDetectNext, EXIT, usageOut, optionFlag, optionString, targetPath } from "@farmslot/recipe-cli/harness";
 import { collectCheckoutView, renderCheckoutView } from "../checkout-view.js";
 import { assertAdapter } from "../paths.js";
 import { getAdapterSurface } from "../adapters/surface.js";
@@ -24,7 +24,7 @@ async function handleStatus({ options }) {
   }
   const fast = optionFlag(options, "fast");
   const allDevices = optionFlag(options, "allDevices");
-  const adapter = detectAdapter(target);
+  const adapter = contextAdapter(target);
   if (!adapter) {
     return usageOut(json, "status", `could not detect the MetaMask repo type for ${target}`, adapterDetectNext());
   }
@@ -58,6 +58,7 @@ async function handleStatus({ options }) {
             command: "status",
             adapter,
             target,
+            ...harnessContextField(),
             view,
             devices: liveView.devicesWithLive,
             featureFlags: featureFlagReport(liveView.featureFlagOverrides),
@@ -79,6 +80,7 @@ async function handleStatus({ options }) {
             command: "status",
             adapter,
             target,
+            ...harnessContextField(),
             view,
             devices,
             featureFlags: staticFeatureFlags,

package/dist/commands/task-init.js

@@ -1,7 +1,6 @@
-import { harnessExecutable, detectAdapter, EXIT } from "@farmslot/recipe-cli/harness";
+import { harnessExecutable, contextAdapter, EXIT } from "@farmslot/recipe-cli/harness";
 import { spawnSync } from "node:child_process";
 import { createRequire } from "node:module";
-import "../adapters/surface.js";
 const require2 = createRequire(import.meta.url);
 const USAGE = "mm-harness task init <task-dir> --flow f --template id --title t [options]";
 function hasOption(argv, name) {
@@ -14,7 +13,7 @@ function metamaskDefaults(argv) {
     defaults.push("--mark-command", `${harnessExecutable()} checklist mark`);
   }
   if (!hasOption(argv, "--platform")) {
-    const adapter = detectAdapter(process.cwd());
+    const adapter = contextAdapter(process.cwd());
     if (adapter) defaults.push("--platform", adapter);
   }
   return defaults;

package/dist/console-classifier.js

@@ -4,13 +4,14 @@ import {
   consoleRecords,
   libraryRootsFromEnv,
   loadConsoleAllowlist,
-  messageSignature
+  messageSignature,
+  withBundledLibraryRoot
 } from "../library/actions/shared/console-findings.mjs";
 const consoleClassifier = {
   records: (text) => consoleRecords(text),
   classify: (record) => classifyConsoleRecord(record),
   signature: (message) => messageSignature(message),
-  loadAllowlist: (libraryRoots) => loadConsoleAllowlist([...libraryRoots]),
+  loadAllowlist: (libraryRoots) => loadConsoleAllowlist(withBundledLibraryRoot([...libraryRoots])),
   match: (event, allowlist) => allowlistMatch(event, allowlist),
   libraryRoots: () => libraryRootsFromEnv()
 };

package/dist/doctor.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
-import { color, harnessExecutable, recipeHarnessRoot, recipeRuntimeDir, readRuntimeContextField, resolveRuntimeContextPath } from "@farmslot/recipe-cli/harness";
+import { RECIPE_CLI_VERSION } from "@farmslot/recipe-cli";
+import { color, harnessContext, harnessContextField, harnessExecutable, recipeHarnessRoot, recipeRuntimeDir, readRuntimeContextField, resolveRuntimeContextPath } from "@farmslot/recipe-cli/harness";
 import { normalizeFeatureFlagRecord } from "./feature-flags.js";
 import { getAdapterSurface } from "./adapters/surface.js";
 import { isPin } from "./harness-pin.js";
@@ -92,7 +93,7 @@ const DEV_SERVER_PORT_ENV = ["WATCHER_PORT", "METRO_PORT", "RECIPE_WATCHER_PORT"
 const RUNTIME_CONTEXT_FIELDS = [
   { key: "slotId", envVars: ["RECIPE_SLOT_ID"], envVar: "RECIPE_SLOT_ID", customize: "doctor --fix creates local identity; Farmslot may override", adapters: ["mobile", "extension", "core"] },
   { key: "watcherPort", envVars: DEV_SERVER_PORT_ENV, envVar: "WATCHER_PORT", customize: "doctor --fix claims one; --watcher-port overrides", adapters: ["mobile"] },
-  { key: "metroPort", envVars: DEV_SERVER_PORT_ENV, envVar: "WATCHER_PORT", customize: "mirrors watcherPort; --metro-port is its alias", adapters: ["mobile"] },
+  { key: "metroPort", envVars: DEV_SERVER_PORT_ENV, envVar: "WATCHER_PORT", customize: "mirrors watcherPort", adapters: ["mobile"] },
   { key: "devServerPort", envVars: DEV_SERVER_PORT_ENV, envVar: "WATCHER_PORT", customize: "mirrors watcherPort for the adapter dev server", adapters: ["mobile", "extension"] },
   { key: "simulator", envVars: ["IOS_SIMULATOR"], envVar: "IOS_SIMULATOR", customize: "--device pins the matched simulator into the context", adapters: ["mobile"] },
   { key: "simulatorUdid", envVars: ["SIM_UDID"], envVar: "SIM_UDID", customize: "--device pins the matched udid into the context", adapters: ["mobile"] },
@@ -106,10 +107,13 @@ function runtimeContextSummary(target, adapter) {
   const file = envOverride ?? path.relative(target, contextPath);
   const fields = {};
   const specs = adapter ? RUNTIME_CONTEXT_FIELDS.filter((spec) => spec.adapters.includes(adapter)) : RUNTIME_CONTEXT_FIELDS;
+  const filled = new Set(
+    Object.values(harnessContext()?.ports ?? {}).flatMap((port) => port?.filled ? port.names ?? [] : [])
+  );
   for (const spec of specs) {
     const envName = spec.envVars.find((name) => {
       const value = process.env[name];
-      return value !== void 0 && value !== "";
+      return value !== void 0 && value !== "" && !filled.has(name);
     });
     if (envName !== void 0) {
       fields[spec.key] = { value: process.env[envName], source: "env", envVar: envName, customize: spec.customize };
@@ -164,6 +168,7 @@ function createDoctorReport(adapter, target, manifestValidation, actionManifestP
     requiredChecks,
     adapter,
     target,
+    ...harnessContextField(),
     runner: runnerProvenance(actionManifestPath),
     compatibilityMode: mode,
     shape: repoShape(target),
@@ -223,7 +228,9 @@ function runnerProvenance(actionManifestPath) {
     invokedPath,
     executablePath,
     actionManifestPath,
-    harnessPackage: "@farmslot/recipe-runner"
+    harnessPackage: "@farmslot/recipe-runner",
+    // The @farmslot/recipe-cli this harness runs on (`--version --verbose` prints it too).
+    recipeCliVersion: RECIPE_CLI_VERSION
   };
 }
 function readJsonObject(file) {