very-happy-cli 0.2.185 → 0.2.186

package/dist/{registerKillSessionHandler-DwPEAS2G.cjs → registerKillSessionHandler-CAif4Uz4.cjs}

@@ -1,19 +1,19 @@
 'use strict';
 
-var logger = require('./logger-CIUMiSLo.cjs');
+var logger = require('./logger-L0pLBOLK.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-C651e0ZZ.cjs');
+require('./pushNotifications-OtQY-Mfa.cjs');
 require('node:crypto');
 require('tweetnacl');
-require('./configuration-CwfmwaLU.cjs');
-require('./index-Ub-5xbcU.cjs');
-require('./registerCommonHandlers-K-BTp2iR.cjs');
+require('./configuration-CI0GWwaT.cjs');
+require('./index-BumVulwx.cjs');
+require('./registerCommonHandlers-De54jKz8.cjs');
 require('os');
 require('child_process');
 require('@paralleldrive/cuid2');
-require('./persistence-CNWBdUH2.cjs');
+require('./persistence-CIzOAWK6.cjs');
 require('chalk');
 require('./types-CRS-srZK.cjs');
 

package/dist/{registerKillSessionHandler-BDxd20fg.mjs → registerKillSessionHandler-CrLsN5m3.mjs}

@@ -1,17 +1,17 @@
-import { l as logger } from './logger-BjXkscIr.mjs';
+import { l as logger } from './logger-CpaeM90D.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-DnpJJ7VR.mjs';
+import './pushNotifications-2CyhYAte.mjs';
 import 'node:crypto';
 import 'tweetnacl';
-import './configuration-HPdj5Til.mjs';
-import './index-DisBaRvM.mjs';
-import './registerCommonHandlers-DpBxSCBi.mjs';
+import './configuration-DbCHeEeP.mjs';
+import './index-B9f1vKcC.mjs';
+import './registerCommonHandlers-X9lnO2TF.mjs';
 import 'os';
 import 'child_process';
 import '@paralleldrive/cuid2';
-import './persistence-CmVwM5uq.mjs';
+import './persistence-FgtDuVAP.mjs';
 import 'chalk';
 import './types-CkqAACXx.mjs';
 

package/dist/{remoteSessionClient-DnFblfFz.cjs → remoteSessionClient-9j3N_bzV.cjs}

@@ -1,12 +1,12 @@
 'use strict';
 
-var controlClient = require('./controlClient-DTMI1aTp.cjs');
-var sessionOps = require('./sessionOps-BDHEzyAY.cjs');
-var time = require('./time-BCGGrWp4.cjs');
+var controlClient = require('./controlClient-BIi1tzEo.cjs');
+var sessionOps = require('./sessionOps-tmBKG5qg.cjs');
+var time = require('./time-DcICfW0N.cjs');
 var axios = require('axios');
 var os = require('node:os');
-var configuration = require('./configuration-CwfmwaLU.cjs');
-var persistence = require('./persistence-CNWBdUH2.cjs');
+var configuration = require('./configuration-CI0GWwaT.cjs');
+var persistence = require('./persistence-CIzOAWK6.cjs');
 var node_crypto = require('node:crypto');
 
 const ACTIVE_FRESH_WINDOW_MS = 15 * 60 * 1e3;

package/dist/{remoteSessionClient-DHWfDMHA.mjs → remoteSessionClient-BApor-c2.mjs}

@@ -1,10 +1,10 @@
-import { j as resumeDaemonSession, l as listDaemonSessions } from './controlClient-DBylxaEh.mjs';
-import { d as archiveSession, u as unarchiveSession, h as sessionLiveness, e as sendUserMessage, i as readSessionState, o as openUserScopedSocket } from './sessionOps-BO6AesNJ.mjs';
-import { d as delay } from './time-BbJ-NWcl.mjs';
+import { j as resumeDaemonSession, l as listDaemonSessions } from './controlClient-Dv80mB_j.mjs';
+import { d as archiveSession, u as unarchiveSession, h as sessionLiveness, e as sendUserMessage, i as readSessionState, o as openUserScopedSocket } from './sessionOps--9p2IzVA.mjs';
+import { d as delay } from './time-BsNUVcKH.mjs';
 import axios from 'axios';
 import { hostname } from 'node:os';
