very-happy-cli 0.2.195 → 0.2.197

package/dist/{run-M06F1958.mjs → run-Cuz34V0P.mjs}

@@ -1,26 +1,26 @@
-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-BH5eT99U.mjs';
+import { i as isClaudeSessionId, h as extractCompleteLines, j as decideBackfill, k as parseTerminalHookPayload, m as decideMirrorBinding, M as MIRROR_BACKFILL_LINES_DEFAULT, n as mirrorLineKey, o as mirrorLocalId, q as initializeOwnedWorktree, f as summarizeSpawnSessionForLog, t as startAgentVersionChecks, W as WORKTREE_CAPABILITY_VERSION, u as currentWorktreeService } from './mirrorProtocol-OJPFNpbq.mjs';
 import { F as FS_MKDIR_CAPABILITY_VERSION } from './fsMkdir-DumgLTzR.mjs';
-import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel } from './piRunnerArgs-Dy-3vN_Q.mjs';
+import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel } from './piRunnerArgs-DxbuKnFC.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, readSync, writeSync, ftruncateSync, utimesSync, realpathSync, promises, constants as constants$1, writeFileSync, mkdirSync, accessSync, 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-CwfgJZKs.mjs';
-import { T as TurnActivityTracker, A as ApiClient } from './api-DOzNOoVJ.mjs';
-import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-hKFGQaSJ.mjs';
-import { l as logger } from './logger-UgDpJA2u.mjs';
-import { p as pruneStaleCompileCaches } from './index-QSAckvNv.mjs';
-import { a as authAndSetupMachineIfNeeded } from './auth-Bfe3Ue_B.mjs';
+import { f as ensurePrivateDirectorySync, w as writePrivateFileSync, c as configuration } from './configuration-BIh6P6kB.mjs';
+import { T as TurnActivityTracker, A as ApiClient } from './api-Do7MUIrP.mjs';
+import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-N3jxdNJC.mjs';
+import { l as logger } from './logger-CahcyjlK.mjs';
+import { p as pruneStaleCompileCaches } from './index-P6modcWo.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-Dnu0Mocz.mjs';
 import { spawn, execSync } from 'child_process';
