@zixt/host 0.0.82 → 0.0.84

package/dist/index.js

@@ -31,7 +31,7 @@ import { homedir as homedir3 } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.82",
+  version: "0.0.84",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -16805,6 +16805,7 @@ var ListTasksResponse = external_exports.object({
 // ../../packages/contracts/src/protocol.ts
 var PROTOCOL_VERSION = 8;
 var BROWSER_PROFILE_INVENTORY_PAGE_SIZE = 200;
+var HELLO_UNWOUND_ASSIGNMENT_LIMIT = 1e3;
 var TASK_CANCEL_ACK_EVENT = "zixt.task.cancel.acknowledged";
 var TASK_CREDENTIAL_ROLLOVER_ACK_EVENT = "zixt.task.credential_rollover.acknowledged";
 var UnwoundAssignmentRef = external_exports.object({
@@ -18051,7 +18052,7 @@ var HelloFrame = external_exports.object({
    * prior socket died. Optional for rolling v5 hosts; repeated references are
    * idempotent and remain presence/host/org/epoch fenced by the cloud.
    */
-  unwoundAssignments: external_exports.array(UnwoundAssignmentRef).max(1e3).optional()
+  unwoundAssignments: external_exports.array(UnwoundAssignmentRef).max(HELLO_UNWOUND_ASSIGNMENT_LIMIT).optional()
 });
 var BrowserProfileInventoryFrame = external_exports.object({
   type: external_exports.literal("browser.profile.inventory"),
@@ -18176,6 +18177,8 @@ var CLOSE_CODES = {
   replacedByNewerConnection: 4003,
   revoked: 4004
 };
+var UNSUPPORTED_PROTOCOL_CLOSE_REASON = "unsupported protocol version";
+var CLOSE_REASON_MAX_BYTES = 123;
 
 // ../../packages/contracts/src/manager.ts
 var MANAGER_DEFAULT_MODEL = "gpt-5.6-luna";
@@ -21315,6 +21318,17 @@ function operationGrantRetryCause(code) {
   }
   return "GitHub is temporarily unavailable for credential issuance";
 }
+function closeDetail(reason) {
+  if (reason === void 0) return void 0;
+  const raw = typeof reason === "string" ? reason : reason.toString("utf8");
+  let printable = "";
+  for (const character of raw) {
+    const code = character.codePointAt(0) ?? 0;
+    printable += code < 32 || code === 127 ? " " : character;
+  }
+  const text = printable.trim().slice(0, CLOSE_REASON_MAX_BYTES);
+  return text.length > 0 ? text : void 0;
+}
 var HostClient = class _HostClient {
   constructor(opts) {
     this.opts = opts;
@@ -21687,9 +21701,13 @@ var HostClient = class _HostClient {
       const inventoryConfigured = Boolean(
         this.opts.browser?.profileInventoryPages || this.opts.browser?.profileInventory
       );
-      const unwoundAssignments = [...this.pendingUnwoundAssignments.values()].sort(
+      const disclaimable = [...this.pendingUnwoundAssignments.values()].sort(
         (left, right) => left.taskId === right.taskId ? left.epoch - right.epoch : left.taskId.localeCompare(right.taskId)
       );
+      const unwoundAssignments = disclaimable.slice(0, HELLO_UNWOUND_ASSIGNMENT_LIMIT);
+      if (disclaimable.length > unwoundAssignments.length) {
+        this.opts.onDisclaimerBacklog?.(disclaimable.length, unwoundAssignments.length);
+      }
       this.send(
         {
           type: "hello",
@@ -21721,14 +21739,14 @@ var HostClient = class _HostClient {
         if (this.ws === ws) ws.terminate();
       });
     });
-    ws.on("close", (code) => {
+    ws.on("close", (code, reason) => {
       if (inventoryRetryTimer) clearTimeout(inventoryRetryTimer);
-      void this.handleClose(ws, code, closeReason, frameTail);
+      void this.handleClose(ws, code, closeReason, frameTail, closeDetail(reason));
     });
     ws.on("error", () => {
     });
   }
-  async handleClose(ws, code, closeReason, frameTail = Promise.resolve()) {
+  async handleClose(ws, code, closeReason, frameTail = Promise.resolve(), detail) {
     if (this.ws !== ws) return;
     this.ws = void 0;
     this.protocolReady = false;
@@ -21767,13 +21785,18 @@ var HostClient = class _HostClient {
       await this.unwindAllRuns("host connection was replaced by a newer client", "client_shutdown");
       return;
     }
-    if (code === CLOSE_CODES.protocolError) {
-      this.opts.onStatus?.("incompatible");
+    const versionMismatch = code === CLOSE_CODES.protocolError && detail === UNSUPPORTED_PROTOCOL_CLOSE_REASON;
+    if (versionMismatch) {
+      this.opts.onStatus?.("incompatible", detail);
       this.stopped = true;
       await this.unwindAllRuns("host protocol is incompatible", "client_shutdown");
       return;
     }
-    this.opts.onStatus?.(closeReason === "heartbeat_timeout" ? "unresponsive" : "disconnected");
+    if (code === CLOSE_CODES.protocolError) {
+      this.opts.onStatus?.("rejected", detail);
+    } else {
+      this.opts.onStatus?.(closeReason === "heartbeat_timeout" ? "unresponsive" : "disconnected");
+    }
     if (this.stopped) return;
     await this.unwindAllRuns(
       closeReason === "heartbeat_timeout" ? "Zixt Cloud stopped answering heartbeat probes" : "host connection was lost",
@@ -25446,6 +25469,9 @@ var DO_NOT_RESTART_EXIT_CODE = 64;
 var RESTART_BACKOFF_MS = 2e3;
 var MAX_RESTART_BACKOFF_MS = 6e4;
 var CRASH_STREAK_RESET_MS = 6e4;
+function streakBackoffMs(streak) {
+  return Math.min(MAX_RESTART_BACKOFF_MS, RESTART_BACKOFF_MS * 2 ** Math.min(streak - 1, 10));
+}
 var RELEASE_PROBATION_MS = 5 * 6e4;
 var FAST_UPDATE_EXIT_MS = 1e4;
 var STOP_GRACE_MS = 3e4;
@@ -25496,6 +25522,23 @@ function versionsRoot() {
 function npmCommand(platform = process.platform) {
   return platform === "win32" ? "npm.cmd" : "npm";
 }
+async function resolveInstallerCommand(options = {}) {
+  const platform = options.platform ?? process.platform;
+  const command = npmCommand(platform);
+  if (platform !== "win32") return command;
+  const execPath = options.execPath ?? process.execPath;
+  const resolution = {
+    platform,
+    ...options.searchPath !== void 0 ? { searchPath: options.searchPath } : {}
+  };
+  return (
+    // npm ships beside the `node` running this process, and that copy is the
+    // one matching it. A per-user Scheduled Task may carry no npm on PATH.
+    await resolveTrustedCliCommand(join8(dirname4(execPath), command), resolution) ?? await resolveTrustedCliCommand(command, resolution) ?? // Nothing resolved: keep the previous behaviour, so a Machine without npm
+    // fails one install rather than changing how failure is handled.
+    command
+  );
+}
 function windowsInstallerCommandLine(command, args) {
   return [command, ...args].map(quoteForCmd).join(" ");
 }
@@ -25788,12 +25831,12 @@ var InstallerContainmentError = class extends Error {
 async function installRelease(version2, options = {}) {
   if (!VERSION_DIR.test(version2)) return null;
   const platform = options.platform ?? process.platform;
-  const installerCommand = options.installerCommand ?? npmCommand(platform);
   const root = options.root ?? versionsRoot();
   const prefix = join8(root, version2);
   const entry = installedReleaseEntry(version2, root);
   if (await validReleaseAtPrefix(prefix, version2)) return entry;
   if (options.signal?.aborted) return null;
+  const installerCommand = options.installerCommand ?? await resolveInstallerCommand({ platform });
   await mkdir5(root, { recursive: true, mode: 448 });
   const staging = join8(root, `.install-${version2}-${process.pid}-${crypto.randomUUID()}`);
   const quarantine = join8(root, `.invalid-${version2}-${process.pid}-${crypto.randomUUID()}`);
@@ -26602,6 +26645,7 @@ async function superviseHost(options = {}) {
     announceShutdown = resolve18;
   });
   const attempted = /* @__PURE__ */ new Set();
+  let unsatisfiableUpdates = 0;
   const waitOrShutdown = async (ms) => {
     if (shuttingDown2) return false;
     if (!customDelay) {
@@ -26622,11 +26666,7 @@ async function superviseHost(options = {}) {
   const waitAfterCrash = async (runtimeMs) => {
     if (runtimeMs >= CRASH_STREAK_RESET_MS) consecutiveCrashes = 0;
     consecutiveCrashes++;
-    const backoff = Math.min(
-      MAX_RESTART_BACKOFF_MS,
-      RESTART_BACKOFF_MS * 2 ** Math.min(consecutiveCrashes - 1, 10)
-    );
-    return waitOrShutdown(backoff);
+    return waitOrShutdown(streakBackoffMs(consecutiveCrashes));
   };
   const cleanupExitedWorker = async (exitedChild, childExited, workerBoundary, containment) => {
     for (let attempt = 1; attempt <= CLEANUP_ATTEMPTS2; attempt++) {
@@ -26989,10 +27029,15 @@ async function superviseHost(options = {}) {
       consecutiveCrashes = 0;
       if (orderlyValidatedBoundary) rollbackCandidate = null;
       const target = await published();
+      let updateLanded = false;
       if (target === null) {
         log2(
           "Zixt Host: a newer release was reported but the registry is unreachable; staying on the current version"
         );
+      } else if (target === command.version) {
+        log2(
+          `Zixt Host: this Machine already runs the newest published release (${target}), so an update cannot satisfy the cloud; waiting for a newer one`
+        );
       } else if (attempted.has(target)) {
         log2(`Zixt Host: already running ${target}; ignoring a repeated update request`);
       } else {
@@ -27066,6 +27111,7 @@ async function superviseHost(options = {}) {
               }
               rollbackCandidate = { failedVersion: target, command: fallback };
               command = { entry, version: target };
+              updateLanded = true;
               if (reloadAfterActivation) return SUPERVISOR_RELOAD_EXIT_CODE;
               if (releaseStore) {
                 const probation = durableState("probation", target, fallback.version);
@@ -27093,7 +27139,10 @@ async function superviseHost(options = {}) {
           log2(`Zixt Host: could not install ${target}; staying on the current version`);
         }
       }
-      if (now() - startedAt < FAST_UPDATE_EXIT_MS && !await waitOrShutdown(RESTART_BACKOFF_MS)) {
+      unsatisfiableUpdates = updateLanded ? 0 : unsatisfiableUpdates + 1;
+      if (unsatisfiableUpdates > 0) {
+        if (!await waitOrShutdown(streakBackoffMs(unsatisfiableUpdates))) return 0;
+      } else if (now() - startedAt < FAST_UPDATE_EXIT_MS && !await waitOrShutdown(RESTART_BACKOFF_MS)) {
         return 0;
       }
       if (shuttingDown2) return 0;
@@ -40385,16 +40434,26 @@ var colorOverride = forcedColor(cliOptions.color) ?? (process.env[HOST_CONSOLE_C
 var hostConsoleTail = [];
 var hostConsoleSequence = 0;
 var clientForConsole = {};
+function recordConsoleLine(line) {
+  const entry = { sequence: ++hostConsoleSequence, line };
+  hostConsoleTail.push(entry);
+  if (hostConsoleTail.length > 200) hostConsoleTail.shift();
+  clientForConsole.current?.hostConsoleLine(entry);
+}
 var log = createHostLogger({
   ...colorOverride === void 0 ? {} : { color: colorOverride },
   write: (line) => {
     console.error(line);
-    const entry = { sequence: ++hostConsoleSequence, line };
-    hostConsoleTail.push(entry);
-    if (hostConsoleTail.length > 200) hostConsoleTail.shift();
-    clientForConsole.current?.hostConsoleLine(entry);
+    recordConsoleLine(line);
   }
 });
+function replayConsoleLine(level, message, context) {
+  recordConsoleLine(
+    formatHostLogLine(level, message, context, {
+      ...colorOverride === void 0 ? {} : { color: colorOverride }
+    })
+  );
+}
 if (cliOptions.help) {
   process.stdout.write(`${hostHelpText()}
 `);
@@ -40779,6 +40838,14 @@ var client = new HostClient({
       forgetAcknowledgedAcceptedAssignments(assignments, acceptedAssignmentRoot)
     ]);
   },
+  onDisclaimerBacklog: (pending, reported) => {
+    log.warn("More unfinished Task claims than one connection can report", {
+      machine,
+      pending,
+      reported,
+      next: "The rest are reported as this Machine reconnects; report this if it does not clear"
+    });
+  },
   persistAcceptedAssignment: (assignment) => recordAcceptedAssignment(assignment, acceptedAssignmentRoot).then(() => void 0),
   forgetAcceptedAssignment: (assignment) => forgetAcceptedAssignment(assignment, acceptedAssignmentRoot),
   persistTerminalOutcome: (hostId, outcome) => recordTerminalOutcome(hostId, outcome, terminalOutcomeRoot),
@@ -40810,7 +40877,7 @@ var client = new HostClient({
   onUsableTelemetryReport: () => {
     reportWorkerReadiness();
   },
-  onStatus: (status) => {
+  onStatus: (status, detail) => {
     if (status === lastReportedStatus) return;
     lastReportedStatus = status;
     switch (status) {
@@ -40850,6 +40917,13 @@ var client = new HostClient({
         });
         queueMicrotask(() => shutdown(packagedBuild ? UPDATE_EXIT_CODE : DO_NOT_RESTART_EXIT_CODE));
         break;
+      case "rejected":
+        log.error("Zixt Cloud refused this Machine", {
+          ...connectionContext,
+          reason: detail ?? "the cloud gave no reason",
+          next: "Zixt keeps retrying; report this reason if the Machine stays offline, because no update changes it"
+        });
+        break;
     }
   },
   executor,
@@ -40867,7 +40941,7 @@ for (const { record: record2 } of reportedWorkerExits) {
     ...context,
     next: "This Machine restarted itself; report it if the same exit repeats"
   });
-  for (const line of record2.stderr) log.error("Previous worker output", { machine, line });
+  for (const line of record2.stderr) replayConsoleLine("error", "Previous worker output", { line });
 }
 log.info("Starting Zixt Host", connectionContext);
 client.start();

package/package.json

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