@adhdev/daemon-core 1.0.18-rc.8 → 1.0.18-rc.9

package/dist/commands/windows-atomic-upgrade.d.ts

@@ -46,6 +46,10 @@ export declare function createDefaultWindowsAtomicHooks(options: {
     cwd: string;
     env: NodeJS.ProcessEnv;
     log: (message: string) => void;
+    /** Loopback IPC port to probe for health/version. Defaults to the daemon's local IPC port. */
+    healthPort?: number;
+    /** How long to poll for the replacement daemon to report the target version. */
+    healthTimeoutMs?: number;
 }): WindowsAtomicUpgradeHooks;
 export declare function boundedCleanupInactivePrefixes(layout: WindowsInstallerLayout, activePrefix: string, log: (message: string) => void): void;
 export declare function cleanupInactivePrefixesWithGuard(options: {

package/dist/index.js

@@ -442,10 +442,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "ebf45e12869e32286272a11046f70914784f3f04" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "ebf45e12" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "1.0.18-rc.8" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-22T04:22:40.678Z" : void 0);
+  const commit = readInjected(true ? "3a1a0d16c0dd7ce3df15591fbe30b7e8638ab876" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "3a1a0d16" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "1.0.18-rc.9" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-22T05:27:14.328Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -16639,6 +16639,33 @@ function isTargetNodeTransientlyUnresolved(mesh, task) {
   }
   return isWithinCloneBootstrapGrace(targetNodeId);
 }
+function resolveDeadTargetVerdict(components, meshId, mesh, task) {
+  const NOT_DEAD = { dead: false, nodeDead: false, reason: "" };
+  const targetSessionId = readNonEmptyString(task.targetSessionId);
+  const targetNodeId = readNonEmptyString(task.targetNodeId);
+  if (!targetSessionId && !targetNodeId) return NOT_DEAD;
+  const lastUpdateMs = Date.parse(task.updatedAt || task.createdAt || "");
+  if (Number.isFinite(lastUpdateMs) && Date.now() - lastUpdateMs < DEAD_TARGET_GRACE_MS) return NOT_DEAD;
+  const nodes = Array.isArray(mesh?.nodes) ? mesh.nodes : [];
+  if (targetNodeId) {
+    const nodePresent = nodes.some((n) => meshNodeIdMatches(n, targetNodeId));
+    if (!nodePresent) {
+      if (isTargetNodeTransientlyUnresolved(mesh, task)) return NOT_DEAD;
+      return { dead: true, nodeDead: true, reason: "dead_target_node_absent" };
+    }
+  }
+  if (targetSessionId) {
+    const node = targetNodeId ? nodes.find((n) => meshNodeIdMatches(n, targetNodeId)) : void 0;
+    const nodeIsLocal = node ? isLocalAutoLaunchNode(node) : true;
+    if (nodeIsLocal) {
+      const verdict = resolveSessionBusyVerdict(components, targetSessionId);
+      if (verdict === "UNKNOWN") {
+        return { dead: true, nodeDead: false, reason: "dead_target_session_absent" };
+      }
+    }
+  }
+  return NOT_DEAD;
+}
 function retractActionableSkipIfPreviouslyNotified(meshId, taskId) {
   const dedupKey = `${meshId}:${taskId}`;
   if (!lastActionableSkipNotified.delete(dedupKey)) return;
@@ -17156,6 +17183,21 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
       continue;
     }
     if (task.targetSessionId) {
+      const deadTarget = resolveDeadTargetVerdict(components, meshId, mesh, task);
+      if (deadTarget.dead) {
+        const requeued = requeueTask(meshId, task.id, {
+          reason: deadTarget.reason,
+          clearTargetSession: true,
+          // Keep the node pin if only the SESSION died on a still-live node; clear it
+          // when the NODE itself is absent (nothing to pin to).
+          clearTargetNode: deadTarget.nodeDead
+        });
+        if (requeued) {
+          LOG.warn("MeshQueue", `DEAD-TARGET-SELFHEAL: task ${task.id} (mesh ${meshId}) was pinned to a dead target (${deadTarget.reason}); requeued${deadTarget.nodeDead ? " and unpinned node" : ""} (requeueCount=${requeued.requeueCount ?? "?"}, status=${requeued.status}).`);
+        }
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_dead_requeued" });
+        continue;
+      }
       markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_constraint" });
       continue;
     }
@@ -17727,7 +17769,7 @@ function runIdleMaintenanceThenAssignQueue(components, args) {
     });
   });
 }
