@m8t-stack/cli 0.2.90 → 0.2.92

package/dist/cli.js

@@ -921,8 +921,8 @@ async function mirrorBrainYaml(args) {
     Accept: "application/vnd.github+json",
     "X-GitHub-Api-Version": "2022-11-28"
   };
-  const MAX_ATTEMPTS2 = 3;
-  for (let attempt = 1; attempt <= MAX_ATTEMPTS2; attempt++) {
+  const MAX_ATTEMPTS3 = 3;
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS3; attempt++) {
     const getRes = await fetch(url, { headers });
     let sha;
     let existing;
@@ -953,8 +953,8 @@ async function mirrorBrainYaml(args) {
     if (putRes.ok) return;
     const text = await putRes.text();
     const retryable = putRes.status === 409 || putRes.status === 422;
-    if (retryable && attempt < MAX_ATTEMPTS2) continue;
-    const suffix = retryable ? ` after ${MAX_ATTEMPTS2.toString()} attempts` : "";
+    if (retryable && attempt < MAX_ATTEMPTS3) continue;
+    const suffix = retryable ? ` after ${MAX_ATTEMPTS3.toString()} attempts` : "";
     throw new LocalCliError({
       code: "BRAIN_YAML_MIRROR_FAILED",
       message: `PUT .m8t/brain.yaml: HTTP ${putRes.status.toString()}${suffix}
@@ -1487,7 +1487,7 @@ function installFoundryDnsShim() {
 }
 
 // src/lib/package-version.ts
-var CLI_VERSION = "0.2.90";
+var CLI_VERSION = "0.2.92";
 
 // src/lib/render-error.ts
 init_errors();
@@ -24829,7 +24829,7 @@ function reportWhatIf(r, opts) {
   const exitCode = r.unexpected.length === 0 ? 0 : 1;
   if (opts.redact) {
     const output = opts.json ? JSON.stringify({ summary: redactForReport(r), exitCode }, null, 2) : redactForLog(r);
-    return { output, exitCode };
+    return { output, exitCode, ...opts.json ? { diagnostic: redactForLog(r) } : {} };
   }
   if (opts.json) {
     return { output: JSON.stringify({ summary: { noise: r.noise.length, pending: r.pending.length, unexpected: r.unexpected.length }, pending: r.pending, unexpected: r.unexpected, exitCode }, null, 2), exitCode };
@@ -25096,8 +25096,9 @@ var DeployCommand = class extends M8tCommand {
         });
         const changes = await runWhatIf({ resourceGroup: this.resourceGroup, repoRoot: repoRoot2, params: params2 });
         const classified = classifyWhatIf(changes);
-        const { output, exitCode } = reportWhatIf(classified, { json: mode === "json", redact: this.redact });
+        const { output, exitCode, diagnostic } = reportWhatIf(classified, { json: mode === "json", redact: this.redact });
         this.context.stdout.write(output + "\n");
+        if (diagnostic) this.context.stderr.write(diagnostic + "\n");
         return exitCode;
       } catch (e) {
         const { output, exitCode } = reportWhatIfFailure(e, { json: mode === "json", redact: this.redact });
@@ -31792,6 +31793,7 @@ async function getAciState(opts) {
 }
 
 // src/lib/bootstrap-finalize.ts
+init_errors();
 import * as fs39 from "fs/promises";
 import * as os20 from "os";
 import * as path44 from "path";
@@ -32708,10 +32710,10 @@ var DEFAULT_WORKERS = [
   { name: "ezra", label: "Ezra - Azure Expert", brain: "ezra-brain" }
 ];
 function renderInstallSummary(args) {
-  const open3 = args.webappUrl ? `${args.webappUrl}        (or run: m8t open)` : "run: m8t open";
+  const open4 = args.webappUrl ? `${args.webappUrl}        (or run: m8t open)` : "run: m8t open";
   const lines = [
     "\u2705 Your m8t platform is ready to use.",
-    `   Open it:  ${open3}`,
+    `   Open it:  ${open4}`,
     ""
   ];
   if (args.brainOrg) {
@@ -32735,10 +32737,10 @@ function renderInstallSummary(args) {
 
 // src/lib/companion-install.ts
 import { constants as constants2 } from "fs";
-import * as fs37 from "fs/promises";
-import * as path41 from "path";
+import * as fs38 from "fs/promises";
+import * as path42 from "path";
 import { randomUUID as randomUUID3 } from "crypto";
-import { execFile, spawn as spawn7 } from "child_process";
+import { execFile as execFile2, spawn as spawn7 } from "child_process";
 
 // src/lib/companion-artifact.ts
 import { createHash as createHash7 } from "crypto";
@@ -33016,6 +33018,265 @@ async function copyArtifactPayload(sourceRoot, targetRoot, manifest) {
   await verifyArtifactPayload(targetRoot, manifest);
 }
 
+// src/lib/companion-download.ts
+import { createHash as createHash8 } from "crypto";
+import { execFile } from "child_process";
+import { createReadStream } from "fs";
+import * as fs37 from "fs/promises";
+import * as os18 from "os";
+import * as path41 from "path";
+init_errors();
+var MAX_ASSET_BYTES = 512 * 1024 * 1024;
+var MAX_ATTEMPTS2 = 3;
+var BACKOFF_MS = [1e3, 3e3];
+function megabytes(bytes) {
+  return `${Math.round(bytes / 1e6).toString()} MB`;
+}
+function extractArchive(archive, into) {
+  return new Promise((resolve6, reject) => {
+    execFile("tar", ["-xzf", archive, "-C", into], { windowsHide: true }, (error) => {
+      if (error) reject(new Error(`Could not unpack the companion build: ${error.message}`));
+      else resolve6();
+    });
+  });
+}
+function companionDownloadDirectory(homeDirectory) {
+  return path41.join(homeDirectory, ".m8t", "companion", "downloads");
+}
+function companionAssetFor(component, platform = process.platform, architecture = process.arch) {
+  const target = companionTargetFor(platform, architecture);
+  if (target === null) return null;
+  const pinned = component.targets[target];
+  return pinned ? { target, asset: pinned.asset, sha256: pinned.sha256 } : null;
+}
+function tooLarge(asset) {
+  return new LocalCliError({
+    code: "COMPANION_ASSET_TOO_LARGE",
+    message: `${asset} is larger than this command will accept.`
+  });
+}
+function parseContentRange(value) {
+  const matched = /^bytes (\d+)-(\d+)\/(\d+|\*)$/u.exec((value ?? "").trim());
+  if (!matched?.[1] || !matched[3]) return null;
+  return {
+    start: Number(matched[1]),
+    total: matched[3] === "*" ? null : Number(matched[3])
+  };
+}
+function declaredLength(response) {
+  const raw = response.headers.get("content-length");
+  if (raw === null) return null;
+  const value = Number(raw);
+  return Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
+async function usableBytes(partial) {
+  const status = await fs37.lstat(partial).catch(() => null);
+  if (status === null) return 0;
+  if (!status.isFile()) {
+    await fs37.rm(partial, { recursive: true, force: true }).catch(() => void 0);
+    if (await fs37.lstat(partial).then(() => true, () => false)) {
+      throw new LocalCliError({
+        code: "COMPANION_DOWNLOAD_PATH_OCCUPIED",
+        message: `${partial} is not a file and could not be cleared.`,
+        hint: "Something that is not a download is sitting where the companion build goes. Remove it, then run this again."
+      });
+    }
+    return 0;
+  }
+  return status.size;
+}
+async function sweepForeignPartials(directory, keep) {
+  const entries = await fs37.readdir(directory).catch(() => []);
+  await Promise.all(
+    entries.filter((name) => name.endsWith(".part") && name !== keep).map((name) => fs37.rm(path41.join(directory, name), { recursive: true, force: true }))
+  );
+}
+function sha256File3(filePath) {
+  return new Promise((resolve6, reject) => {
+    const hash = createHash8("sha256");
+    const stream = createReadStream(filePath);
+    stream.on("error", reject);
+    stream.on("data", (chunk) => hash.update(chunk));
+    stream.on("end", () => {
+      resolve6(hash.digest("hex"));
+    });
+  });
+}
+async function transferToDisk(input) {
+  let lastError;
+  for (let attempt = 0; attempt < MAX_ATTEMPTS2; attempt++) {
+    let existing = await usableBytes(input.partial);
+    if (existing > input.maxAssetBytes) {
+      await fs37.rm(input.partial, { force: true }).catch(() => void 0);
+      existing = 0;
+    }
+    let received = existing;
+    let answered = false;
+    try {
+      const controller = new AbortController();
+      const response = await input.fetchImpl(input.url, {
+        signal: controller.signal,
+        ...existing > 0 ? { headers: { Range: `bytes=${existing.toString()}-` } } : {}
+      });
+      answered = true;
+      if (response.status === 416) {
+        await response.body?.cancel().catch(() => void 0);
+        if (existing > 0 && await sha256File3(input.partial).catch(() => null) === input.expectedDigest) {
+          return;
+        }
+        await fs37.rm(input.partial, { force: true }).catch(() => void 0);
+        lastError = new Error("the interrupted download no longer fits the published asset");
+        continue;
+      }
+      if (!response.ok) {
+        await response.body?.cancel().catch(() => void 0);
+        const failed = new LocalCliError({
+          code: "COMPANION_ASSET_FETCH_FAILED",
+          message: `GET ${input.url} returned HTTP ${response.status.toString()}.`,
+          hint: "The release the platform is pinned to should carry this file. Try again, or run 'm8t companion repair' once the network is back."
+        });
+        if (response.status < 500) throw failed;
+        lastError = failed;
+        if (attempt + 1 < MAX_ATTEMPTS2) {
+          input.onEvent({ kind: "retrying", received: existing, attempt: attempt + 1, cause: "server-error" });
+          await input.delay(BACKOFF_MS[Math.min(attempt, BACKOFF_MS.length - 1)]);
+        }
+        continue;
+      }
+      let offset;
+      let total;
+      if (response.status === 206) {
+        const range = parseContentRange(response.headers.get("content-range"));
+        if (range?.start !== existing) {
+          await response.body?.cancel().catch(() => void 0);
+          await fs37.rm(input.partial, { force: true }).catch(() => void 0);
+          lastError = new Error("the server answered a different range than the one requested");
+          continue;
+        }
+        offset = existing;
+        total = range.total;
+      } else {
+        offset = 0;
+        total = declaredLength(response);
+      }
+      const declaredBody = declaredLength(response);
+      if (total !== null && total > input.maxAssetBytes || declaredBody !== null && declaredBody > input.maxAssetBytes) {
+        await response.body?.cancel().catch(() => void 0);
+        await fs37.rm(input.partial, { force: true }).catch(() => void 0);
+        throw tooLarge(input.asset);
+      }
+      if (offset > 0) input.onEvent({ kind: "resumed", received: offset, total });
+      received = offset;
+      const body = response.body;
+      if (body === null) throw new Error("the response carried no body");
+      const handle = await fs37.open(input.partial, offset > 0 ? "a" : "w", 384);
+      try {
+        for await (const chunk of body) {
+          received += chunk.byteLength;
+          if (received > input.maxAssetBytes) {
+            controller.abort();
+            throw tooLarge(input.asset);
+          }
+          await handle.write(chunk);
+          input.onEvent({ kind: "progress", received, total });
+        }
+      } finally {
+        await handle.close();
+      }
+      if (total !== null && received < total) {
+        throw new Error(
+          `the transfer stopped at ${received.toString()} of ${total.toString()} bytes`
+        );
+      }
+      return;
+    } catch (error) {
+      if (error instanceof LocalCliError) {
+        if (error.code === "COMPANION_ASSET_TOO_LARGE") {
+          await fs37.rm(input.partial, { force: true }).catch(() => void 0);
+        }
+        throw error;
+      }
+      lastError = error;
+      if (attempt + 1 < MAX_ATTEMPTS2) {
+        input.onEvent({
+          kind: "retrying",
+          received,
+          attempt: attempt + 1,
+          cause: answered ? "dropped" : "not-connected"
+        });
+        await input.delay(BACKOFF_MS[Math.min(attempt, BACKOFF_MS.length - 1)]);
+      }
+    }
+  }
+  const kept = await fs37.lstat(input.partial).then(
+    (status) => status.isFile() ? status.size : 0,
+    () => 0
+  );
+  const keptLabel = megabytes(kept);
+  throw new LocalCliError({
+    code: "COMPANION_DOWNLOAD_INCOMPLETE",
+    message: "The companion build could not be downloaded.",
+    ...keptLabel === "0 MB" ? {} : { hint: `The ${keptLabel} already downloaded is kept. Run it again to carry on from there.` },
+    cause: lastError
+  });
+}
+async function downloadCompanionArtifact(component, deps = {}) {
+  const platform = deps.platform ?? process.platform;
+  const architecture = deps.architecture ?? process.arch;
+  const pinned = companionAssetFor(component, platform, architecture);
+  if (pinned === null) {
+    throw new LocalCliError({
+      code: "COMPANION_NO_BUILD_FOR_HOST",
+      message: `Release ${component.version} carries no desktop companion for ${platform}-${architecture}.`,
+      hint: "The companions are built for macOS and Windows on arm64 and x64."
+    });
+  }
+  const url = releaseAssetUrl(component.tag, pinned.asset);
+  const directory = deps.downloadDirectory ?? companionDownloadDirectory(os18.homedir());
+  const partialName = `${pinned.sha256}.part`;
+  const partial = path41.join(directory, partialName);
+  await fs37.mkdir(directory, { recursive: true, mode: 448 });
+  await sweepForeignPartials(directory, partialName);
+  await transferToDisk({
+    url,
+    asset: pinned.asset,
+    partial,
+    fetchImpl: deps.fetchImpl ?? fetch,
+    onEvent: deps.onEvent ?? (() => void 0),
+    delay: deps.delay ?? ((ms) => new Promise((resolve6) => setTimeout(resolve6, ms))),
+    maxAssetBytes: deps.maxAssetBytes ?? MAX_ASSET_BYTES,
+    expectedDigest: pinned.sha256
+  });
+  const digest = await sha256File3(partial);
+  if (digest !== pinned.sha256) {
+    await fs37.rm(partial, { force: true }).catch(() => void 0);
+    throw new LocalCliError({
+      code: "COMPANION_ASSET_DIGEST_MISMATCH",
+      message: `${pinned.asset} does not match the digest the release pins for it.`,
+      hint: "Nothing was unpacked. This is what a corrupted download or a substituted file looks like \u2014 retry, and report it if it persists."
+    });
+  }
+  const root = await (deps.makeTemporaryDirectory ?? (() => fs37.mkdtemp(path41.join(os18.tmpdir(), "m8t-companion-"))))();
+  const dispose = async () => {
+    await fs37.rm(root, { recursive: true, force: true }).catch(() => void 0);
+  };
+  try {
+    const unpacked = path41.join(root, "unpacked");
+    await fs37.mkdir(unpacked, { recursive: false, mode: 448 });
+    await (deps.extract ?? extractArchive)(partial, unpacked);
+    return {
+      version: component.version,
+      artifactManifestPath: path41.join(unpacked, "artifact-v1.json"),
+      dispose
+    };
+  } catch (error) {
+    await dispose();
+    throw error;
+  } finally {
+    await fs37.rm(partial, { force: true }).catch(() => void 0);
+  }
+}
+
 // src/lib/companion-install.ts
 function xmlEscape(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
@@ -33028,7 +33289,7 @@ function commandError(error, message) {
 }
 function execFileAsync(file2, args) {
   return new Promise((resolve6, reject) => {
-    execFile(file2, [...args], { windowsHide: true }, (error) => {
+    execFile2(file2, [...args], { windowsHide: true }, (error) => {
       if (error) reject(commandError(error, "Login-item command failed"));
       else resolve6();
     });
@@ -33036,7 +33297,7 @@ function execFileAsync(file2, args) {
 }
 function execFileOutput(file2, args) {
   return new Promise((resolve6, reject) => {
-    execFile(
+    execFile2(
       file2,
       [...args],
       { windowsHide: true },
@@ -33049,17 +33310,17 @@ function execFileOutput(file2, args) {
 }
 async function setCompanionStartAtLogin(input) {
   if (input.platform === "darwin") {
-    const launchAgents = path41.join(input.homeDirectory, "Library", "LaunchAgents");
-    const registration = path41.join(
+    const launchAgents = path42.join(input.homeDirectory, "Library", "LaunchAgents");
+    const registration = path42.join(
       launchAgents,
       "com.m8t.companion.plist"
     );
     await assertNotSymlink(registration, "Start-at-login registration");
     if (!input.enabled) {
-      await fs37.rm(registration, { force: true });
+      await fs38.rm(registration, { force: true });
       return;
     }
-    await fs37.mkdir(launchAgents, { recursive: true, mode: 448 });
+    await fs38.mkdir(launchAgents, { recursive: true, mode: 448 });
     const plist = '<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0"><dict><key>Label</key><string>com.m8t.companion</string><key>ProgramArguments</key><array><string>' + xmlEscape(input.executable) + "</string></array><key>RunAtLoad</key><true/></dict></plist>\n";
     await atomicWriteText(registration, plist, 384);
     return;
@@ -33111,7 +33372,7 @@ async function setCompanionStartAtLogin(input) {
 }
 async function getCompanionStartAtLogin(input) {
   if (input.platform === "darwin") {
-    const registration = path41.join(
+    const registration = path42.join(
       input.homeDirectory,
       "Library",
       "LaunchAgents",
@@ -33173,26 +33434,29 @@ function assertSupported(options) {
 }
 function companionInstallPaths(options) {
   assertSupported(options);
-  const companionState = path41.join(
+  const companionState = path42.join(
     options.homeDirectory,
     ".m8t",
     "companion"
   );
-  const targetRoot = options.platform === "darwin" ? path41.join(
+  const targetRoot = options.platform === "darwin" ? path42.join(
     options.homeDirectory,
     "Applications",
     "m8t Companion.app"
-  ) : path41.join(
-    options.localAppData ?? path41.join(options.homeDirectory, "AppData", "Local"),
+  ) : path42.join(
+    options.localAppData ?? path42.join(options.homeDirectory, "AppData", "Local"),
     "m8t",
     "companion",
     "app"
   );
   return {
     targetRoot,
-    installManifest: path41.join(companionState, "install-v1.json"),
-    runtimeBinding: path41.join(companionState, "runtime-v1.json"),
-    preferences: path41.join(companionState, "preferences-v1.json")
+    installManifest: path42.join(companionState, "install-v1.json"),
+    runtimeBinding: path42.join(companionState, "runtime-v1.json"),
+    preferences: path42.join(companionState, "preferences-v1.json"),
+    // Asked of the downloader rather than rebuilt here. Two modules computing
+    // one path is how an uninstall comes to sweep a directory nothing writes.
+    downloads: companionDownloadDirectory(options.homeDirectory)
   };
 }
 function exactKeys2(value, keys) {
@@ -33203,7 +33467,7 @@ function parseInstallManifest(value) {
     throw new Error("Install manifest schema is invalid");
   }
   const record = value;
-  if (!exactKeys2(record, INSTALL_KEYS) || record.schemaVersion !== 1 || typeof record.version !== "string" || record.platform !== "darwin" && record.platform !== "win32" || record.architecture !== "arm64" && record.architecture !== "x64" || typeof record.entryRelativePath !== "string" || typeof record.artifactTreeSha256 !== "string" || !/^[a-f0-9]{64}$/u.test(record.artifactTreeSha256) || typeof record.ownedTargetRoot !== "string" || !path41.isAbsolute(record.ownedTargetRoot)) {
+  if (!exactKeys2(record, INSTALL_KEYS) || record.schemaVersion !== 1 || typeof record.version !== "string" || record.platform !== "darwin" && record.platform !== "win32" || record.architecture !== "arm64" && record.architecture !== "x64" || typeof record.entryRelativePath !== "string" || typeof record.artifactTreeSha256 !== "string" || !/^[a-f0-9]{64}$/u.test(record.artifactTreeSha256) || typeof record.ownedTargetRoot !== "string" || !path42.isAbsolute(record.ownedTargetRoot)) {
     throw new Error("Install manifest schema is invalid");
   }
   return record;
@@ -33213,7 +33477,7 @@ function parseRuntimeBinding(value, platform) {
     throw new Error("Runtime binding schema is invalid");
   }
   const record = value;
-  const paths = platform === "win32" ? path41.win32 : path41.posix;
+  const paths = platform === "win32" ? path42.win32 : path42.posix;
   if (!exactKeys2(record, RUNTIME_KEYS) || record.schemaVersion !== 1 || typeof record.nodeExecutable !== "string" || !paths.isAbsolute(record.nodeExecutable) || typeof record.cliEntry !== "string" || !paths.isAbsolute(record.cliEntry) || typeof record.gatewayOrigin !== "string") {
     throw new Error("Runtime binding schema is invalid");
   }
@@ -33238,7 +33502,7 @@ function validateGatewayOrigin(value) {
 }
 async function assertNotSymlink(filePath, kind) {
   try {
-    if ((await fs37.lstat(filePath)).isSymbolicLink()) {
+    if ((await fs38.lstat(filePath)).isSymbolicLink()) {
       throw new Error(`${kind} is a symbolic link`);
     }
   } catch (error) {
@@ -33247,20 +33511,20 @@ async function assertNotSymlink(filePath, kind) {
   }
 }
 async function assertOwnedDirectoryChain(anchor, targetDirectory) {
-  const relative4 = path41.relative(anchor, targetDirectory);
-  if (relative4 === ".." || relative4.startsWith(`..${path41.sep}`) || path41.isAbsolute(relative4)) {
+  const relative4 = path42.relative(anchor, targetDirectory);
+  if (relative4 === ".." || relative4.startsWith(`..${path42.sep}`) || path42.isAbsolute(relative4)) {
     throw new Error("Companion owned directory escapes its trusted anchor");
   }
-  const segments = relative4.split(path41.sep).filter(Boolean);
+  const segments = relative4.split(path42.sep).filter(Boolean);
   let current = anchor;
-  const anchorStatus = await fs37.lstat(anchor);
+  const anchorStatus = await fs38.lstat(anchor);
   if (anchorStatus.isSymbolicLink() || !anchorStatus.isDirectory()) {
     throw new Error("Companion owned directory anchor is unsafe");
   }
   for (const segment of segments) {
-    current = path41.join(current, segment);
+    current = path42.join(current, segment);
     try {
-      const status = await fs37.lstat(current);
+      const status = await fs38.lstat(current);
       if (status.isSymbolicLink() || !status.isDirectory()) {
         throw new Error("Companion owned directory contains a symbolic link");
       }
@@ -33273,19 +33537,19 @@ async function assertOwnedDirectoryChain(anchor, targetDirectory) {
 async function assertOwnedParents(options, paths) {
   await assertOwnedDirectoryChain(
     options.homeDirectory,
-    path41.dirname(paths.installManifest)
+    path42.dirname(paths.installManifest)
   );
-  const targetAnchor = options.platform === "win32" ? options.localAppData ?? path41.join(options.homeDirectory, "AppData", "Local") : options.homeDirectory;
-  await assertOwnedDirectoryChain(targetAnchor, path41.dirname(paths.targetRoot));
+  const targetAnchor = options.platform === "win32" ? options.localAppData ?? path42.join(options.homeDirectory, "AppData", "Local") : options.homeDirectory;
+  await assertOwnedDirectoryChain(targetAnchor, path42.dirname(paths.targetRoot));
 }
 async function readRegularText(filePath, maxBytes) {
-  const before = await fs37.lstat(filePath);
+  const before = await fs38.lstat(filePath);
   if (before.isSymbolicLink() || !before.isFile()) {
     throw new Error("Companion state file is not a regular file");
   }
   let handle;
   try {
-    handle = await fs37.open(
+    handle = await fs38.open(
       filePath,
       constants2.O_RDONLY | constants2.O_NOFOLLOW
     );
@@ -33308,27 +33572,27 @@ async function atomicWriteJson(filePath, value) {
 }
 async function atomicWriteText(filePath, contents, mode) {
   await assertNotSymlink(filePath, "Companion state file");
-  await fs37.mkdir(path41.dirname(filePath), {
+  await fs38.mkdir(path42.dirname(filePath), {
     recursive: true,
     mode: 448
   });
   const temporary = `${filePath}.${randomUUID3()}.tmp`;
   try {
-    await fs37.writeFile(temporary, contents, {
+    await fs38.writeFile(temporary, contents, {
       mode,
       flag: "wx"
     });
-    await fs37.rename(temporary, filePath);
-    await fs37.chmod(filePath, mode).catch(() => void 0);
+    await fs38.rename(temporary, filePath);
+    await fs38.chmod(filePath, mode).catch(() => void 0);
   } finally {
-    await fs37.rm(temporary, { force: true }).catch(() => void 0);
+    await fs38.rm(temporary, { force: true }).catch(() => void 0);
   }
 }
 async function realRegularFile(filePath, executable) {
-  const real = await fs37.realpath(filePath);
-  const stat5 = await fs37.stat(real);
+  const real = await fs38.realpath(filePath);
+  const stat5 = await fs38.stat(real);
   if (!stat5.isFile()) throw new Error("Companion launch target is not a file");
-  await fs37.access(real, executable ? constants2.X_OK : constants2.R_OK);
+  await fs38.access(real, executable ? constants2.X_OK : constants2.R_OK);
   return real;
 }
 function defaultLaunch(executable) {
@@ -33344,7 +33608,7 @@ async function companionIsRunning(platform, executable) {
   if (platform !== "win32") return false;
   let handle;
   try {
-    handle = await fs37.open(executable, "r+");
+    handle = await fs38.open(executable, "r+");
   } catch (error) {
     const code = error.code;
     if (code === "ENOENT") return false;
@@ -33425,7 +33689,7 @@ async function statusCompanion(options) {
       realRegularFile(runtime.nodeExecutable, options.platform !== "win32"),
       realRegularFile(runtime.cliEntry, false)
     ]);
-    const executable = path41.join(
+    const executable = path42.join(
       paths.targetRoot,
       ...install.entryRelativePath.split("/")
     );
@@ -33458,7 +33722,7 @@ async function snapshotFile(filePath) {
 }
 async function restoreFile(filePath, bytes) {
   if (bytes === null) {
-    await fs37.rm(filePath, { force: true });
+    await fs38.rm(filePath, { force: true });
   } else {
     await atomicWriteJson(filePath, JSON.parse(bytes.toString("utf8")));
   }
@@ -33473,8 +33737,8 @@ async function converge(options, force) {
   if (artifactManifest.platform !== options.platform || artifactManifest.architecture !== options.architecture) {
     throw new Error("Companion artifact does not match this OS and architecture");
   }
-  const payloadRoot = path41.join(
-    path41.dirname(options.artifactManifestPath),
+  const payloadRoot = path42.join(
+    path42.dirname(options.artifactManifestPath),
     "payload"
   );
   await verifyArtifactSource(payloadRoot, artifactManifest);
@@ -33494,7 +33758,7 @@ async function converge(options, force) {
   if (priorInstalled) {
     await assertCompanionNotRunning(
       options,
-      path41.join(
+      path42.join(
         priorInstalled.paths.targetRoot,
         ...priorInstalled.install.entryRelativePath.split("/")
       )
@@ -33502,7 +33766,7 @@ async function converge(options, force) {
   }
   if (current.state === "not-installed") {
     try {
-      await fs37.lstat(paths.targetRoot);
+      await fs38.lstat(paths.targetRoot);
       throw new Error(
         "The fixed companion target exists without an owned install manifest"
       );
@@ -33513,7 +33777,7 @@ async function converge(options, force) {
   const stage = `${paths.targetRoot}.m8t-stage-${randomUUID3()}`;
   const backup = `${paths.targetRoot}.m8t-backup-${randomUUID3()}`;
   const copy = options.copyPayload ?? copyArtifactPayload;
-  await fs37.mkdir(path41.dirname(paths.targetRoot), {
+  await fs38.mkdir(path42.dirname(paths.targetRoot), {
     recursive: true,
     mode: 448
   });
@@ -33530,12 +33794,12 @@ async function converge(options, force) {
   try {
     await copy(payloadRoot, stage, artifactManifest);
     try {
-      await fs37.rename(paths.targetRoot, backup);
+      await fs38.rename(paths.targetRoot, backup);
       movedPrior = true;
     } catch (error) {
       if (error.code !== "ENOENT") throw error;
     }
-    await fs37.rename(stage, paths.targetRoot);
+    await fs38.rename(stage, paths.targetRoot);
     installedStage = true;
     const nodeExecutable = await realRegularFile(
       options.nodeExecutable,
@@ -33577,7 +33841,7 @@ async function converge(options, force) {
       await readClosedJson(paths.runtimeBinding),
       options.platform
     );
-    const executable = path41.join(
+    const executable = path42.join(
       paths.targetRoot,
       ...artifactManifest.entryRelativePath.split("/")
     );
@@ -33587,7 +33851,7 @@ async function converge(options, force) {
       platform: options.platform,
       executable: ownedExecutable
     }));
-    priorLoginExecutable = priorInstalled ? path41.join(
+    priorLoginExecutable = priorInstalled ? path42.join(
       priorInstalled.paths.targetRoot,
       ...priorInstalled.install.entryRelativePath.split("/")
     ) : executable;
@@ -33598,7 +33862,7 @@ async function converge(options, force) {
     );
     loginChanged = true;
     await (options.launch ?? defaultLaunch)(executable);
-    await fs37.rm(backup, { recursive: true, force: true });
+    await fs38.rm(backup, { recursive: true, force: true });
     return {
       state: "installed",
       version: artifactManifest.version,
@@ -33612,15 +33876,15 @@ async function converge(options, force) {
         () => void 0
       );
     }
-    await fs37.rm(stage, { recursive: true, force: true }).catch(() => void 0);
+    await fs38.rm(stage, { recursive: true, force: true }).catch(() => void 0);
     if (installedStage) {
-      await fs37.rm(paths.targetRoot, {
+      await fs38.rm(paths.targetRoot, {
         recursive: true,
         force: true
       }).catch(() => void 0);
     }
     if (movedPrior) {
-      await fs37.rename(backup, paths.targetRoot).catch(() => void 0);
+      await fs38.rename(backup, paths.targetRoot).catch(() => void 0);
     }
     await Promise.all([
       restoreFile(paths.installManifest, snapshots[0]),
@@ -33640,25 +33904,29 @@ async function uninstallCompanion(options) {
   assertSupported(options);
   const expectedPaths = companionInstallPaths(options);
   await assertOwnedParents(options, expectedPaths);
+  const remove = options.removeOwnedPath ?? (async (ownedPath, recursive) => {
+    await fs38.rm(ownedPath, { recursive, force: true });
+  });
   const installed2 = await readInstalled(options);
-  if (!installed2) return { state: "not-installed" };
+  if (!installed2) {
+    await remove(expectedPaths.downloads, true);
+    return { state: "not-installed" };
+  }
   const { paths, install } = installed2;
   if (install.ownedTargetRoot !== paths.targetRoot) {
     throw new Error("Refusing to remove a non-owned companion target");
   }
-  const executable = path41.join(
+  const executable = path42.join(
     paths.targetRoot,
     ...install.entryRelativePath.split("/")
   );
   await assertCompanionNotRunning(options, executable);
   await (options.setStartAtLogin ?? (() => Promise.resolve()))(executable, false);
-  const remove = options.removeOwnedPath ?? (async (ownedPath, recursive) => {
-    await fs37.rm(ownedPath, { recursive, force: true });
-  });
   await remove(paths.targetRoot, true);
   await remove(paths.installManifest, false);
   await remove(paths.runtimeBinding, false);
   await remove(paths.preferences, false);
+  await remove(paths.downloads, true);
   return { state: "not-installed" };
 }
 
@@ -33679,84 +33947,55 @@ async function readCompanionRelease(source = { url: CHANNEL_LATEST_URL }, deps =
   };
 }
 
-// src/lib/companion-download.ts
-import { createHash as createHash8 } from "crypto";
-import { execFile as execFile2 } from "child_process";
-import * as fs38 from "fs/promises";
-import * as os18 from "os";
-import * as path42 from "path";
-init_errors();
-var MAX_ASSET_BYTES = 512 * 1024 * 1024;
-function extractArchive(archive, into) {
-  return new Promise((resolve6, reject) => {
-    execFile2("tar", ["-xzf", archive, "-C", into], { windowsHide: true }, (error) => {
-      if (error) reject(new Error(`Could not unpack the companion build: ${error.message}`));
-      else resolve6();
-    });
-  });
-}
-function companionAssetFor(component, platform = process.platform, architecture = process.arch) {
-  const target = companionTargetFor(platform, architecture);
-  if (target === null) return null;
-  const pinned = component.targets[target];
-  return pinned ? { target, asset: pinned.asset, sha256: pinned.sha256 } : null;
-}
-async function downloadCompanionArtifact(component, deps = {}) {
-  const platform = deps.platform ?? process.platform;
-  const architecture = deps.architecture ?? process.arch;
-  const pinned = companionAssetFor(component, platform, architecture);
-  if (pinned === null) {
-    throw new LocalCliError({
-      code: "COMPANION_NO_BUILD_FOR_HOST",
-      message: `Release ${component.version} carries no desktop companion for ${platform}-${architecture}.`,
-      hint: "The companions are built for macOS and Windows on arm64 and x64."
-    });
-  }
-  const url = releaseAssetUrl(component.tag, pinned.asset);
-  const fetchImpl = deps.fetchImpl ?? fetch;
-  const response = await fetchImpl(url);
-  if (!response.ok) {
-    throw new LocalCliError({
-      code: "COMPANION_ASSET_FETCH_FAILED",
-      message: `GET ${url} returned HTTP ${response.status.toString()}.`,
-      hint: "The release the platform is pinned to should carry this file. Try again, or run 'm8t companion repair' once the network is back."
-    });
-  }
-  const bytes = Buffer.from(await response.arrayBuffer());
-  if (bytes.byteLength > MAX_ASSET_BYTES) {
-    throw new LocalCliError({
-      code: "COMPANION_ASSET_TOO_LARGE",
-      message: `${pinned.asset} is larger than this command will accept.`
-    });
-  }
-  const digest = createHash8("sha256").update(bytes).digest("hex");
-  if (digest !== pinned.sha256) {
-    throw new LocalCliError({
-      code: "COMPANION_ASSET_DIGEST_MISMATCH",
-      message: `${pinned.asset} does not match the digest the release pins for it.`,
-      hint: "Nothing was unpacked. This is what a corrupted download or a substituted file looks like \u2014 retry, and report it if it persists."
-    });
-  }
-  const root = await (deps.makeTemporaryDirectory ?? (() => fs38.mkdtemp(path42.join(os18.tmpdir(), "m8t-companion-"))))();
-  const dispose = async () => {
-    await fs38.rm(root, { recursive: true, force: true }).catch(() => void 0);
+// src/lib/companion-download-progress.ts
+var STEP_FRACTION = 0.25;
+var INTERVAL_MS = 3e4;
+function downloadProgressLines(options) {
+  const now = options.now ?? Date.now;
+  let lastStep = 0;
+  let lastReceived = 0;
+  let lastEmitAt = null;
+  const emit = (line2) => {
+    lastEmitAt = now();
+    options.write(line2);
+  };
+  return (event) => {
+    if (event.kind === "retrying") {
+      emit(
+        event.cause === "not-connected" ? "  Couldn't connect \u2014 retrying.\n" : event.cause === "server-error" ? "  The download service answered with an error \u2014 retrying.\n" : `  The connection dropped at ${megabytes(event.received)} \u2014 retrying.
+`
+      );
+      return;
+    }
+    if (event.kind === "resumed") {
+      if (event.total !== null && event.total > 0) {
+        lastStep = Math.floor(event.received / event.total / STEP_FRACTION);
+      }
+      lastReceived = event.received;
+      emit(`  Resuming an interrupted download from ${megabytes(event.received)}.
+`);
+      return;
+    }
+    lastEmitAt ??= now();
+    if (event.received < lastReceived) lastStep = 0;
+    lastReceived = event.received;
+    const total = event.total !== null && event.total > 0 ? event.total : null;
+    if (total === null) {
+      if (now() - lastEmitAt < INTERVAL_MS) return;
+      emit(`  ${megabytes(event.received)} downloaded.
+`);
+      return;
+    }
+    const fraction = event.received / total;
+    if (fraction >= 1) return;
+    const step = Math.floor(fraction / STEP_FRACTION);
+    if (step <= lastStep && now() - lastEmitAt < INTERVAL_MS) return;
+    lastStep = step;
+    emit(
+      `  ${Math.floor(fraction * 100).toString()}% \xB7 ${megabytes(event.received)} of ${megabytes(total)}
+`
+    );
   };
-  try {
-    const archive = path42.join(root, pinned.asset);
-    await fs38.writeFile(archive, bytes, { mode: 384 });
-    const unpacked = path42.join(root, "unpacked");
-    await fs38.mkdir(unpacked, { recursive: false, mode: 448 });
-    await (deps.extract ?? extractArchive)(archive, unpacked);
-    await fs38.rm(archive, { force: true });
-    return {
-      version: component.version,
-      artifactManifestPath: path42.join(unpacked, "artifact-v1.json"),
-      dispose
-    };
-  } catch (error) {
-    await dispose();
-    throw error;
-  }
 }
 
 // src/commands/companion/install.ts
@@ -33777,7 +34016,7 @@ function defaultLocalCompanionInstallOptions() {
   };
 }
 async function convergeCompanionFromChannel(converge2, options = {}) {
-  const { from: stagedDirectory, resourceGroup, platformVersion } = options;
+  const { from: stagedDirectory, resourceGroup, platformVersion, onDownloadEvent } = options;
   let artifactManifestPath;
   let dispose = () => Promise.resolve();
   if (stagedDirectory !== void 0) {
@@ -33787,7 +34026,9 @@ async function convergeCompanionFromChannel(converge2, options = {}) {
       platformVersion !== void 0 ? { channel: true, version: platformTag(platformVersion) } : { url: CHANNEL_LATEST_URL }
     );
     if (release === null) return { state: "not-released" };
-    const build = await downloadCompanionArtifact(release.component);
+    const build = await downloadCompanionArtifact(release.component, {
+      ...onDownloadEvent !== void 0 ? { onEvent: onDownloadEvent } : {}
+    });
     artifactManifestPath = build.artifactManifestPath;
     dispose = build.dispose;
   }
@@ -33840,11 +34081,13 @@ var CompanionInstallCommand = class extends M8tCommand {
     description: "Which deployment to bind to, when the subscription holds more than one."
   });
   async executeCommand() {
+    const stdout = this.context.stdout;
     return runCompanionInstallCommand(
-      this.context.stdout,
+      stdout,
       () => convergeCompanionFromChannel(installCompanion, {
         ...this.from !== void 0 ? { from: this.from } : {},
-        ...this.resourceGroup !== void 0 ? { resourceGroup: this.resourceGroup } : {}
+        ...this.resourceGroup !== void 0 ? { resourceGroup: this.resourceGroup } : {},
+        onDownloadEvent: downloadProgressLines({ write: (line2) => stdout.write(line2) })
       })
     );
   }
@@ -33864,7 +34107,7 @@ async function looksLikeCheckout(dir2) {
     return false;
   }
 }
-var defaultDeps3 = {
+var defaultFinalizeDeps = Object.freeze({
   discoverGateway,
   writeConfig,
   ensureGatewayRedirectUri,
@@ -33872,12 +34115,13 @@ var defaultDeps3 = {
   reactiveSeed: reactiveSeedOnInstallComplete,
   companionsSupportHost,
   companionStatus: () => statusCompanion(defaultLocalCompanionInstallOptions()),
-  convergeCompanion: (platformVersion) => convergeCompanionFromChannel(installCompanion, {
-    ...platformVersion !== void 0 ? { platformVersion } : {}
+  convergeCompanion: (platformVersion, onDownloadEvent) => convergeCompanionFromChannel(installCompanion, {
+    ...platformVersion !== void 0 ? { platformVersion } : {},
+    ...onDownloadEvent !== void 0 ? { onDownloadEvent } : {}
   }),
   homedir: () => os20.homedir()
-};
-async function finalizeInstall(args, deps = defaultDeps3) {
+});
+async function finalizeInstall(args, deps = defaultFinalizeDeps) {
   const markerDir = path44.join(deps.homedir(), ".m8t");
   const markerPath = path44.join(markerDir, "repo-root");
   const cwd = process.cwd();
@@ -34015,7 +34259,10 @@ ${colors.field("Then open a brand new chat/session")} \u2014 new skills + MCP se
 `
     );
     try {
-      const companion = await deps.convergeCompanion(pinned);
+      const companion = await deps.convergeCompanion(
+        pinned,
+        downloadProgressLines({ write: args.stdout })
+      );
       if (companion.state === "installed") {
         args.stdout("Desktop companions installed - they are at the edge of your screen.\n\n");
       } else if (companion.state === "not-released") {
@@ -34031,7 +34278,7 @@ They arrive with a platform release \u2014 run: m8t platform update
         );
       }
     } catch (e) {
-      const reason = e instanceof Error ? e.message : String(e);
+      const reason = e instanceof LocalCliError && e.code === "COMPANION_DOWNLOAD_INCOMPLETE" && e.hint !== void 0 ? e.hint : e instanceof Error ? e.message : String(e);
       args.stdout(
         `Platform installation succeeded, but the desktop companions need repair.
 Run: m8t companion repair
@@ -34680,9 +34927,9 @@ async function openChatInvite(deps = {}) {
   if (!invite.ok) return CHAT_UNAVAILABLE_LINE;
   const print = deps.print === true;
   if (!print) {
-    const open3 = deps.open ?? tryOpenUrl;
+    const open4 = deps.open ?? tryOpenUrl;
     try {
-      await open3(invite.url);
+      await open4(invite.url);
     } catch {
     }
   }
@@ -36449,7 +36696,7 @@ async function runCompanionBridgeServe(stdin, stdout, stderr, deps = {}) {
 }
 
 // src/commands/companion/bridge.ts
-var defaultDeps4 = {
+var defaultDeps3 = {
   roster: rosterCompanions,
   send: sendCompanionMessage,
   converse: converseCompanionMessage,
@@ -36487,7 +36734,7 @@ function exitFor(terminal) {
   }
   return 2;
 }
-async function runCompanionBridge(stdin, stdout, stderr, deps = defaultDeps4) {
+async function runCompanionBridge(stdin, stdout, stderr, deps = defaultDeps3) {
   let request;
   try {
     request = parseRequestLine(await readSingleRequest(stdin));
@@ -36659,10 +36906,14 @@ var CompanionRepairCommand = class extends M8tCommand {
     description: "Which deployment to bind to, when the subscription holds more than one."
   });
   async executeCommand() {
+    const stdout = this.context.stdout;
     return runCompanionRepairCommand(
-      this.context.stdout,
+      stdout,
       () => convergeCompanionFromChannel(repairCompanion, {
-        ...this.resourceGroup !== void 0 ? { resourceGroup: this.resourceGroup } : {}
+        ...this.resourceGroup !== void 0 ? { resourceGroup: this.resourceGroup } : {},
+        // Repair is the command a founder reaches for after an interrupted
+        // install, so it is the one most likely to pick up a partial download.
+        onDownloadEvent: downloadProgressLines({ write: (line2) => stdout.write(line2) })
       })
     );
   }