@mutmutco/installer-launcher 1.2.2 → 1.2.4

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", () => {
@@ -1742,162 +1729,6 @@ function firstLine(text) {
   return String(text).split(/\r?\n/).map((line) => line.trim()).filter(Boolean)[0] ?? "";
 }
 
-// src/refresh.ts
-import { execFile } from "node:child_process";
-import { chmodSync, existsSync as existsSync7, lstatSync, readdirSync, readFileSync as readFileSync7, renameSync as renameSync4, rmSync as rmSync5, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir } from "node:os";
-import { basename, dirname as dirname3, join as join6 } from "node:path";
-var LAUNCHER_RECORD_FILE = "launcher.json";
-var RECORD_TIMEOUT_MS = 1e4;
-function platformKey(platform, arch) {
-  if (platform === "win32") return arch === "x64" || arch === "arm64" ? `win-${arch}` : null;
-  return platform === "darwin" && arch === "arm64" ? "darwin-arm64" : null;
-}
-function verifierFor(target) {
-  return { product: target.product, host: target.host, loginKind: "github", publicKey: target.key, binName: target.bin };
-}
-async function fetchRecord(target, options) {
-  let json;
-  try {
-    const response = await (options.fetch ?? fetch)(
-      `${target.host.replace(/\/+$/u, "")}/release/launcher`,
-      { signal: AbortSignal.timeout(options.timeoutMs ?? RECORD_TIMEOUT_MS) }
-    );
-    if (!response.ok) return null;
-    json = await response.json();
-  } catch {
-    return null;
-  }
-  let record;
-  try {
-    record = parseManifest(json);
-  } catch {
-    return null;
-  }
-  if (!verifyManifest(record, record.signature, verifierFor(target))) return "bad-signature";
-  return { version: record.version, files: record.files };
-}
-async function readLauncherRecord(target, options = {}) {
-  const record = await fetchRecord(target, options);
-  return record === "bad-signature" ? null : record;
-}
-function compareVersions(a, b) {
-  const split = (v) => {
-    const [core, pre = ""] = v.split("-", 2);
-    return { nums: core.split(".").map((n) => Number.parseInt(n, 10) || 0), pre };
-  };
-  const x = split(a);
-  const y = split(b);
-  for (let i = 0; i < 3; i++) if ((x.nums[i] ?? 0) !== (y.nums[i] ?? 0)) return (x.nums[i] ?? 0) > (y.nums[i] ?? 0) ? 1 : -1;
-  if (x.pre === y.pre) return 0;
-  if (!x.pre) return 1;
-  if (!y.pre) return -1;
-  return x.pre > y.pre ? 1 : -1;
-}
-function recordedPath(productDir) {
-  try {
-    const saved = JSON.parse(readFileSync7(join6(productDir, LAUNCHER_RECORD_FILE), "utf8"));
-    return typeof saved.path === "string" && saved.path ? saved.path : null;
-  } catch {
-    return null;
-  }
-}
-function installedPath(target, productDir, platform) {
-  return platform === "win32" ? join6(productDir, "bin", `${target.bin}.exe`) : join6(homedir(), ".local", "bin", target.bin);
-}
-function parseLauncherVersion(stdout, bin) {
-  const text = String(stdout).trim();
-  if (!text.startsWith(`${bin} `)) return null;
-  return text.match(/launcher (\d+\.\d+\.\d+[^\s)]*)/u)?.[1] ?? null;
-}
-function runVersion(path, bin) {
-  return new Promise((resolve3) => {
-    execFile(path, ["--version"], { timeout: 3e4, windowsHide: true, encoding: "utf8" }, (error, stdout) => {
-      resolve3(error ? null : parseLauncherVersion(stdout, bin));
-    });
-  });
-}
-function removeStale(file) {
-  const prefix = `${basename(file)}.old-`;
-  let names;
-  try {
-    names = readdirSync(dirname3(file));
-  } catch {
-    return;
-  }
-  for (const name of names) {
-    if (!name.startsWith(prefix)) continue;
-    try {
-      rmSync5(join6(dirname3(file), name), { force: true });
-    } catch {
-    }
-  }
-}
-async function refreshLauncher(target, options = {}) {
-  const started = Date.now();
-  const platform = options.platform ?? process.platform;
-  const key = platformKey(platform, options.arch ?? process.arch);
-  if (!key) return null;
-  const productDir = options.productDir ?? defaultProductDir(target.product);
-  const recorded = recordedPath(productDir);
-  const file = options.path ?? (recorded && existsSync7(recorded) ? recorded : installedPath(target, productDir, platform));
-  if (!existsSync7(file) || lstatSync(file).isSymbolicLink()) return null;
-  if (!options.dryRun) removeStale(file);
-  const from = await (options.readVersion ?? ((path) => runVersion(path, target.bin)))(file);
-  if (!from) return null;
-  const arm = (verdict, to, detail) => ({ surface: "launcher", from, to, verdict, detail, durationMs: Date.now() - started });
-  const record = await fetchRecord(target, options);
-  if (record === "bad-signature") return arm("fail", from, "The launcher record failed its signature check.");
-  const entry2 = record?.files.find((candidate) => candidate.path === key);
-  if (!record || !entry2) return arm("skip", from, "No launcher update is offered yet.");
-  if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
-  if (options.dryRun) return arm("ok", record.version, "");
-  let unlock;
-  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
-  if (!lockHeld) {
-    try {
-      unlock = lockInstallation(productDir);
-    } catch {
-      return arm("defer", from, "Another install is running; the launcher updates next time.");
-    }
-  }
-  const next = `${file}.new-${process.pid}`;
-  let moved;
-  try {
-    let bytes;
-    try {
-      const response = await (options.fetch ?? fetch)(
-        `${(target.dl ?? target.host).replace(/\/+$/u, "")}/dl/${target.product}/${key}`,
-        { signal: AbortSignal.timeout(3e5) }
-      );
-      if (!response.ok) return arm("defer", from, "The launcher download did not complete; it retries next time.");
-      bytes = await readDownload(response, void 0, entry2.size);
-    } catch {
-      return arm("defer", from, "The launcher download did not complete; it retries next time.");
-    }
-    if (!verifyFileBytes(entry2, bytes)) return arm("fail", from, "The downloaded launcher failed its checksum.");
-    try {
-      writeFileSync7(next, bytes, { mode: 493 });
-      if (platform !== "win32") chmodSync(next, 493);
-      if (platform === "win32") {
-        moved = `${file}.old-${process.pid}-${Date.now()}`;
-        renameSync4(file, moved);
-      }
-      renameSync4(next, file);
-    } catch {
-      try {
-        if (moved && !existsSync7(file)) renameSync4(moved, file);
-      } catch {
-      }
-      rmSync5(next, { force: true });
-      return arm("fail", from, "The launcher could not be replaced.");
-    }
-    return arm("ok", record.version, "");
-  } finally {
-    unlock?.();
-  }
-}
-
 // src/login-github.ts
 import { spawn, spawnSync as spawnSync3 } from "node:child_process";
 var realSleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
