@deeeed/metamask-harness 0.17.5 → 0.19.0

package/dist/commands/parse-args.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { detectAdapter } from "../harness.js";
 import { assertAdapter, manifestPath } from "../paths.js";
+import { explicitRecipeTrustOptions } from "../recipe-security.js";
 import { ADAPTER_DETECT_NEXT } from "./shared.js";
 import { EXIT } from "./shared.js";
 class CliError extends Error {
@@ -19,12 +20,15 @@ function parseArgs(argv, command) {
   const options = {};
   const booleanOptions = /* @__PURE__ */ new Set([
     "json",
+    "jsonStream",
     "launchExistingDist",
     "startWatch",
     "record",
     "plan",
     "list",
+    "describe",
     "raw",
+    "categories",
     "fix",
     "force",
     "resolveOnly",
@@ -34,6 +38,7 @@ function parseArgs(argv, command) {
     "allDevices",
     "help"
   ]);
+  const repeatableOptions = /* @__PURE__ */ new Set(["library"]);
   for (let i = 0; i < argv.length; i += 1) {
     const arg = argv[i];
     if (!arg.startsWith("--")) {
@@ -66,15 +71,56 @@ function parseArgs(argv, command) {
       continue;
     }
     if (inlineValue !== void 0) {
-      options[key] = inlineValue;
+      assignOption(options, key, inlineValue, repeatableOptions);
       continue;
     }
     if (i + 1 >= argv.length) throw usageError(`Missing value for ${arg}`);
-    options[key] = argv[i + 1];
+    assignOption(options, key, argv[i + 1], repeatableOptions);
     i += 1;
   }
   return { positional, options, rawArgv: [...argv] };
 }
+function assignOption(options, key, value, repeatableOptions) {
+  if (!repeatableOptions.has(key)) {
+    options[key] = value;
+    return;
+  }
+  const existing = options[key];
+  if (existing === void 0) {
+    options[key] = [value];
+    return;
+  }
+  if (!Array.isArray(existing)) throw usageError(`--${key} has conflicting values.`);
+  options[key] = [...existing, value];
+}
+function parseRecipeParamAssignments(values) {
+  const params = {};
+  for (const assignment of values) {
+    const separator = assignment.indexOf("=");
+    if (separator <= 0) {
+      throw usageError(`recipe parameter ${JSON.stringify(assignment)} must use key=value.`);
+    }
+    const key = assignment.slice(0, separator).trim();
+    if (!key) throw usageError(`recipe parameter ${JSON.stringify(assignment)} has an empty key.`);
+    if (Object.hasOwn(params, key)) {
+      throw usageError(`recipe parameter ${JSON.stringify(key)} was provided more than once.`);
+    }
+    const raw = assignment.slice(separator + 1);
+    let value;
+    try {
+      value = JSON.parse(raw);
+    } catch {
+      value = raw;
+    }
+    Object.defineProperty(params, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  }
+  return params;
+}
 function parseRecordVideoMode(value) {
   if (value === void 0 || value === "" || value === "true") return "full-run";
   if (value === "off" || value === "false") return false;
@@ -97,6 +143,14 @@ function optionString(options, key) {
   if (typeof value !== "string") throw usageError(`--${key} requires a value.`);
   return value;
 }
+function optionStrings(options, key) {
+  const value = options[key];
+  if (value === void 0) return void 0;
+  if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) {
+    throw usageError(`--${key} requires a value.`);
+  }
+  return value;
+}
 function optionFlag(options, key) {
   const value = options[key];
   return value === true;
@@ -127,7 +181,7 @@ function adapterOption(options) {
   return adapter;
 }
 function targetPath(options) {
-  return path.resolve(optionString(options, "target") ?? optionString(options, "projectRoot") ?? process.cwd());
+  return path.resolve(optionString(options, "target") ?? process.cwd());
 }
 function actionManifestPathOption(options, adapter) {
   const configured = optionString(options, "actionManifest");
@@ -140,13 +194,21 @@ function parsePort(value, errorMessage) {
 }
 function runtimeOptionsFromCli(options) {
   const recordVideo = options.recordVideo;
+  const trust = explicitRecipeTrustOptions({
+    sourceTrust: optionString(options, "sourceTrust"),
+    sourceKind: optionString(options, "sourceKind"),
+    sourceName: optionString(options, "sourceName"),
+    sourceDigest: optionString(options, "sourceDigest"),
+    approvalDigest: optionString(options, "approvePlan")
+  });
   return {
     cdpPort: optionString(options, "cdpPort"),
     watcherPort: optionString(options, "watcherPort") ?? optionString(options, "metroPort"),
     launchExistingDist: optionFlag(options, "launchExistingDist"),
     slot: optionString(options, "slot"),
     validationRuntimeDir: optionString(options, "validationRuntimeDir"),
-    recordVideo: recordVideo === "full-run" ? "full-run" : false
+    recordVideo: recordVideo === "full-run" ? "full-run" : false,
+    ...trust
   };
 }
 function resolveAdapter(options) {
@@ -184,8 +246,10 @@ export {
   isRecord,
   optionFlag,
   optionString,
+  optionStrings,
   parseArgs,
   parsePort,
+  parseRecipeParamAssignments,
   requiredOption,
   resolveAdapter,
   runtimeOptionsFromCli,

package/dist/commands/provision.js

@@ -1,7 +1,7 @@
 import { detectAdapter } from "../harness.js";
 import { assertAdapter } from "../paths.js";
 import { getAdapterSurface } from "../adapters/surface.js";
-import { ADAPTER_DETECT_NEXT, usageOut } from "./shared.js";
+import { ADAPTER_DETECT_NEXT, usageOut, writeInteractiveProgress } from "./shared.js";
 import {
   applyWatcherPortOption,
   optionFlag,
@@ -25,9 +25,13 @@ async function handleProvision({ positional, options, rawArgv }) {
   }
   const surface = getAdapterSurface(adapter);
   const rerunCommand = provisionRerunCommand(rawArgv, options, adapter, target);
+  const platform = optionString(options, "platform") ?? optionString(options, "devicePlatform") ?? (positional[0] === "runway" ? positional[1] : positional[0]) ?? "ios";
+  if (adapter === "mobile") {
+    writeInteractiveProgress(json, `\u2192 provision mobile ${platform} \u2014 resolving simulator and Runway artifact`);
+  }
   const result = await surface.runwayProvision.run(target, {
     json,
-    platform: optionString(options, "platform") ?? optionString(options, "devicePlatform") ?? (positional[0] === "runway" ? positional[1] : positional[0]) ?? "ios",
+    platform,
     branch: optionString(options, "branch"),
     defaultBranch: optionString(options, "defaultBranch"),
     run: optionString(options, "run"),
@@ -42,8 +46,10 @@ async function handleProvision({ positional, options, rawArgv }) {
     resolveOnly: optionFlag(options, "resolveOnly"),
     rerunCommand
   });
+  const next = result.status === "pass" && adapter === "mobile" && result.resolveOnly !== true ? `mm-harness launch ${String(result.platform ?? platform)} --adapter mobile --target ${shellQuote(target)}` : void 0;
+  const output = next ? { ...result, next } : result;
   if (json) {
-    console.log(JSON.stringify(result, null, 2));
+    console.log(JSON.stringify(output, null, 2));
   } else if (result.status === "pass") {
     const cache = typeof result.cache === "object" && result.cache ? result.cache : void 0;
     const simulator = typeof result.simulator === "object" && result.simulator ? result.simulator : void 0;
@@ -54,6 +60,7 @@ async function handleProvision({ positional, options, rawArgv }) {
       const action = result.skipped ? "already provisioned" : "provisioned";
       console.error(`\u2713 ${action} ${adapter} ${result.platform ?? ""} simulator=${simulator?.name ?? "unknown"} cache=${cache?.status ?? "unknown"}`);
     }
+    if (next) console.error(`  Next: ${next}`);
   } else {
     console.error(`\u2717 mm-harness provision: ${result.error?.message ?? "provision failed"}
   Next: ${result.error?.userAction ?? rerunCommand}`);
@@ -92,7 +99,6 @@ function provisionPositionals(rawArgv) {
   const valueFlags = /* @__PURE__ */ new Set([
     "--adapter",
     "--target",
-    "--project-root",
     "--platform",
     "--device-platform",
     "--branch",