@mutmutco/installer-launcher 0.1.4 → 0.1.8

package/dist/launcher.js

@@ -88,20 +88,26 @@ function wrapWords(text, width) {
   if (line) lines.push(line);
   return lines.length ? lines : [""];
 }
-function createFace({ product, color = false, columns }) {
+function createFace({ product, color = false, columns, env = process.env }) {
   const identity = identityFor(product);
   const width = faceWidth(columns);
   const paint = (sgr, text) => color ? `\x1B[${sgr}m${text}\x1B[0m` : String(text);
   const bar = () => paint(PALETTE.muted, GLYPH.bar);
   const indent = " ".repeat(TITLE_COLUMN - 1);
-  const welcome = () => [
+  const continuedPhases = new Set((env.MM_FACE_CONTINUES ?? "").split(",").map((phase) => phase.trim()).filter(Boolean));
+  const continuesFace = continuedPhases.size > 0;
+  const welcome = () => continuesFace ? [] : [
     `${paint(identity.accent, GLYPH.diamond)}  ${paint(identity.accent, identity.name)} \u2014 Mutatis Mutandis`,
     bar(),
     `${bar()}  ${identity.warm}`,
     bar()
   ];
+  const continues = (phase, kind = "ok") => {
+    const inherited = continuedPhases.delete(String(phase).trim());
+    return kind === "fail" ? false : inherited;
+  };
   const step = (title, seconds = null, kind = "ok") => {
-    const glyph = kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.hollow) : paint(PALETTE.green, GLYPH.check);
+    const glyph = kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.dot) : paint(PALETTE.green, GLYPH.check);
     const time = seconds === null || seconds === void 0 ? "" : paint(PALETTE.muted, `${Math.max(0, Math.round(seconds))}s`);
     const column = Math.min(44, Math.max(0, width - 8));
     const reserved = time ? 6 : 0;
@@ -115,8 +121,7 @@ function createFace({ product, color = false, columns }) {
     const body = (Array.isArray(lines) ? lines : String(lines).split("\n")).flatMap((raw) => {
       const line = String(raw);
       if (visibleWidth(line) <= width - 6) return [line];
-      const lead = /^\s*/u.exec(line)?.[0] ?? "";
-      return wrapWords(line, width - 6 - lead.length).map((part) => `${lead}${part}`);
+      return wrapWords(line, width - 6);
     });
     const content = Math.min(width - 6, Math.max(...body.map(visibleWidth)));
     const rule = paint(identity.accent, GLYPH.rule.repeat(content + 4));
@@ -130,7 +135,7 @@ function createFace({ product, color = false, columns }) {
   };
   const signOff = () => `${paint(identity.accent, GLYPH.diamond)}  ${paint(identity.accent, `${identity.name} \xB7 Mutatis Mutandis`)}`;
   const refusal = (message) => `${bar()}  ${paint(identity.accent, GLYPH.cross)}  ${message}`;
-  return { identity, width, welcome, step, relay, receipt, signOff, refusal, paint };
+  return { identity, width, welcome, continues, step, relay, receipt, signOff, refusal, paint };
 }
 var RELAY_INDENT = " ".repeat(TITLE_COLUMN - 1);
 var FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
@@ -863,7 +868,7 @@ function wipeProductDir(dir) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "0.1.4" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "0.1.8" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -1075,20 +1080,58 @@ function needsShell(command) {
 function quoteForShell(arg) {
   return /[\s"&|<>^%]/.test(arg) ? `"${arg.replace(/"/g, '\\"')}"` : arg;
 }
+var SUPPORTED_PROGRESS_PROTOCOLS = /* @__PURE__ */ new Set([1]);
+function parseProgress(raw) {
+  if (raw === null || raw === void 0) return [];
+  const progress = [];
+  for (const line of raw.toString().split(/\r?\n/)) {
+    if (!line) continue;
+    try {
+      const message = JSON.parse(line);
+      if (!SUPPORTED_PROGRESS_PROTOCOLS.has(message.v) || typeof message.step !== "string") continue;
+      const state = message.state ?? "ok";
+      if (state !== "ok" && state !== "fail" && state !== "note") continue;
+      if (message.ms !== void 0 && typeof message.ms !== "number") continue;
+      progress.push({
+        step: message.step,
+        state,
+        ...typeof message.ms === "number" ? { ms: message.ms } : {}
+      });
+    } catch {
+    }
+  }
+  return progress;
+}
 function defaultRunEntry(entry, cwd, env) {
   const [command, ...args] = entry;
   const shell = needsShell(command);
   const commandLine = shell ? [command, ...args].map(quoteForShell).join(" ") : command;
-  const result = spawnSync2(commandLine, shell ? [] : args, {
+  const spawn2 = (progress2) => spawnSync2(commandLine, shell ? [] : args, {
     cwd,
-    stdio: "inherit",
+    stdio: progress2 ? ["inherit", "inherit", "inherit", "pipe"] : "inherit",
     shell,
-    env: env ?? process.env,
+    env: progress2 ? { ...env ?? process.env, MM_PROGRESS_FD: "3", MM_PROGRESS_PROTOCOL: "1" } : env ?? process.env,
     windowsHide: true
   });
+  let result;
+  if (process.platform === "win32" && shell) {
+    result = spawn2(false);
+  } else {
+    try {
+      result = spawn2(true);
+    } catch {
+      result = spawn2(false);
+    }
+  }
   if (result.error) return { ok: false, error: result.error.message };
   const code = typeof result.status === "number" ? result.status : void 0;
-  return { ok: result.status === 0, error: result.status === 0 ? void 0 : `exit code ${result.status}`, code };
+  const progress = parseProgress(result.output?.[3]);
+  return {
+    ok: result.status === 0,
+    error: result.status === 0 ? void 0 : `exit code ${result.status}`,
+    code,
+    ...progress.length > 0 ? { progress } : {}
+  };
 }
 function faceProduct(config) {
   const known = { mmi: "mmi-hub", jerv: "jerv-hub" };
@@ -1110,9 +1153,13 @@ function faceFor(config, options) {
 function since(start) {
   return (Date.now() - start) / 1e3;
 }
+function outerConsoleOwnsOutcome() {
+  return process.env.MM_OUTER_CONSOLE === "1";
+}
 function printReceipt(face, config, print, ready, lines) {
   const name = face ? face.identity.name : config.product;
   const headline = ready ? `${name} is ready.` : `${name} is installed, but not ready yet.`;
+  if (ready && outerConsoleOwnsOutcome()) return;
   if (!face) {
     print(headline);
     for (const line of lines) print(line.trim());
@@ -1125,6 +1172,11 @@ function printReceipt(face, config, print, ready, lines) {
 function printStep(face, print, title, seconds, kind = "ok") {
   print(face ? face.step(title, seconds, kind) : title);
 }
+function printProgress(face, print, progress) {
+  for (const message of progress ?? []) {
+    printStep(face, print, message.step, message.ms === void 0 ? null : message.ms / 1e3, message.state);
+  }
+}
 async function doInstall(config, dir, options, print) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const face = faceFor(config, options);
@@ -1139,7 +1191,7 @@ async function doInstall(config, dir, options, print) {
 async function doUpdate(config, dir, options, print) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const face = faceFor(config, options);
-  if (face) for (const line of face.welcome()) print(line);
+  if (face && !outerConsoleOwnsOutcome()) for (const line of face.welcome()) print(line);
   const accessToken = await fetchAccessTokenOrLogin(config, dir, options, print);
   const started = Date.now();
   const manifest = await fetchVerifiedManifest(config, accessToken, fetchImpl);
@@ -1178,8 +1230,8 @@ function finishLastMile(config, dir, options, print, face, version) {
   const payload = payloadDir(dir);
   if (!entry) {
     printReceipt(face, config, print, true, [
-      `    Installed ${version} into ${dir}`,
-      `    next step: run ${join4(payload, config.binName)} to start ${config.product}.`
+      `Installed ${version} into ${dir}`,
+      `next step: run ${join4(payload, config.binName)} to start ${config.product}.`
     ]);
     return 0;
   }
@@ -1188,19 +1240,20 @@ function finishLastMile(config, dir, options, print, face, version) {
   if (dataFile) {
     printStep(face, print, `The payload names ${dataFile} as its command, but that is a file, not a program`, null, "fail");
     printReceipt(face, config, print, false, [
-      `    Downloaded ${version} into ${dir}`,
-      `    This payload was built wrong: its entry must be a command, not one of its own files.`,
-      `    Nothing on this machine can finish it \u2014 report it to the ${config.product} maintainers.`
+      `Downloaded ${version} into ${dir}`,
+      `This payload was built wrong: its entry must be a command, not one of its own files.`,
+      `Nothing on this machine can finish it \u2014 report it to the ${config.product} maintainers.`
     ]);
     return 2;
   }
   const started = Date.now();
   const result = (options.runEntry ?? defaultRunEntry)(command, payload, payloadEnv(dir));
+  printProgress(face, print, result.progress);
   if (result.ok) {
     printStep(face, print, "Armed this machine", since(started));
     printReceipt(face, config, print, true, [
-      `    Installed ${version} into ${dir}`,
-      `    Check health any time:  ${config.binName} doctor`
+      `Installed ${version} into ${dir}`,
+      `Check health any time:  ${config.binName} doctor`
     ]);
     return 0;
   }
@@ -1213,8 +1266,8 @@ function finishLastMile(config, dir, options, print, face, version) {
     "fail"
   );
   printReceipt(face, config, print, false, [
-    `    Downloaded ${version} into ${dir}`,
-    `    Finish it with:  (cd ${payload} && ${command.join(" ")})`
+    `Downloaded ${version} into ${dir}`,
+    `Finish it with:  (cd ${payload} && ${command.join(" ")})`
   ]);
   return code;
 }

package/dist/launcher.sea.cjs

@@ -118,20 +118,26 @@ function wrapWords(text, width) {
   if (line) lines.push(line);
   return lines.length ? lines : [""];
 }
-function createFace({ product, color = false, columns }) {
+function createFace({ product, color = false, columns, env = process.env }) {
   const identity = identityFor(product);
   const width = faceWidth(columns);
   const paint = (sgr, text) => color ? `\x1B[${sgr}m${text}\x1B[0m` : String(text);
   const bar = () => paint(PALETTE.muted, GLYPH.bar);
   const indent = " ".repeat(TITLE_COLUMN - 1);
-  const welcome = () => [
+  const continuedPhases = new Set((env.MM_FACE_CONTINUES ?? "").split(",").map((phase) => phase.trim()).filter(Boolean));
+  const continuesFace = continuedPhases.size > 0;
+  const welcome = () => continuesFace ? [] : [
     `${paint(identity.accent, GLYPH.diamond)}  ${paint(identity.accent, identity.name)} \u2014 Mutatis Mutandis`,
     bar(),
     `${bar()}  ${identity.warm}`,
     bar()
   ];
+  const continues = (phase, kind = "ok") => {
+    const inherited = continuedPhases.delete(String(phase).trim());
+    return kind === "fail" ? false : inherited;
+  };
   const step = (title, seconds = null, kind = "ok") => {
-    const glyph = kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.hollow) : paint(PALETTE.green, GLYPH.check);
+    const glyph = kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.dot) : paint(PALETTE.green, GLYPH.check);
     const time = seconds === null || seconds === void 0 ? "" : paint(PALETTE.muted, `${Math.max(0, Math.round(seconds))}s`);
     const column = Math.min(44, Math.max(0, width - 8));
     const reserved = time ? 6 : 0;
@@ -145,8 +151,7 @@ function createFace({ product, color = false, columns }) {
     const body = (Array.isArray(lines) ? lines : String(lines).split("\n")).flatMap((raw) => {
       const line = String(raw);
       if (visibleWidth(line) <= width - 6) return [line];
-      const lead = /^\s*/u.exec(line)?.[0] ?? "";
-      return wrapWords(line, width - 6 - lead.length).map((part) => `${lead}${part}`);
+      return wrapWords(line, width - 6);
     });
     const content = Math.min(width - 6, Math.max(...body.map(visibleWidth)));
     const rule = paint(identity.accent, GLYPH.rule.repeat(content + 4));
@@ -160,7 +165,7 @@ function createFace({ product, color = false, columns }) {
   };
   const signOff = () => `${paint(identity.accent, GLYPH.diamond)}  ${paint(identity.accent, `${identity.name} \xB7 Mutatis Mutandis`)}`;
   const refusal = (message) => `${bar()}  ${paint(identity.accent, GLYPH.cross)}  ${message}`;
-  return { identity, width, welcome, step, relay, receipt, signOff, refusal, paint };
+  return { identity, width, welcome, continues, step, relay, receipt, signOff, refusal, paint };
 }
 var RELAY_INDENT = " ".repeat(TITLE_COLUMN - 1);
 var FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
@@ -894,7 +899,7 @@ function wipeProductDir(dir) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "0.1.4" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "0.1.8" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -1106,20 +1111,58 @@ function needsShell(command) {
 function quoteForShell(arg) {
   return /[\s"&|<>^%]/.test(arg) ? `"${arg.replace(/"/g, '\\"')}"` : arg;
 }
+var SUPPORTED_PROGRESS_PROTOCOLS = /* @__PURE__ */ new Set([1]);
+function parseProgress(raw) {
+  if (raw === null || raw === void 0) return [];
+  const progress = [];
+  for (const line of raw.toString().split(/\r?\n/)) {
+    if (!line) continue;
+    try {
+      const message = JSON.parse(line);
+      if (!SUPPORTED_PROGRESS_PROTOCOLS.has(message.v) || typeof message.step !== "string") continue;
+      const state = message.state ?? "ok";
+      if (state !== "ok" && state !== "fail" && state !== "note") continue;
+      if (message.ms !== void 0 && typeof message.ms !== "number") continue;
+      progress.push({
+        step: message.step,
+        state,
+        ...typeof message.ms === "number" ? { ms: message.ms } : {}
+      });
+    } catch {
+    }
+  }
+  return progress;
+}
 function defaultRunEntry(entry, cwd, env) {
   const [command, ...args] = entry;
   const shell = needsShell(command);
   const commandLine = shell ? [command, ...args].map(quoteForShell).join(" ") : command;
-  const result = (0, import_node_child_process3.spawnSync)(commandLine, shell ? [] : args, {
+  const spawn2 = (progress2) => (0, import_node_child_process3.spawnSync)(commandLine, shell ? [] : args, {
     cwd,
-    stdio: "inherit",
+    stdio: progress2 ? ["inherit", "inherit", "inherit", "pipe"] : "inherit",
     shell,
-    env: env ?? process.env,
+    env: progress2 ? { ...env ?? process.env, MM_PROGRESS_FD: "3", MM_PROGRESS_PROTOCOL: "1" } : env ?? process.env,
     windowsHide: true
   });
+  let result;
+  if (process.platform === "win32" && shell) {
+    result = spawn2(false);
+  } else {
+    try {
+      result = spawn2(true);
+    } catch {
+      result = spawn2(false);
+    }
+  }
   if (result.error) return { ok: false, error: result.error.message };
   const code = typeof result.status === "number" ? result.status : void 0;
-  return { ok: result.status === 0, error: result.status === 0 ? void 0 : `exit code ${result.status}`, code };
+  const progress = parseProgress(result.output?.[3]);
+  return {
+    ok: result.status === 0,
+    error: result.status === 0 ? void 0 : `exit code ${result.status}`,
+    code,
+    ...progress.length > 0 ? { progress } : {}
+  };
 }
 function faceProduct(config) {
   const known = { mmi: "mmi-hub", jerv: "jerv-hub" };
@@ -1141,9 +1184,13 @@ function faceFor(config, options) {
 function since(start) {
   return (Date.now() - start) / 1e3;
 }
+function outerConsoleOwnsOutcome() {
+  return process.env.MM_OUTER_CONSOLE === "1";
+}
 function printReceipt(face, config, print, ready, lines) {
   const name = face ? face.identity.name : config.product;
   const headline = ready ? `${name} is ready.` : `${name} is installed, but not ready yet.`;
+  if (ready && outerConsoleOwnsOutcome()) return;
   if (!face) {
     print(headline);
     for (const line of lines) print(line.trim());
@@ -1156,6 +1203,11 @@ function printReceipt(face, config, print, ready, lines) {
 function printStep(face, print, title, seconds, kind = "ok") {
   print(face ? face.step(title, seconds, kind) : title);
 }
+function printProgress(face, print, progress) {
+  for (const message of progress ?? []) {
+    printStep(face, print, message.step, message.ms === void 0 ? null : message.ms / 1e3, message.state);
+  }
+}
 async function doInstall(config, dir, options, print) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const face = faceFor(config, options);
@@ -1170,7 +1222,7 @@ async function doInstall(config, dir, options, print) {
 async function doUpdate(config, dir, options, print) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const face = faceFor(config, options);
-  if (face) for (const line of face.welcome()) print(line);
+  if (face && !outerConsoleOwnsOutcome()) for (const line of face.welcome()) print(line);
   const accessToken = await fetchAccessTokenOrLogin(config, dir, options, print);
   const started = Date.now();
   const manifest = await fetchVerifiedManifest(config, accessToken, fetchImpl);
@@ -1209,8 +1261,8 @@ function finishLastMile(config, dir, options, print, face, version) {
   const payload = payloadDir(dir);
   if (!entry) {
     printReceipt(face, config, print, true, [
-      `    Installed ${version} into ${dir}`,
-      `    next step: run ${(0, import_node_path4.join)(payload, config.binName)} to start ${config.product}.`
+      `Installed ${version} into ${dir}`,
+      `next step: run ${(0, import_node_path4.join)(payload, config.binName)} to start ${config.product}.`
     ]);
     return 0;
   }
@@ -1219,19 +1271,20 @@ function finishLastMile(config, dir, options, print, face, version) {
   if (dataFile) {
     printStep(face, print, `The payload names ${dataFile} as its command, but that is a file, not a program`, null, "fail");
     printReceipt(face, config, print, false, [
-      `    Downloaded ${version} into ${dir}`,
-      `    This payload was built wrong: its entry must be a command, not one of its own files.`,
-      `    Nothing on this machine can finish it \u2014 report it to the ${config.product} maintainers.`
+      `Downloaded ${version} into ${dir}`,
+      `This payload was built wrong: its entry must be a command, not one of its own files.`,
+      `Nothing on this machine can finish it \u2014 report it to the ${config.product} maintainers.`
     ]);
     return 2;
   }
   const started = Date.now();
   const result = (options.runEntry ?? defaultRunEntry)(command, payload, payloadEnv(dir));
+  printProgress(face, print, result.progress);
   if (result.ok) {
     printStep(face, print, "Armed this machine", since(started));
     printReceipt(face, config, print, true, [
-      `    Installed ${version} into ${dir}`,
-      `    Check health any time:  ${config.binName} doctor`
+      `Installed ${version} into ${dir}`,
+      `Check health any time:  ${config.binName} doctor`
     ]);
     return 0;
   }
@@ -1244,8 +1297,8 @@ function finishLastMile(config, dir, options, print, face, version) {
     "fail"
   );
   printReceipt(face, config, print, false, [
-    `    Downloaded ${version} into ${dir}`,
-    `    Finish it with:  (cd ${payload} && ${command.join(" ")})`
+    `Downloaded ${version} into ${dir}`,
+    `Finish it with:  (cd ${payload} && ${command.join(" ")})`
   ]);
   return code;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/installer-launcher",
-  "version": "0.1.4",
+  "version": "0.1.8",
   "description": "Single-executable (SEA) launcher: sign-in, gated payload fetch, self-update. One copy ships per product.",
   "type": "module",
   "license": "UNLICENSED",
@@ -34,6 +34,6 @@
     "vitest": "^4.1.0"
   },
   "dependencies": {
-    "@mutmutco/installer-face": "^0.2.1"
+    "@mutmutco/installer-face": "^0.2.3"
   }
 }