very-happy-cli 0.2.184 → 0.2.186

package/dist/{run-DqjEj8M2.mjs → run-CmA3cPD_.mjs}

@@ -1,25 +1,25 @@
-import { i as isClaudeSessionId, g as extractCompleteLines, h as decideBackfill, j as parseTerminalHookPayload, k as decideMirrorBinding, M as MIRROR_BACKFILL_LINES_DEFAULT, m as mirrorLineKey, n as mirrorLocalId, o as initializeOwnedWorktree, e as summarizeSpawnSessionForLog, q as startAgentVersionChecks, W as WORKTREE_CAPABILITY_VERSION, t as currentWorktreeService } from './mirrorProtocol-DTHWtAE5.mjs';
+import { i as isClaudeSessionId, g as extractCompleteLines, h as decideBackfill, j as parseTerminalHookPayload, k as decideMirrorBinding, M as MIRROR_BACKFILL_LINES_DEFAULT, m as mirrorLineKey, n as mirrorLocalId, o as initializeOwnedWorktree, e as summarizeSpawnSessionForLog, q as startAgentVersionChecks, W as WORKTREE_CAPABILITY_VERSION, t as currentWorktreeService } from './mirrorProtocol-DukUp2Bj.mjs';
 import { F as FS_MKDIR_CAPABILITY_VERSION } from './fsMkdir-DumgLTzR.mjs';
-import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel } from './piRunnerArgs-CIWprC1S.mjs';
+import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel } from './piRunnerArgs-YbYkfixz.mjs';
 import fs from 'fs/promises';
 import os from 'os';
 import * as tmp from 'tmp';
 import axios from 'axios';
-import { readFileSync, openSync, fsyncSync, closeSync, renameSync, existsSync, readdirSync, statSync, unlinkSync, realpathSync, promises, writeFileSync, mkdirSync, accessSync, constants as constants$1, readSync, rmdirSync } from 'node:fs';
-import { join, isAbsolute, resolve, dirname, sep, basename } from 'node:path';
-import { f as ensurePrivateDirectorySync, w as writePrivateFileSync, c as configuration } from './configuration-CVgUe2qN.mjs';
-import { T as TurnActivityTracker, A as ApiClient } from './api-BpTDU2BO.mjs';
-import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-jXo9jIYo.mjs';
-import { l as logger } from './logger-D2qd0mMg.mjs';
-import { p as pruneStaleCompileCaches } from './index-CVUiytNq.mjs';
-import { a as authAndSetupMachineIfNeeded } from './auth-D6kSt2sR.mjs';
+import { readFileSync, openSync, fsyncSync, closeSync, renameSync, existsSync, readdirSync, statSync, unlinkSync, realpathSync, promises, constants as constants$1, writeFileSync, mkdirSync, accessSync, readSync, rmdirSync } from 'node:fs';
+import { join, isAbsolute, resolve, dirname, sep, basename, relative } from 'node:path';
+import { f as ensurePrivateDirectorySync, w as writePrivateFileSync, c as configuration } from './configuration-DbCHeEeP.mjs';
+import { T as TurnActivityTracker, A as ApiClient } from './api-DUFy21Nf.mjs';
+import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-f2q31uUV.mjs';
+import { l as logger } from './logger-CpaeM90D.mjs';
+import { p as pruneStaleCompileCaches } from './index-Cyu_8WAd.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-DP3eN2Fv.mjs';
 import { spawn, execSync } from 'child_process';
