@deeeed/metamask-harness 0.17.5 → 0.18.0

package/dist/commands/shared.js

@@ -1,8 +1,18 @@
 import { spawn, spawnSync } from "node:child_process";
 import path from "node:path";
 import { detectAdapter } from "../harness.js";
+import { colorHumanMessage } from "../cli-color.js";
 import { resolveLeafInvoke, shellLeafMissing } from "../leaf-invoke.js";
 const EXIT = { ok: 0, runtime: 1, usage: 2, infra: 3, bounded: 4, validation: 5 };
+function writeInteractiveProgress(json, message, {
+  stdoutIsTTY = Boolean(process.stdout.isTTY),
+  stream = process.stderr
+} = {}) {
+  if (json || !stdoutIsTTY) return false;
+  stream.write(`${colorHumanMessage(message, { stream })}
+`);
+  return true;
+}
 function parseFlags(argv, booleans) {
   const positional = [];
   const options = {};
@@ -138,11 +148,19 @@ function spawnScriptStreaming(script, args, cwd, options) {
     let settled = false;
     let didTimeout = false;
     let escalation;
+    let forwardedParentSignal;
+    let parentSignalFallback;
+    const parentSignals = ["SIGINT", "SIGTERM"];
+    const removeParentSignalHandlers = () => {
+      for (const signal of parentSignals) process.removeListener(signal, parentSignalHandlers[signal]);
+    };
     const finish = (result) => {
       if (settled) return;
       settled = true;
       if (timer) clearTimeout(timer);
-      if (escalation && !didTimeout) clearTimeout(escalation);
+      if (escalation) clearTimeout(escalation);
+      if (parentSignalFallback) clearTimeout(parentSignalFallback);
+      removeParentSignalHandlers();
       resolve(result);
     };
     const signalChildTree = (signal) => {
@@ -152,6 +170,26 @@ function spawnScriptStreaming(script, args, cwd, options) {
       } catch {
       }
     };
+    const exitFromForwardedSignal = () => {
+      if (!forwardedParentSignal) return;
+      const signal = forwardedParentSignal;
+      forwardedParentSignal = void 0;
+      if (parentSignalFallback) clearTimeout(parentSignalFallback);
+      process.kill(process.pid, signal);
+    };
+    const parentSignalHandlers = Object.fromEntries(parentSignals.map((signal) => [signal, () => {
+      if (forwardedParentSignal) return;
+      forwardedParentSignal = signal;
+      signalChildTree(signal);
+      removeParentSignalHandlers();
+      parentSignalFallback = setTimeout(() => {
+        signalChildTree("SIGKILL");
+        exitFromForwardedSignal();
+      }, 1e3);
+    }]));
+    if (ownsProcessGroup) {
+      for (const signal of parentSignals) process.once(signal, parentSignalHandlers[signal]);
+    }
     const timeoutMs = spawnOptions.timeoutMs;
     const timer = Number.isFinite(timeoutMs) && Number(timeoutMs) > 0 ? setTimeout(() => {
       didTimeout = true;
@@ -182,8 +220,17 @@ function spawnScriptStreaming(script, args, cwd, options) {
 `);
       finish({ status: 1, output: message });
     });
+    child.on("exit", () => {
+      if (forwardedParentSignal) {
+        exitFromForwardedSignal();
+        return;
+      }
+      if (!didTimeout) return;
+      signalChildTree("SIGKILL");
+      finish({ status: 1, output, timedOut: true, timeoutMs: Number(timeoutMs) });
+    });
     child.on("close", (status) => {
-      if (didTimeout && escalation) return;
+      if (didTimeout) signalChildTree("SIGKILL");
       finish({
         status: didTimeout ? 1 : status ?? 1,
         output,
@@ -208,9 +255,33 @@ function usageOut(json, command, message, userAction) {
   }
   return EXIT.usage;
 }
+function checkoutBusyOut(json, command, message, lockPath) {
+  const userAction = `wait for the current owner, or inspect ${lockPath} if its process has exited`;
+  if (json) {
+    console.log(
+      JSON.stringify(
+        {
+          schemaVersion: 1,
+          command,
+          status: "fail",
+          exitCode: EXIT.bounded,
+          recoverable: false,
+          error: { code: "SANDBOX_BUSY", message, userAction }
+        },
+        null,
+        2
+      )
+    );
+  } else {
+    console.error(`\u2717 mm-harness ${command}: ${message}
+  Next: ${userAction}`);
+  }
+  return EXIT.bounded;
+}
 export {
   ADAPTER_DETECT_NEXT,
   EXIT,
+  checkoutBusyOut,
   flag,
   parseFlags,
   resolveAdapter,
@@ -220,5 +291,6 @@ export {
   spawnScriptStreaming,
   str,
   targetOf,
-  usageOut
+  usageOut,
+  writeInteractiveProgress
 };

package/dist/commands/status-probe.js

@@ -22,6 +22,9 @@ function routeToString(route) {
 function deriveWalletState(account, route) {
   const routeStr = (routeToString(route) ?? "").toLowerCase();
   if (routeStr.includes("onboard")) return "onboarding";
+  if (routeStr === "login" || routeStr === "lockscreen") {
+    return "locked";
+  }
   if (account !== null && account !== void 0 && typeof account === "object") return "unlocked";
   return "locked";
 }
@@ -34,7 +37,7 @@ function parseBridgeEntries(raw) {
     deviceName: typeof e.deviceName === "string" ? e.deviceName : "",
     platform: typeof e.platform === "string" ? e.platform : "",
     // agenticPresent is only set when the bridge explicitly sends it (false = absent).
-    // Omitted by older bridge versions → leave undefined so caller treats as present.
+    // An omitted value remains unknown.
     ...typeof e.agenticPresent === "boolean" ? { agenticPresent: e.agenticPresent } : {}
   }));
 }

package/dist/commands/status.js

@@ -31,7 +31,7 @@ async function handleStatus({ options }) {
   if (adapter === "mobile") {
     const dtResult = applyDeviceTargeting("status", adapter, options, { gate: false, rerun: "" });
     if ("code" in dtResult) {
-      return usageOut(json, "status", dtResult.message, "mm-harness status --device <id> or --all-devices");
+      return usageOut(json, "status", dtResult.message, dtResult.userAction);
     }
   }
   const next = surface.hints.relaunch;
@@ -104,6 +104,7 @@ function renderRuntimeStatus(runtime, out) {
   );
 }
 function nextForRuntime(launchHint, relaunchHint, runtime) {
+  if (runtime.nextAction) return runtime.nextAction;
   if (runtime.decision === "ready") return "mm-harness logs";
   if (runtime.decision === "relaunch") return launchHint;
   return relaunchHint;

package/dist/commands/stop.js

@@ -5,7 +5,8 @@ import {
   parseArgs,
   optionFlag,
   optionString,
-  resolveAdapter
+  resolveAdapter,
+  shellQuote
 } from "./parse-args.js";
 async function handleStop(argv) {
   const { options } = parseArgs(argv, "stop");
@@ -22,6 +23,8 @@ async function handleStop(argv) {
   if (stop.kind === "headless") {
     return usageOut(json, "stop", stop.message, stop.userAction);
   }
+  const next = adapter === "extension" ? `${surface.hints.launch} --target ${shellQuote(target)}` : void 0;
+  const userAction = `mm-harness status --target ${shellQuote(target)} --json`;
   if (json) {
     console.log(
       JSON.stringify(
@@ -33,7 +36,8 @@ async function handleStop(argv) {
           status: stop.status === 0 ? "pass" : "fail",
           ...stop.signalled !== void 0 ? { signalled: stop.signalled } : {},
           exitCode: stop.status,
-          ...stop.output ? { output: stop.output } : {}
+          ...stop.output ? { output: stop.output } : {},
+          ...stop.status === 0 ? next ? { next } : {} : { error: { code: "DEV_SERVER_STOP_FAILED", message: stop.summary, userAction } }
         },
         null,
         2
@@ -43,6 +47,7 @@ async function handleStop(argv) {
     if (stop.output) process.stderr.write(`${stop.output}
 `);
     console.error(`${color(stop.status === 0 ? "ok" : "err", stop.status === 0 ? "\u2713" : "\u2717")} ${stop.summary}`);
+    if (stop.status !== 0 || next) console.error(`  Next: ${stop.status === 0 ? next : userAction}`);
   }
   return stop.status;
 }

package/dist/commands/update.js

@@ -1,4 +1,4 @@
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -6,7 +6,8 @@ import { runnerDir } from "../paths.js";
 import { EXIT, flag, parseFlags } from "./shared.js";
 const PACKAGE_NAME = "@deeeed/metamask-harness";
 const NUDGE_INTERVAL_MS = 24 * 60 * 60 * 1e3;
-const NUDGE_FETCH_TIMEOUT_MS = 300;
+const NUDGE_FETCH_TIMEOUT_MS = 2e3;
+const REGISTRY_DIST_TAGS_ENDPOINT = `https://registry.npmjs.org/-/package/${encodeURIComponent(PACKAGE_NAME)}/dist-tags`;
 function currentVersion() {
   try {
     const pkg = JSON.parse(fs.readFileSync(path.join(runnerDir, "package.json"), "utf8"));
@@ -56,24 +57,6 @@ function fetchLatest(timeoutMs) {
   if (!latest) return { error: { kind: "unreachable", message: "npm returned no dist-tag for latest" } };
   return { latest };
 }
-async function fetchLatestAsync(timeoutMs) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const url = `https://registry.npmjs.org/-/package/${encodeURIComponent(PACKAGE_NAME)}/dist-tags`;
-    const res = await fetch(url, { signal: controller.signal });
-    if (!res.ok) return { error: { kind: "unreachable", message: `registry returned HTTP ${res.status}` } };
-    const data = await res.json();
-    const latest = data["latest"];
-    if (!latest) return { error: { kind: "unreachable", message: "npm registry returned no latest dist-tag" } };
-    return { latest };
-  } catch (err) {
-    const msg = err.name === "AbortError" ? `registry fetch timed out after ${timeoutMs}ms` : err.message;
-    return { error: { kind: "unreachable", message: msg } };
-  } finally {
-    clearTimeout(timer);
-  }
-}
 function teachFailure(json, current, code, message, userAction) {
   if (json) {
     console.log(
@@ -211,23 +194,28 @@ function nudgeDisabled() {
 function nudgeLine(current, latest) {
   return isNewer(latest, current) ? `mm-harness ${current} \u2192 ${latest} available \xB7 run: mm-harness update` : null;
 }
-async function maybeNudge(now = Date.now()) {
+function maybeNudge(now = Date.now()) {
   if (nudgeDisabled()) return;
   const file = cacheFile();
   const cache = readCache(file);
   const current = currentVersion();
-  let latest = cache?.latest ?? "";
   process.once("exit", () => {
-    const line = nudgeLine(current, latest);
+    const line = nudgeLine(current, cache?.latest ?? "");
     if (line) process.stderr.write(`${line}
 `);
   });
   if (!cache || now - cache.lastCheck >= NUDGE_INTERVAL_MS) {
-    writeCache(file, { lastCheck: now, latest });
-    const fetched = await fetchLatestAsync(NUDGE_FETCH_TIMEOUT_MS);
-    if (fetched.latest) {
-      latest = fetched.latest;
-      writeCache(file, { lastCheck: now, latest });
+    writeCache(file, { lastCheck: now, latest: cache?.latest ?? "" });
+    const worker = path.join(runnerDir, "adapters", "shared", "update-check-worker.mjs");
+    if (!fs.existsSync(worker)) return;
+    try {
+      const child = spawn(
+        process.execPath,
+        [worker, file, String(NUDGE_FETCH_TIMEOUT_MS), REGISTRY_DIST_TAGS_ENDPOINT],
+        { detached: true, stdio: "ignore" }
+      );
+      child.unref();
+    } catch {
     }
   }
 }

package/dist/completions-cache.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { recipeRuntimePath } from "./paths.js";
-const COMPLETION_CACHE_VERSION = 1;
+const COMPLETION_CACHE_VERSION = 2;
 const COMPLETION_CACHE_TTL_MS = 6e4;
 function completionCachePath(projectRoot) {
   return recipeRuntimePath(projectRoot, ".completion-cache.json");

package/dist/doctor.js

@@ -93,10 +93,7 @@ function fixtureFileSummary(file, adapter, reportedPath = file) {
 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: "extensionId", envVars: ["RECIPE_HARNESS_EXTENSION_ID"], envVar: "RECIPE_HARNESS_EXTENSION_ID", customize: "resolved from the built extension", adapters: ["extension"] },
-  { key: "cdpPort", envVars: ["RECIPE_CDP_PORT", "CDP_PORT"], envVar: "CDP_PORT", customize: "doctor --fix claims one; --cdp-port overrides", adapters: ["extension"] },
-  { key: "runtimeStart.approved", envVars: ["RECIPE_RUNTIME_START_APPROVED"], envVar: "RECIPE_RUNTIME_START_APPROVED", customize: "optional orchestrator-provided legacy live context", adapters: ["mobile", "extension"] },
-  { key: "runtimeStart.command", envVars: [], envVar: null, customize: "optional orchestrator-provided legacy live context", adapters: ["mobile", "extension"] },
-  { key: "runtimeStart.readyUrl", envVars: ["RECIPE_RUNTIME_READY_URL"], envVar: "RECIPE_RUNTIME_READY_URL", customize: "optional orchestrator-provided legacy live context", adapters: ["mobile", "extension"] }
+  { key: "cdpPort", envVars: ["RECIPE_CDP_PORT", "CDP_PORT"], envVar: "CDP_PORT", customize: "doctor --fix claims one; --cdp-port overrides", adapters: ["extension"] }
 ];
 function runtimeContextSummary(target, adapter) {
   const contextPath = resolveRuntimeContextPath(target);
@@ -158,12 +155,7 @@ function createDoctorReport(adapter, target, manifestValidation, actionManifestP
     requiredChecks,
     adapter,
     target,
-    runner: {
-      name: "@metamask/recipe-runner",
-      runnerDir,
-      actionManifestPath,
-      harnessPackage: "@farmslot/recipe-harness"
-    },
+    runner: runnerProvenance(actionManifestPath),
     compatibilityMode: mode,
     shape: repoShape(target),
     fixture: fixtureSummary(target, adapter),
@@ -172,6 +164,60 @@ function createDoctorReport(adapter, target, manifestValidation, actionManifestP
     manifestValidation: manifestValidation.summary
   };
 }
+function runnerInstallKind(runnerRoot, invokedPath, executablePath) {
+  const normalizedRoot = path.normalize(runnerRoot);
+  const nodeModulesSegment = `${path.sep}node_modules${path.sep}`;
+  const globalNodeModulesSegment = `${path.sep}lib${path.sep}node_modules${path.sep}`;
+  if (normalizedRoot.includes(globalNodeModulesSegment)) return "global-install";
+  const nodeModulesIndex = normalizedRoot.lastIndexOf(nodeModulesSegment);
+  if (nodeModulesIndex >= 0) {
+    const nodeModulesRoot = normalizedRoot.slice(
+      0,
+      nodeModulesIndex + nodeModulesSegment.length - 1
+    );
+    const invoked = path.resolve(invokedPath);
+    const projectBin = `${path.join(nodeModulesRoot, ".bin")}${path.sep}`;
+    if (invoked === path.resolve(executablePath) || invoked.startsWith(projectBin)) {
+      return "project-install";
+    }
+    return "global-install";
+  }
+  if (path.resolve(invokedPath) !== path.resolve(executablePath)) return "local-link";
+  return "source-checkout";
+}
+function runnerProvenance(actionManifestPath) {
+  const packagePath = path.join(runnerDir, "package.json");
+  const packageDocument = readJsonObject(packagePath);
+  const packageName = packageDocument.name;
+  const version = packageDocument.version;
+  if (packageName !== "@deeeed/metamask-harness") {
+    throw new Error(`Expected @deeeed/metamask-harness package name in ${packagePath}`);
+  }
+  if (typeof version !== "string" || !version) {
+    throw new Error(`Expected package version in ${packagePath}`);
+  }
+  const executablePath = path.resolve(
+    process.env.MM_HARNESS_EXECUTABLE ?? path.join(runnerDir, "bin/mm-harness")
+  );
+  const invokedPath = path.resolve(process.env.MM_HARNESS_INVOKED_AS ?? executablePath);
+  const installKind = runnerInstallKind(runnerDir, invokedPath, executablePath);
+  const packageSource = runnerDir.includes(`${path.sep}node_modules${path.sep}`) ? "node_modules" : "source-checkout";
+  return {
+    name: "@metamask/recipe-runner",
+    packageName,
+    version,
+    runnerDir,
+    packagePath,
+    packageSource,
+    installKind,
+    linked: installKind === "local-link",
+    global: installKind === "global-install",
+    invokedPath,
+    executablePath,
+    actionManifestPath,
+    harnessPackage: "@farmslot/recipe-harness"
+  };
+}
 function readJsonObject(file) {
   const value = readJson(file);
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -187,5 +233,6 @@ export {
   renderRuntimeContext,
   repoShape,
   requiredDoctorCheckSummary,
+  runnerInstallKind,
   runtimeContextSummary
 };