@m8t-stack/cli 0.2.58 → 0.2.60

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.58";
+var CLI_VERSION = "0.2.60";
 
 // 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.51";
+var DEFAULT_INSTALLER_TAG = "v0.1.52";
 var ACI_NAME = "m8t-installer";
 var MI_NAME = "m8t-installer-mi";
 var BootstrapLaunchCommand = class extends M8tCommand {
@@ -30650,6 +30650,29 @@ function defaultLaunch(executable) {
   child.unref();
   return Promise.resolve();
 }
+async function companionIsRunning(platform, executable) {
+  if (platform !== "win32") return false;
+  let handle;
+  try {
+    handle = await fs32.open(executable, "r+");
+  } catch (error) {
+    const code = error.code;
+    if (code === "ENOENT") return false;
+    if (code === "EBUSY" || code === "EPERM" || code === "EACCES") return true;
+    throw error;
+  } finally {
+    await handle?.close().catch(() => void 0);
+  }
+  return false;
+}
+async function assertCompanionNotRunning(options, executable) {
+  const running = options.isRunning ?? ((owned) => companionIsRunning(options.platform, owned));
+  if (await running(executable)) {
+    throw new Error(
+      "The desktop companions are running. Quit them from the tray, then run this again."
+    );
+  }
+}
 async function readInstalled(options) {
   const paths = companionInstallPaths(options);
   await assertNotSymlink(paths.installManifest, "Install manifest");
@@ -30778,6 +30801,15 @@ async function converge(options, force) {
   if (!force && current.state === "installed" && current.version === artifactManifest.version && current.artifactTreeSha256 === artifactManifest.treeSha256 && current.startAtLogin) {
     return current;
   }
+  if (priorInstalled) {
+    await assertCompanionNotRunning(
+      options,
+      path35.join(
+        priorInstalled.paths.targetRoot,
+        ...priorInstalled.install.entryRelativePath.split("/")
+      )
+    );
+  }
   if (current.state === "not-installed") {
     try {
       await fs32.lstat(paths.targetRoot);
@@ -30928,6 +30960,7 @@ async function uninstallCompanion(options) {
     paths.targetRoot,
     ...install.entryRelativePath.split("/")
   );
+  await assertCompanionNotRunning(options, executable);
   await (options.setStartAtLogin ?? (() => Promise.resolve()))(executable, false);
   const remove = options.removeOwnedPath ?? (async (ownedPath, recursive) => {
     await fs32.rm(ownedPath, { recursive, force: true });
@@ -31053,7 +31086,7 @@ function defaultLocalCompanionInstallOptions() {
     getStartAtLogin: (executable) => getCompanionStartAtLogin({ homeDirectory, platform, executable })
   };
 }
-async function convergeCompanionFromChannel(converge2, stagedDirectory) {
+async function convergeCompanionFromChannel(converge2, stagedDirectory, resourceGroup) {
   let artifactManifestPath;
   let dispose = () => Promise.resolve();
   if (stagedDirectory !== void 0) {
@@ -31065,7 +31098,7 @@ async function convergeCompanionFromChannel(converge2, stagedDirectory) {
     artifactManifestPath = build.artifactManifestPath;
     dispose = build.dispose;
   }
-  const gateway = await resolveGatewayContext({ interactive: false });
+  const gateway = await resolveGatewayContext({ interactive: false, resourceGroup });
   try {
     return await converge2({
       ...defaultLocalCompanionInstallOptions(),
@@ -31110,10 +31143,13 @@ var CompanionInstallCommand = class extends M8tCommand {
   from = Option52.String("--from", {
     description: "A locally staged build directory instead of the released one."
   });
+  resourceGroup = Option52.String("--resource-group", {
+    description: "Which deployment to bind to, when the subscription holds more than one."
+  });
   async executeCommand() {
     return runCompanionInstallCommand(
       this.context.stdout,
-      () => convergeCompanionFromChannel(installCompanion, this.from)
+      () => convergeCompanionFromChannel(installCompanion, this.from, this.resourceGroup)
     );
   }
 };
@@ -33575,7 +33611,7 @@ var CompanionStatusCommand = class extends M8tCommand {
 };
 
 // src/commands/companion/repair.ts
-import { Command as Command63 } from "clipanion";
+import { Command as Command63, Option as Option58 } from "clipanion";
 async function runCompanionRepairCommand(stdout, repair) {
   const state = await repair();
   if (state.state === "not-released") {
@@ -33595,12 +33631,15 @@ async function runCompanionRepairCommand(stdout, repair) {
 var CompanionRepairCommand = class extends M8tCommand {
   static paths = [["companion", "repair"]];
   static usage = Command63.Usage({
-    description: "Restore the internal desktop companion and start-at-login state."
+    description: "Restore the desktop companions and start-at-login state."
+  });
+  resourceGroup = Option58.String("--resource-group", {
+    description: "Which deployment to bind to, when the subscription holds more than one."
   });
   async executeCommand() {
     return runCompanionRepairCommand(
       this.context.stdout,
-      () => convergeCompanionFromChannel(repairCompanion)
+      () => convergeCompanionFromChannel(repairCompanion, void 0, this.resourceGroup)
     );
   }
 };