@@ -2158,8 +1989,201 @@ function page(title, body) {
   return `<!doctype html><meta charset="utf-8"><meta name="color-scheme" content="dark"><title>${title}</title><style>${style}</style><main><h1>${title}</h1><p>${body}</p></main>`;
 }
 
+// src/tokens.ts
+async function ensureFreshToken(config, dir, fetchImpl = fetch) {
+  const stored = readTokens(dir);
+  if (!stored) return null;
+  if (stored.expiresAt - Date.now() > 6e4) return stored.accessToken;
+  if (!stored.refreshToken) return null;
+  if (config.loginKind === "github") {
+    const refreshed2 = await refreshAccessToken(config, stored.refreshToken, fetchImpl);
+    if (!refreshed2) {
+      clearTokens(dir);
+      return null;
+    }
+    writeTokens(dir, {
+      accessToken: refreshed2.accessToken,
+      refreshToken: refreshed2.refreshToken ?? stored.refreshToken,
+      expiresAt: Date.now() + refreshed2.expiresIn * 1e3
+    });
+    return refreshed2.accessToken;
+  }
+  if (!stored.clientId) {
+    clearTokens(dir);
+    return null;
+  }
+  const refreshed = await refreshGoogleToken(config.host, stored.clientId, stored.refreshToken, fetchImpl);
+  if (!refreshed) {
+    clearTokens(dir);
+    return null;
+  }
+  writeTokens(dir, {
+    accessToken: refreshed.accessToken,
+    refreshToken: refreshed.refreshToken,
+    expiresAt: Date.now() + refreshed.expiresIn * 1e3,
+    clientId: stored.clientId
+  });
+  return refreshed.accessToken;
+}
+
+// src/refresh.ts
+import { execFile } from "node:child_process";
+import { chmodSync, existsSync as existsSync7, lstatSync, readdirSync, readFileSync as readFileSync7, renameSync as renameSync4, rmSync as rmSync5, writeFileSync as writeFileSync7 } from "node:fs";
+import { homedir } from "node:os";
+import { basename, dirname as dirname3, join as join6 } from "node:path";
+var LAUNCHER_RECORD_FILE = "launcher.json";
+var RECORD_TIMEOUT_MS = 1e4;
+function platformKey(platform, arch) {
+  if (platform === "win32") return arch === "x64" || arch === "arm64" ? `win-${arch}` : null;
+  return platform === "darwin" && arch === "arm64" ? "darwin-arm64" : null;
+}
+function verifierFor(target) {
+  return { product: target.product, host: target.host, loginKind: "github", publicKey: target.key, binName: target.bin };
+}
+async function fetchRecord(target, options) {
+  let json;
+  try {
+    const response = await (options.fetch ?? fetch)(
+      `${target.host.replace(/\/+$/u, "")}/release/launcher`,
+      { signal: AbortSignal.timeout(options.timeoutMs ?? RECORD_TIMEOUT_MS) }
+    );
+    if (!response.ok) return null;
+    json = await response.json();
+  } catch {
+    return null;
+  }
+  let record;
+  try {
+    record = parseManifest(json);
+  } catch {
+    return null;
+  }
+  if (!verifyManifest(record, record.signature, verifierFor(target))) return "bad-signature";
+  return { version: record.version, files: record.files };
+}
+async function readLauncherRecord(target, options = {}) {
+  const record = await fetchRecord(target, options);
+  return record === "bad-signature" ? null : record;
+}
+function compareVersions(a, b) {
+  const split = (v) => {
+    const [core, pre = ""] = v.split("-", 2);
+    return { nums: core.split(".").map((n) => Number.parseInt(n, 10) || 0), pre };
+  };
+  const x = split(a);
+  const y = split(b);
+  for (let i = 0; i < 3; i++) if ((x.nums[i] ?? 0) !== (y.nums[i] ?? 0)) return (x.nums[i] ?? 0) > (y.nums[i] ?? 0) ? 1 : -1;
+  if (x.pre === y.pre) return 0;
+  if (!x.pre) return 1;
+  if (!y.pre) return -1;
+  return x.pre > y.pre ? 1 : -1;
+}
+function recordedPath(productDir) {
+  try {
+    const saved = JSON.parse(readFileSync7(join6(productDir, LAUNCHER_RECORD_FILE), "utf8"));
+    return typeof saved.path === "string" && saved.path ? saved.path : null;
+  } catch {
+    return null;
+  }
+}
+function installedPath(target, productDir, platform) {
+  return platform === "win32" ? join6(productDir, "bin", `${target.bin}.exe`) : join6(homedir(), ".local", "bin", target.bin);
+}
+function parseLauncherVersion(stdout, bin) {
+  const text = String(stdout).trim();
+  if (!text.startsWith(`${bin} `)) return null;
+  return text.match(/launcher (\d+\.\d+\.\d+[^\s)]*)/u)?.[1] ?? null;
+}
+function runVersion(path, bin) {
+  return new Promise((resolve3) => {
+    execFile(path, ["--version"], { timeout: 3e4, windowsHide: true, encoding: "utf8" }, (error, stdout) => {
+      resolve3(error ? null : parseLauncherVersion(stdout, bin));
+    });
+  });
+}
+function removeStale(file) {
+  const prefix = `${basename(file)}.old-`;
+  let names;
+  try {
+    names = readdirSync(dirname3(file));
+  } catch {
+    return;
+  }
+  for (const name of names) {
+    if (!name.startsWith(prefix)) continue;
+    try {
+      rmSync5(join6(dirname3(file), name), { force: true });
+    } catch {
+    }
+  }
+}
+async function refreshLauncher(target, options = {}) {
+  const started = Date.now();
+  const platform = options.platform ?? process.platform;
+  const key = platformKey(platform, options.arch ?? process.arch);
+  if (!key) return null;
+  const productDir = options.productDir ?? defaultProductDir(target.product);
+  const recorded = recordedPath(productDir);
+  const file = options.path ?? (recorded && existsSync7(recorded) ? recorded : installedPath(target, productDir, platform));
+  if (!existsSync7(file) || lstatSync(file).isSymbolicLink()) return null;
+  if (!options.dryRun) removeStale(file);
+  const from = await (options.readVersion ?? ((path) => runVersion(path, target.bin)))(file);
+  if (!from) return null;
+  const arm = (verdict, to, detail) => ({ surface: "launcher", from, to, verdict, detail, durationMs: Date.now() - started });
+  const record = await fetchRecord(target, options);
+  if (record === "bad-signature") return arm("fail", from, "The launcher record failed its signature check.");
+  const entry2 = record?.files.find((candidate) => candidate.path === key);
+  if (!record || !entry2) return arm("skip", from, "No launcher update is offered yet.");
+  if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
+  if (options.dryRun) return arm("ok", record.version, "");
+  let unlock;
+  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
+  if (!lockHeld) {
+    try {
+      unlock = lockInstallation(productDir);
+    } catch {
+      return arm("defer", from, "Another install is running; the launcher updates next time.");
+    }
+  }
+  const next = `${file}.new-${process.pid}`;
+  let moved;
+  try {
+    let bytes;
+    try {
+      const response = await (options.fetch ?? fetch)(
+        `${(target.dl ?? target.host).replace(/\/+$/u, "")}/dl/${target.product}/${key}`,
+        { signal: AbortSignal.timeout(3e5) }
+      );
+      if (!response.ok) return arm("defer", from, "The launcher download did not complete; it retries next time.");
+      bytes = await readDownload(response, void 0, entry2.size);
+    } catch {
+      return arm("defer", from, "The launcher download did not complete; it retries next time.");
+    }
+    if (!verifyFileBytes(entry2, bytes)) return arm("fail", from, "The downloaded launcher failed its checksum.");
+    try {
+      writeFileSync7(next, bytes, { mode: 493 });
+      if (platform !== "win32") chmodSync(next, 493);
+      if (platform === "win32") {
+        moved = `${file}.old-${process.pid}-${Date.now()}`;
+        renameSync4(file, moved);
+      }
+      renameSync4(next, file);
+    } catch {
+      try {
+        if (moved && !existsSync7(file)) renameSync4(moved, file);
+      } catch {
+      }
+      rmSync5(next, { force: true });
+      return arm("fail", from, "The launcher could not be replaced.");
+    }
+    return arm("ok", record.version, "");
+  } finally {
+    unlock?.();
+  }
+}
+
 // src/index.ts
