@mutmutco/cli 3.88.0 → 3.90.0

package/dist/main.cjs

@@ -4040,6 +4040,56 @@ var execFileP2 = (file, args, options = {}) => (
   rawExecFileP2(file, args, { encoding: "utf8", windowsHide: true, timeout: DEFAULT_EXEC_TIMEOUT_MS, killSignal: "SIGTERM", ...options })
 );
 var GIT_TIMEOUT_MS = DEFAULT_EXEC_TIMEOUT_MS;
+var ExecDeadlineError = class extends Error {
+  constructor(step, timeoutMs, elapsedMs, killed) {
+    super(
+      `\`${step}\` did not finish within ${Math.round(timeoutMs / 1e3)}s (gave up after ${Math.round(elapsedMs / 1e3)}s). It stopped responding and did not exit when asked to, so the timeout alone could not end it; ${killed ? "its process tree was force-terminated" : "its process tree could NOT be terminated and may still be running"}.`
+    );
+    this.step = step;
+    this.timeoutMs = timeoutMs;
+    this.elapsedMs = elapsedMs;
+    this.killed = killed;
+    this.name = "ExecDeadlineError";
+  }
+  step;
+  timeoutMs;
+  elapsedMs;
+  killed;
+};
+function killProcessTree(pid) {
+  try {
+    if (process.platform === "win32") {
+      (0, import_node_child_process3.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+    } else {
+      process.kill(pid, "SIGKILL");
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function execFileHard(file, args, options) {
+  const { timeout, step, ...rest } = options;
+  const started = Date.now();
+  return new Promise((resolve5, reject) => {
+    const child2 = (0, import_node_child_process3.execFile)(file, args, { encoding: "utf8", windowsHide: true, ...rest, timeout: 0 }, (error, stdout, stderr) => {
+      clearTimeout(timer);
+      if (expired) return;
+      if (error) reject(error);
+      else resolve5({ stdout: String(stdout), stderr: String(stderr) });
+    });
+    let expired = false;
+    const timer = setTimeout(() => {
+      expired = true;
+      const killed = child2.pid ? killProcessTree(child2.pid) : false;
+      child2.stdout?.destroy();
+      child2.stderr?.destroy();
+      child2.unref();
+      reject(new ExecDeadlineError(step, timeout, Date.now() - started, killed));
+    }, timeout);
+    timer.unref?.();
+  });
+}
 var cachedGithubLogin;
 async function githubLogin() {
   cachedGithubLogin ??= execFileP2("gh", ["api", "user", "--jq", ".login"]).then(({ stdout }) => stdout.trim() || void 0).catch(() => void 0);
@@ -8872,7 +8922,11 @@ function hasUserInstallRecord(file, pluginId) {
 var CLAUDE_PLUGIN_TIMEOUT_MS = 12e4;
 var NPM_VIEW_TIMEOUT_MS = 15e3;
 function runHostBin(bin, args, opts) {
-  return isWin ? execFileP2("cmd.exe", ["/c", bin, ...args], opts) : execFileP2(bin, args, opts);
+  const { step, timeout } = opts;
+  const shared = { timeout, stdio: ["ignore", "pipe", "pipe"], maxBuffer: 16 * 1024 * 1024 };
+  const file = isWin ? "cmd.exe" : bin;
+  const argv = isWin ? ["/c", bin, ...args] : args;
+  return step ? execFileHard(file, argv, { ...shared, step }) : execFileP2(file, argv, shared);
 }
 function surfaceConfigRoot(surface, env = process.env, home = (0, import_node_os4.homedir)()) {
   if (surface === "codex") return env.CODEX_HOME?.trim() || (0, import_node_path14.join)(home, ".codex");
@@ -9050,27 +9104,14 @@ function snapshotPluginGuardInput(surface = detectSurface(process.env), isOrgRep
     ) : (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "cache", "mutmutco", "mmi"))
   };
 }
-async function runClaudePlugin(args) {
-  try {
-    await runHostBin("claude", args, { timeout: CLAUDE_PLUGIN_TIMEOUT_MS });
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function runCodexPlugin(args) {
+async function runPluginCli(bin, args, log) {
   try {
-    await runHostBin("codex", args, { timeout: CLAUDE_PLUGIN_TIMEOUT_MS });
+    await runHostBin(bin, args, { timeout: CLAUDE_PLUGIN_TIMEOUT_MS, step: `${bin} ${args.join(" ")}` });
     return true;
-  } catch {
-    return false;
-  }
-}
-async function runKiloPlugin(args) {
-  try {
-    await runHostBin("kilo", args, { timeout: CLAUDE_PLUGIN_TIMEOUT_MS });
-    return true;
-  } catch {
+  } catch (error) {
+    if (error instanceof ExecDeadlineError) {
+      log(`  \u2717 ${error.message} Recover with: mmi-cli plugin heal`);
+    }
     return false;
   }
 }
@@ -9131,7 +9172,8 @@ async function installCursorPluginCheckout(env = process.env) {
       });
     } else {
       await runHostBin("gh", ["repo", "clone", "mutmutco/MMI-Hub", staged, "--", "--branch", "main", "--depth", "1"], {
-        timeout: CLAUDE_PLUGIN_TIMEOUT_MS
+        timeout: CLAUDE_PLUGIN_TIMEOUT_MS,
+        step: "gh repo clone mutmutco/MMI-Hub"
       });
     }
     if (!cursorPluginTreeHealthy(staged)) {
@@ -9161,7 +9203,8 @@ async function installCursorPluginCheckout(env = process.env) {
 async function marketplaceAddRefSupported(bin) {
   try {
     const { stdout, stderr } = await runHostBin(bin, ["plugin", "marketplace", "add", "--help"], {
-      timeout: CLAUDE_PLUGIN_TIMEOUT_MS
+      timeout: CLAUDE_PLUGIN_TIMEOUT_MS,
+      step: `${bin} plugin marketplace add --help`
     });
     return marketplaceAddSupportsRef(`${stdout}
 ${stderr}`);
@@ -9191,7 +9234,7 @@ async function applyPluginHeal(surface, log, opts) {
   if (token === "kilo") {
     log("  \u21BB reinstalling the MMI plugin via `kilo plugin` (install \u2192 server() provisions the skills)\u2026");
     for (const step of descriptor.healSteps) {
-      const ok = await runKiloPlugin([...step.args]);
+      const ok = await runPluginCli("kilo", [...step.args], log);
       if (healStepAborts(step, ok)) return false;
     }
     return true;
@@ -9207,7 +9250,7 @@ async function applyPluginHeal(surface, log, opts) {
   const pins = token === "claude" ? captureMarketplacePins(readKnownMarketplacesFile(pinsPath), [MMI_MARKETPLACE_NAME, JERV_MARKETPLACE_NAME]) : /* @__PURE__ */ new Map();
   try {
     for (const step of steps) {
-      const ok = token === "claude" ? await runClaudePlugin([...step.args]) : await runCodexPlugin([...step.args]);
+      const ok = await runPluginCli(token, [...step.args], log);
       if (healStepAborts(step, ok)) return false;
     }
   } finally {
@@ -24037,27 +24080,41 @@ function decideStage(inputs) {
 var import_node_net2 = require("node:net");
 var STAGE_LIVE_HUB_REPO = "mutmutco/MMI-Hub";
 var IP_ECHO_URL = "https://api.ipify.org";
+var IP6_ECHO_URL = "https://api6.ipify.org";
 var IP_DETECT_TIMEOUT_MS = 1e4;
 function validStageLiveIp(ip) {
   return (0, import_node_net2.isIP)(ip.trim()) !== 0;
 }
 async function detectPublicIp(fetchImpl = fetch) {
+  return detectPublicIpFrom(IP_ECHO_URL, fetchImpl);
+}
+async function detectCallerIps(fetchImpl = fetch) {
+  const [v4, v6] = await Promise.allSettled([
+    detectPublicIp(fetchImpl),
+    detectPublicIpFrom(IP6_ECHO_URL, fetchImpl)
+  ]);
+  if (v4.status === "rejected") throw v4.reason;
+  const ip = v4.value;
+  const candidate = v6.status === "fulfilled" ? v6.value : void 0;
+  return { ip, ip6: candidate && (0, import_node_net2.isIP)(candidate) === 6 ? candidate : void 0 };
+}
+async function detectPublicIpFrom(url, fetchImpl) {
   let res;
   try {
-    res = await fetchImpl(IP_ECHO_URL, { signal: AbortSignal.timeout(IP_DETECT_TIMEOUT_MS) });
+    res = await fetchImpl(url, { signal: AbortSignal.timeout(IP_DETECT_TIMEOUT_MS) });
   } catch (e) {
-    throw new Error(`public IP detection failed (${IP_ECHO_URL}): ${e.message}`);
+    throw new Error(`public IP detection failed (${url}): ${e.message}`);
   }
-  if (!res.ok) throw new Error(`public IP detection failed: HTTP ${res.status} from ${IP_ECHO_URL}`);
+  if (!res.ok) throw new Error(`public IP detection failed: HTTP ${res.status} from ${url}`);
   const ip = (await res.text()).trim();
-  if (!validStageLiveIp(ip)) throw new Error(`public IP detection returned a non-IP body from ${IP_ECHO_URL}: "${ip.slice(0, 80)}"`);
+  if (!validStageLiveIp(ip)) throw new Error(`public IP detection returned a non-IP body from ${url}: "${ip.slice(0, 80)}"`);
   return ip;
 }
 function stageLiveUpSteps(t) {
   return [
-    { label: `detect your public IP (${IP_ECHO_URL}, bounded)` },
+    { label: `detect your public IPv4 and IPv6 (${IP_ECHO_URL} + ${IP6_ECHO_URL}, bounded, in parallel)` },
     { label: `deploy ${t.ref ?? "<current branch>"} to the ${t.slug} dev stage via the Hub backend (tenant-deploy)` },
-    { label: `gate ${t.host} to your IP at the Cloudflare edge via the Hub backend (tenant-control cf-gate-allow)` },
+    { label: `gate ${t.host} to your IPv4 and your IPv6 /64 at the Cloudflare edge via the Hub backend (tenant-control cf-gate-allow)` },
     { label: "tear down when done", command: "mmi-cli stage --live --down --apply" }
   ];
 }
@@ -24069,11 +24126,14 @@ function stageLiveDownSteps(t) {
 }
 async function runStageLiveUp(deps, t) {
   if (!t.ref?.trim()) throw new Error("stage --live: cannot resolve the current branch to deploy");
-  const ip = (await deps.detectIp()).trim();
+  const detected = await deps.detectIp();
+  const ip = detected.ip.trim();
   if (!validStageLiveIp(ip)) throw new Error(`stage --live: detected public IP is not a literal IPv4/IPv6 address: "${ip.slice(0, 80)}"`);
+  const ip6 = detected.ip6?.trim() || void 0;
   if (!t.host?.trim()) throw new Error("stage --live: cannot resolve the dev edge host (registry edgeDomains.dev)");
   await deps.deployDev({ repo: t.repo, ref: t.ref });
-  await deps.control({ repo: t.repo, action: "cf-gate-allow", host: t.host, ip });
+  await deps.control({ repo: t.repo, action: "cf-gate-allow", host: t.host, ip, ip6 });
+  const allowed = ip6 ? `${ip} and your IPv6 /64 prefix (from ${ip6})` : `${ip} (IPv4 only \u2014 no public IPv6 detected)`;
   return {
     command: "stage --live",
     mode: "up",
@@ -24081,10 +24141,11 @@ async function runStageLiveUp(deps, t) {
     repo: t.repo,
     ref: t.ref,
     ip,
+    ip6,
     dispatched: ["tenant-deploy.yml", "tenant-control.yml"],
     // #2656: the gate now writes a skip+block pair and self-verifies from the runner (a non-allowed vantage),
     // so a gate that failed to close fails the run RED. The stage is private only once that gate run is green.
-    message: `dispatched the dev deploy of ${t.ref} and the Cloudflare edge gate for ${t.host} \u2192 ${ip}; watch the runs in ${STAGE_LIVE_HUB_REPO} Actions and treat the stage as private ONLY once the cf-gate-allow run is green (it self-verifies the host is blocked) \u2014 tear down with: mmi-cli stage --live --down --apply`
+    message: `dispatched the dev deploy of ${t.ref} and the Cloudflare edge gate for ${t.host} \u2192 ${allowed}; watch the runs in ${STAGE_LIVE_HUB_REPO} Actions and treat the stage as private ONLY once the cf-gate-allow run is green (it self-verifies the host is blocked) \u2014 tear down with: mmi-cli stage --live --down --apply`
   };
 }
 async function runStageLiveDown(deps, t) {
@@ -24221,13 +24282,13 @@ function registerStageCommands(program3) {
     }
     const rcDeps = registryClientDeps(await loadConfig());
     const deps = {
-      detectIp: () => detectPublicIp(),
+      detectIp: () => detectCallerIps(),
       deployDev: async ({ repo, ref }) => {
         const res = await tenantDeploy({ repo, stage: "dev", ref }, rcDeps);
         if (!res.ok) throw new Error(`dev deploy dispatch failed: ${res.body?.error ?? res.error ?? `HTTP ${res.status}`}`);
       },
-      control: async ({ repo, action, host, ip }) => {
-        const res = await tenantControl({ repo, stage: "dev", action, host, ip }, rcDeps);
+      control: async ({ repo, action, host, ip, ip6 }) => {
+        const res = await tenantControl({ repo, stage: "dev", action, host, ip, ip6 }, rcDeps);
         if (!res.ok) throw new Error(`runtime tenant control ${action} dispatch failed: ${res.body?.error ?? res.error ?? `HTTP ${res.status}`}`);
       }
     };
@@ -27862,13 +27923,16 @@ function registerSessionReport(program3) {
 // src/doctor-render.ts
 var RESTART_LINE = "\u21BB Restart Claude to finish.";
 var VERBOSE_INDENT = "    ";
+function checkGlyph(check) {
+  if (!check.ok) return "\u2717";
+  return check.verified === false ? "?" : "\u2713";
+}
 function renderCheckLine(check) {
-  if (check.ok) {
-    return check.detail ? `\u2713 ${check.label} \u2014 ${check.detail}` : `\u2713 ${check.label}`;
-  }
-  const head = check.detail ? `\u2717 ${check.label} \u2014 ${check.detail}` : `\u2717 ${check.label}`;
-  return check.fix ? `${head}
-${VERBOSE_INDENT}\u2192 ${check.fix}` : head;
+  const head = check.detail ? `${checkGlyph(check)} ${check.label} \u2014 ${check.detail}` : `${checkGlyph(check)} ${check.label}`;
+  const lines = [head];
+  if (check.fix) lines.push(`${VERBOSE_INDENT}\u2192 ${check.fix}`);
+  if (check.command) lines.push(`${VERBOSE_INDENT}${check.command}`);
+  return lines.join("\n");
 }
 function renderReport(checks, opts) {
   const lines = checks.map(renderCheckLine);
@@ -27877,8 +27941,14 @@ function renderReport(checks, opts) {
 }
 function renderTally(checks) {
   const total = checks.length;
-  const healthy = total - checks.filter((c) => !c.ok).length;
-  return healthy === total ? `\u2713 all ${total} checks healthy` : `\u2713 ${healthy} of ${total} checks healthy`;
+  const failed = checks.filter((c) => !c.ok).length;
+  const unverified = checks.filter((c) => c.ok && c.verified === false).length;
+  const healthy = total - failed - unverified;
+  if (failed === 0 && unverified === 0) return `\u2713 all ${total} checks healthy`;
+  const parts = [`\u2713 ${healthy} verified healthy`];
+  if (unverified > 0) parts.push(`? ${unverified} unverified`);
+  if (failed > 0) parts.push(`\u2717 ${failed} failed`);
+  return `${parts.join(" \xB7 ")} \u2014 ${total} checks`;
 }
 function doctorReportExitCode(checks) {
   return checks.some((c) => !c.ok && !c.reportOnly) ? 1 : 0;
@@ -28704,6 +28774,11 @@ function checkAwsIdentity(probe) {
   const arn = probe.callerArn?.trim();
   return {
     ok: !arn || !arn.endsWith(":root"),
+    // #4074: the row's claim is "this caller is not root", and with no ARN resolved there is no caller to
+    // make it about. `awsCallerArn` returns undefined for ANY failure — expired SSO, no `aws` binary, a
+    // timeout — so an empty result is "I could not look", never "I looked and it is fine". The evidence
+    // line below has said exactly that since #3485; the glyph now says it too.
+    verified: Boolean(arn),
     id: "aws-identity",
     label: "aws identity",
     fix: "use a non-root IAM user/session profile (set AWS_PROFILE or run: aws sso login), then verify `aws sts get-caller-identity` is not :root",
@@ -28738,13 +28813,25 @@ function checkCodexHookTrust(probe, displayName = "Codex") {
   if (probe.trusted) {
     return { id: "codex-hook-trust", ok: true, label, detail: "trusted", verbose: evidence };
   }
+  if (probe.requiredCount === 0) {
+    return {
+      id: "codex-hook-trust",
+      ok: true,
+      verified: false,
+      warn: true,
+      label,
+      detail: "no approval rows to read \u2014 the hook bundle could not be checked",
+      fix: `run \`mmi-cli plugin heal\`, restart ${displayName}, then review and trust MMI under \`/hooks\``,
+      verbose: evidence
+    };
+  }
   return {
     id: "codex-hook-trust",
     ok: true,
     warn: true,
     label,
-    detail: probe.requiredCount > 0 ? `${probe.trustedCount}/${probe.requiredCount} approval rows present \u2014 current hashes unverified` : "hook bundle could not be verified",
-    fix: probe.requiredCount > 0 ? `${displayName} does not allow silent hook approval; run \`/hooks\`, review the MMI commands, and trust them` : `run \`mmi-cli plugin heal\`, restart ${displayName}, then review and trust MMI under \`/hooks\``,
+    detail: `${probe.trustedCount}/${probe.requiredCount} approval rows present`,
+    fix: `${displayName} does not allow silent hook approval; run \`/hooks\`, review the MMI commands, and trust them`,
     verbose: evidence
   };
 }
@@ -28757,8 +28844,9 @@ function checkCliVersion(input, releasedNote) {
   if (!report.releasedVersion) {
     return {
       id: "cli-version",
-      ok: false,
-      reportOnly: true,
+      ok: true,
+      verified: false,
+      warn: true,
       label: "mmi-cli",
       detail: `${report.currentVersion} \u2014 freshness UNKNOWN, the published version could not be read`,
       fix: "check it directly: `mmi-cli --version` against `npm view @mutmutco/cli version`; update with `npm install -g @mutmutco/cli@<released>`",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.88.0",
+  "version": "3.90.0",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",