-import { p as packageJson } from './package-Ek5FOyEo.mjs';
-import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-OwNmTpYh.mjs';
-import { s as spawnHappyCLI } from './spawnHappyCLI-66grqHO0.mjs';
-import { c as readPersistedSessions, r as readSettings, l as latchKeepAwake, q as reportSignature, s as decideDaemonHibernation, t as nextCheckDelay, v as persistSession, d as readDaemonState, x as acquireDaemonLock, a as resolveCheckMs, y as resolveIdleMs, z as deletePersistedSessions, A as writeDaemonState, B as writeSettings, C as settingIdleMs, u as updateSettings, D as rewriteCredentialsForRelay, g as readCredentials, E as releaseDaemonLock } from './persistence-DFtgQvr6.mjs';
-import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, u as cleanupDaemonState } from './controlClient-DMCxtwq2.mjs';
-import { e as sendUserMessage, f as readSessionMetadata, r as readSessionTranscript, l as listAccountSessions, a as listSessions, M as MAX_READ_LIMIT, s as sessionWebUrl, g as waitForSessionKey, d as archiveSession, j as analyzeLatestTurn, k as readSessionLog, m as TURN_WINDOW, n as userPromptText } from './sessionOps-Di9MC0FP.mjs';
+import { p as packageJson } from './package-DagIeOhi.mjs';
+import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-Ymj096qP.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-BcSO1rF6.mjs';
+import { c as readPersistedSessions, r as readSettings, l as latchKeepAwake, q as reportSignature, s as decideDaemonHibernation, t as nextCheckDelay, v as persistSession, d as readDaemonState, x as acquireDaemonLock, a as resolveCheckMs, y as resolveIdleMs, z as deletePersistedSessions, A as writeDaemonState, B as writeSettings, C as settingIdleMs, u as updateSettings, D as rewriteCredentialsForRelay, g as readCredentials, E as releaseDaemonLock } from './persistence-FgtDuVAP.mjs';
+import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, u as cleanupDaemonState } from './controlClient-Dv80mB_j.mjs';
+import { e as sendUserMessage, f as readSessionMetadata, r as readSessionTranscript, l as listAccountSessions, a as listSessions, M as MAX_READ_LIMIT, s as sessionWebUrl, g as waitForSessionKey, d as archiveSession, j as analyzeLatestTurn, k as readSessionLog, m as TURN_WINDOW, n as userPromptText } from './sessionOps--9p2IzVA.mjs';
 import fastify from 'fastify';
 import { z } from 'zod';
 import { validatorCompiler, serializerCompiler } from 'fastify-type-provider-zod';
@@ -27,62 +27,62 @@ import { d as decodeBase64, s as sameRelay, e as encodeBase64, h as decrypt } fr
 import { randomBytes, createHash, timingSafeEqual, randomUUID } from 'node:crypto';
 import { c as checkPreviewPath } from './previewPath-CXN4Vag0.mjs';
 import { a as BACKGROUND_TASKS_MAX, d as BACKGROUND_TASK_DESCRIPTION_MAX, e as BackgroundTaskTracker } from './backgroundTaskActivity-8PdPxrvy.mjs';
-import { b as sanitizeRateLimitReport } from './rateLimitWindows-DM_gshI4.mjs';
-import { f as formatEditConflictNotice, b as SESSION_PEER_SENT_FROM, s as sendPeerMessage, l as listPeerSessions, C as CLI_PEER_SENDER_ID } from './peerTools-CABQ6iKd.mjs';
+import { b as sanitizeRateLimitReport } from './rateLimitWindows-C0zbGT7K.mjs';
+import { f as formatEditConflictNotice, b as SESSION_PEER_SENT_FROM, s as sendPeerMessage, l as listPeerSessions, C as CLI_PEER_SENDER_ID } from './peerTools-CUCqJ83-.mjs';
 import os$1, { hostname, homedir, tmpdir } from 'node:os';
-import { c as RemoteCallBudget, e as REMOTE_WRITE_CALLS_PER_MINUTE, d as deliverToSession, g as guardRemoteSessionOpsRequest, h as remoteError, i as REMOTE_OP_DEADLINE_MS, j as formatRemoteAuditLine, k as REMOTE_SEND_COMMIT_DEADLINE_MS, m as REMOTE_RESUME_WAIT_MS, n as capRemoteTranscript, o as capRemoteText, p as REMOTE_ANSWER_MAX_BYTES, q as REMOTE_TITLE_MAX_BYTES } from './remoteSessionClient-1nycIdrG.mjs';
-import { assistantHome, bootstrapAssistantHome } from './bootstrap-CodyCmGt.mjs';
-import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-C7zgeuLP.mjs';
+import { c as RemoteCallBudget, e as REMOTE_WRITE_CALLS_PER_MINUTE, d as deliverToSession, g as guardRemoteSessionOpsRequest, h as remoteError, i as REMOTE_OP_DEADLINE_MS, j as formatRemoteAuditLine, k as REMOTE_SEND_COMMIT_DEADLINE_MS, m as REMOTE_RESUME_WAIT_MS, n as capRemoteTranscript, o as capRemoteText, p as REMOTE_ANSWER_MAX_BYTES, q as REMOTE_TITLE_MAX_BYTES } from './remoteSessionClient-BApor-c2.mjs';
+import { assistantHome, bootstrapAssistantHome } from './bootstrap-MFmMruyB.mjs';
+import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-04pYyzsJ.mjs';
 import require$$0, { existsSync as existsSync$1, statSync as statSync$1, mkdtempSync, rmSync } from 'fs';
 import require$$1, { join as join$1 } from 'path';
 import { spawn as spawn$1, execFile, spawnSync } from 'node:child_process';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { d as daemonEndpointsMatch, r as resolveClaudeCredentialReadiness } from './doctorReadiness-C208SMN9.mjs';
