@slayzone/cli 0.36.0-beta.16 → 0.36.0-beta.17

package/dist/slay.js

@@ -35722,7 +35722,7 @@ var import_node_child_process2 = require("node:child_process");
 var import_node_fs6 = require("node:fs");
 var import_node_module = require("node:module");
 var import_node_path6 = require("node:path");
-var CLI_VERSION = true ? "0.36.0-beta.16" : "";
+var CLI_VERSION = true ? "0.36.0-beta.17" : "";
 function fail(message) {
   console.error(message);
   process.exit(1);
@@ -35873,7 +35873,18 @@ No output was captured in ${shortenPath(logPath)}.
 `)
   );
 }
-function readServiceLogTail(kind, root, lines) {
+function readServiceLogTail(kind, root, lines, systemdUnit) {
+  if (systemdUnit) {
+    try {
+      return (0, import_node_child_process2.execFileSync)(
+        "journalctl",
+        ["--user", "-u", systemdUnit, "-n", String(lines), "--no-pager", "-o", "cat"],
+        { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], env: userServiceEnv() }
+      ).trim();
+    } catch {
+      return "";
+    }
+  }
   const dir = logDirFor(kind, root);
   let files;
   try {
@@ -36502,6 +36513,12 @@ machines dial, recreate it with \`--public-address <host:port>\`.`
         `The unit for "${name}" does not record a root \u2014 it may be hand-edited. Remove it with \`slay hub rm ${name}\` and create it again.`
       );
     }
+    const occupant = (await discoverAllHubs()).find((h) => h.root === root);
+    if (occupant) {
+      fail(
+        `A hub is already running in ${shortenPath(root)} \u2014 "${occupant.name}" on port ${occupant.port} (pid ${occupant.pid}). Starting "${name}" would put two hubs on the same store.`
+      );
+    }
     await launchHub({ name, root, backend, creating: false });
   });
   cmd.command("stop <name|port>").description("Stop a hub, keeping it registered so `start` can bring it back").action(async (nameOrPort) => {
@@ -36564,7 +36581,14 @@ machines dial, recreate it with \`--public-address <host:port>\`.`
       console.log(`Unit updated to ${HUB_PACKAGE}@${bin.version}.`);
     }
     supervisorStop("hub", backend, name);
-    await waitForHubGone(hub.port, 15e3);
+    if (!await waitForHubGone(hub.port, 15e3)) {
+      fail(
+        `Hub "${name}" is still answering on port ${hub.port} after 15s, so restarting would leave TWO hubs sharing ${shortenPath(root)} \u2014 refusing.
+It is not owned by ${backend} (started by hand, docker, or before it was registered). Stop that process first:
+  kill ${hub.pid}
+then \`slay hub start ${name}\`.`
+      );
+    }
     supervisorStart("hub", backend, name, unitPath("hub", name, backend));
     const back = await waitForHub(() => findHub(name), 2e4);
     if (!back) fail(`Hub "${name}" did not come back within 20s. Check ${shortenPath(logDir)}.`);
@@ -36869,10 +36893,11 @@ function requireRegistered(name, backend) {
   }
   return { root };
 }
-async function waitForConnected(root, timeoutMs) {
+async function waitForConnected(root, timeoutMs, backend, name) {
+  const unit = backend === "systemd" ? systemdUnitName("runner", name) : void 0;
   const deadline = Date.now() + timeoutMs;
   for (; ; ) {
-    if (CONNECTED_RE.test(readServiceLogTail("runner", root, 200))) return true;
+    if (CONNECTED_RE.test(readServiceLogTail("runner", root, 200, unit))) return true;
     if (Date.now() >= deadline) return false;
     await new Promise((r) => setTimeout(r, 300));
   }
@@ -36900,7 +36925,7 @@ async function launchRunner(args) {
       }
     });
     child.unref();
-    if (!await waitForConnected(root, ENROLL_TIMEOUT_MS)) {
+    if (!await waitForConnected(root, ENROLL_TIMEOUT_MS, backend, name)) {
       if (creating) runCreateRollback();
       failWithLog(
         "runner",
@@ -36953,7 +36978,7 @@ then log out and back in, and retry. If this account is not meant to have one (a
 ` : "")
     );
   }
-  if (!await waitForConnected(root, ENROLL_TIMEOUT_MS)) {
+  if (!await waitForConnected(root, ENROLL_TIMEOUT_MS, backend, name)) {
     if (creating) {
       supervisorStop("runner", backend, name);
       removeUnit("runner", name, backend);
@@ -37058,10 +37083,10 @@ ${explainNoBackend(detectBackendWithReason().reason)}`);
         `${r.name.padEnd(nameW)}  ${state(r).padEnd(9)}  ${(r.root ? shortenPath(r.root) : "?").padEnd(rootW)}  ${(r.hubUrl ?? "-").padEnd(hubW)}  ${enrolled(r)}`
       );
     }
-    if (!hubReachable) {
+    if (!hubReachable && runners.some((r) => enrolled(r) === "?")) {
       console.log(
         `
-No hub could be reached, so ENROLLED is unknown ("?") for runners this machine has no local record of.`
+No hub could be reached, so ENROLLED is "?" for runners with no local credentials \u2014 they may or may not be enrolled.`
       );
     }
     const unmanaged = runners.filter((r) => state(r) === "unmanaged");
@@ -37230,7 +37255,7 @@ Start it with \`slay runner start ${name}\`, or remove it with \`slay runner rm
     supervisorStop("runner", backend, name);
     await waitForStopped(name, backend, 15e3);
     supervisorStart("runner", backend, name, unitPath("runner", name, backend));
-    if (!await waitForConnected(root, ENROLL_TIMEOUT_MS)) {
+    if (!await waitForConnected(root, ENROLL_TIMEOUT_MS, backend, name)) {
       fail(
         `Runner "${name}" did not reconnect within ${ENROLL_TIMEOUT_MS / 1e3}s. Check \`slay runner logs ${name}\`.`
       );
@@ -37437,7 +37462,7 @@ function updateCommand() {
 }
 
 // src/index.ts
-var program2 = new Command().name("slay").description("SlayZone CLI").version("0.36.0-beta.16").option("--dev", "Use development database (slayzone.dev.sqlite)").option("--hub <name|port>", "Target a specific hub on this machine (see `slay hub ls`)").showSuggestionAfterError(true).showHelpAfterError(true).hook("preAction", async (thisCommand) => {
+var program2 = new Command().name("slay").description("SlayZone CLI").version("0.36.0-beta.17").option("--dev", "Use development database (slayzone.dev.sqlite)").option("--hub <name|port>", "Target a specific hub on this machine (see `slay hub ls`)").showSuggestionAfterError(true).showHelpAfterError(true).hook("preAction", async (thisCommand) => {
   const root = thisCommand.parent ?? thisCommand;
   const opts = root.opts();
   if (opts.dev) process.env.SLAYZONE_DEV = "1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slayzone/cli",
-  "version": "0.36.0-beta.16",
+  "version": "0.36.0-beta.17",
   "description": "SlayZone CLI — run, list and target SlayZone hubs; drive tasks, ptys and projects",
   "license": "GPL-3.0-only",
   "private": false,