-var LAUNCHER_VERSION = true ? "1.2.2" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "1.2.4" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2382,41 +2406,6 @@ async function runFile(file, args, printErr) {
   }
   return code;
 }
-async function ensureFreshToken(config, dir, fetchImpl = fetch) {
-  const stored = readTokens(dir);
-  if (!stored) return null;
-  if (stored.expiresAt - Date.now() > 6e4) return stored.accessToken;
-  if (!stored.refreshToken) return null;
-  if (config.loginKind === "github") {
-    const refreshed2 = await refreshAccessToken(config, stored.refreshToken, fetchImpl);
-    if (!refreshed2) {
-      clearTokens(dir);
-      return null;
-    }
-    writeTokens(dir, {
-      accessToken: refreshed2.accessToken,
-      refreshToken: refreshed2.refreshToken ?? stored.refreshToken,
-      expiresAt: Date.now() + refreshed2.expiresIn * 1e3
-    });
-    return refreshed2.accessToken;
-  }
-  if (!stored.clientId) {
-    clearTokens(dir);
-    return null;
-  }
-  const refreshed = await refreshGoogleToken(config.host, stored.clientId, stored.refreshToken, fetchImpl);
-  if (!refreshed) {
-    clearTokens(dir);
-    return null;
-  }
-  writeTokens(dir, {
-    accessToken: refreshed.accessToken,
-    refreshToken: refreshed.refreshToken,
-    expiresAt: Date.now() + refreshed.expiresIn * 1e3,
-    clientId: stored.clientId
-  });
-  return refreshed.accessToken;
-}
 async function doLogin(config, dir, options, prompt, installer) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const open = options.open ?? openBrowser;