-var import_fs13, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, CONTINUOUS_AUTO_FAST_FORWARD_SCAN_COOLDOWN_MS, continuousAutoFastForwardLastScan, autoFastForwardWorkspaceLease, BOOTSTRAP_TERMINAL_STATUSES, DISPATCH_CONFIRM_TIMEOUT_MS, DISPATCH_CONNECT_TIMEOUT_MS, dispatchWarmupGetterMissingWarned, LOCAL_LAUNCH_READY_TIMEOUT_MS, LOCAL_LAUNCH_READY_POLL_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, AUTO_LAUNCH_AWAIT_CLAIM_BACKOFF_CAP_CYCLES, AUTO_LAUNCH_REMOTE_IDLE_TTL_MS, autoLaunchAwaitClaimBackoff, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, ACTIONABLE_SKIP_REASON_PREFIXES, TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON, lastActionableSkipNotified;
+var import_fs13, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, CONTINUOUS_AUTO_FAST_FORWARD_SCAN_COOLDOWN_MS, continuousAutoFastForwardLastScan, autoFastForwardWorkspaceLease, BOOTSTRAP_TERMINAL_STATUSES, DISPATCH_CONFIRM_TIMEOUT_MS, DISPATCH_CONNECT_TIMEOUT_MS, dispatchWarmupGetterMissingWarned, LOCAL_LAUNCH_READY_TIMEOUT_MS, LOCAL_LAUNCH_READY_POLL_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, AUTO_LAUNCH_AWAIT_CLAIM_BACKOFF_CAP_CYCLES, AUTO_LAUNCH_REMOTE_IDLE_TTL_MS, autoLaunchAwaitClaimBackoff, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, ACTIONABLE_SKIP_REASON_PREFIXES, TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON, lastActionableSkipNotified, DEAD_TARGET_GRACE_MS;
 var init_mesh_queue_assignment = __esm({
   "src/mesh/mesh-queue-assignment.ts"() {
     "use strict";
@@ -17789,6 +17831,7 @@ var init_mesh_queue_assignment = __esm({
     ];
     TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON = "target_node_bootstrap_pending";
     lastActionableSkipNotified = /* @__PURE__ */ new Map();
+    DEAD_TARGET_GRACE_MS = 6e4;
   }
 });
 
@@ -43395,6 +43438,40 @@ async function stopOwnedProcessesForPrefixes(options) {
 var POINTER_NAME = ".adhdev-current";
 var STABLE_FILES = [POINTER_NAME, "adhdev.cmd", "adhdev.ps1", "adhdev"];
 var DEFAULT_HEALTH_PORT = 19222;
+function fetchLocalJson(port, pathname) {
+  return new Promise((resolve27) => {
+    const req = http2.get(`http://127.0.0.1:${port}${pathname}`, { timeout: 1500 }, (res) => {
+      let body = "";
+      res.setEncoding("utf8");
+      res.on("data", (chunk) => {
+        body += chunk;
+      });
+      res.on("end", () => resolve27({ ok: res.statusCode === 200, body }));
+    });
+    req.on("timeout", () => req.destroy());
+    req.on("error", () => resolve27({ ok: false, body: "" }));
+  });
+}
+async function fetchLocalHealth(port) {
+  const { ok, body } = await fetchLocalJson(port, "/health");
+  if (!ok) return { ok: false };
+  try {
+    const pid = Number(JSON.parse(body)?.pid);
+    return { ok: true, pid: Number.isFinite(pid) ? pid : void 0 };
+  } catch {
+    return { ok: false };
+  }
+}
+async function fetchLocalStatusVersion(port) {
+  const { ok, body } = await fetchLocalJson(port, "/api/v1/status");
+  if (!ok) return void 0;
+  try {
+    const version = JSON.parse(body)?.status?.version;
+    return typeof version === "string" ? version : void 0;
+  } catch {
+    return void 0;
+  }
+}
 var ADHDEV_OWNED_MARKERS = [
   "session-host-daemon",
   "node_modules/adhdev",
@@ -43672,6 +43749,8 @@ async function performWindowsAtomicUpgrade(options) {
   }
 }
 function createDefaultWindowsAtomicHooks(options) {
+  const healthPort = options.healthPort ?? DEFAULT_HEALTH_PORT;
+  const healthTimeoutMs = options.healthTimeoutMs ?? 3e4;
   return {
     install: (stagedPrefix, portableNode) => {
       const env = {
@@ -43682,7 +43761,7 @@ function createDefaultWindowsAtomicHooks(options) {
       };
       const pathKey = Object.keys(env).find((key2) => key2.toLowerCase() === "path") || "Path";
       env[pathKey] = `${path20.dirname(portableNode)};${env[pathKey] || ""}`;
-      (0, import_child_process6.execFileSync)(portableNode, [
+      const installOutput = String((0, import_child_process6.execFileSync)(portableNode, [
         options.npmCliPath,
         "install",
         "-g",
@@ -43697,7 +43776,8 @@ function createDefaultWindowsAtomicHooks(options) {
         maxBuffer: 20 * 1024 * 1024,
         windowsHide: true,
         env
-      });
+      }));
+      if (installOutput.trim()) options.log(installOutput.trim());
     },
     restart: (portableNode, stagedCliEntry) => {
       const restartArgv = options.restartArgv.map((arg, index) => index === 0 ? stagedCliEntry : arg);
@@ -43724,28 +43804,12 @@ function createDefaultWindowsAtomicHooks(options) {
       child.unref();
     },
     waitForHealth: async (pid, targetVersion) => {
-      const deadline = Date.now() + 3e4;
+      const deadline = Date.now() + healthTimeoutMs;
       while (Date.now() < deadline) {
-        const result = await new Promise((resolve27) => {
-          const req = http2.get(`http://127.0.0.1:${DEFAULT_HEALTH_PORT}/health`, { timeout: 1500 }, (res) => {
-            let body = "";
-            res.setEncoding("utf8");
-            res.on("data", (chunk) => {
-              body += chunk;
-            });
-            res.on("end", () => {
-              let responsePid;
-              try {
-                responsePid = Number(JSON.parse(body)?.pid);
-              } catch {
-              }
-              resolve27({ ok: res.statusCode === 200, pid: responsePid, body });
-            });
-          });
-          req.on("timeout", () => req.destroy());
-          req.on("error", () => resolve27({ ok: false }));
-        });
-        if (result.ok && result.pid === pid && result.body?.includes(targetVersion)) return true;
+        const liveness = await fetchLocalHealth(healthPort);
+        const alive = liveness.ok && liveness.pid === pid;
+        const version = alive ? await fetchLocalStatusVersion(healthPort) : void 0;
+        if (alive && version === targetVersion) return true;
         await new Promise((resolve27) => setTimeout(resolve27, 500));
       }
       return false;
@@ -44174,22 +44238,31 @@ async function runDaemonUpgradeHelper(payload) {
         `Cannot upgrade: owned processes still running under current prefix: ${preStop.survivors.map((s2) => s2.pid).join(", ")}`
       );
     }
-    await performWindowsAtomicUpgrade({
-      layout: windowsInstallerLayout,
-      packageName: payload.packageName,
-      targetVersion: payload.targetVersion,
-      portableNode,
-      excludePids: upgradePids,
-      hooks: createDefaultWindowsAtomicHooks({
+    try {
+      await performWindowsAtomicUpgrade({
+        layout: windowsInstallerLayout,
         packageName: payload.packageName,
         targetVersion: payload.targetVersion,
-        npmCliPath,
-        restartArgv,
-        cwd: payload.cwd || process.cwd(),
-        env: Object.fromEntries(Object.entries(process.env).filter(([key2]) => key2 !== UPGRADE_HELPER_ENV)),
-        log: appendUpgradeLog
-      })
-    });
+        portableNode,
+        excludePids: upgradePids,
+        hooks: createDefaultWindowsAtomicHooks({
+          packageName: payload.packageName,
+          targetVersion: payload.targetVersion,
+          npmCliPath,
+          restartArgv,
+          cwd: payload.cwd || process.cwd(),
+          env: Object.fromEntries(Object.entries(process.env).filter(([key2]) => key2 !== UPGRADE_HELPER_ENV)),
+          log: appendUpgradeLog
+        })
+      });
+    } catch (error) {
+      emitUpgradeFailureNotice([
+        `adhdev ${payload.packageName}@${payload.targetVersion} upgrade failed and was rolled back: ${error?.message || String(error)}`,
+        `Previous version preserved (active prefix: ${windowsInstallerLayout.activePrefix}).`,
+        "See daemon-upgrade.log for the full install/health trace. The next daemon start will retry."
+      ]);
+      throw error;
+    }
     try {
       fs15.unlinkSync(getUpgradeFailureNoticePath());
     } catch {