@m8t-stack/cli 0.2.60 → 0.2.62

package/dist/cli.js

@@ -1364,7 +1364,7 @@ var init_enable_hosted_brain = __esm({
 import { Builtins, Cli } from "clipanion";
 
 // src/lib/package-version.ts
-var CLI_VERSION = "0.2.60";
+var CLI_VERSION = "0.2.62";
 
 // src/lib/render-error.ts
 init_errors();
@@ -28858,7 +28858,7 @@ ${colors.error("\u2717")} The GitHub App on disk is installed on ${colors.field(
 // src/commands/bootstrap/launch.ts
 var DEFAULT_RG = "rg-m8t-stack";
 var DEFAULT_INSTALLER = "ghcr.io/m8t-labs/m8t-installer";
-var DEFAULT_INSTALLER_TAG = "v0.1.52";
+var DEFAULT_INSTALLER_TAG = "v0.1.53";
 var ACI_NAME = "m8t-installer";
 var MI_NAME = "m8t-installer-mi";
 var BootstrapLaunchCommand = class extends M8tCommand {
@@ -31086,13 +31086,16 @@ function defaultLocalCompanionInstallOptions() {
     getStartAtLogin: (executable) => getCompanionStartAtLogin({ homeDirectory, platform, executable })
   };
 }
-async function convergeCompanionFromChannel(converge2, stagedDirectory, resourceGroup) {
+async function convergeCompanionFromChannel(converge2, options = {}) {
+  const { from: stagedDirectory, resourceGroup, platformVersion } = options;
   let artifactManifestPath;
   let dispose = () => Promise.resolve();
   if (stagedDirectory !== void 0) {
     artifactManifestPath = path37.resolve(stagedDirectory, "artifact-v1.json");
   } else {
-    const release = await readCompanionRelease();
+    const release = await readCompanionRelease(
+      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);
     artifactManifestPath = build.artifactManifestPath;
@@ -31113,7 +31116,7 @@ async function runCompanionInstallCommand(stdout, install) {
   const state = await install();
   if (state.state === "not-released") {
     stdout.write(
-      "The release this platform is pinned to carries no desktop companions.\nThey arrive with a platform release \u2014 run: m8t platform update\n"
+      "The latest platform release carries no desktop companions.\nThey arrive with a platform release \u2014 run: m8t platform update\n"
     );
     return 1;
   }
@@ -31149,7 +31152,10 @@ var CompanionInstallCommand = class extends M8tCommand {
   async executeCommand() {
     return runCompanionInstallCommand(
       this.context.stdout,
-      () => convergeCompanionFromChannel(installCompanion, this.from, this.resourceGroup)
+      () => convergeCompanionFromChannel(installCompanion, {
+        ...this.from !== void 0 ? { from: this.from } : {},
+        ...this.resourceGroup !== void 0 ? { resourceGroup: this.resourceGroup } : {}
+      })
     );
   }
 };
@@ -31175,7 +31181,10 @@ var defaultDeps2 = {
   runUsagePhase,
   reactiveSeed: reactiveSeedOnInstallComplete,
   companionsSupportHost,
-  convergeCompanion: () => convergeCompanionFromChannel(installCompanion),
+  companionStatus: () => statusCompanion(defaultLocalCompanionInstallOptions()),
+  convergeCompanion: (platformVersion) => convergeCompanionFromChannel(installCompanion, {
+    ...platformVersion !== void 0 ? { platformVersion } : {}
+  }),
   homedir: () => os18.homedir()
 };
 async function finalizeInstall(args, deps = defaultDeps2) {
@@ -31266,25 +31275,6 @@ async function finalizeInstall(args, deps = defaultDeps2) {
 ` : "") + "\n"
     );
   }
-  if (webappUrl !== void 0 && deps.companionsSupportHost()) {
-    try {
-      const companion = await deps.convergeCompanion();
-      if (companion.state === "installed") {
-        args.stdout("Desktop companions installed: Stacey and Azzy are ready.\n\n");
-      } else if (companion.state !== "not-released") {
-        throw new Error("companion installation is not verified");
-      }
-    } catch (e) {
-      const reason = e instanceof Error ? e.message : String(e);
-      args.stdout(
-        `Platform installation succeeded, but the desktop companions need repair.
-Run: m8t companion repair
-  ${colors.hint(reason)}
-
-`
-      );
-    }
-  }
   let brainOrg = null;
   try {
     const credsRaw = await fs34.readFile(path38.join(markerDir, "github-app.json"), "utf8");
@@ -31315,6 +31305,49 @@ ${colors.field("Then open a brand new chat/session")} \u2014 new skills + MCP se
 `
     );
   }
+  if (webappUrl === void 0) {
+  } else if (!deps.companionsSupportHost()) {
+    args.stdout(
+      `Desktop companions are not built for ${process.platform}-${process.arch} \u2014 skipped.
+  ${colors.hint("They are macOS and Windows only.")}
+
+`
+    );
+  } else {
+    const alreadyHasCompanion = await deps.companionStatus().then((s) => s.state !== "not-installed").catch(() => true);
+    const pinned = alreadyHasCompanion ? void 0 : args.doc.result?.platformVersion;
+    args.stdout(
+      (pinned === void 0 ? "Putting Stacey and Azzy on your desktop \u2014 fetching the latest released build\n" : `Putting Stacey and Azzy on your desktop \u2014 fetching the build ${pinned} pins
+`) + `  ${colors.hint("(about 120 MB; on a slow link this takes a few minutes)")}
+`
+    );
+    try {
+      const companion = await deps.convergeCompanion(pinned);
+      if (companion.state === "installed") {
+        args.stdout("Desktop companions installed: Stacey and Azzy are ready.\n\n");
+      } else if (companion.state === "not-released") {
+        args.stdout(
+          `${pinned === void 0 ? "The latest platform release carries no desktop companions." : `The release this platform is pinned to (${pinned}) carries no desktop companions.`}
+They arrive with a platform release \u2014 run: m8t platform update
+
+`
+        );
+      } else {
+        throw new Error(
+          companion.state === "needs-repair" ? companion.reason : `companion installation is not verified (${companion.state})`
+        );
+      }
+    } catch (e) {
+      const reason = e instanceof Error ? e.message : String(e);
+      args.stdout(
+        `Platform installation succeeded, but the desktop companions need repair.
+Run: m8t companion repair
+  ${colors.hint(reason)}
+
+`
+      );
+    }
+  }
 }
 
 // src/commands/bootstrap/status.ts
@@ -33568,10 +33601,52 @@ var CompanionBridgeCommand = class extends Command61 {
 
 // src/commands/companion/status.ts
 import { Command as Command62 } from "clipanion";
-async function runCompanionStatusCommand(stdout, status, update) {
+async function withTimeout(work, ms) {
+  let timer;
+  try {
+    return await Promise.race([
+      work,
+      new Promise((_, reject) => {
+        timer = setTimeout(() => {
+          reject(new Error("channel timed out"));
+        }, ms);
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+async function runCompanionStatusCommand(stdout, status, options = {}) {
+  const { update, channel, timeoutMs = 1e4, host } = options;
   const state = await status();
   if (state.state === "not-installed") {
     stdout.write("Desktop companions are not installed.\n");
+    let answered = null;
+    if (channel) {
+      try {
+        answered = { release: await withTimeout(channel(), timeoutMs) };
+      } catch {
+        answered = null;
+      }
+    }
+    if (answered === null) return 0;
+    const { release } = answered;
+    if (release === null) {
+      stdout.write(
+        "The latest platform release carries no desktop companions.\nThey arrive with a platform release \u2014 run: m8t platform update\n"
+      );
+    } else if (companionAssetFor(release.component, host?.platform, host?.architecture) === null) {
+      stdout.write(
+        `The latest platform release (${platformTag(release.platformVersion)}) carries no companion build for this host.
+`
+      );
+    } else {
+      stdout.write(
+        `A companion build is available (${release.component.version}).
+Run: m8t companion install
+`
+      );
+    }
     return 0;
   }
   if (state.state === "needs-repair") {
@@ -33602,11 +33677,11 @@ var CompanionStatusCommand = class extends M8tCommand {
   });
   async executeCommand() {
     const options = defaultLocalCompanionInstallOptions();
-    return runCompanionStatusCommand(
-      this.context.stdout,
-      () => statusCompanion(options),
-      () => checkCompanionUpdate(options)
-    );
+    return runCompanionStatusCommand(this.context.stdout, () => statusCompanion(options), {
+      update: () => checkCompanionUpdate(options),
+      channel: () => readCompanionRelease(),
+      host: { platform: options.platform, architecture: options.architecture }
+    });
   }
 };
 
@@ -33616,7 +33691,7 @@ async function runCompanionRepairCommand(stdout, repair) {
   const state = await repair();
   if (state.state === "not-released") {
     stdout.write(
-      "The release this platform is pinned to carries no desktop companions.\nThere is nothing to repair to \u2014 run: m8t platform update\n"
+      "The latest platform release carries no desktop companions.\nThere is nothing to repair to \u2014 run: m8t platform update\n"
     );
     return 1;
   }
@@ -33639,7 +33714,9 @@ var CompanionRepairCommand = class extends M8tCommand {
   async executeCommand() {
     return runCompanionRepairCommand(
       this.context.stdout,
-      () => convergeCompanionFromChannel(repairCompanion, void 0, this.resourceGroup)
+      () => convergeCompanionFromChannel(repairCompanion, {
+        ...this.resourceGroup !== void 0 ? { resourceGroup: this.resourceGroup } : {}
+      })
     );
   }
 };