-import { p as packageJson } from './package-C4OfB2YF.mjs';
-import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-BkyoZ0Uw.mjs';
-import { s as spawnHappyCLI } from './spawnHappyCLI-CgjpjSTT.mjs';
-import { c as readPersistedSessions, r as readSettings, l as latchKeepAwake, s as reportSignature, t as decideDaemonHibernation, v as nextCheckDelay, x as persistSession, d as readDaemonState, y as acquireDaemonLock, a as resolveCheckMs, z as resolveIdleMs, A as deletePersistedSessions, B as writeDaemonState, C as writeSettings, D as settingIdleMs, u as updateSettings, E as rewriteCredentialsForRelay, g as readCredentials, F as releaseDaemonLock } from './persistence-CQhmtobL.mjs';
-import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, w as cleanupDaemonState } from './controlClient-Dv6IvvUq.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, n as lineageOf, g as waitForSessionKey, d as archiveSession, h as analyzeLatestTurn, i as readSessionLog, j as TURN_WINDOW, p as userPromptText } from './sessionOps-BkEgNA2O.mjs';
-import { E as AgentProfilesStateSchema, aa as ServerMigrateNoticeSchema, ab as isHarnessInstallId, ac as agentProfileUnavailableReason, ad as MODEL_INTENT_CONFIG, j as AUTOMATION_SUMMARY_MAX_CHARS, ae as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, af as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, d as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, ag as AUTOMATION_CLAIM_MAX_RUNS, ah as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, ai as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, v as resolveLaunchAgentProfile, aj as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-BlWyEpMw.mjs';
+import { p as packageJson } from './package-DUKnh8UF.mjs';
+import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-TK49jR60.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-C9dzdAh0.mjs';
+import { c as readPersistedSessions, r as readSettings, l as latchKeepAwake, s as reportSignature, t as decideDaemonHibernation, v as nextCheckDelay, x as persistSession, d as readDaemonState, y as acquireDaemonLock, a as resolveCheckMs, z as resolveIdleMs, A as deletePersistedSessions, B as writeDaemonState, C as writeSettings, D as settingIdleMs, u as updateSettings, E as rewriteCredentialsForRelay, g as readCredentials, F as releaseDaemonLock } from './persistence-CPIj3Iha.mjs';
+import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, w as cleanupDaemonState } from './controlClient-CPZkMKsH.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, n as lineageOf, g as waitForSessionKey, d as archiveSession, h as analyzeLatestTurn, i as readSessionLog, j as TURN_WINDOW, p as userPromptText } from './sessionOps-fuLJNyOT.mjs';
+import { Q as AgentProfilesStateSchema, aa as ServerMigrateNoticeSchema, ab as isHarnessInstallId, ac as agentProfileUnavailableReason, ad as MODEL_INTENT_CONFIG, j as AUTOMATION_SUMMARY_MAX_CHARS, ae as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, af as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, d as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, ag as AUTOMATION_CLAIM_MAX_RUNS, ah as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, ai as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, v as resolveLaunchAgentProfile, aj as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-C27JFCbe.mjs';
 import fastify from 'fastify';
 import { z } from 'zod';
 import { validatorCompiler, serializerCompiler } from 'fastify-type-provider-zod';
@@ -28,70 +28,71 @@ 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-8-khalzj.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-DS6GqJcn.mjs';
+import { b as sanitizeRateLimitReport } from './rateLimitWindows-BAfkXSck.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-ByJiL-w1.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-DQSnC7ox.mjs';
-import { assistantHome, bootstrapAssistantHome } from './bootstrap-BxcKrgR9.mjs';
-import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-BENDk1i9.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-DYTwJSZR.mjs';
+import { assistantHome, bootstrapAssistantHome } from './bootstrap-C2JyiPax.mjs';
+import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-BSSAKD4Q.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-BYHC-3Vx.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-jOqz4fn8.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 { p as parse } from './codexAccount-CKXpXq0B.mjs';
+import { p as parse } from './codexAccount-iZwmpYti.mjs';
 import require$$3 from 'crypto';
 import { c as commandOnPath } from './detectCLI-CSGMlV51.mjs';
-import { buildResumeLaunch } from './handleResumeCommand-BK_2ShBf.mjs';
+import { buildResumeLaunch } from './handleResumeCommand-B69L6W80.mjs';
 import { n as normalizeWebPanels } from './webPanels-B2_C2-3g.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-CydHzidF.mjs';
-import { d as wrapperReportsIdle, f as decideAutoRestart, s as statusFromVerdict, g as autoRestartNextCheck, h as wrapperStaleness, r as recordAttempt, i as AUTO_RESTART_MAX_ATTEMPTS, j as AUTO_RESTART_MIN_GAP_MS, p as processIdentityFields, k as readSessionLock, l as terminateProcess, n as terminateProcessTree, o as AUTO_RESTARTED_ENV, q as encodeAutoRestarted, u as pendingUpgradeVersion, v as resolveQuietMs, x as AUTO_RESTART_RECHECK_CAP_MS } from './sessionLock-BexUoWhZ.mjs';
-import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-DpTk1S7C.mjs';
+import { P as ProjectsUnsupportedError, c as createProjectsClient } from './client-CkiWUkm6.mjs';
+import { d as wrapperReportsIdle, f as decideAutoRestart, s as statusFromVerdict, g as autoRestartNextCheck, h as wrapperStaleness, r as recordAttempt, i as AUTO_RESTART_MAX_ATTEMPTS, j as AUTO_RESTART_MIN_GAP_MS, p as processIdentityFields, k as readSessionLock, l as AUTO_RESTARTED_ENV, n as encodeAutoRestarted, o as pendingUpgradeVersion, q as resolveQuietMs, u as AUTO_RESTART_RECHECK_CAP_MS } from './sessionLock-C4zRSYwt.mjs';
+import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-BeEAF2yn.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 { A as AccountService } from './accountService-BtEgv0fC.mjs';
-import { spawnSetupTokenPty, watchAccountFiles } from './daemonAccounts-QT-RDDEp.mjs';
+import { A as AccountService } from './accountService-DQ21IlBs.mjs';
+import { spawnSetupTokenPty, watchAccountFiles } from './daemonAccounts-CnAEaJE_.mjs';
 import { g as getProjectPath } from './path-D2wdaNSk.mjs';
 import { b as extractClaudeEditPaths } from './editPaths-BVfS_FFL.mjs';
-import { s as startFileWatcher } from './startFileWatcher-DapvIGxp.mjs';
-import { I as InvalidateSync } from './sync-GJkf-HGu.mjs';
+import { s as startFileWatcher } from './startFileWatcher-FjvRihwq.mjs';
+import { I as InvalidateSync } from './sync-CHU9HM9N.mjs';
 import { R as RawJSONLinesSchema } from './types-CkqAACXx.mjs';
-import { t as tmuxArgs, a as scrubTmuxClientEnv, s as shellescape } from './tmuxSocket-B8Yx20sT.mjs';
-import { findAllHappyProcesses } from './doctor-BPkYWSuq.mjs';
+import { t as tmuxArgs, a as scrubTmuxClientEnv, s as shellescape } from './tmuxSocket-BmZyixRM.mjs';
+import { i as isProcessAlive, t as terminateProcessTree } from './processTermination-ChJG5SLW.mjs';
+import { findAllHappyProcesses } from './doctor-GN5mPOn5.mjs';
 import { T as TEAM_SKILL, a as TEAM_LEAD_PLAYBOOK, b as TEAM_MEMBER_RULES } from './resources-CLP_MpK4.mjs';
 import { promisify } from 'node:util';
-import { b as clipText, r as renderAction, c as clipAutomationReport, e as renderTemplate } from './template-Ci-cyigF.mjs';
+import { b as clipText, r as renderAction, c as clipAutomationReport, e as renderTemplate } from './template-CJ8uLlD8.mjs';
 import { d as describeAgentHome } from './loginShellEnv-Dw8M7tkI.mjs';
-import { S as SPAWN_ACCOUNT_ENV } from './store-Tf-r1ouq.mjs';
-import './acpSessionResume-BYMm4w8Q.mjs';
-import './lidState-Cb3TbhPb.mjs';
+import { S as SPAWN_ACCOUNT_ENV } from './store-BlPvTr_Q.mjs';
+import './acpSessionResume-DzFELzTU.mjs';
+import './pushNotifications-CD5-W90c.mjs';
+import './contentLogMetadata-BlWI0egu.mjs';
+import './lidState-nbXgabCS.mjs';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-67GmbVfE.mjs';
-import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-CIkdLyza.mjs';
-import './registerCommonHandlers-C7hlztAO.mjs';
+import './time-DZ7wPlsL.mjs';
+import './registerCommonHandlers-Anq6Ma1d.mjs';
 import 'util';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
 import 'chalk';
 import 'node:module';
 import 'tweetnacl';
-import './browser-Bb0Gqffc.mjs';
+import './browser-Cnk2N81e.mjs';
 import 'open';
 import './specialCommands-MXUN0wfI.mjs';
 import './ids-DU6sLx4C.mjs';
 import 'url';
-import './localHappyAgentAuth-CAAIUJyY.mjs';
-import './processTreeSnapshot-CuLJDNC-.mjs';
-import './claudeAccountEnv-NyoxjLuJ.mjs';
+import './localHappyAgentAuth-BupJnMMB.mjs';
+import './claudeAccountEnv-CPO6CGNd.mjs';
 import 'node:readline';
 import 'node-pty';
+import './processTreeSnapshot-fuwxC0fr.mjs';
 import 'ps-list';
 
 async function resolveRelaunchMetadata(snapshot, fetchServer) {
@@ -7170,13 +7171,7 @@ async function startDaemon() {
       tracked: (sessionId, pid) => {
         const tracked = pidToTrackedSession.get(pid);
         if (!tracked || tracked.happySessionId !== sessionId) return null;
-        let live = false;
-        try {
-          process.kill(pid, 0);
-          live = true;
-        } catch {
-          live = false;
-        }
+        const live = isProcessAlive(pid);
         return { live, ...tracked.spawnedBy ? { spawnedBy: tracked.spawnedBy } : {} };
       },
       teamsMember: (sessionId) => teamWorker?.hasSession(sessionId) === true,
@@ -7342,14 +7337,7 @@ async function startDaemon() {
             logger.debug(`[DAEMON RUN] forceNew: purged persisted assistant session(s): ${assistantIds.join(", ")}`);
           }
         } else {
-          const live = findLiveAssistant(pidToTrackedSession.values(), (pid) => {
-            try {
-              process.kill(pid, 0);
-              return true;
-            } catch {
-              return false;
-            }
-          });
+          const live = findLiveAssistant(pidToTrackedSession.values(), (pid) => isProcessAlive(pid));
           if (live?.happySessionId) {
             logger.debug(`[DAEMON RUN] Assistant already running (session ${live.happySessionId}, pid ${live.pid})`);
             return { type: "success", sessionId: live.happySessionId };
@@ -7759,7 +7747,7 @@ async function startDaemon() {
           pidToAwaiter.delete(pid);
           logger.debug(`[DAEMON RUN] Session webhook timeout for PID ${pid}`);
           try {
-            const started = terminateProcess(pid, (stopped) => fail({ exited: stopped, code: null, signal: null, timedOut: true }));
+            const started = terminateProcessTree(pid, (stopped) => fail({ exited: stopped, code: null, signal: null, timedOut: true }));
             if (!started) fail({ exited: false, code: null, signal: null, timedOut: true });
           } catch {
             fail({ exited: false, code: null, signal: null, timedOut: true });
@@ -8146,14 +8134,7 @@ async function startDaemon() {
       pidToTrackedSession.delete(pid);
     };
     const assistantReportLastSentAt = /* @__PURE__ */ new Map();
-    const isPidAlive = (pid) => {
-      try {
-        process.kill(pid, 0);
-        return true;
-      } catch {
-        return false;
-      }
-    };
+    const isPidAlive = (pid) => isProcessAlive(pid);
     const onSessionStateEvent = (sessionId, event, spawnedByFromSession) => {
       if (automationRunner?.hasSession(sessionId)) automationRunner.report(sessionId, event === "completed" ? "idle" : "blocked");
       if (spawnedByFromSession === "teams" || teamWorker?.hasSession(sessionId) || [...pidToTrackedSession.values()].some((s) => s.happySessionId === sessionId && s.spawnedBy === "teams")) {
@@ -8637,9 +8618,7 @@ async function startDaemon() {
           logger.debug(`[DAEMON RUN] Health check started at ${(/* @__PURE__ */ new Date()).toLocaleString()}`);
         }
         for (const [pid, _] of pidToTrackedSession.entries()) {
-          try {
-            process.kill(pid, 0);
-          } catch (error) {
+          if (!isProcessAlive(pid)) {
             logger.debug(`[DAEMON RUN] Finalizing stale session with PID ${pid} (process no longer exists)`);
             onChildExited(pid);
           }
@@ -8684,7 +8663,7 @@ async function startDaemon() {
               accountService.dispose();
               apiMachine.shutdown();
               await stopControlServer();
-              await cleanupDaemonState();
+              await cleanupDaemonState(process.pid);
               await releaseDaemonLock(daemonLockHandle);
               await stopCaffeinate();
               if (daemonSupervisor !== "none") {
@@ -8709,6 +8688,7 @@ async function startDaemon() {
         if (daemonState && daemonState.pid !== process.pid) {
           logger.debug("[DAEMON RUN] Somehow a different daemon was started without killing us. We should kill ourselves.");
           requestShutdown("exception", "A different daemon was started without killing us. We should kill ourselves.");
+          return;
         }
         try {
           fileState = withDaemonHeartbeat(fileState, (/* @__PURE__ */ new Date()).toLocaleString());
@@ -8829,7 +8809,7 @@ async function startDaemon() {
       accountService.dispose();
       apiMachine.shutdown();
       await stopControlServer();
-      await cleanupDaemonState();
+      await cleanupDaemonState(process.pid);
       await stopCaffeinate();
       await releaseDaemonLock(daemonLockHandle);
       logger.debug(`[DAEMON RUN] Cleanup completed, exiting process with code ${daemonExitCode(source)}`);

package/dist/{run-tQ4bFkHu.cjs → run-D0nDSvGo.cjs}

@@ -1,27 +1,27 @@
 'use strict';
 
-var mirrorProtocol = require('./mirrorProtocol-Ci9YmCEV.cjs');
+var mirrorProtocol = require('./mirrorProtocol-CFDn3zfT.cjs');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
-var piRunnerArgs = require('./piRunnerArgs-CmEE058l.cjs');
+var piRunnerArgs = require('./piRunnerArgs-Aqs-zKLm.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-CKaq0tNe.cjs');
-var api = require('./api-TpjZJXV-.cjs');
+var configuration = require('./configuration-BL_fxboH.cjs');
+var api = require('./api-CB3tLbbj.cjs');
 var spawnAgents = require('./spawnAgents-Cm23BW-D.cjs');
-var logger = require('./logger-BZ5TcbEh.cjs');
-var index$2 = require('./index-Bz9Bj7l1.cjs');
-var auth = require('./auth-DfcdjMUp.cjs');
+var logger = require('./logger-CtweAuKq.cjs');
+var index$2 = require('./index-DgnbOqH_.cjs');
+var auth = require('./auth-ZKJNs8AK.cjs');
 var child_process = require('child_process');
-var _package = require('./package-B61-BBlh.cjs');
-var doctor = require('./doctor-Czbl7gk2.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-Du1IgJGA.cjs');
-var persistence = require('./persistence-DBmeYlwT.cjs');
-var controlClient = require('./controlClient-D_HIbnnS.cjs');
-var sessionOps = require('./sessionOps-74pSDXoS.cjs');
+var _package = require('./package-DdYN77UN.cjs');
+var doctor = require('./doctor-DHK-5Hxm.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-D4_Ij_BB.cjs');
+var persistence = require('./persistence-CWEaFv6R.cjs');
+var controlClient = require('./controlClient-DMtkGpc3.cjs');
+var sessionOps = require('./sessionOps-flaRRzdo.cjs');
 var index = require('./index-D9Hidq-g.cjs');
 var fastify = require('fastify');
 var z = require('zod');
@@ -30,70 +30,71 @@ 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-BIfLMxOk.cjs');
-var peerTools = require('./peerTools-BXSjS8lB.cjs');
+var rateLimitWindows = require('./rateLimitWindows-_KfSDJdB.cjs');
+var peerTools = require('./peerTools-03MimWe-.cjs');
 var os = require('node:os');
-var remoteSessionClient = require('./remoteSessionClient-D6_7vNKc.cjs');
-var bootstrap = require('./bootstrap-DpyP22Wx.cjs');
-var index$1 = require('./index-CGKn-GTK.cjs');
+var remoteSessionClient = require('./remoteSessionClient-BsXgrMSP.cjs');
+var bootstrap = require('./bootstrap-B7mwfud6.cjs');
+var index$1 = require('./index-XeWmi_Wt.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-DLb-m4fL.cjs');
+var machineMetadata = require('./machineMetadata-thOCcaSv.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
 var pi = require('./pi-DlsrPCTa.cjs');
 var codexAccount = require('./codexAccount-CYhQir50.cjs');
 var require$$3 = require('crypto');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var handleResumeCommand = require('./handleResumeCommand-CCgK7-0v.cjs');
+var handleResumeCommand = require('./handleResumeCommand-CMLpVjkl.cjs');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
 var promises = require('node:fs/promises');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var client = require('./client-DcXLNaF2.cjs');
-var sessionLock = require('./sessionLock-B8fsnpZD.cjs');
-var client$1 = require('./client-BlV73Gbw.cjs');
+var client = require('./client-DmO89_dS.cjs');
+var sessionLock = require('./sessionLock-CbIB9WAp.cjs');
+var client$1 = require('./client-DH_mgm2T.cjs');
 var daemonSupervisor = require('./daemonSupervisor-alqGPANc.cjs');
 var accountService = require('./accountService-DL6xhVUa.cjs');
 var daemonAccounts = require('./daemonAccounts-CxMJw7x2.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var startFileWatcher = require('./startFileWatcher-DGOnF95-.cjs');
-var sync = require('./sync-Cj8Vhltg.cjs');
+var startFileWatcher = require('./startFileWatcher-905w_JCn.cjs');
+var sync = require('./sync-Dz_U1UHu.cjs');
 var types = require('./types-CRS-srZK.cjs');
-var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
-var doctor$1 = require('./doctor-u46qYYKX.cjs');
+var tmuxSocket = require('./tmuxSocket-Dg11Olx0.cjs');
+var processTermination = require('./processTermination-f17wxlMb.cjs');
+var doctor$1 = require('./doctor-CJpFhHoK.cjs');
 var resources = require('./resources-BZ_Be0qM.cjs');
 var node_util = require('node:util');
 var template = require('./template-B1AORlgU.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
 var store = require('./store-aa3CVNwS.cjs');
-require('./acpSessionResume-B2hd1Wub.cjs');
-require('./lidState-Btv4N_B8.cjs');
+require('./acpSessionResume-CfEw8L26.cjs');
+require('./pushNotifications-BhnrQa32.cjs');
+require('./contentLogMetadata-ZSFk_NjQ.cjs');
+require('./lidState-DXy1ymL0.cjs');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-qCS7_tDF.cjs');
-require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-BPPTQ_sE.cjs');
-require('./registerCommonHandlers-G2p0MJu4.cjs');
+require('./time-BTXLicT9.cjs');
+require('./registerCommonHandlers-CsMpXP1_.cjs');
 require('util');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
 require('chalk');
 require('node:module');
 require('tweetnacl');
-require('./browser-ac0aPrVE.cjs');
+require('./browser-B3VVAWcC.cjs');
 require('open');
 require('./specialCommands-J3JFOq0J.cjs');
 require('./ids-B6ZC0HGt.cjs');
 require('url');
-require('./localHappyAgentAuth-B3Q5DNLR.cjs');
-require('./processTreeSnapshot-mDbnuojn.cjs');
+require('./localHappyAgentAuth-Dxl6itKW.cjs');
 require('./claudeAccountEnv-_O3x5AJ1.cjs');
 require('node:readline');
 require('node-pty');
+require('./processTreeSnapshot-D5iNblp6.cjs');
 require('ps-list');
 
 function _interopNamespaceDefault(e) {
@@ -7191,13 +7192,7 @@ async function startDaemon() {
       tracked: (sessionId, pid) => {
         const tracked = pidToTrackedSession.get(pid);
         if (!tracked || tracked.happySessionId !== sessionId) return null;
-        let live = false;
-        try {
-          process.kill(pid, 0);
-          live = true;
-        } catch {
-          live = false;
-        }
+        const live = processTermination.isProcessAlive(pid);
         return { live, ...tracked.spawnedBy ? { spawnedBy: tracked.spawnedBy } : {} };
       },
       teamsMember: (sessionId) => teamWorker?.hasSession(sessionId) === true,
@@ -7363,14 +7358,7 @@ async function startDaemon() {
             logger.logger.debug(`[DAEMON RUN] forceNew: purged persisted assistant session(s): ${assistantIds.join(", ")}`);
           }
         } else {
-          const live = findLiveAssistant(pidToTrackedSession.values(), (pid) => {
-            try {
-              process.kill(pid, 0);
-              return true;
-            } catch {
-              return false;
-            }
-          });
+          const live = findLiveAssistant(pidToTrackedSession.values(), (pid) => processTermination.isProcessAlive(pid));
           if (live?.happySessionId) {
             logger.logger.debug(`[DAEMON RUN] Assistant already running (session ${live.happySessionId}, pid ${live.pid})`);
             return { type: "success", sessionId: live.happySessionId };
@@ -7780,7 +7768,7 @@ async function startDaemon() {
           pidToAwaiter.delete(pid);
           logger.logger.debug(`[DAEMON RUN] Session webhook timeout for PID ${pid}`);
           try {
-            const started = sessionLock.terminateProcess(pid, (stopped) => fail({ exited: stopped, code: null, signal: null, timedOut: true }));
+            const started = processTermination.terminateProcessTree(pid, (stopped) => fail({ exited: stopped, code: null, signal: null, timedOut: true }));
             if (!started) fail({ exited: false, code: null, signal: null, timedOut: true });
           } catch {
             fail({ exited: false, code: null, signal: null, timedOut: true });
@@ -7997,7 +7985,7 @@ async function startDaemon() {
             resolve();
           }
         };
-        const requested = sessionLock.terminateProcessTree(pid, () => {
+        const requested = processTermination.terminateProcessTree(pid, () => {
           const tracked = pidToTrackedSession.get(pid);
           if (tracked) {
             if (tracked.happySessionId && tracked.encryption) {
@@ -8118,7 +8106,7 @@ async function startDaemon() {
       logger.logger.debug(`[DAEMON RUN] Attempting to stop session ${sessionId}`);
       for (const [pid, session] of pidToTrackedSession.entries()) {
         if (session.happySessionId === sessionId || sessionId.startsWith("PID-") && pid === parseInt(sessionId.replace("PID-", ""))) {
-          const requested = sessionLock.terminateProcessTree(pid, (stopped) => {
+          const requested = processTermination.terminateProcessTree(pid, (stopped) => {
             if (!stopped) {
               logger.logger.debug(`[DAEMON RUN] Session ${sessionId} survived SIGTERM and SIGKILL attempts`);
               return;
@@ -8167,14 +8155,7 @@ async function startDaemon() {
       pidToTrackedSession.delete(pid);
     };
     const assistantReportLastSentAt = /* @__PURE__ */ new Map();
-    const isPidAlive = (pid) => {
-      try {
-        process.kill(pid, 0);
-        return true;
-      } catch {
-        return false;
-      }
-    };
+    const isPidAlive = (pid) => processTermination.isProcessAlive(pid);
     const onSessionStateEvent = (sessionId, event, spawnedByFromSession) => {
       if (automationRunner?.hasSession(sessionId)) automationRunner.report(sessionId, event === "completed" ? "idle" : "blocked");
       if (spawnedByFromSession === "teams" || teamWorker?.hasSession(sessionId) || [...pidToTrackedSession.values()].some((s) => s.happySessionId === sessionId && s.spawnedBy === "teams")) {
@@ -8658,9 +8639,7 @@ async function startDaemon() {
           logger.logger.debug(`[DAEMON RUN] Health check started at ${(/* @__PURE__ */ new Date()).toLocaleString()}`);
         }
         for (const [pid, _] of pidToTrackedSession.entries()) {
-          try {
-            process.kill(pid, 0);
-          } catch (error) {
+          if (!processTermination.isProcessAlive(pid)) {
             logger.logger.debug(`[DAEMON RUN] Finalizing stale session with PID ${pid} (process no longer exists)`);
             onChildExited(pid);
           }
@@ -8705,7 +8684,7 @@ async function startDaemon() {
               accountService$1.dispose();
               apiMachine.shutdown();
               await stopControlServer();
-              await controlClient.cleanupDaemonState();
+              await controlClient.cleanupDaemonState(process.pid);
               await persistence.releaseDaemonLock(daemonLockHandle);
               await stopCaffeinate();
               if (daemonSupervisor$1 !== "none") {
@@ -8730,6 +8709,7 @@ async function startDaemon() {
         if (daemonState && daemonState.pid !== process.pid) {
           logger.logger.debug("[DAEMON RUN] Somehow a different daemon was started without killing us. We should kill ourselves.");
           requestShutdown("exception", "A different daemon was started without killing us. We should kill ourselves.");
+          return;
         }
         try {
           fileState = withDaemonHeartbeat(fileState, (/* @__PURE__ */ new Date()).toLocaleString());
@@ -8850,7 +8830,7 @@ async function startDaemon() {
       accountService$1.dispose();
       apiMachine.shutdown();
       await stopControlServer();
-      await controlClient.cleanupDaemonState();
+      await controlClient.cleanupDaemonState(process.pid);
       await stopCaffeinate();
       await persistence.releaseDaemonLock(daemonLockHandle);
       logger.logger.debug(`[DAEMON RUN] Cleanup completed, exiting process with code ${daemonExitCode(source)}`);

package/dist/{runClaude-Ct0_mShC.cjs → runClaude-DHHDBtKG.cjs}

@@ -1,61 +1,62 @@
 'use strict';
 
 var os = require('node:os');
-var sessionLock = require('./sessionLock-B8fsnpZD.cjs');
-var persistence = require('./persistence-DBmeYlwT.cjs');
-var startupSessionCreate = require('./startupSessionCreate-rkIMVGJW.cjs');
+var sessionLock = require('./sessionLock-CbIB9WAp.cjs');
+var persistence = require('./persistence-CWEaFv6R.cjs');
+var startupSessionCreate = require('./startupSessionCreate-WY7c74aG.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-TpjZJXV-.cjs');
-var logger = require('./logger-BZ5TcbEh.cjs');
-var createSessionMetadata = require('./createSessionMetadata-CusO22Am.cjs');
-var _package = require('./package-B61-BBlh.cjs');
+var api = require('./api-CB3tLbbj.cjs');
+var logger = require('./logger-CtweAuKq.cjs');
+var createSessionMetadata = require('./createSessionMetadata-BWr0XT-Y.cjs');
+var _package = require('./package-DdYN77UN.cjs');
 var index = require('./index-D9Hidq-g.cjs');
 var defaultPermissionMode = require('./defaultPermissionMode-BCWCMONI.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
-var configuration = require('./configuration-CKaq0tNe.cjs');
+var configuration = require('./configuration-BL_fxboH.cjs');
 var wrapperAccount = require('./wrapperAccount-BubTurHU.cjs');
 var store = require('./store-aa3CVNwS.cjs');
-var controlClient = require('./controlClient-D_HIbnnS.cjs');
-var machineMetadata = require('./machineMetadata-DLb-m4fL.cjs');
+var controlClient = require('./controlClient-DMtkGpc3.cjs');
+var machineMetadata = require('./machineMetadata-thOCcaSv.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var promises = require('node:fs/promises');
-var attachmentContent = require('./attachmentContent-BiBOjTXX.cjs');
+var attachmentContent = require('./attachmentContent-errR84kh.cjs');
 var transcriptCursor = require('./transcriptCursor-DcXGLeSc.cjs');
 var startupPlan = require('./startupPlan-BLMbfQIH.cjs');
 var reconnectEnv = require('./reconnectEnv-B31lY4nR.cjs');
 require('./cliUpdate-DsKXPFYp.cjs');
 require('node:fs');
-require('./processTreeSnapshot-mDbnuojn.cjs');
+require('./processTermination-f17wxlMb.cjs');
 require('node:child_process');
+require('./processTreeSnapshot-D5iNblp6.cjs');
 require('zod');
 require('axios');
-require('./lidState-Btv4N_B8.cjs');
+require('./pushNotifications-BhnrQa32.cjs');
+require('./contentLogMetadata-ZSFk_NjQ.cjs');
+require('./lidState-DXy1ymL0.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-qCS7_tDF.cjs');
-require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-BPPTQ_sE.cjs');
-require('./registerCommonHandlers-G2p0MJu4.cjs');
+require('./time-BTXLicT9.cjs');
+require('./registerCommonHandlers-CsMpXP1_.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
-require('./sync-Cj8Vhltg.cjs');
+require('./sync-Dz_U1UHu.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('chalk');
 require('node:util');
 require('./claudeAccountEnv-_O3x5AJ1.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-B3Q5DNLR.cjs');
+require('./localHappyAgentAuth-Dxl6itKW.cjs');
 require('tweetnacl');
 require('./fsMkdir-0K3yENml.cjs');
 require('url');
@@ -66,7 +67,7 @@ const CLAUDE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
 function restoredClaudeEffort(effort) {
   return CLAUDE_EFFORTS.includes(effort ?? "") ? effort : void 0;
 }
-const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-BT2kWCrQ.cjs'); });
+const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-Cfeci4al.cjs'); });
 async function runClaude(credentials, options = {}) {
   logger.logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -82,7 +83,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-DpyP22Wx.cjs'); });
+      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-B7mwfud6.cjs'); });
       await bootstrapAssistantHome();
     } catch (error) {
       logger.logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -208,7 +209,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-RGWhplSr.cjs'); });
+    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-CvZ5Sfq_.cjs'); });
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = api.startOfflineReconnection({
       serverUrl: configuration.configuration.serverUrl,
@@ -842,7 +843,7 @@ async function runClaude(credentials, options = {}) {
   const exitGate = new SessionExitGate();
   let hibernationProbe = null;
   const cleanup = async (opts = { archive: true }) => {
-    const intent = opts.hibernation ? "hibernate" : exitGate.claim(exitIntentFromArchiveFlag(opts.archive));
+    const intent = opts.hibernation ? "hibernate" : exitGate.claim(opts.superseded ? "superseded" : exitIntentFromArchiveFlag(opts.archive));
     if (intent === null) {
       logger.logger.debug(`[START] Termination (archive=${opts.archive ?? true}) ignored: cleanup already running as ${exitGate.current}`);
       return;
@@ -866,7 +867,7 @@ async function runClaude(credentials, options = {}) {
           deactivateSession: (id) => api$1.deactivateSession(id),
           log: (message, ...args) => logger.logger.debug(message, ...args)
         });
-        await session.flush();
+        if (intent !== "superseded") await session.flush();
         await session.close();
       }
       happyServer.stop();
@@ -906,6 +907,9 @@ async function runClaude(credentials, options = {}) {
     void cleanup({ archive: true });
   });
   registerKillSessionHandler(session.rpcHandlerManager, () => cleanup({ archive: true }), session);
+  session.on("superseded", () => {
+    void cleanup({ superseded: true });
+  });
   let keepAwakeLatch = false;
   const hibernationSnapshot = () => {
     const agentState = session.getAgentState();
@@ -944,7 +948,7 @@ async function runClaude(credentials, options = {}) {
         // commit window runs now instead of being lost.
         releaseExit: () => {
           const deferred = exitGate.release("hibernate");
-          if (deferred) void cleanup({ archive: deferred === "archive" });
+          if (deferred) void cleanup(deferred === "superseded" ? { superseded: true } : { archive: deferred === "archive" });
         },
         recheck: () => persistence.evaluateWrapperIdle(hibernationSnapshot(), idleMs, Date.now()),
         idleMs,