-import { o as ownerRetryPending, c as consumeOwnerRetry, s as spawnGate, a as afterStartupFailure, b as startupFailureMessage, T as TEAM_SPAWN_MAX_ATTEMPTS, d as TEAM_CLEANUP_RETRY_MS, g as getInitialMachineMetadata, e as getStartupCliAvailability, f as TEAM_RETRY_CAPABILITY_VERSION, w as withRunningCliFacts } from './machineMetadata-B2czDiTd.mjs';
+import { o as ownerRetryPending, c as consumeOwnerRetry, s as spawnGate, a as afterStartupFailure, b as startupFailureMessage, T as TEAM_SPAWN_MAX_ATTEMPTS, d as TEAM_CLEANUP_RETRY_MS, g as getInitialMachineMetadata, e as getStartupCliAvailability, f as TEAM_RETRY_CAPABILITY_VERSION, w as withRunningCliFacts } from './machineMetadata-ukaYmmlK.mjs';
 import { M as ModelConfigError, B as BackupStore, r as readConfigFile, s as sha256, a as atomicWriteFile } from './fileStore-5qpetZS0.mjs';
 import { c as collectSecretValues, a as parseJsonObject, b as childObject, s as setOrDelete, d as changedPaths, e as stringifyLike, f as fail, n as normalizeModelList, g as normalizeModelId, h as normalizeSecret, i as normalizeBaseUrl, u as uniq, j as baseUrlWarnings, m as maskSecret, k as getPath$1, l as normalizeProviderId, o as piAdapter, r as redactText } from './pi-CqyoZMjI.mjs';
 import require$$3 from 'crypto';
 import { c as commandOnPath } from './detectCLI-CSGMlV51.mjs';
-import { buildResumeLaunch } from './handleResumeCommand-BO00SYjG.mjs';
+import { buildResumeLaunch } from './handleResumeCommand-DW_MRgtz.mjs';
 import { n as normalizeWebPanels } from './webPanels-B2_C2-3g.mjs';
