@mutmutco/hub 4.4.12 → 4.4.14

package/dist/index.cjs

@@ -282,7 +282,26 @@ var RELAY_INDENT = " ".repeat(TITLE_COLUMN - 1);
 // ../installer/face/src/spinner.ts
 var import_node_fs2 = require("node:fs");
 var import_node_worker_threads = require("node:worker_threads");
-var FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
+
+// ../installer/face/src/encoding.ts
+var UNICODE_SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
+var ASCII_SPINNER_FRAMES = Object.freeze(["-", "\\", "|", "/"]);
+function consoleRendersUnicode(env = process.env, platform = process.platform) {
+  if (env.MM_FACE_ASCII === "1" || env.NO_UNICODE === "1") return false;
+  const locale = env.LC_ALL || env.LC_CTYPE || env.LANG || "";
+  if (locale === "C" || locale === "POSIX" || /^C\./u.test(locale) || /^POSIX\./u.test(locale)) return false;
+  if (/cp437|ibm437|\b437\b/iu.test(locale)) return false;
+  if (/utf-?8/iu.test(locale)) return true;
+  if (platform === "win32") {
+    return Boolean(env.WT_SESSION) || env.TERM_PROGRAM === "vscode" || env.CHCP === "65001" || env.ConEmuANSI === "ON";
+  }
+  return true;
+}
+function spinnerFramesFor(env = process.env, platform = process.platform) {
+  return consoleRendersUnicode(env, platform) ? UNICODE_SPINNER_FRAMES : ASCII_SPINNER_FRAMES;
+}
+
+// ../installer/face/src/spinner.ts
 var WORKER_SOURCE = `
 const { parentPort, workerData } = require('node:worker_threads');
 const { writeSync, appendFileSync } = require('node:fs');
@@ -307,8 +326,10 @@ parentPort.on('message', (next) => {
 });
 setInterval(draw, workerData.intervalMs);
 `;
-function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath }) {
+function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath, env = process.env, platform = process.platform }) {
   animate = animate && !face.nested && !face.emitsProgress;
+  const glyphs = spinnerFramesFor(env, platform);
+  const ascii = glyphs[0] === ASCII_SPINNER_FRAMES[0];
   let timer = null;
   let worker = null;
   let control = null;
@@ -326,7 +347,8 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath
   };
   const render = (text, measure) => {
     const line = face.step(text, measure ?? "__elapsed__", "note").split("\n")[0];
-    frames = line ? FRAMES.map((glyph) => `\r\x1B[2K${line.replace(GLYPH.dot, glyph)}`) : [];
+    const prepared = line && ascii ? line.replaceAll(GLYPH.bar, "|") : line;
+    frames = prepared ? glyphs.map((glyph) => `\r\x1B[2K${prepared.replace(GLYPH.dot, glyph)}`) : [];
   };
   const draw = () => {
     if (animate && !suspended && frames.length) write(frames[frame++ % frames.length].replace("__elapsed__", `${Math.floor((Date.now() - started) / 1e3)}s`));
@@ -403,7 +425,6 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath
     }
   };
 }
-var SPINNER_FRAMES = Object.freeze([...FRAMES]);
 
 // ../installer/face/src/conformance.ts
 var ALLOWED = new Set(Object.values(GLYPH));
@@ -634,6 +655,14 @@ var PHASES = {
   doctor: ["Checking health", "Checked health"],
   rollback: ["Restoring the previous version", "Restored the previous version"]
 };
