@zixt/host 0.0.127 → 0.0.129

package/dist/index.js

@@ -28,7 +28,7 @@ import { homedir as homedir4 } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.127",
+  version: "0.0.129",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -25600,6 +25600,9 @@ function watchForUpdates(options) {
   };
 }
 
+// src/exit-codes.ts
+var DO_NOT_RESTART_EXIT_CODE = 64;
+
 // src/runners/process-tree.ts
 import { spawn as spawn3 } from "node:child_process";
 import { readFile as readFile3 } from "node:fs/promises";
@@ -26629,8 +26632,9 @@ var CONTAINMENT_SUMMARY = {
   probation_commit: "could not commit its probation evidence"
 };
 function describeWorkerExit(record2) {
+  const controlledStop = record2.containment === null && record2.signal === null && record2.code === DO_NOT_RESTART_EXIT_CODE;
   return {
-    summary: record2.containment ? CONTAINMENT_SUMMARY[record2.containment] : record2.signal ? `was killed by ${record2.signal}` : `exited unexpectedly with code ${record2.code ?? "unknown"}`,
+    summary: controlledStop ? "stopped because this Machine needed attention" : record2.containment ? CONTAINMENT_SUMMARY[record2.containment] : record2.signal ? `was killed by ${record2.signal}` : `exited unexpectedly with code ${record2.code ?? "unknown"}`,
     context: {
       ...record2.version ? { version: record2.version } : {},
       ...record2.pid === null ? {} : { pid: record2.pid },
@@ -26640,7 +26644,8 @@ function describeWorkerExit(record2) {
       heartbeats: record2.heartbeats,
       readiness: record2.readinessMilestones,
       ...record2.msSinceHeartbeat === null ? {} : { sinceHeartbeat: `${record2.msSinceHeartbeat}ms` }
-    }
+    },
+    replayNext: controlledStop ? "This was a controlled stop, not a crash. Review the earlier Host message if this Machine still needs attention" : "This Machine restarted itself; report it if the same exit repeats"
   };
 }
 
@@ -27852,7 +27857,6 @@ var SUPERVISOR_PROTOCOL_ENV = "ZIXT_HOST_SUPERVISOR_PROTOCOL";
 var SUPERVISOR_VERSION_ENV = "ZIXT_HOST_SUPERVISOR_VERSION";
 var SUPERVISOR_PROTOCOL = "2";
 var SUPERVISOR_RELOAD_EXIT_CODE = 76;
-var DO_NOT_RESTART_EXIT_CODE = 64;
 var RESTART_BACKOFF_MS = 2e3;
 var MAX_RESTART_BACKOFF_MS = 6e4;
 var CRASH_STREAK_RESET_MS = 6e4;
@@ -42638,6 +42642,7 @@ import { homedir as homedir12, userInfo as userInfo2 } from "node:os";
 import { basename as basename5, dirname as dirname12, join as join23, relative as relative10, resolve as resolve14, sep as sep7 } from "node:path";
 var LAUNCH_AGENT_LABEL = "ai.zixt.host";
 var SERVICE_STABILITY_DELAY_MS2 = 2e3;
+var STATUS_WAIT_MS = 2e4;
 var COMMAND_TIMEOUT_MS2 = 7e4;
 var COMMAND_OUTPUT_LIMIT2 = 64 * 1024;
 function oneLine2(value, name) {
@@ -42851,13 +42856,18 @@ async function installMacosService(options) {
   const observe = async () => {
     const result = await run3(launchctl, ["print", target]);
     if (result.code !== 0) throw commandFailure2("Checking Zixt startup", result);
-    const status = parseLaunchdStatus(result.stdout);
-    if (!status) throw new Error("Zixt started but did not reach a running process state.");
-    return status;
+    return parseLaunchdStatus(result.stdout);
   };
-  const first = await observe();
+  const deadline = Date.now() + (options.statusWaitMs ?? STATUS_WAIT_MS);
+  let first = await observe();
+  while (!first && Date.now() < deadline) {
+    await delay4(250);
+    first = await observe();
+  }
+  if (!first) throw new Error("Zixt started but did not reach a running process state.");
   await delay4(options.serviceStabilityDelayMs ?? SERVICE_STABILITY_DELAY_MS2);
   const second = await observe();
+  if (!second) throw new Error("Zixt started but did not reach a running process state.");
   if (first.pid !== second.pid || first.runs !== second.runs) {
     throw new Error("Zixt started but restarted during its readiness check.");
   }
@@ -42881,7 +42891,7 @@ import { basename as basename6, dirname as dirname13, isAbsolute as isAbsolute18
 var TASK_NAME = "Zixt Host";
 var COMMAND_TIMEOUT_MS3 = 7e4;
 var SERVICE_STABILITY_DELAY_MS3 = 2e3;
-var STATUS_WAIT_MS = 2e4;
+var STATUS_WAIT_MS2 = 2e4;
 var SAFE_SID = /^S-1-(?:\d+-){1,14}\d+$/;
 function oneLine3(value, name) {
   if (!value || /[\0\r\n]/.test(value)) throw new Error(`${name} is not a valid one-line value`);
@@ -43217,7 +43227,7 @@ async function installWindowsService(options) {
   if (create.code !== 0) throw commandFailure3("Installing Zixt at sign-in", create);
   const start = await run3(schtasks, ["/Run", "/TN", TASK_NAME]);
   if (start.code !== 0) throw commandFailure3("Starting Zixt", start);
-  const deadline = Date.now() + (options.statusWaitMs ?? STATUS_WAIT_MS);
+  const deadline = Date.now() + (options.statusWaitMs ?? STATUS_WAIT_MS2);
   let first = null;
   do {
     first = await observe(statusPath, generation);
@@ -44584,12 +44594,12 @@ clientForConsole.current = client;
 var diagnosticsRoot = configuredWorkerDiagnosticsRoot();
 var reportedWorkerExits = diagnosticsRoot ? await readWorkerExits(diagnosticsRoot) : [];
 for (const { record: record2 } of reportedWorkerExits) {
-  const { summary, context } = describeWorkerExit(record2);
+  const { summary, context, replayNext } = describeWorkerExit(record2);
   replayConsoleLine("error", `The previous Zixt Host worker ${summary}`, {
     machine,
     at: record2.at,
     ...context,
-    next: "This Machine restarted itself; report it if the same exit repeats"
+    next: replayNext
   });
   for (const line of record2.stderr) replayConsoleLine("error", "Previous worker output", { line });
 }
@@ -44626,7 +44636,7 @@ function shutdown(exitCode = 0) {
           // the honoured code can differ from the verdict this stop was for.
           ...code === exitCode ? {} : { requested: exitCode },
           activeTasks: activeSessions,
-          next: "The Host restarts automatically; report this if it repeats"
+          next: code === DO_NOT_RESTART_EXIT_CODE ? "Resolve the earlier Host message, then start the Host again" : "The Host restarts automatically; report this if it repeats"
         }
       );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.127",
+  "version": "0.0.129",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",