-import { c as configuration } from './configuration-HPdj5Til.mjs';
-import { r as readSettings, b as readCredentialsForConfiguredRelay } from './persistence-CmVwM5uq.mjs';
+import { c as configuration } from './configuration-DbCHeEeP.mjs';
+import { r as readSettings, b as readCredentialsForConfiguredRelay } from './persistence-FgtDuVAP.mjs';
 import { randomUUID } from 'node:crypto';
 
 const ACTIVE_FRESH_WINDOW_MS = 15 * 60 * 1e3;

package/dist/{reportProgressTool-DJXfK6rp.mjs → reportProgressTool-6mDoxKuq.mjs}

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { o as AutomationNameSchema, d as AUTOMATION_ATTENTION_REASON_MAX_CHARS, e as AUTOMATION_SUMMARY_MAX_CHARS, c as AutomationPrecheckSchema, p as AutomationConcurrencySchema, q as AutomationActionSchema, t as AutomationTriggerSchema } from './index-DisBaRvM.mjs';
-import { a as authenticatedAutomationsClient, b as automationRunIdFromEnv } from './client-Ct1rnpJw.mjs';
+import { o as AutomationNameSchema, d as AUTOMATION_ATTENTION_REASON_MAX_CHARS, e as AUTOMATION_SUMMARY_MAX_CHARS, c as AutomationPrecheckSchema, p as AutomationConcurrencySchema, q as AutomationActionSchema, t as AutomationTriggerSchema } from './index-B9f1vKcC.mjs';
+import { a as authenticatedAutomationsClient, b as automationRunIdFromEnv } from './client-BfGuTBMO.mjs';
 import { u as updateAutomationChecked, c as createAutomationChecked } from './precheckCompat-DeEbilbr.mjs';
-import { P as ProjectsUnsupportedError, a as ProjectRequestError, s as sharedProjectsClient } from './client-D2lOnvzs.mjs';
+import { P as ProjectsUnsupportedError, a as ProjectRequestError, s as sharedProjectsClient } from './client-DAnQqPmc.mjs';
 import { f as formatContextForTool } from './prompt-QHuFx9j6.mjs';
 import { R as REPORT_PROGRESS_TOOL_NAME, d as REPORT_PROGRESS_TOOL_TITLE, e as REPORT_PROGRESS_TOOL_DESCRIPTION } from './agentGuidance-BDYt2Qy2.mjs';
 

