@mutmutco/installer-launcher 1.2.1 → 1.2.3

package/dist/launcher.js

@@ -896,35 +896,17 @@ var plainText = (text) => String(text).replaceAll("\u2192", "->").replaceAll("\x
 
 // ../face/src/spinner.ts
 import { appendFileSync as appendFileSync2, writeSync as writeSync2 } from "node:fs";
+import { isatty } from "node:tty";
 import { Worker } from "node:worker_threads";
 
 // ../face/src/encoding.ts
-import { execFileSync } from "node:child_process";
 var UNICODE_SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
 var ASCII_SPINNER_FRAMES = Object.freeze(["-", "\\", "|", "/"]);
-var cachedCodePage;
-function consoleOutputCodePage() {
-  if (cachedCodePage !== void 0) return cachedCodePage;
-  cachedCodePage = null;
-  try {
-    const out = execFileSync("chcp.com", { windowsHide: true, encoding: "utf8", timeout: 5e3 });
-    const pages = [...String(out).matchAll(/(\d{3,5})/gu)].map((m) => Number(m[1]));
-    cachedCodePage = pages.length ? pages[pages.length - 1] : null;
-  } catch {
-    cachedCodePage = null;
-  }
-  return cachedCodePage;
-}
-function consoleRendersUnicode(env = process.env, platform = process.platform, codePage = platform === "win32" ? consoleOutputCodePage() : null) {
+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") {
-    if (env.WT_SESSION || env.ConEmuANSI === "ON") return true;
-    return codePage === 65001;
-  }
   return true;
 }
 function spinnerFramesFor(env = process.env, platform = process.platform) {
@@ -935,6 +917,8 @@ function spinnerFramesFor(env = process.env, platform = process.platform) {
 var WORKER_SOURCE = `
 const { parentPort, workerData } = require('node:worker_threads');
 const { writeSync, appendFileSync } = require('node:fs');
+const wide = workerData.wide ? new (require('node:tty').WriteStream)(2) : null;
+const put = (text) => wide ? wide.write(text) : writeSync(2, text);
 const control = new Int32Array(workerData.control);
 let frames = workerData.frames, frame = workerData.frame;
 function draw() {
@@ -942,7 +926,7 @@ function draw() {
   try {
     if (Atomics.load(control, 0) || Atomics.load(control, 2) || !frames.length) return;
     const text = frames[frame++ % frames.length].replace('__elapsed__', Math.floor((Date.now() - workerData.started) / 1000) + 's');
-    writeSync(2, text);
+    put(text);
     if (workerData.transcriptPath) appendFileSync(workerData.transcriptPath, JSON.stringify({ channel: 'spinner', text }) + '\\n');
   } finally {
     Atomics.store(control, 1, 0);
@@ -967,10 +951,12 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath,
   let frame = 0;
   let started = 0;
   let suspended = false;
+  const wide = process.platform === "win32" && isatty(2);
   const write = (text) => {
     if (stream) stream.write(text);
     else {
-      writeSync2(2, text);
+      if (wide) process.stderr.write(`\x1B[1G${text}`);
+      else writeSync2(2, text);
       if (transcriptPath) appendFileSync2(transcriptPath, `${JSON.stringify({ channel: "spinner", text })}
 `);
     }
@@ -1017,7 +1003,8 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath,
             frame,
             intervalMs,
             transcriptPath,
-            started
+            started,
+            wide
           } });
           const active = worker;
           worker.on("error", () => {
@@ -1853,7 +1840,8 @@ async function refreshLauncher(target, options = {}) {
   if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
   if (options.dryRun) return arm("ok", record.version, "");
   let unlock;
-  if (!options.lockHeld) {
+  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
+  if (!lockHeld) {
     try {
       unlock = lockInstallation(productDir);
     } catch {
@@ -2158,7 +2146,7 @@ function page(title, body) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "1.2.1" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "1.2.3" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2604,6 +2592,7 @@ async function installOrUpdateRun(config, dir, options, print, update, flags2, m
       fetch: fetchImpl,
       readVersion: async () => LAUNCHER_VERSION
     }) : null;
+    if (arm) process.env.MM_LAUNCHER_REFRESHED = "1";
     if (arm) {
       installer.surface({
         id: LAUNCHER_SURFACE,

package/dist/launcher.sea.cjs

@@ -710,7 +710,7 @@ async function installAcquisition(dir, candidate, version, acquisition, options)
 }
 
 // src/index.ts
-var import_node_child_process6 = require("node:child_process");
+var import_node_child_process5 = require("node:child_process");
 var import_node_fs12 = require("node:fs");
 var import_node_os5 = require("node:os");
 var import_node_path7 = require("node:path");
@@ -930,35 +930,17 @@ var plainText = (text) => String(text).replaceAll("\u2192", "->").replaceAll("\x
 
 // ../face/src/spinner.ts
 var import_node_fs7 = require("node:fs");
+var import_node_tty = require("node:tty");
 var import_node_worker_threads = require("node:worker_threads");
 
 // ../face/src/encoding.ts
-var import_node_child_process2 = require("node:child_process");
 var UNICODE_SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
 var ASCII_SPINNER_FRAMES = Object.freeze(["-", "\\", "|", "/"]);
-var cachedCodePage;
-function consoleOutputCodePage() {
-  if (cachedCodePage !== void 0) return cachedCodePage;
-  cachedCodePage = null;
-  try {
-    const out = (0, import_node_child_process2.execFileSync)("chcp.com", { windowsHide: true, encoding: "utf8", timeout: 5e3 });
-    const pages = [...String(out).matchAll(/(\d{3,5})/gu)].map((m) => Number(m[1]));
-    cachedCodePage = pages.length ? pages[pages.length - 1] : null;
-  } catch {
-    cachedCodePage = null;
-  }
-  return cachedCodePage;
-}
-function consoleRendersUnicode(env = process.env, platform = process.platform, codePage = platform === "win32" ? consoleOutputCodePage() : null) {
+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") {
-    if (env.WT_SESSION || env.ConEmuANSI === "ON") return true;
-    return codePage === 65001;
-  }
   return true;
 }
 function spinnerFramesFor(env = process.env, platform = process.platform) {
@@ -969,6 +951,8 @@ function spinnerFramesFor(env = process.env, platform = process.platform) {
 var WORKER_SOURCE = `
 const { parentPort, workerData } = require('node:worker_threads');
 const { writeSync, appendFileSync } = require('node:fs');
+const wide = workerData.wide ? new (require('node:tty').WriteStream)(2) : null;
+const put = (text) => wide ? wide.write(text) : writeSync(2, text);
 const control = new Int32Array(workerData.control);
 let frames = workerData.frames, frame = workerData.frame;
 function draw() {
@@ -976,7 +960,7 @@ function draw() {
   try {
     if (Atomics.load(control, 0) || Atomics.load(control, 2) || !frames.length) return;
     const text = frames[frame++ % frames.length].replace('__elapsed__', Math.floor((Date.now() - workerData.started) / 1000) + 's');
-    writeSync(2, text);
+    put(text);
     if (workerData.transcriptPath) appendFileSync(workerData.transcriptPath, JSON.stringify({ channel: 'spinner', text }) + '\\n');
   } finally {
     Atomics.store(control, 1, 0);
@@ -1001,10 +985,12 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath,
   let frame = 0;
   let started = 0;
   let suspended = false;
+  const wide = process.platform === "win32" && (0, import_node_tty.isatty)(2);
   const write = (text) => {
     if (stream) stream.write(text);
     else {
-      (0, import_node_fs7.writeSync)(2, text);
+      if (wide) process.stderr.write(`\x1B[1G${text}`);
+      else (0, import_node_fs7.writeSync)(2, text);
       if (transcriptPath) (0, import_node_fs7.appendFileSync)(transcriptPath, `${JSON.stringify({ channel: "spinner", text })}
 `);
     }
@@ -1051,7 +1037,8 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath,
             frame,
             intervalMs,
             transcriptPath,
-            started
+            started,
+            wide
           } });
           const active = worker;
           worker.on("error", () => {
@@ -1587,7 +1574,7 @@ var plain = (text, lane) => lane.tty ? String(text) : plainText(stripColor(Strin
 var rowTitle = (row) => `${row.surface}${row.aspect ? ` ${row.aspect}` : ""}${row.instance ? ` \xB7 ${row.instance}` : ""} ${row.state}`;
 
 // src/autoupdate.ts
-var import_node_child_process3 = require("node:child_process");
+var import_node_child_process2 = require("node:child_process");
 var import_node_fs10 = require("node:fs");
 var import_node_os3 = require("node:os");
 var import_node_path5 = require("node:path");
@@ -1597,7 +1584,7 @@ function schedulePlatform(override) {
   return null;
 }
 function defaultExec(command2, args) {
-  const result = (0, import_node_child_process3.spawnSync)(command2, args, { encoding: "utf8", windowsHide: true });
+  const result = (0, import_node_child_process2.spawnSync)(command2, args, { encoding: "utf8", windowsHide: true });
   if (result.error) return { code: 1, stdout: "", stderr: result.error.message };
   return {
     code: typeof result.status === "number" ? result.status : 1,
@@ -1777,7 +1764,7 @@ function firstLine(text) {
 }
 
 // src/refresh.ts
-var import_node_child_process4 = require("node:child_process");
+var import_node_child_process3 = require("node:child_process");
 var import_node_fs11 = require("node:fs");
 var import_node_os4 = require("node:os");
 var import_node_path6 = require("node:path");
@@ -1846,7 +1833,7 @@ function parseLauncherVersion(stdout, bin) {
 }
 function runVersion(path, bin) {
   return new Promise((resolve3) => {
-    (0, import_node_child_process4.execFile)(path, ["--version"], { timeout: 3e4, windowsHide: true, encoding: "utf8" }, (error, stdout) => {
+    (0, import_node_child_process3.execFile)(path, ["--version"], { timeout: 3e4, windowsHide: true, encoding: "utf8" }, (error, stdout) => {
       resolve3(error ? null : parseLauncherVersion(stdout, bin));
     });
   });
@@ -1887,7 +1874,8 @@ async function refreshLauncher(target, options = {}) {
   if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
   if (options.dryRun) return arm("ok", record.version, "");
   let unlock;
-  if (!options.lockHeld) {
+  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
+  if (!lockHeld) {
     try {
       unlock = lockInstallation(productDir);
     } catch {
@@ -1932,14 +1920,14 @@ async function refreshLauncher(target, options = {}) {
 }
 
 // src/login-github.ts
-var import_node_child_process5 = require("node:child_process");
+var import_node_child_process4 = require("node:child_process");
 var realSleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
 function openBrowser(url) {
   if (process.env.LAUNCHER_NO_OPEN === "1") return;
   const opener = process.platform === "darwin" ? "open" : process.platform === "win32" ? "rundll32" : "xdg-open";
   const args = process.platform === "win32" ? ["url.dll,FileProtocolHandler", url] : [url];
   try {
-    const child = (0, import_node_child_process5.spawn)(opener, args, { detached: true, stdio: "ignore", windowsHide: true });
+    const child = (0, import_node_child_process4.spawn)(opener, args, { detached: true, stdio: "ignore", windowsHide: true });
     child.on("error", () => {
     });
     child.unref();
@@ -2057,7 +2045,7 @@ async function refreshAccessToken(config, refreshToken, fetchImpl = fetch) {
 }
 function readGhToken() {
   try {
-    const result = (0, import_node_child_process5.spawnSync)("gh", ["auth", "token", "--hostname", "github.com"], { encoding: "utf8", timeout: 1e4, windowsHide: true });
+    const result = (0, import_node_child_process4.spawnSync)("gh", ["auth", "token", "--hostname", "github.com"], { encoding: "utf8", timeout: 1e4, windowsHide: true });
     const token = result.status === 0 ? String(result.stdout).trim() : "";
     return token && !/\s/u.test(token) ? token : null;
   } catch {
@@ -2192,7 +2180,7 @@ function page(title, body) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "1.2.1" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "1.2.3" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2568,7 +2556,7 @@ function defaultRunEntry(entry2, cwd, env) {
   const [command2, ...args] = entry2;
   const shell = needsShell(command2);
   const commandLine = shell ? [command2, ...args].map(quoteForShell).join(" ") : command2;
-  const spawnEntry = (progress2) => (0, import_node_child_process6.spawnSync)(commandLine, shell ? [] : args, {
+  const spawnEntry = (progress2) => (0, import_node_child_process5.spawnSync)(commandLine, shell ? [] : args, {
     cwd,
     stdio: progress2 ? ["inherit", "inherit", "inherit", "pipe"] : "inherit",
     shell,
@@ -2638,6 +2626,7 @@ async function installOrUpdateRun(config, dir, options, print, update, flags2, m
       fetch: fetchImpl,
       readVersion: async () => LAUNCHER_VERSION
     }) : null;
+    if (arm) process.env.MM_LAUNCHER_REFRESHED = "1";
     if (arm) {
       installer.surface({
         id: LAUNCHER_SURFACE,
@@ -2859,7 +2848,7 @@ async function runInstallEntry(entry2, cwd, env, installer, tokens = null) {
   const redact = (text) => secrets.reduce((safe, value) => safe.replaceAll(value, "[redacted]"), text);
   try {
     const result = await new Promise((resolve3) => {
-      const child = (0, import_node_child_process6.spawn)(shell ? [command2, ...args].map(quoteForShell).join(" ") : command2, shell ? [] : args, {
+      const child = (0, import_node_child_process5.spawn)(shell ? [command2, ...args].map(quoteForShell).join(" ") : command2, shell ? [] : args, {
         cwd,
         shell,
         windowsHide: true,

package/dist/refresh.js

@@ -283,7 +283,8 @@ async function refreshLauncher(target, options = {}) {
   if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
   if (options.dryRun) return arm("ok", record.version, "");
   let unlock;
-  if (!options.lockHeld) {
+  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
+  if (!lockHeld) {
     try {
       unlock = lockInstallation(productDir);
     } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/installer-launcher",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Single-executable (SEA) launcher: sign-in, gated payload fetch, self-update. One copy ships per product.",
   "type": "module",
   "license": "UNLICENSED",