+var UPDATE_CHECK_PHASES = /* @__PURE__ */ new Set([
+  "preflight",
+  "resolve",
+  "verify-release",
+  "download",
+  "sign-in",
+  "check"
+]);
 function createInstallerRun(value, options = {}) {
   const declaration = validateInstallerProduct(value);
   const env = options.env ?? process.env;
@@ -669,6 +698,7 @@ function createInstallerRun(value, options = {}) {
   };
   const spinner = createSpinner(face, {
     animate: tty && env.TERM !== "dumb" && (options.animate ?? Boolean(process.stderr.isTTY)),
+    env,
     ...options.write ? { stream: { write: (text) => {
       emit(String(text), "spinner");
       return true;
@@ -687,6 +717,7 @@ function createInstallerRun(value, options = {}) {
   };
   let started = false;
   let finished = false;
+  let operation = options.operation;
   const start = () => {
     if (started || finished) return;
     started = true;
@@ -694,7 +725,7 @@ function createInstallerRun(value, options = {}) {
     const welcome = face.welcome();
     if (tty) lines(welcome);
     else if (welcome.length) {
-      const warm = options.operation === "install" ? face.identity.installWarm : face.identity.warm;
+      const warm = operation === "install" ? face.identity.installWarm : face.identity.warm;
       lines([`${face.identity.name} - Mutatis Mutandis`, warm.replaceAll("\u2014", "-").replaceAll("\u2026", "...")]);
     }
   };
@@ -710,13 +741,20 @@ function createInstallerRun(value, options = {}) {
     get errors() {
       return [...errors];
     },
+    get operation() {
+      return operation;
+    },
+    set operation(value2) {
+      operation = value2;
+    },
     start,
     phase(id, facts = {}) {
       if (finished) throw new Error("installer run already finished");
       if (!Object.hasOwn(PHASES, id)) throw new Error("installer run: unknown phase");
       start();
       const state = facts.state ?? "ok";
-      const title = PHASES[id][state === "ok" ? 1 : 0];
+      const fold = operation === "update" && UPDATE_CHECK_PHASES.has(id) && state !== "fail";
+      const title = PHASES[fold ? "check" : id][state === "ok" ? 1 : 0];
       if (state === "running") {
         if (face.progress(title, facts.measure ?? null)) return;
         if (activeTitle === title) spinner.say(title, facts.measure ?? null);
@@ -726,6 +764,10 @@ function createInstallerRun(value, options = {}) {
         }
         return;
       }
+      if (fold && id !== "check") {
+        if (facts.detail) run.relay(facts.detail);
+        return;
+      }
       if (!face.continues(id, state)) durable(title, facts.seconds ?? facts.measure ?? null, state);
       if (facts.detail) run.relay(facts.detail);
     },
@@ -881,6 +923,7 @@ async function runMaintenance(product, args, dependencies) {
     quiet,
     operation: installed ? "install" : "update"
   });
+  if (run) run.operation = installed ? "install" : "update";
   if (!quiet) run?.start();
   let active;
   let activeFacts;
@@ -3118,6 +3161,9 @@ async function reconcile(options) {
     options.narrate?.(line);
     options.onPhase?.(line);
   };
+  const phase = (id, state, detail) => {
+    options.onPhaseEvent?.({ id, state, ...detail ? { detail } : {} });
+  };
   const run = `${(/* @__PURE__ */ new Date()).toISOString()}-${process.pid}`;
   const paths = ensureState(env);
   const repoUrl = env.MMI_UPDATER_REPO || REPO_URL_DEFAULT;
@@ -3139,6 +3185,7 @@ async function reconcile(options) {
     say("acquiring single-writer lease");
     const leaseWaitMs = Number(env.MMI_UPDATER_LEASE_WAIT_MS) || void 0;
     return await withLease(paths.leasePath, async () => {
+      phase("preflight", "running");
       const journalEvents = parseJournal(paths.journalPath);
       if (!options.dryRun) {
         const pendingBefore = readPending(paths);
@@ -3150,6 +3197,8 @@ async function reconcile(options) {
       summary.reap = reap({ paths, dryRun: options.dryRun, env });
       for (const row of summary.reap) journal({ kind: "reap", surface: row.category, verdict: row.verdict, count: row.reaped, detail: row.detail, durationMs: row.durationMs });
       for (const row of summary.reap.filter((entry) => entry.verdict !== "skip")) say(`reap ${row.category}: ${row.verdict}${row.detail ? " \u2014 " + row.detail : ""}`);
+      phase("preflight", "ok");
+      phase("resolve", "running");
       if (shipped) {
         say(`shipped target v${shipped} \u2014 the payload is the release; no npm poll, no gate`);
         summary.target = shipped;
@@ -3208,7 +3257,9 @@ async function reconcile(options) {
         }
       }
       say(`target v${summary.target} (${summary.gate})`);
+      phase("resolve", "ok");
       options.onTargetResolved?.(summary.target, summary.gate);
+      phase("check", "running");
       say("updater: self-bootstrap");
       const selfStartedAt = import_node_perf_hooks2.performance.now();
       const self = npmGlobalArm({
@@ -3271,6 +3322,7 @@ async function reconcile(options) {
           journal({ kind: "surface", surface: probe.id, present: true, verdict: "skip", detail: `present, its converge arm has not landed yet (target ${summary.target})` });
         }
       }
+      phase("check", "ok");
       return summary;
     }, leaseWaitMs);
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/hub",
-  "version": "4.4.12",
+  "version": "4.4.14",
   "description": "Install and maintain the MMI CLI and every present host surface from one release-gated Hub command.",
   "type": "module",
   "license": "UNLICENSED",