package/dist/{reportProgressTool-CYgnezAO.cjs → reportProgressTool-RR5VkbDf.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var z = require('zod');
-var index = require('./index-Ub-5xbcU.cjs');
-var client = require('./client-qgKef7S6.cjs');
+var index = require('./index-BumVulwx.cjs');
+var client = require('./client-CMIhQ32m.cjs');
 var precheckCompat = require('./precheckCompat-CWOi5c9L.cjs');
-var client$1 = require('./client-C54hMWx6.cjs');
+var client$1 = require('./client-CTNxuHVc.cjs');
 var prompt = require('./prompt-Bof2aQkI.cjs');
 var agentGuidance = require('./agentGuidance-BtBx2xxE.cjs');
 

package/dist/{run-BChqUxs6.cjs → run-B2ZorDI7.cjs}

@@ -1,27 +1,27 @@
 'use strict';
 
-var mirrorProtocol = require('./mirrorProtocol-CMJ2HOZF.cjs');
+var mirrorProtocol = require('./mirrorProtocol-Did0-1jn.cjs');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
-var piRunnerArgs = require('./piRunnerArgs-CXJx3PPx.cjs');
+var piRunnerArgs = require('./piRunnerArgs-CJhXFPM9.cjs');
 var fs = require('fs/promises');
 var os$1 = require('os');
 var tmp = require('tmp');
 var axios = require('axios');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var configuration = require('./configuration-CwfmwaLU.cjs');
-var api = require('./api-BSz8MYte.cjs');
-var spawnAgents = require('./spawnAgents-D15n6tAj.cjs');
-var logger = require('./logger-CIUMiSLo.cjs');
-var index$2 = require('./index-Bh806Q-1.cjs');
-var auth = require('./auth-B8nCUEiK.cjs');
+var configuration = require('./configuration-CI0GWwaT.cjs');
+var api = require('./api-DjqQTT16.cjs');
+var spawnAgents = require('./spawnAgents-DsJSyLDl.cjs');
+var logger = require('./logger-L0pLBOLK.cjs');
+var index$2 = require('./index-W8wlfp57.cjs');
+var auth = require('./auth-CImUXAjH.cjs');
 var child_process = require('child_process');
-var _package = require('./package-CRDjc5vK.cjs');
-var doctor = require('./doctor-tLRILlmz.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-WYJCvAWD.cjs');
-var persistence = require('./persistence-CNWBdUH2.cjs');
-var controlClient = require('./controlClient-DTMI1aTp.cjs');
-var sessionOps = require('./sessionOps-BDHEzyAY.cjs');
+var _package = require('./package-BuATIMpK.cjs');
+var doctor = require('./doctor-DI6aIOne.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-BWOub_Uf.cjs');
+var persistence = require('./persistence-CIzOAWK6.cjs');
+var controlClient = require('./controlClient-BIi1tzEo.cjs');
+var sessionOps = require('./sessionOps-tmBKG5qg.cjs');
 var fastify = require('fastify');
 var z = require('zod');
 var fastifyTypeProviderZod = require('fastify-type-provider-zod');
@@ -29,62 +29,62 @@ var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var node_crypto = require('node:crypto');
 var previewPath = require('./previewPath-B0rBdhy1.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var rateLimitWindows = require('./rateLimitWindows-1WoBs8ln.cjs');
-var peerTools = require('./peerTools-SLRntgX6.cjs');
+var rateLimitWindows = require('./rateLimitWindows-DwhrA5wy.cjs');
+var peerTools = require('./peerTools-Cs3Ln6d0.cjs');
 var os = require('node:os');
-var remoteSessionClient = require('./remoteSessionClient-DnFblfFz.cjs');
-var bootstrap = require('./bootstrap-DIMkxIbR.cjs');
-var index$1 = require('./index-Dzb_Bsfu.cjs');
+var remoteSessionClient = require('./remoteSessionClient-9j3N_bzV.cjs');
+var bootstrap = require('./bootstrap-B7YvJcVK.cjs');
+var index$1 = require('./index-Bq6VHNdk.cjs');
 var require$$0 = require('fs');
 var require$$1 = require('path');
 var node_child_process = require('node:child_process');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var doctorReadiness = require('./doctorReadiness-Dl6yRQCy.cjs');
-var machineMetadata = require('./machineMetadata-BPlyxzxb.cjs');
+var machineMetadata = require('./machineMetadata-YeHF4gSY.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
 var pi = require('./pi-DlsrPCTa.cjs');
 var require$$3 = require('crypto');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var handleResumeCommand = require('./handleResumeCommand-CncudrQd.cjs');
+var handleResumeCommand = require('./handleResumeCommand-BBKUGhCv.cjs');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
-var index = require('./index-Ub-5xbcU.cjs');
+var index = require('./index-BumVulwx.cjs');
 var promises = require('node:fs/promises');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var client = require('./client-C54hMWx6.cjs');
-var client$1 = require('./client-qgKef7S6.cjs');
-var daemonSupervisor = require('./daemonSupervisor-57JYYzMf.cjs');
+var client = require('./client-CTNxuHVc.cjs');
+var client$1 = require('./client-CMIhQ32m.cjs');
+var daemonSupervisor = require('./daemonSupervisor-alqGPANc.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var startFileWatcher = require('./startFileWatcher-VFZ-Bpwa.cjs');
-var sync = require('./sync-DliZ1zZh.cjs');
+var startFileWatcher = require('./startFileWatcher-BZrpUz7_.cjs');
+var sync = require('./sync-CKSmwxec.cjs');
 var types = require('./types-CRS-srZK.cjs');
 var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
-var sessionLock = require('./sessionLock-BTo7Cdbi.cjs');
+var sessionLock = require('./sessionLock-h4162Jrf.cjs');
 var doctor$1 = require('./doctor-u46qYYKX.cjs');
 var resources = require('./resources-CqwHPhdK.cjs');
 var node_util = require('node:util');
-var template = require('./template-BLJxflCH.cjs');
+var template = require('./template-DPsqlHJQ.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
-require('./acpSessionResume-umHzSMbQ.cjs');
-require('./lidState-wwiu6M3p.cjs');
+require('./acpSessionResume-CpPNoxaW.cjs');
+require('./lidState-BxHu6dus.cjs');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-C651e0ZZ.cjs');
+require('./pushNotifications-OtQY-Mfa.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-BCGGrWp4.cjs');
-require('./registerCommonHandlers-K-BTp2iR.cjs');
+require('./time-DcICfW0N.cjs');
+require('./registerCommonHandlers-De54jKz8.cjs');
 require('util');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
 require('chalk');
 require('node:module');
 require('tweetnacl');
-require('./browser-Ch50ZchJ.cjs');
+require('./browser-C19iD31j.cjs');
 require('open');
 require('./ids-B6ZC0HGt.cjs');
 require('url');
-require('./localHappyAgentAuth-UoytSUX0.cjs');
+require('./localHappyAgentAuth-BHklNDKQ.cjs');
 require('./processTreeSnapshot-mDbnuojn.cjs');
 require('ps-list');
 
@@ -4431,7 +4431,7 @@ const runNpmProcess = (args, deps = processDefaults) => new Promise((resolveResu
   child.on("close", (code) => done({ code: timedOut ? null : code, stdout, stderr, terminationConfirmed: !timedOut || treeKilled }));
 });
 const runNpm = (args) => runNpmProcess(args);
-const defaults = {
+const defaults$1 = {
   npm: runNpm,
   fs: { lstat: promises.lstat, readlink: promises.readlink, unlink: promises.unlink, rm: promises.rm, readFile: promises.readFile, symlink: promises.symlink, access: promises.access },
   platform: process.platform,
@@ -4463,7 +4463,7 @@ function ownedCliLink(link, target, packageDir) {
   const resolved = path.resolve(path.dirname(link), target);
   return resolved.startsWith(path.join(packageDir, "bin") + path.sep);
 }
-async function installCliSafely(version, deps = defaults) {
+async function installCliSafely(version, deps = defaults$1) {
   const parsed = cliUpdate.parseExactVersion(version);
   if (!parsed) throw new Error("Invalid exact CLI version");
   if (deps.platform === "win32") {
@@ -4560,6 +4560,12 @@ async function installCliSafely(version, deps = defaults) {
   }
 }
 
+const DEFAULT_BUSY_INSTALL_GRACE_MS = 15 * 6e4;
+function resolveBusyInstallGrace(raw) {
+  if (raw === void 0 || raw.trim() === "") return DEFAULT_BUSY_INSTALL_GRACE_MS;
+  const value = Number(raw);
+  return Number.isInteger(value) && value >= 0 && value <= 24 * 60 * 6e4 ? value : DEFAULT_BUSY_INSTALL_GRACE_MS;
+}
 function createUpdateController(deps) {
   let policy = null;
   let outcome = null;
@@ -4570,6 +4576,8 @@ function createUpdateController(deps) {
   let handoverHold;
   let lastPublished = "";
   let autoUpdateEnabled;
+  let busySince = null;
+  let busyDeferred = null;
   let lastInstall = (() => {
     try {
       return deps.lastInstall?.read() ?? null;
@@ -4636,14 +4644,29 @@ function createUpdateController(deps) {
       publish(order === null ? "policy_stale" : "current", target);
       return;
     }
+    let whileBusy = false;
     if (!deps.idle()) {
-      publish("waiting_idle", target);
-      return;
+      if (busySince?.version !== target) busySince = { version: target, at: now() };
+      whileBusy = !!deps.installWhileBusy && busyDeferred?.version !== target && !deps.installFenced?.() && now() - busySince.at >= (deps.busyGraceMs ?? DEFAULT_BUSY_INSTALL_GRACE_MS);
+      if (!whileBusy) {
+        publish("waiting_idle", target, busyDeferred?.version === target ? busyDeferred.reason : void 0);
+        return;
+      }
     }
     running = true;
-    publish("installing", target);
+    publish("installing", target, whileBusy ? "while_busy" : void 0);
     try {
-      const code = await deps.install(target);
+      const code = whileBusy ? await deps.installWhileBusy(target) : await deps.install(target);
+      if (code && typeof code === "object" && "deferred" in code) {
+        busyDeferred = { version: target, reason: code.deferred };
+        publish("waiting_idle", target, code.deferred);
+        return;
+      }
+      if (code && typeof code === "object" && "blocked" in code) {
+        blocked = true;
+        publish("manual_required", target, code.blocked);
+        return;
+      }
       if (code && typeof code === "object") {
         if ("manual" in code) publish("manual_required", target, code.manual);
         else publish("failed", target, code.failed);
@@ -4761,6 +4784,134 @@ function createUpdateController(deps) {
   return { refresh, retry, request, tick, withHandover, holdHandover, isRunning: () => running, currentTarget: () => policy?.autoUpdateVersion ?? null };
 }
 
+const defaults = {
+  npm: runNpm,
+  fs: { lstat: promises.lstat, readlink: promises.readlink, readFile: promises.readFile, readdir: promises.readdir, copyFile: promises.copyFile, mkdir: promises.mkdir, rename: promises.rename, rm: promises.rm, access: promises.access },
+  platform: process.platform,
+  runningPackageDir: projectPath.projectPath(),
+  now: Date.now
+};
+const MANAGED_BINS = ["very-happy", "very-happy-mcp"];
+async function manifest(dir, deps) {
+  try {
+    return JSON.parse(await deps.fs.readFile(path.join(dir, "package.json"), "utf8"));
+  } catch {
+    return null;
+  }
+}
+async function isFile(path, deps) {
+  const stat = await deps.fs.lstat(path).catch(() => null);
+  return !!stat?.isFile();
+}
+function packageRelative(path$1) {
+  const normalized = path.relative("/pkg", path.resolve("/pkg", path$1));
+  return normalized && !normalized.startsWith("..") && !normalized.startsWith(path.sep) ? normalized : null;
+}
+async function binsUnchanged(stagedDir, liveDir, prefix, deps) {
+  const staged = await manifest(stagedDir, deps);
+  const bin = staged?.bin;
+  if (!bin || typeof bin !== "object") return "staged_bin_map_unreadable";
+  const names = Object.keys(bin).sort();
+  if (names.join(",") !== [...MANAGED_BINS].sort().join(",")) return "staged_bin_map_changed";
+  for (const name of MANAGED_BINS) {
+    const target = packageRelative(String(bin[name]));
+    if (!target || !await isFile(path.join(stagedDir, target), deps)) return "staged_bin_missing";
+    const link = path.join(prefix, "bin", name);
+    const stat = await deps.fs.lstat(link).catch(() => null);
+    if (!stat?.isSymbolicLink()) return "live_bin_not_linked";
+    const linkTarget = await deps.fs.readlink(link);
+    if (!ownedCliLink(link, linkTarget, liveDir)) return "live_bin_not_owned";
+    if (path.relative(liveDir, path.resolve(path.dirname(link), linkTarget)) !== target) return "staged_bin_map_changed";
+  }
+  return null;
+}
+async function keepOldChunks(liveDir, stagedDir, deps, sub = "dist") {
+  const live = await deps.fs.readdir(path.join(liveDir, sub)).catch(() => []);
+  const staged = new Set(await deps.fs.readdir(path.join(stagedDir, sub)).catch(() => []));
+  let kept = 0;
+  for (const name of live) {
+    if (path.basename(name) !== name) continue;
+    const from = path.join(liveDir, sub, name);
+    const stat = await deps.fs.lstat(from).catch(() => null);
+    if (stat?.isDirectory()) {
+      if (!staged.has(name)) await deps.fs.mkdir(path.join(stagedDir, sub, name));
+      kept += await keepOldChunks(liveDir, stagedDir, deps, path.join(sub, name));
+      continue;
+    }
+    if (staged.has(name) || !stat?.isFile()) continue;
+    await deps.fs.copyFile(from, path.join(stagedDir, sub, name), node_fs.constants.COPYFILE_EXCL);
+    kept++;
+  }
+  return kept;
+}
+async function installCliStaged(version, deps = defaults) {
+  const parsed = cliUpdate.parseExactVersion(version);
+  if (!parsed) throw new Error("Invalid exact CLI version");
+  if (deps.platform === "win32") return { outcome: { deferred: "staged_install_unsupported" } };
+  const liveDir = deps.runningPackageDir;
+  const prefix = liveDir ? doctor.globalPrefixForPackage(liveDir) : null;
+  if (!liveDir || !prefix) return { outcome: { manual: "install_location_unverified" } };
+  const liveStat = await deps.fs.lstat(liveDir).catch(() => null);
+  const live = await manifest(liveDir, deps);
+  if (!liveStat?.isDirectory() || liveStat.isSymbolicLink() || live?.name !== "very-happy-cli" || typeof live.version !== "string") {
+    return { outcome: { manual: "install_location_unverified" } };
+  }
+  const root = path.dirname(liveDir);
+  try {
+    await deps.fs.access(root, node_fs.constants.W_OK);
+    await deps.fs.access(liveDir, node_fs.constants.W_OK);
+  } catch {
+    return { outcome: { manual: "install_location_not_writable" } };
+  }
+  const stagePrefix = path.join(root, `.very-happy-cli-stage-${parsed.exact}`);
+  const stagedDir = path.join(stagePrefix, "lib", "node_modules", "very-happy-cli");
+  const retiredDir = path.join(root, `.very-happy-cli-retired-${live.version}-${deps.now()}`);
+  const cleanup = async (path) => {
+    await deps.fs.rm(path, { recursive: true, force: true }).catch(() => void 0);
+  };
+  await cleanup(stagePrefix);
+  let swapped = false;
+  try {
+    const result = await deps.npm(autoUpdateInstallArgs(parsed.exact, stagePrefix));
+    if (result.terminationConfirmed === false) return { outcome: "blocked" };
+    if (result.code !== 0) return { outcome: result.code };
+    const staged = await manifest(stagedDir, deps);
+    if (staged?.name !== "very-happy-cli" || staged.version !== parsed.exact) return { outcome: { deferred: "staged_package_unverified" } };
+    const binProblem = await binsUnchanged(stagedDir, liveDir, prefix, deps);
+    if (binProblem) return { outcome: { deferred: binProblem } };
+    let keptChunks;
+    try {
+      keptChunks = await keepOldChunks(liveDir, stagedDir, deps);
+    } catch {
+      return { outcome: { deferred: "staged_copy_failed" } };
+    }
+    try {
+      await deps.fs.rename(liveDir, retiredDir);
+    } catch {
+      return { outcome: { deferred: "staged_retire_failed" } };
+    }
+    try {
+      await deps.fs.rename(stagedDir, liveDir);
+    } catch {
+      try {
+        await deps.fs.rename(retiredDir, liveDir);
+      } catch {
+        return { outcome: { blocked: "staged_rollback_failed", retiredDir }, keptChunks };
+      }
+      return { outcome: { deferred: "staged_swap_failed" } };
+    }
+    swapped = true;
+    const installed = await manifest(liveDir, deps);
+    return { outcome: installed?.version === parsed.exact ? 0 : { failed: "installed_elsewhere" }, keptChunks };
+  } finally {
+    await cleanup(stagePrefix);
+    if (swapped) {
+      await cleanup(retiredDir);
+      await cleanup(path.join(root, ".package-lock.json"));
+    }
+  }
+}
+
 function parseLastInstall(raw) {
   if (!raw || typeof raw !== "object") return null;
   const { from, to, at, source } = raw;
@@ -8446,6 +8597,17 @@ async function startDaemon() {
     const daemonSupervisor$1 = daemonSupervisor.detectDaemonSupervisor(process.env, process.platform, launchdJob);
     const lineage = daemonSupervisor.daemonLineage(daemonSupervisor$1, process.env, process.platform, launchdJob);
     logger.logger.debug(`[DAEMON RUN] Supervisor: ${daemonSupervisor$1} (lineage ${lineage}${launchdJob ? `, launchd job pid ${launchdJob.jobPid ?? "-"}` : ""})`);
+    const systemdKillMode = daemonSupervisor$1 === "systemd" ? await daemonSupervisor.probeSystemdKillMode() : null;
+    const handoverSparesWrappers = daemonSupervisor.wrappersSurviveHandover({
+      supervisor: daemonSupervisor$1,
+      env: process.env,
+      platform: process.platform,
+      pid: process.pid,
+      ppid: process.ppid,
+      inContainer: require$$0.existsSync("/.dockerenv") || require$$0.existsSync("/run/.containerenv"),
+      systemdKillMode
+    });
+    logger.logger.debug(`[DAEMON RUN] Handover spares wrappers: ${handoverSparesWrappers}${daemonSupervisor$1 === "systemd" ? ` (KillMode ${systemdKillMode ?? "unknown"})` : ""}`);
     let fileState = {
       pid: process.pid,
       httpPort: controlPort,
@@ -8579,6 +8741,15 @@ async function startDaemon() {
       // whose turn ended but still has background tasks is busy too.
       idle: () => !turnActivity.hasActiveTurn() && !backgroundTasks.hasAny() && !harnessInstaller?.isRunning(),
       install: installCliSafely,
+      // B-817: a machine that is never idle installs after the grace period
+      // through the staged path, which never leaves the live tree incomplete.
+      installWhileBusy: async (version) => {
+        const report = await installCliStaged(version);
+        logger.logger.warn(`[DAEMON RUN] CLI update: staged install while busy -> ${JSON.stringify(report.outcome)} keptChunks=${report.keptChunks ?? 0}`);
+        return report.outcome;
+      },
+      installFenced: () => !!harnessInstaller?.isRunning(),
+      busyGraceMs: resolveBusyInstallGrace(process.env.HAPPY_CLI_UPDATE_BUSY_GRACE_MS),
       lastInstall: lastInstallStore(configuration.configuration.happyHomeDir),
       publish: (state) => {
         cliUpdateStateRef = state;
@@ -8680,7 +8851,8 @@ async function startDaemon() {
               }
             }
             const relayMove = pendingRelayMove;
-            if ((bundleReplaced || relayMove) && !teamWorker?.busy && !automationRunner?.busy && !updateController.isRunning() && !harnessInstaller?.isRunning() && !turnActivity.hasActiveTurn() && !backgroundTasks.hasAny()) {
+            const sessionsHold = () => daemonSupervisor.handoverWaitsForSessions({ bundleReplaced, relayMove: !!relayMove, sparesWrappers: handoverSparesWrappers }) && (turnActivity.hasActiveTurn() || backgroundTasks.hasAny());
+            if ((bundleReplaced || relayMove) && !teamWorker?.busy && !automationRunner?.busy && !updateController.isRunning() && !harnessInstaller?.isRunning() && !sessionsHold()) {
               const preflight = bundleReplaced ? await preflightNewBundle(bundlePath) : { action: "proceed" };
               if (preflight.action === "hold") {
                 if (lastHandoverHold !== preflight.reason) {
@@ -8690,7 +8862,7 @@ async function startDaemon() {
                 updateController.holdHandover(preflight.reason);
                 return;
               }
-              if (teamWorker?.busy || automationRunner?.busy || updateController.isRunning() || harnessInstaller?.isRunning() || turnActivity.hasActiveTurn() || backgroundTasks.hasAny()) return;
+              if (teamWorker?.busy || automationRunner?.busy || updateController.isRunning() || harnessInstaller?.isRunning() || sessionsHold()) return;
               lastHandoverHold = null;
               logger.logger.debug(relayMove ? `[DAEMON RUN] Relay moved to ${relayMove.serverUrl}; handing off to a new daemon on the new settings` : "[DAEMON RUN] Daemon bundle replaced on disk and verified, handing off to new daemon");
               teamWorker?.stop();