-import { K as ServerMigrateNoticeSchema, L as isHarnessInstallId, e as AUTOMATION_SUMMARY_MAX_CHARS, M as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, N as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, b as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, Q as AUTOMATION_CLAIM_MAX_RUNS, T as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, U as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, V as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-DisBaRvM.mjs';
-import { access, symlink, readFile, rm, unlink, readlink, lstat, constants, stat, open } from 'node:fs/promises';
+import { K as ServerMigrateNoticeSchema, L as isHarnessInstallId, e as AUTOMATION_SUMMARY_MAX_CHARS, M as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, N as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, b as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, Q as AUTOMATION_CLAIM_MAX_RUNS, T as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, U as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, V as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-B9f1vKcC.mjs';
+import { access, symlink, readFile, rm, unlink, readlink, lstat, constants, rename, mkdir, copyFile, readdir, stat, open } from 'node:fs/promises';
 import { p as parseExactVersion, c as compareExactVersions, f as fetchCliUpdateState, r as resolveCliUpdateCheckInterval, D as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS } from './cliUpdate-Y34VGe9Y.mjs';
-import { P as ProjectsUnsupportedError, c as createProjectsClient } from './client-CX-_2myt.mjs';
-import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-BdbVizjk.mjs';
-import { w as withKeychainOffPath, a as keychainIdentityFor, i as interpretSecurityRead, s as securityReadArgs, b as securityDeleteArgs, c as keychainOffShimDir, d as interpretCredentialsFile, C as CREDENTIALS_REJECTED_DETAIL, e as buildClaudeAuthState, f as claudeAuthStateChanged, r as resolveSdkClaudeBinary, g as classifyAuthStatus, h as diagnoseStores, p as parseLaunchctlPid, H as HAPPY_DAEMON_LAUNCHD_LABEL, j as classifyLineage, l as probeLaunchdJob, m as detectDaemonSupervisor, n as daemonLineage } from './daemonSupervisor-DfzrtNhM.mjs';
+import { P as ProjectsUnsupportedError, c as createProjectsClient } from './client-DAnQqPmc.mjs';
+import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-BfGuTBMO.mjs';
+import { w as withKeychainOffPath, a as keychainIdentityFor, i as interpretSecurityRead, s as securityReadArgs, b as securityDeleteArgs, c as keychainOffShimDir, d as interpretCredentialsFile, C as CREDENTIALS_REJECTED_DETAIL, e as buildClaudeAuthState, f as claudeAuthStateChanged, r as resolveSdkClaudeBinary, g as classifyAuthStatus, h as diagnoseStores, p as parseLaunchctlPid, H as HAPPY_DAEMON_LAUNCHD_LABEL, j as classifyLineage, l as probeLaunchdJob, m as detectDaemonSupervisor, n as daemonLineage, o as probeSystemdKillMode, q as wrappersSurviveHandover, t as handoverWaitsForSessions } from './daemonSupervisor-BxohggqN.mjs';
 import { g as getProjectPath } from './path-D2wdaNSk.mjs';
 import { b as extractClaudeEditPaths } from './editPaths-BVfS_FFL.mjs';
-import { s as startFileWatcher } from './startFileWatcher-BLDkieUW.mjs';
-import { I as InvalidateSync } from './sync-DJvx7RbO.mjs';
+import { s as startFileWatcher } from './startFileWatcher-DVia64Vg.mjs';
+import { I as InvalidateSync } from './sync-CZjyTC4v.mjs';
 import { R as RawJSONLinesSchema } from './types-CkqAACXx.mjs';
 import { t as tmuxArgs, a as scrubTmuxClientEnv, s as shellescape } from './tmuxSocket-B8Yx20sT.mjs';
-import { p as processIdentityFields, r as readSessionLock, t as terminateProcess, d as terminateProcessTree } from './sessionLock-ha9gsQEn.mjs';
+import { p as processIdentityFields, r as readSessionLock, t as terminateProcess, d as terminateProcessTree } from './sessionLock-DOsE5UUf.mjs';
 import { findAllHappyProcesses } from './doctor-BPkYWSuq.mjs';
 import { T as TEAM_SKILL, a as TEAM_LEAD_PLAYBOOK, b as TEAM_MEMBER_RULES } from './resources-CLdQfe3b.mjs';
 import { promisify } from 'node:util';
-import { b as clipText, r as renderAction, c as clipAutomationReport, e as renderTemplate } from './template-YlpbYGeQ.mjs';
+import { b as clipText, r as renderAction, c as clipAutomationReport, e as renderTemplate } from './template-DuKZw-Sz.mjs';
 import { d as describeAgentHome } from './loginShellEnv-Dw8M7tkI.mjs';
-import './acpSessionResume-Dz1myMbR.mjs';
-import './lidState-CBjQEwTt.mjs';
+import './acpSessionResume-CKacrrHV.mjs';
+import './lidState-CZ1ggYiB.mjs';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-gVJWGFBP.mjs';
+import './pushNotifications-2CyhYAte.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-Du0scQeJ.mjs';
-import './registerCommonHandlers-CyAtDNvs.mjs';
+import './time-BsNUVcKH.mjs';
+import './registerCommonHandlers-X9lnO2TF.mjs';
 import 'util';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
 import 'chalk';
 import 'node:module';
 import 'tweetnacl';
-import './browser-CqMhj8Gm.mjs';
+import './browser-CfFbN1Us.mjs';
 import 'open';
 import './ids-DU6sLx4C.mjs';
 import 'url';
-import './localHappyAgentAuth-CcWGU_lS.mjs';
+import './localHappyAgentAuth-OJk4xDwg.mjs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'ps-list';
 
@@ -4410,7 +4410,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, readlink, unlink, rm, readFile, symlink, access },
   platform: process.platform,
@@ -4442,7 +4442,7 @@ function ownedCliLink(link, target, packageDir) {
   const resolved = resolve(dirname(link), target);
   return resolved.startsWith(join(packageDir, "bin") + sep);
 }
-async function installCliSafely(version, deps = defaults) {
+async function installCliSafely(version, deps = defaults$1) {
   const parsed = parseExactVersion(version);
   if (!parsed) throw new Error("Invalid exact CLI version");
   if (deps.platform === "win32") {
@@ -4539,6 +4539,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;
@@ -4549,6 +4555,8 @@ function createUpdateController(deps) {
   let handoverHold;
   let lastPublished = "";
   let autoUpdateEnabled;
+  let busySince = null;
+  let busyDeferred = null;
   let lastInstall = (() => {
     try {
       return deps.lastInstall?.read() ?? null;
@@ -4615,14 +4623,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);
@@ -4740,6 +4763,134 @@ function createUpdateController(deps) {
   return { refresh, retry, request, tick, withHandover, holdHandover, isRunning: () => running, currentTarget: () => policy?.autoUpdateVersion ?? null };
 }
 
+const defaults = {
+  npm: runNpm,
+  fs: { lstat, readlink, readFile, readdir, copyFile, mkdir, rename, rm, access },
+  platform: process.platform,
+  runningPackageDir: 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(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) {
+  const normalized = relative("/pkg", resolve("/pkg", path));
+  return normalized && !normalized.startsWith("..") && !normalized.startsWith(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(join(stagedDir, target), deps)) return "staged_bin_missing";
+    const link = 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 (relative(liveDir, resolve(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(join(liveDir, sub)).catch(() => []);
+  const staged = new Set(await deps.fs.readdir(join(stagedDir, sub)).catch(() => []));
+  let kept = 0;
+  for (const name of live) {
+    if (basename(name) !== name) continue;
+    const from = join(liveDir, sub, name);
+    const stat = await deps.fs.lstat(from).catch(() => null);
+    if (stat?.isDirectory()) {
+      if (!staged.has(name)) await deps.fs.mkdir(join(stagedDir, sub, name));
+      kept += await keepOldChunks(liveDir, stagedDir, deps, join(sub, name));
+      continue;
+    }
+    if (staged.has(name) || !stat?.isFile()) continue;
+    await deps.fs.copyFile(from, join(stagedDir, sub, name), constants$1.COPYFILE_EXCL);
+    kept++;
+  }
+  return kept;
+}
+async function installCliStaged(version, deps = defaults) {
+  const parsed = 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 ? 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 = dirname(liveDir);
+  try {
+    await deps.fs.access(root, constants$1.W_OK);
+    await deps.fs.access(liveDir, constants$1.W_OK);
+  } catch {
+    return { outcome: { manual: "install_location_not_writable" } };
+  }
+  const stagePrefix = join(root, `.very-happy-cli-stage-${parsed.exact}`);
+  const stagedDir = join(stagePrefix, "lib", "node_modules", "very-happy-cli");
+  const retiredDir = 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(join(root, ".package-lock.json"));
+    }
+  }
+}
+
 function parseLastInstall(raw) {
   if (!raw || typeof raw !== "object") return null;
   const { from, to, at, source } = raw;
@@ -8425,6 +8576,17 @@ async function startDaemon() {
     const daemonSupervisor = detectDaemonSupervisor(process.env, process.platform, launchdJob);
     const lineage = daemonLineage(daemonSupervisor, process.env, process.platform, launchdJob);
     logger.debug(`[DAEMON RUN] Supervisor: ${daemonSupervisor} (lineage ${lineage}${launchdJob ? `, launchd job pid ${launchdJob.jobPid ?? "-"}` : ""})`);
+    const systemdKillMode = daemonSupervisor === "systemd" ? await probeSystemdKillMode() : null;
+    const handoverSparesWrappers = wrappersSurviveHandover({
+      supervisor: daemonSupervisor,
+      env: process.env,
+      platform: process.platform,
+      pid: process.pid,
+      ppid: process.ppid,
+      inContainer: existsSync$1("/.dockerenv") || existsSync$1("/run/.containerenv"),
+      systemdKillMode
+    });
+    logger.debug(`[DAEMON RUN] Handover spares wrappers: ${handoverSparesWrappers}${daemonSupervisor === "systemd" ? ` (KillMode ${systemdKillMode ?? "unknown"})` : ""}`);
     let fileState = {
       pid: process.pid,
       httpPort: controlPort,
@@ -8558,6 +8720,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.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.happyHomeDir),
       publish: (state) => {
         cliUpdateStateRef = state;
@@ -8659,7 +8830,8 @@ async function startDaemon() {
               }
             }
             const relayMove = pendingRelayMove;
-            if ((bundleReplaced || relayMove) && !teamWorker?.busy && !automationRunner?.busy && !updateController.isRunning() && !harnessInstaller?.isRunning() && !turnActivity.hasActiveTurn() && !backgroundTasks.hasAny()) {
+            const sessionsHold = () => 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) {
@@ -8669,7 +8841,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.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();

package/dist/{runClaude-CtVoFstP.cjs → runClaude-Dk73bQ0n.cjs}

@@ -1,27 +1,27 @@
 'use strict';
 
 var os = require('node:os');
-var sessionLock = require('./sessionLock-DNGDn9oj.cjs');
-var persistence = require('./persistence-IYH6bAXY.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-B7mjHQKp.cjs');
+var sessionLock = require('./sessionLock-h4162Jrf.cjs');
+var persistence = require('./persistence-CIzOAWK6.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-BYqJbPhc.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-rw5xkzxo.cjs');
-var logger = require('./logger-CrtT0opS.cjs');
-var createSessionMetadata = require('./createSessionMetadata-5Mde6Dfh.cjs');
-var _package = require('./package-DczR1k0c.cjs');
-var index = require('./index-Ub-5xbcU.cjs');
+var api = require('./api-DjqQTT16.cjs');
+var logger = require('./logger-L0pLBOLK.cjs');
+var createSessionMetadata = require('./createSessionMetadata-DT24NjY2.cjs');
+var _package = require('./package-BuATIMpK.cjs');
+var index = require('./index-BumVulwx.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
-var configuration = require('./configuration-C9Sx-Foo.cjs');
+var configuration = require('./configuration-CI0GWwaT.cjs');
 var providerBinding = require('./providerBinding-B-Qbx9W2.cjs');
-var controlClient = require('./controlClient-BLO1_pPx.cjs');
-var machineMetadata = require('./machineMetadata-D1hlm_oF.cjs');
+var controlClient = require('./controlClient-BIi1tzEo.cjs');
+var machineMetadata = require('./machineMetadata-YeHF4gSY.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var startupSessionCreate = require('./startupSessionCreate-CXRVahaU.cjs');
+var startupSessionCreate = require('./startupSessionCreate-63ABDnfJ.cjs');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var promises = require('node:fs/promises');
-var attachmentContent = require('./attachmentContent-K_Up4InS.cjs');
+var attachmentContent = require('./attachmentContent-2kInPZrP.cjs');
 var transcriptCursor = require('./transcriptCursor-DcXGLeSc.cjs');
 var startupPlan = require('./startupPlan-BLMbfQIH.cjs');
 require('node:fs');
@@ -29,36 +29,36 @@ require('./processTreeSnapshot-mDbnuojn.cjs');
 require('node:child_process');
 require('zod');
 require('axios');
-require('./lidState-C4YgPn6y.cjs');
+require('./lidState-BxHu6dus.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-BgQ_QTgS.cjs');
+require('./pushNotifications-OtQY-Mfa.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-D-8GFCE7.cjs');
-require('./registerCommonHandlers-CRqKXwQt.cjs');
+require('./time-DcICfW0N.cjs');
+require('./registerCommonHandlers-De54jKz8.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
-require('./sync-DKSZOi6w.cjs');
+require('./sync-CKSmwxec.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('chalk');
 require('node:util');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-BzCuIkzi.cjs');
+require('./localHappyAgentAuth-BHklNDKQ.cjs');
 require('tweetnacl');
 require('./fsMkdir-0K3yENml.cjs');
 require('url');
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-DqOgRuKq.cjs'); });
+const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-dVfReVd4.cjs'); });
 async function runClaude(credentials, options = {}) {
   logger.logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -72,7 +72,7 @@ async function runClaude(credentials, options = {}) {
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-BPz1iX77.cjs'); });
+      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-B7YvJcVK.cjs'); });
       await bootstrapAssistantHome();
     } catch (error) {
       logger.logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -192,7 +192,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-Dywp8NKr.cjs'); });
+    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-C4A7-BmS.cjs'); });
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = api.startOfflineReconnection({
       serverUrl: configuration.configuration.serverUrl,

package/dist/{runClaude-CuSjrZSf.mjs → runClaude-bxwea9mX.mjs}

@@ -1,25 +1,25 @@
 import os from 'node:os';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-ha9gsQEn.mjs';
-import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-DFtgQvr6.mjs';
-import { D as DEFAULT_CLAUDE_PERMISSION_MODE, H as HibernationProbe, c as commitHibernation } from './defaultPermissionMode-CTdxUV_3.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-DOsE5UUf.mjs';
+import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-FgtDuVAP.mjs';
+import { D as DEFAULT_CLAUDE_PERMISSION_MODE, H as HibernationProbe, c as commitHibernation } from './defaultPermissionMode-yR27mevc.mjs';
 import { randomUUID } from 'node:crypto';
-import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-BpTDU2BO.mjs';
-import { l as logger } from './logger-D2qd0mMg.mjs';
-import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-BYroCdrU.mjs';
-import { p as packageJson } from './package-Ek5FOyEo.mjs';
-import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-DisBaRvM.mjs';
+import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-DUFy21Nf.mjs';
+import { l as logger } from './logger-CpaeM90D.mjs';
+import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-Dqy_DfoF.mjs';
+import { p as packageJson } from './package-DagIeOhi.mjs';
+import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-B9f1vKcC.mjs';
 import { F as FORK_BACKFILL_CAPABILITY, p as publishForkBackfillWhenCommitted } from './forkBackfill-DYIjlN1Z.mjs';
-import { c as configuration } from './configuration-CVgUe2qN.mjs';
+import { c as configuration } from './configuration-DbCHeEeP.mjs';
 import { l as loadSessionProvider, a as applyProviderEnv } from './providerBinding-CYubGg-Z.mjs';
-import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-DMCxtwq2.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-B2czDiTd.mjs';
+import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-Dv80mB_j.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-ukaYmmlK.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { resolve, join } from 'node:path';
-import { c as createSessionForStartup } from './startupSessionCreate-B60THeNz.mjs';
+import { c as createSessionForStartup } from './startupSessionCreate-CY4tPjlZ.mjs';
 import { a as applySandboxPermissionPolicy, r as resolveInitialClaudePermissionMode, m as mapToClaudeMode, b as reconcilePublishedPermissionMode } from './permissionMode-CH4FoZfU.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
 import { readFile } from 'node:fs/promises';
-import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-CWSSGMMo.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-D01-pLOB.mjs';
 import { T as TranscriptPathHints } from './transcriptCursor-B7T_gkQ0.mjs';
 import { p as planClaudeStartup } from './startupPlan-DFMyNgAs.mjs';
 import 'node:fs';
@@ -27,36 +27,36 @@ import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'node:child_process';
 import 'zod';
 import 'axios';
-import './lidState-CBjQEwTt.mjs';
+import './lidState-CZ1ggYiB.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-gVJWGFBP.mjs';
+import './pushNotifications-2CyhYAte.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-Du0scQeJ.mjs';
-import './registerCommonHandlers-CyAtDNvs.mjs';
+import './time-BsNUVcKH.mjs';
+import './registerCommonHandlers-X9lnO2TF.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
-import './sync-DJvx7RbO.mjs';
+import './sync-CZjyTC4v.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import 'chalk';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-CcWGU_lS.mjs';
+import './localHappyAgentAuth-OJk4xDwg.mjs';
 import 'tweetnacl';
 import './fsMkdir-DumgLTzR.mjs';
 import 'url';
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => import('./runClaudeDeps-eazOhb6g.mjs');
+const importRunClaudeDeps = () => import('./runClaudeDeps-DoaYM017.mjs');
 async function runClaude(credentials, options = {}) {
   logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -70,7 +70,7 @@ async function runClaude(credentials, options = {}) {
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await import('./bootstrap-CodyCmGt.mjs');
+      const { bootstrapAssistantHome } = await import('./bootstrap-MFmMruyB.mjs');
       await bootstrapAssistantHome();
     } catch (error) {
       logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -190,7 +190,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await import('./claudeLocal-BgIRtT3Q.mjs');
+    const { claudeLocal } = await import('./claudeLocal-C6wNx9qH.mjs');
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = startOfflineReconnection({
       serverUrl: configuration.serverUrl,