@@ -3064,7 +3053,6 @@ if (invokedAsMain) {
 export {
   LAUNCHER_VERSION,
   defaultRunEntry,
-  ensureFreshToken,
   formatMb,
   parseArgv,
   readPayloadEntry,

package/dist/launcher.sea.cjs

@@ -22,7 +22,6 @@ var index_exports = {};
 __export(index_exports, {
   LAUNCHER_VERSION: () => LAUNCHER_VERSION,
   defaultRunEntry: () => defaultRunEntry,
-  ensureFreshToken: () => ensureFreshToken,
   formatMb: () => formatMb,
   parseArgv: () => parseArgv,
   readPayloadEntry: () => readPayloadEntry,
@@ -710,7 +709,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 +929,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 +950,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 +959,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 +984,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 +1036,8 @@ function createSpinner(face, { animate, stream, intervalMs = 90, transcriptPath,
             frame,
             intervalMs,
             transcriptPath,
-            started
+            started,
+            wide
           } });
           const active = worker;
           worker.on("error", () => {
@@ -1587,7 +1573,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 +1583,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,
@@ -1776,171 +1762,15 @@ function firstLine(text) {
   return String(text).split(/\r?\n/).map((line) => line.trim()).filter(Boolean)[0] ?? "";
 }
 
-// src/refresh.ts
-var import_node_child_process4 = 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");
-var LAUNCHER_RECORD_FILE = "launcher.json";
-var RECORD_TIMEOUT_MS = 1e4;
-function platformKey(platform, arch) {
-  if (platform === "win32") return arch === "x64" || arch === "arm64" ? `win-${arch}` : null;
-  return platform === "darwin" && arch === "arm64" ? "darwin-arm64" : null;
-}
-function verifierFor(target) {
-  return { product: target.product, host: target.host, loginKind: "github", publicKey: target.key, binName: target.bin };
-}
-async function fetchRecord(target, options) {
-  let json;
-  try {
-    const response = await (options.fetch ?? fetch)(
-      `${target.host.replace(/\/+$/u, "")}/release/launcher`,
-      { signal: AbortSignal.timeout(options.timeoutMs ?? RECORD_TIMEOUT_MS) }
-    );
-    if (!response.ok) return null;
-    json = await response.json();
-  } catch {
-    return null;
-  }
-  let record;
-  try {
-    record = parseManifest(json);
-  } catch {
-    return null;
-  }
-  if (!verifyManifest(record, record.signature, verifierFor(target))) return "bad-signature";
-  return { version: record.version, files: record.files };
-}
-async function readLauncherRecord(target, options = {}) {
-  const record = await fetchRecord(target, options);
-  return record === "bad-signature" ? null : record;
-}
-function compareVersions(a, b) {
-  const split = (v) => {
-    const [core, pre = ""] = v.split("-", 2);
-    return { nums: core.split(".").map((n) => Number.parseInt(n, 10) || 0), pre };
-  };
-  const x = split(a);
-  const y = split(b);
-  for (let i = 0; i < 3; i++) if ((x.nums[i] ?? 0) !== (y.nums[i] ?? 0)) return (x.nums[i] ?? 0) > (y.nums[i] ?? 0) ? 1 : -1;
-  if (x.pre === y.pre) return 0;
-  if (!x.pre) return 1;
-  if (!y.pre) return -1;
-  return x.pre > y.pre ? 1 : -1;
-}
-function recordedPath(productDir) {
-  try {
-    const saved = JSON.parse((0, import_node_fs11.readFileSync)((0, import_node_path6.join)(productDir, LAUNCHER_RECORD_FILE), "utf8"));
-    return typeof saved.path === "string" && saved.path ? saved.path : null;
-  } catch {
-    return null;
-  }
-}
-function installedPath(target, productDir, platform) {
-  return platform === "win32" ? (0, import_node_path6.join)(productDir, "bin", `${target.bin}.exe`) : (0, import_node_path6.join)((0, import_node_os4.homedir)(), ".local", "bin", target.bin);
-}
-function parseLauncherVersion(stdout, bin) {
-  const text = String(stdout).trim();
-  if (!text.startsWith(`${bin} `)) return null;
-  return text.match(/launcher (\d+\.\d+\.\d+[^\s)]*)/u)?.[1] ?? null;
-}
-function runVersion(path, bin) {
-  return new Promise((resolve3) => {
-    (0, import_node_child_process4.execFile)(path, ["--version"], { timeout: 3e4, windowsHide: true, encoding: "utf8" }, (error, stdout) => {
-      resolve3(error ? null : parseLauncherVersion(stdout, bin));
-    });
-  });
-}
-function removeStale(file) {
-  const prefix = `${(0, import_node_path6.basename)(file)}.old-`;
-  let names;
-  try {
-    names = (0, import_node_fs11.readdirSync)((0, import_node_path6.dirname)(file));
-  } catch {
-    return;
-  }
-  for (const name of names) {
-    if (!name.startsWith(prefix)) continue;
-    try {
-      (0, import_node_fs11.rmSync)((0, import_node_path6.join)((0, import_node_path6.dirname)(file), name), { force: true });
-    } catch {
-    }
-  }
-}
-async function refreshLauncher(target, options = {}) {
-  const started = Date.now();
-  const platform = options.platform ?? process.platform;
-  const key = platformKey(platform, options.arch ?? process.arch);
-  if (!key) return null;
-  const productDir = options.productDir ?? defaultProductDir(target.product);
-  const recorded = recordedPath(productDir);
-  const file = options.path ?? (recorded && (0, import_node_fs11.existsSync)(recorded) ? recorded : installedPath(target, productDir, platform));
-  if (!(0, import_node_fs11.existsSync)(file) || (0, import_node_fs11.lstatSync)(file).isSymbolicLink()) return null;
-  if (!options.dryRun) removeStale(file);
-  const from = await (options.readVersion ?? ((path) => runVersion(path, target.bin)))(file);
-  if (!from) return null;
-  const arm = (verdict, to, detail) => ({ surface: "launcher", from, to, verdict, detail, durationMs: Date.now() - started });
-  const record = await fetchRecord(target, options);
-  if (record === "bad-signature") return arm("fail", from, "The launcher record failed its signature check.");
-  const entry2 = record?.files.find((candidate) => candidate.path === key);
-  if (!record || !entry2) return arm("skip", from, "No launcher update is offered yet.");
-  if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
-  if (options.dryRun) return arm("ok", record.version, "");
-  let unlock;
-  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
-  if (!lockHeld) {
-    try {
-      unlock = lockInstallation(productDir);
-    } catch {
-      return arm("defer", from, "Another install is running; the launcher updates next time.");
-    }
-  }
-  const next = `${file}.new-${process.pid}`;
-  let moved;
-  try {
-    let bytes;
-    try {
-      const response = await (options.fetch ?? fetch)(
-        `${(target.dl ?? target.host).replace(/\/+$/u, "")}/dl/${target.product}/${key}`,
-        { signal: AbortSignal.timeout(3e5) }
-      );
-      if (!response.ok) return arm("defer", from, "The launcher download did not complete; it retries next time.");
-      bytes = await readDownload(response, void 0, entry2.size);
-    } catch {
-      return arm("defer", from, "The launcher download did not complete; it retries next time.");
-    }
-    if (!verifyFileBytes(entry2, bytes)) return arm("fail", from, "The downloaded launcher failed its checksum.");
-    try {
-      (0, import_node_fs11.writeFileSync)(next, bytes, { mode: 493 });
-      if (platform !== "win32") (0, import_node_fs11.chmodSync)(next, 493);
-      if (platform === "win32") {
-        moved = `${file}.old-${process.pid}-${Date.now()}`;
-        (0, import_node_fs11.renameSync)(file, moved);
-      }
-      (0, import_node_fs11.renameSync)(next, file);
-    } catch {
-      try {
-        if (moved && !(0, import_node_fs11.existsSync)(file)) (0, import_node_fs11.renameSync)(moved, file);
-      } catch {
-      }
-      (0, import_node_fs11.rmSync)(next, { force: true });
-      return arm("fail", from, "The launcher could not be replaced.");
-    }
-    return arm("ok", record.version, "");
-  } finally {
-    unlock?.();
-  }
-}
-
 // src/login-github.ts
-var import_node_child_process5 = require("node:child_process");
+var import_node_child_process3 = 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_process3.spawn)(opener, args, { detached: true, stdio: "ignore", windowsHide: true });
     child.on("error", () => {
     });
     child.unref();
@@ -2058,7 +1888,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_process3.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,8 +2022,201 @@ function page(title, body) {
   return `<!doctype html><meta charset="utf-8"><meta name="color-scheme" content="dark"><title>${title}</title><style>${style}</style><main><h1>${title}</h1><p>${body}</p></main>`;
 }
 
+// src/tokens.ts
+async function ensureFreshToken(config, dir, fetchImpl = fetch) {
+  const stored = readTokens(dir);
+  if (!stored) return null;
+  if (stored.expiresAt - Date.now() > 6e4) return stored.accessToken;
+  if (!stored.refreshToken) return null;
+  if (config.loginKind === "github") {
+    const refreshed2 = await refreshAccessToken(config, stored.refreshToken, fetchImpl);
+    if (!refreshed2) {
+      clearTokens(dir);
+      return null;
+    }
+    writeTokens(dir, {
+      accessToken: refreshed2.accessToken,
+      refreshToken: refreshed2.refreshToken ?? stored.refreshToken,
+      expiresAt: Date.now() + refreshed2.expiresIn * 1e3
+    });
+    return refreshed2.accessToken;
+  }
+  if (!stored.clientId) {
+    clearTokens(dir);
+    return null;
+  }
+  const refreshed = await refreshGoogleToken(config.host, stored.clientId, stored.refreshToken, fetchImpl);
+  if (!refreshed) {
+    clearTokens(dir);
+    return null;
+  }
+  writeTokens(dir, {
+    accessToken: refreshed.accessToken,
+    refreshToken: refreshed.refreshToken,
+    expiresAt: Date.now() + refreshed.expiresIn * 1e3,
+    clientId: stored.clientId
+  });
+  return refreshed.accessToken;
+}
+
+// src/refresh.ts
+var import_node_child_process4 = 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");
+var LAUNCHER_RECORD_FILE = "launcher.json";
+var RECORD_TIMEOUT_MS = 1e4;
+function platformKey(platform, arch) {
+  if (platform === "win32") return arch === "x64" || arch === "arm64" ? `win-${arch}` : null;
+  return platform === "darwin" && arch === "arm64" ? "darwin-arm64" : null;
+}
+function verifierFor(target) {
+  return { product: target.product, host: target.host, loginKind: "github", publicKey: target.key, binName: target.bin };
+}
+async function fetchRecord(target, options) {
+  let json;
+  try {
+    const response = await (options.fetch ?? fetch)(
+      `${target.host.replace(/\/+$/u, "")}/release/launcher`,
+      { signal: AbortSignal.timeout(options.timeoutMs ?? RECORD_TIMEOUT_MS) }
+    );
+    if (!response.ok) return null;
+    json = await response.json();
+  } catch {
+    return null;
+  }
+  let record;
+  try {
+    record = parseManifest(json);
+  } catch {
+    return null;
+  }
+  if (!verifyManifest(record, record.signature, verifierFor(target))) return "bad-signature";
+  return { version: record.version, files: record.files };
+}
+async function readLauncherRecord(target, options = {}) {
+  const record = await fetchRecord(target, options);
+  return record === "bad-signature" ? null : record;
+}
+function compareVersions(a, b) {
+  const split = (v) => {
+    const [core, pre = ""] = v.split("-", 2);
+    return { nums: core.split(".").map((n) => Number.parseInt(n, 10) || 0), pre };
+  };
+  const x = split(a);
+  const y = split(b);
+  for (let i = 0; i < 3; i++) if ((x.nums[i] ?? 0) !== (y.nums[i] ?? 0)) return (x.nums[i] ?? 0) > (y.nums[i] ?? 0) ? 1 : -1;
+  if (x.pre === y.pre) return 0;
+  if (!x.pre) return 1;
+  if (!y.pre) return -1;
+  return x.pre > y.pre ? 1 : -1;
+}
+function recordedPath(productDir) {
+  try {
+    const saved = JSON.parse((0, import_node_fs11.readFileSync)((0, import_node_path6.join)(productDir, LAUNCHER_RECORD_FILE), "utf8"));
+    return typeof saved.path === "string" && saved.path ? saved.path : null;
+  } catch {
+    return null;
+  }
+}
+function installedPath(target, productDir, platform) {
+  return platform === "win32" ? (0, import_node_path6.join)(productDir, "bin", `${target.bin}.exe`) : (0, import_node_path6.join)((0, import_node_os4.homedir)(), ".local", "bin", target.bin);
+}
+function parseLauncherVersion(stdout, bin) {
+  const text = String(stdout).trim();
+  if (!text.startsWith(`${bin} `)) return null;
+  return text.match(/launcher (\d+\.\d+\.\d+[^\s)]*)/u)?.[1] ?? null;
+}
+function runVersion(path, bin) {
+  return new Promise((resolve3) => {
+    (0, import_node_child_process4.execFile)(path, ["--version"], { timeout: 3e4, windowsHide: true, encoding: "utf8" }, (error, stdout) => {
+      resolve3(error ? null : parseLauncherVersion(stdout, bin));
+    });
+  });
+}
+function removeStale(file) {
+  const prefix = `${(0, import_node_path6.basename)(file)}.old-`;
+  let names;
+  try {
+    names = (0, import_node_fs11.readdirSync)((0, import_node_path6.dirname)(file));
+  } catch {
+    return;
+  }
+  for (const name of names) {
+    if (!name.startsWith(prefix)) continue;
+    try {
+      (0, import_node_fs11.rmSync)((0, import_node_path6.join)((0, import_node_path6.dirname)(file), name), { force: true });
+    } catch {
+    }
+  }
+}
+async function refreshLauncher(target, options = {}) {
+  const started = Date.now();
+  const platform = options.platform ?? process.platform;
+  const key = platformKey(platform, options.arch ?? process.arch);
+  if (!key) return null;
+  const productDir = options.productDir ?? defaultProductDir(target.product);
+  const recorded = recordedPath(productDir);
+  const file = options.path ?? (recorded && (0, import_node_fs11.existsSync)(recorded) ? recorded : installedPath(target, productDir, platform));
+  if (!(0, import_node_fs11.existsSync)(file) || (0, import_node_fs11.lstatSync)(file).isSymbolicLink()) return null;
+  if (!options.dryRun) removeStale(file);
+  const from = await (options.readVersion ?? ((path) => runVersion(path, target.bin)))(file);
+  if (!from) return null;
+  const arm = (verdict, to, detail) => ({ surface: "launcher", from, to, verdict, detail, durationMs: Date.now() - started });
+  const record = await fetchRecord(target, options);
+  if (record === "bad-signature") return arm("fail", from, "The launcher record failed its signature check.");
+  const entry2 = record?.files.find((candidate) => candidate.path === key);
+  if (!record || !entry2) return arm("skip", from, "No launcher update is offered yet.");
+  if (compareVersions(record.version, from) <= 0) return arm("ok", from, "");
+  if (options.dryRun) return arm("ok", record.version, "");
+  let unlock;
+  const lockHeld = options.lockHeld ?? process.env.MM_OUTER_CONSOLE === "1";
+  if (!lockHeld) {
+    try {
+      unlock = lockInstallation(productDir);
+    } catch {
+      return arm("defer", from, "Another install is running; the launcher updates next time.");
+    }
+  }
+  const next = `${file}.new-${process.pid}`;
+  let moved;
+  try {
+    let bytes;
+    try {
+      const response = await (options.fetch ?? fetch)(
+        `${(target.dl ?? target.host).replace(/\/+$/u, "")}/dl/${target.product}/${key}`,
+        { signal: AbortSignal.timeout(3e5) }
+      );
+      if (!response.ok) return arm("defer", from, "The launcher download did not complete; it retries next time.");
+      bytes = await readDownload(response, void 0, entry2.size);
+    } catch {
+      return arm("defer", from, "The launcher download did not complete; it retries next time.");
+    }
+    if (!verifyFileBytes(entry2, bytes)) return arm("fail", from, "The downloaded launcher failed its checksum.");
+    try {
+      (0, import_node_fs11.writeFileSync)(next, bytes, { mode: 493 });
+      if (platform !== "win32") (0, import_node_fs11.chmodSync)(next, 493);
+      if (platform === "win32") {
+        moved = `${file}.old-${process.pid}-${Date.now()}`;
+        (0, import_node_fs11.renameSync)(file, moved);
+      }
+      (0, import_node_fs11.renameSync)(next, file);
+    } catch {
+      try {
+        if (moved && !(0, import_node_fs11.existsSync)(file)) (0, import_node_fs11.renameSync)(moved, file);
+      } catch {
+      }
+      (0, import_node_fs11.rmSync)(next, { force: true });
+      return arm("fail", from, "The launcher could not be replaced.");
+    }
+    return arm("ok", record.version, "");
+  } finally {
+    unlock?.();
+  }
+}
+
 // src/index.ts
-var LAUNCHER_VERSION = true ? "1.2.2" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "1.2.4" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2416,41 +2439,6 @@ async function runFile(file, args, printErr) {
   }
   return code;
 }
-async function ensureFreshToken(config, dir, fetchImpl = fetch) {
-  const stored = readTokens(dir);
-  if (!stored) return null;
-  if (stored.expiresAt - Date.now() > 6e4) return stored.accessToken;
-  if (!stored.refreshToken) return null;
-  if (config.loginKind === "github") {
-    const refreshed2 = await refreshAccessToken(config, stored.refreshToken, fetchImpl);
-    if (!refreshed2) {
-      clearTokens(dir);
-      return null;
-    }
-    writeTokens(dir, {
-      accessToken: refreshed2.accessToken,
-      refreshToken: refreshed2.refreshToken ?? stored.refreshToken,
-      expiresAt: Date.now() + refreshed2.expiresIn * 1e3
-    });
-    return refreshed2.accessToken;
-  }
-  if (!stored.clientId) {
-    clearTokens(dir);
-    return null;
-  }
-  const refreshed = await refreshGoogleToken(config.host, stored.clientId, stored.refreshToken, fetchImpl);
-  if (!refreshed) {
-    clearTokens(dir);
-    return null;
-  }
-  writeTokens(dir, {
-    accessToken: refreshed.accessToken,
-    refreshToken: refreshed.refreshToken,
-    expiresAt: Date.now() + refreshed.expiresIn * 1e3,
-    clientId: stored.clientId
-  });
-  return refreshed.accessToken;
-}
 async function doLogin(config, dir, options, prompt, installer) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const open = options.open ?? openBrowser;
@@ -2569,7 +2557,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,
@@ -2861,7 +2849,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,
@@ -3099,7 +3087,6 @@ if (invokedAsMain) {
 0 && (module.exports = {
   LAUNCHER_VERSION,
   defaultRunEntry,
-  ensureFreshToken,
   formatMb,
   parseArgv,
   readPayloadEntry,

package/package.json

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