very-happy-cli 0.2.200 → 0.2.202

package/dist/{run-CVAIFpsp.cjs → run-bzlz4DI1.cjs}

@@ -1,28 +1,29 @@
 'use strict';
 
-var mirrorProtocol = require('./mirrorProtocol-CCl9dtzh.cjs');
+var mirrorProtocol = require('./mirrorProtocol-DGMmhArw.cjs');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
-var piRunnerArgs = require('./piRunnerArgs-DOEJJymf.cjs');
+var piRunnerArgs = require('./piRunnerArgs-DkjCRPYn.cjs');
 var fs = require('fs/promises');
 var os$1 = require('os');
 var tmp = require('tmp');
 var axios = require('axios');
+var sessionMetadata = require('./sessionMetadata-B44cL4Xj.cjs');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var configuration = require('./configuration-ClUt7pqs.cjs');
-var api = require('./api-BPWRzeNF.cjs');
-var spawnAgents = require('./spawnAgents-IiuqX0S5.cjs');
-var logger = require('./logger-D28MY1Bv.cjs');
-var index$2 = require('./index-DUwOmhnq.cjs');
-var auth = require('./auth-oAnLi4Tl.cjs');
+var configuration = require('./configuration-DZUnfWp2.cjs');
+var api = require('./api-B-FB-s4z.cjs');
+var spawnAgents = require('./spawnAgents-DvbEDCIq.cjs');
+var logger = require('./logger-Dhc0l3xH.cjs');
+var index$2 = require('./index-CoBaGAA4.cjs');
+var auth = require('./auth-DpIHm7Lb.cjs');
 var child_process = require('child_process');
-var _package = require('./package-BFSsS_dl.cjs');
-var doctor = require('./doctor-C9D-t20z.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-C3XuIB2N.cjs');
-var persistence = require('./persistence-TpVFA5-I.cjs');
-var controlClient = require('./controlClient-SYDFcIkk.cjs');
-var sessionOps = require('./sessionOps-CIFvoFPA.cjs');
-var index = require('./index-BiutHOAO.cjs');
+var _package = require('./package-CAmlKYcH.cjs');
+var doctor = require('./doctor-DHCmWcwR.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-CeWgULMt.cjs');
+var persistence = require('./persistence-05BAS4Ou.cjs');
+var controlClient = require('./controlClient-Bfwe0Xpt.cjs');
+var sessionOps = require('./sessionOps-CvmOHwGP.cjs');
+var index = require('./index-44o_qMvE.cjs');
 var fastify = require('fastify');
 var z = require('zod');
 var fastifyTypeProviderZod = require('fastify-type-provider-zod');
@@ -30,69 +31,69 @@ 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-BREA7OZj.cjs');
-var peerTools = require('./peerTools-Z8V2E0AF.cjs');
+var rateLimitWindows = require('./rateLimitWindows-CpSOlXBt.cjs');
+var peerTools = require('./peerTools-dgllF1wT.cjs');
 var os = require('node:os');
-var remoteSessionClient = require('./remoteSessionClient-DleOeQlN.cjs');
-var bootstrap = require('./bootstrap-DUKAKxrJ.cjs');
-var index$1 = require('./index-CbzettaI.cjs');
+var remoteSessionClient = require('./remoteSessionClient-BLWFXMBo.cjs');
+var bootstrap = require('./bootstrap-CsZO_jkL.cjs');
+var index$1 = require('./index-DDOCSeEj.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-BzjrIn_N.cjs');
+var machineMetadata = require('./machineMetadata-ixKckJ7k.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
 var pi = require('./pi-DlsrPCTa.cjs');
-var codexAccount = require('./codexAccount-DfeCHUOU.cjs');
+var codexAccount = require('./codexAccount-D-OBY29W.cjs');
 var require$$3 = require('crypto');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var handleResumeCommand = require('./handleResumeCommand-CjCtwrrm.cjs');
+var handleResumeCommand = require('./handleResumeCommand-uKzhaOVC.cjs');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
 var promises = require('node:fs/promises');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var client = require('./client-BnoN4P4t.cjs');
-var sessionLock = require('./sessionLock-DglhFHzB.cjs');
-var client$1 = require('./client-D0_UOmC1.cjs');
+var client = require('./client-CNWx72ZT.cjs');
+var sessionLock = require('./sessionLock-Bjsy90aM.cjs');
+var client$1 = require('./client-Dq7jaxb2.cjs');
 var daemonSupervisor = require('./daemonSupervisor-alqGPANc.cjs');
-var accountService = require('./accountService-BDJo14mY.cjs');
-var daemonAccounts = require('./daemonAccounts-Ch_rSTSX.cjs');
+var accountService = require('./accountService-Cns8UYGI.cjs');
+var daemonAccounts = require('./daemonAccounts-ciidbU2h.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var startFileWatcher = require('./startFileWatcher-CeDJl9mN.cjs');
-var sync = require('./sync-BvxhuW9R.cjs');
+var startFileWatcher = require('./startFileWatcher-CXZYt0y9.cjs');
+var sync = require('./sync-CyUWevwD.cjs');
 var types = require('./types-CRS-srZK.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-M1YGFYUT.cjs');
-var client$2 = require('./client-1zIbVVX5.cjs');
+var template = require('./template-3fV9bi0X.cjs');
+var client$2 = require('./client-xV99weGP.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
-var store = require('./store-DOZAMV4W.cjs');
-require('./acpSessionResume-B_W8uTI6.cjs');
-require('./pushNotifications-C1i2W1GQ.cjs');
+var store = require('./store-Cpb1LMNW.cjs');
+require('./acpSessionResume-C8Kd8eK6.cjs');
+require('./pushNotifications-DaVlLe7N.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
-require('./reconnectGate-YQ5jXJfY.cjs');
+require('./reconnectGate-B_aJrehH.cjs');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./time-D-v2Cd9e.cjs');
-require('./registerCommonHandlers-D95IxqDN.cjs');
+require('./time-CbOTVtAt.cjs');
+require('./registerCommonHandlers-em2elV3l.cjs');
 require('util');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
 require('chalk');
 require('node:module');
 require('tweetnacl');
-require('./browser-Ds-N-Dup.cjs');
+require('./browser-DgufCq1K.cjs');
 require('open');
 require('./specialCommands-J3JFOq0J.cjs');
 require('./ids-B6ZC0HGt.cjs');
 require('url');
-require('./localHappyAgentAuth-CjtNcaI0.cjs');
-require('./claudeAccountEnv-D33xXRE7.cjs');
+require('./localHappyAgentAuth-WLqXQbc6.cjs');
+require('./claudeAccountEnv-Btp39mfa.cjs');
 require('node:readline');
 require('node-pty');
 require('./processTreeSnapshot-D5iNblp6.cjs');
@@ -3914,8 +3915,9 @@ function createUpdateController(deps) {
     outcome = { state, version, detail, at: now(), ...manualVersion ? { source: "manual" } : {} };
     deps.publish(snapshot());
   }
+  const superseded = () => !!deps.owned && !deps.owned();
   async function evaluate() {
-    if (!policy || running) return;
+    if (!policy || running || superseded()) return;
     const target = manualVersion ?? policy.autoUpdateVersion ?? null;
     if (outcome?.version === target && ["failed", "installed", "manual_required"].includes(outcome.state)) {
       const fingerprint = JSON.stringify([policy.checkedAt, outcome.state, outcome.version, outcome.detail, manualVersion, autoUpdateEnabled]);
@@ -4007,19 +4009,23 @@ function createUpdateController(deps) {
     }
   }
   async function refresh() {
-    if (operation || blocked) return;
+    if (superseded()) return "superseded";
+    if (blocked) return "blocked";
+    if (operation) return "busy";
     operation = "refresh";
     try {
       const next = await deps.policy();
-      if (!next) return;
+      if (!next) return "unavailable";
       if (manualVersion && !validManualTarget(next, manualVersion)) manualVersion = null;
       policy = next;
       await evaluate();
+      return policyStale() ? "stale" : "ok";
     } finally {
       operation = null;
     }
   }
   async function retry(version) {
+    if (superseded()) return { error: "daemon_superseded" };
     if (operation || blocked) return { error: blocked ? "manual_recovery_required" : "update_in_progress" };
     if (typeof version !== "string" || outcome?.state !== "failed" || outcome.version !== version) {
       return { error: "no_matching_failed_update" };
@@ -4044,6 +4050,7 @@ function createUpdateController(deps) {
     }
   }
   async function request(version) {
+    if (superseded()) return { error: "daemon_superseded" };
     if (operation || blocked) return { error: blocked ? "manual_recovery_required" : "update_in_progress" };
     operation = "request";
     try {
@@ -4087,7 +4094,8 @@ function createUpdateController(deps) {
     handoverHold = { reason, at: now() };
     publish("failed", manualVersion ?? policy?.autoUpdateVersion ?? null, "handover_preflight_failed");
   }
-  return { refresh, retry, request, tick, withHandover, holdHandover, isRunning: () => running, currentTarget: () => policy?.autoUpdateVersion ?? null };
+  const policyStale = () => !policy || now() - policy.checkedAt > 65 * 6e4;
+  return { refresh, retry, request, tick, withHandover, holdHandover, policyStale, isRunning: () => running, currentTarget: () => policy?.autoUpdateVersion ?? null };
 }
 
 const defaults = {
@@ -4296,6 +4304,132 @@ function createPolicyAnnouncementHandler(deps) {
   };
 }
 
+const POLICY_REFRESH_MIN_INTERVAL_MS = 5 * 6e4;
+const POLICY_REFRESH_RETRY_MS = 3e4;
+const POLICY_REFRESH_MAX_BACKOFF_MS = 30 * 6e4;
+const WAKE_GAP_SLACK_MS = 2 * 6e4;
+function createPolicyRefreshTrigger(deps) {
+  const now = deps.now ?? Date.now;
+  const minIntervalMs = deps.minIntervalMs ?? POLICY_REFRESH_MIN_INTERVAL_MS;
+  const retryMs = deps.retryMs ?? POLICY_REFRESH_RETRY_MS;
+  const maxBackoffMs = deps.maxBackoffMs ?? POLICY_REFRESH_MAX_BACKOFF_MS;
+  const setTimer = deps.setTimer ?? ((fn, ms) => {
+    const t = setTimeout(fn, ms);
+    t.unref?.();
+    return t;
+  });
+  const clearTimer = deps.clearTimer ?? ((handle) => clearTimeout(handle));
+  const log = (message, level) => deps.log?.(message, level);
+  let lastSuccessAt = null;
+  let lastAttemptAt = null;
+  let lastBypassAt = null;
+  let failures = 0;
+  let inFlight = false;
+  let timer = null;
+  let stopped = false;
+  const backoff = (n) => n <= 0 ? retryMs : Math.min(retryMs * 2 ** (n - 1), maxBackoffMs);
+  function earliestRun(reason) {
+    const windowEnd = lastSuccessAt === null ? 0 : lastSuccessAt + minIntervalMs;
+    const retryAt = lastAttemptAt === null ? 0 : lastAttemptAt + backoff(failures);
+    if (retryAt <= Math.max(windowEnd, now())) return { at: windowEnd, bypass: false };
+    const mayBypass = (reason === "connect" || reason === "wake") && (lastBypassAt === null || now() - lastBypassAt >= minIntervalMs);
+    return mayBypass ? { at: windowEnd, bypass: true } : { at: retryAt, bypass: false };
+  }
+  function defer(ms) {
+    if (timer !== null) return;
+    timer = setTimer(() => {
+      timer = null;
+      request("scheduled");
+    }, Math.max(0, ms));
+  }
+  function run(reason) {
+    inFlight = true;
+    lastAttemptAt = now();
+    log(`CLI update policy refresh (${reason})`, failures === 0 ? "warn" : "debug");
+    void deps.refresh().catch(() => "unavailable").then((result) => {
+      inFlight = false;
+      if (result === "superseded") {
+        stop();
+        return;
+      }
+      if (result === "ok") {
+        if (failures > 0) log(`CLI update policy refresh recovered after ${failures} failed attempt(s)`, "warn");
+        lastSuccessAt = now();
+        failures = 0;
+        return;
+      }
+      if (result === "busy") lastAttemptAt = now();
+      else {
+        if (result === "stale") lastSuccessAt = now();
+        failures += 1;
+        const stepUp = failures === 1 || backoff(failures) > backoff(failures - 1);
+        const next = result === "blocked" ? "waiting for the next connect / wake / hourly check" : `next try in ${Math.round(backoff(failures) / 1e3)}s`;
+        log(`CLI update policy refresh (${reason}) read no fresh policy (${result}, ${failures} in a row); ${next}`, stepUp ? "warn" : "debug");
+      }
+      if (stopped || result === "blocked") return;
+      defer(earliestRun("scheduled").at - now());
+    });
+  }
+  function request(reason) {
+    if (stopped) return "stopped";
+    if (inFlight) return "in-flight";
+    const { at, bypass } = earliestRun(reason);
+    const wait = at - now();
+    if (wait > 0) {
+      defer(wait);
+      return "deferred";
+    }
+    if (bypass) lastBypassAt = now();
+    if (timer !== null) {
+      clearTimer(timer);
+      timer = null;
+    }
+    run(reason);
+    return "run";
+  }
+  function stop() {
+    stopped = true;
+    if (timer !== null) clearTimer(timer);
+    timer = null;
+  }
+  return {
+    request,
+    /** Any other refresh (startup, hourly, announcement) that read a policy restarts the window (and a fresh one ends the backoff); one that found us superseded stops it. */
+    noteRefreshed(result) {
+      if (result === "ok" || result === "stale") lastSuccessAt = now();
+      if (result === "ok") failures = 0;
+      else if (result === "superseded") stop();
+    },
+    stop
+  };
+}
+function createWakeDetector(intervalMs, now = Date.now, slackMs = WAKE_GAP_SLACK_MS) {
+  let last = null;
+  return {
+    /** Call once per heartbeat; true when the process was just suspended. */
+    beat() {
+      const at = now();
+      const woke = last !== null && at - last > intervalMs + slackMs;
+      last = at;
+      return woke;
+    }
+  };
+}
+
+function createDaemonOwnership(deps) {
+  let superseded = false;
+  return {
+    owns() {
+      if (superseded) return false;
+      const ownerPid = deps.statePid();
+      if (ownerPid === null || ownerPid === deps.pid) return true;
+      superseded = true;
+      deps.onSuperseded(ownerPid);
+      return false;
+    }
+  };
+}
+
 const HARNESS_INSTALL_CATALOG = Object.freeze({
   claude: Object.freeze({ packages: [{ name: "@anthropic-ai/claude-code", spec: "latest" }], commands: ["claude"], minNode: "22.0.0", scripts: true }),
   codex: Object.freeze({ packages: [{ name: "@openai/codex", spec: "latest" }], commands: ["codex"], minNode: "16.0.0", scripts: false }),
@@ -7074,6 +7208,7 @@ function listIssueReceipts(home, now = Date.now()) {
 
 const ISSUE_POLL_MS = 5e3;
 const ISSUE_SPAWNED_BY = "issue";
+const ISSUE_SPAWN_UNKNOWN_GRACE_MS = 6e4;
 const FIRST_MESSAGE_KEY_WAIT_MS = 1e4;
 function issueKeyFromPrompt(prompt) {
   return /^You are assigned issue ([A-Z]+-\d{1,9}):/.exec(prompt)?.[1] ?? null;
@@ -7125,10 +7260,35 @@ function createIssueWorker(deps) {
     writeIssueReceipt(home, receipt);
     return receipt;
   };
-  async function fail(receipt, error, unknown = false) {
-    await client.fail(receipt.dispatchId, { machineId: deps.machineId, claimId: receipt.claimId, error: error.slice(0, 4e3), ...unknown ? { unknown: true } : {} });
-    save({ ...receipt, phase: unknown ? receipt.phase : "failed" });
-    deps.log(`Issue dispatch ${receipt.dispatchId} ${unknown ? "outcome unknown" : "failed"}`);
+  const now = deps.now ?? Date.now;
+  const unknownSpawns = /* @__PURE__ */ new Map();
+  async function fail(receipt, error) {
+    await client.fail(receipt.dispatchId, { machineId: deps.machineId, claimId: receipt.claimId, error: error.slice(0, 4e3) });
+    save({ ...receipt, phase: "failed" });
+    deps.log(`Issue dispatch ${receipt.dispatchId} failed`);
+  }
+  function holdUnknown(view, receipt, reason) {
+    const held = unknownSpawns.get(view.id);
+    unknownSpawns.set(view.id, { view, receipt, reason, deadline: held?.deadline ?? now() + ISSUE_SPAWN_UNKNOWN_GRACE_MS });
+    deps.log(`Issue dispatch ${view.id} spawn outcome unknown; re-checking`);
+  }
+  async function recheckUnknown() {
+    for (const [id, held] of [...unknownSpawns]) {
+      if (closed) return;
+      const matches = persistedRunSessions(held.view.runId);
+      try {
+        if (matches.length === 1) {
+          unknownSpawns.delete(id);
+          await afterSpawn(held.view, save({ ...held.receipt, sessionId: matches[0], phase: "spawned" }));
+        } else if (matches.length > 1 || now() >= held.deadline) {
+          unknownSpawns.delete(id);
+          await fail(held.receipt, matches.length > 1 ? `Spawn produced ${matches.length} sessions for this run; stop the extra ones and retry` : `Session did not start within ${Math.round(ISSUE_SPAWN_UNKNOWN_GRACE_MS / 1e3)} s (${held.reason}); check the machine before retrying`);
+        }
+      } catch (error) {
+        if (httpCode(error) === "issue_dispatch_claim_mismatch" || error instanceof client$2.IssuesUnsupportedError) unknownSpawns.delete(id);
+        deps.log(`Issue dispatch ${id} remains pending${error instanceof client$2.IssueRequestError && error.code ? ` (${error.code})` : ""}`);
+      }
+    }
   }
   async function complete(receipt) {
     let lastError;
@@ -7187,7 +7347,7 @@ function createIssueWorker(deps) {
         await fail({ ...receipt, phase: "claimed" }, accountUnavailableError(spawned.errorMessage, "issue") ?? spawned.errorMessage);
         return;
       }
-      if (spawned.type === "error" && spawned.startupExit?.exited) {
+      if (spawned.type === "error" && (spawned.startupExit?.exited || spawned.notStarted)) {
         await fail(receipt, `Session failed to start: ${spawned.errorMessage}`);
         return;
       }
@@ -7198,25 +7358,36 @@ function createIssueWorker(deps) {
       if (spawned.type !== "success") {
         const matches = persistedRunSessions(view.runId);
         if (matches.length !== 1) {
-          await fail(receipt, `Spawn outcome unknown: ${spawned.errorMessage}`, true);
+          holdUnknown(view, receipt, spawned.errorMessage);
           return;
         }
         receipt = save({ ...receipt, sessionId: matches[0], phase: "spawned" });
       } else {
         receipt = save({ ...receipt, sessionId: spawned.sessionId, phase: "spawned" });
       }
-      runBySession.set(receipt.sessionId, view.runId);
-      if (spawn.projectId && deps.joinProject) await deps.joinProject(receipt.sessionId, spawn.projectId).catch(() => void 0);
-    }
-    if (receipt.phase === "spawning") {
+    } else if (receipt.phase === "spawning") {
       const matches = persistedRunSessions(view.runId);
       if (matches.length !== 1) {
-        await fail(receipt, "Spawn outcome unknown; verify the old process before retrying", true);
+        holdUnknown(view, receipt, "the spawn was interrupted by a daemon restart");
         return;
       }
       receipt = save({ ...receipt, sessionId: matches[0], phase: "spawned" });
-      runBySession.set(receipt.sessionId, view.runId);
+    } else {
+      if (receipt.sessionId && !receipt.ended) runBySession.set(receipt.sessionId, view.runId);
+      await deliverAndComplete(view, receipt);
+      return;
     }
+    await afterSpawn(view, receipt);
+  }
+  async function afterSpawn(view, receipt) {
+    runBySession.set(receipt.sessionId, view.runId);
+    const projectId = view.spawn?.projectId;
+    if (projectId && deps.joinProject) await deps.joinProject(receipt.sessionId, projectId).catch(() => void 0);
+    await deliverAndComplete(view, receipt);
+  }
+  async function deliverAndComplete(view, receipt) {
+    const spawn = view.spawn;
+    const agent = spawn.agent;
     if (receipt.phase === "spawned") {
       const sessionId = receipt.sessionId;
       const mode = spawnAgents.sanitizeSpawnPermissionMode(spawn.permissionMode ?? void 0);
@@ -7307,6 +7478,7 @@ function createIssueWorker(deps) {
     if (running || closed || Date.now() < retryAt) return;
     running = true;
     try {
+      await recheckUnknown();
       let dispatches;
       try {
         dispatches = (await client.poll(deps.machineId)).dispatches ?? [];
@@ -7788,7 +7960,8 @@ async function startDaemon() {
           logger.logger.debug(`[DAEMON RUN] Directory creation failed: ${errorMessage}`);
           return {
             type: "error",
-            errorMessage
+            errorMessage,
+            notStarted: true
           };
         }
       }
@@ -7847,11 +8020,11 @@ async function startDaemon() {
             const requested = forkSpawnAccount(options.agentProfileId, options.parentSessionId, (id) => accountServiceRef.sessionAccount(id));
             spawnAccountId = accountServiceRef.resolveSpawnAccount(accountAgent, requested);
           } catch (error) {
-            return { type: "error", errorMessage: error instanceof Error ? error.message : String(error) };
+            return { type: "error", errorMessage: error instanceof Error ? error.message : String(error), notStarted: true };
           }
           if (spawnAccountId) extraEnv[store.SPAWN_ACCOUNT_ENV] = spawnAccountId;
         } else if (options.agentProfileId) {
-          return { type: "error", errorMessage: `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${options.agent} yet` };
+          return { type: "error", errorMessage: `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${options.agent} yet`, notStarted: true };
         }
         const claudeAuthStatus = claudeAuthServiceRef?.current()?.status;
         if ((options.agent ?? "claude") === "claude" && claudeAuthStatus && !spawnAccountId) {
@@ -7878,7 +8051,8 @@ async function startDaemon() {
           logger.logger.warn(`[DAEMON RUN] ${errorMessage}`);
           return {
             type: "error",
-            errorMessage
+            errorMessage,
+            notStarted: true
           };
         }
         let tmuxSessionName = extraEnv.TMUX_SESSION_NAME;
@@ -7899,7 +8073,8 @@ async function startDaemon() {
           if (!spawnAgents.isSpawnAgent(agent)) {
             return {
               type: "error",
-              errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`
+              errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`,
+              notStarted: true
             };
           }
           const resumeId = agent === "claude" ? options.resumeClaudeSessionId : agent === "codex" ? options.resumeCodexThreadId : void 0;
@@ -7985,7 +8160,8 @@ async function startDaemon() {
             default:
               return {
                 type: "error",
-                errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`
+                errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`,
+                notStarted: true
               };
           }
           const args = [
@@ -8055,7 +8231,8 @@ async function startDaemon() {
         logger.logger.debug("[DAEMON RUN] Failed to spawn process - no PID returned");
         return Promise.resolve({
           type: "error",
-          errorMessage: "Failed to spawn Happy process - no PID returned"
+          errorMessage: "Failed to spawn Happy process - no PID returned",
+          notStarted: true
         });
       }
       timer?.mark("spawned");
@@ -8281,7 +8458,9 @@ async function startDaemon() {
             HAPPY_RECONNECT_SEQ: String(tracked.encryption.seq),
             HAPPY_RECONNECT_METADATA_VERSION: String(tracked.encryption.metadataVersion),
             HAPPY_RECONNECT_AGENT_STATE_VERSION: String(tracked.encryption.agentStateVersion),
-            ...teamEnv
+            ...teamEnv,
+            // B-874c: an issue run's binding rides every relaunch (digest, MCP context).
+            ...sessionMetadata.issueRelaunchEnv(metadata)
           }
         });
         if (result.type === "success") {
@@ -8423,6 +8602,8 @@ async function startDaemon() {
             HAPPY_RECONNECT_METADATA_VERSION: String(tracked.encryption.metadataVersion),
             HAPPY_RECONNECT_AGENT_STATE_VERSION: String(tracked.encryption.agentStateVersion),
             ...teamEnv,
+            // B-874c: see resumeSessionImpl.
+            ...sessionMetadata.issueRelaunchEnv(metadata),
             ...options?.auto ? { [sessionLock.AUTO_RESTARTED_ENV]: sessionLock.encodeAutoRestarted(options.auto.kind, options.auto.target) } : {}
           }
         });
@@ -8871,6 +9052,14 @@ async function startDaemon() {
         host: initialMachineMetadata.host
       })).then(() => logger.logger.debug(`[DAEMON RUN] claimed the machine record for host ${initialMachineMetadata.host}`)).catch((error) => logger.logger.debug("[DAEMON RUN] could not refresh the recorded host:", error));
     }
+    const daemonOwnership = createDaemonOwnership({
+      pid: process.pid,
+      statePid: persistence.readDaemonStatePidSync,
+      onSuperseded: (ownerPid) => {
+        logger.logger.debug(`[DAEMON RUN] Somehow a different daemon (pid ${ownerPid}) was started without killing us. We should kill ourselves.`);
+        requestShutdown("exception", "A different daemon was started without killing us. We should kill ourselves.");
+      }
+    });
     let lastUpdateLog = "";
     let harnessInstaller = null;
     let handoverInFlight = false;
@@ -8893,7 +9082,9 @@ async function startDaemon() {
       installFenced: () => !!harnessInstaller?.isRunning(),
       busyGraceMs: resolveBusyInstallGrace(process.env.HAPPY_CLI_UPDATE_BUSY_GRACE_MS),
       lastInstall: lastInstallStore(configuration.configuration.happyHomeDir),
+      owned: daemonOwnership.owns,
       publish: (state) => {
+        if (!daemonOwnership.owns()) return;
         cliUpdateStateRef = state;
         fileState = { ...fileState, cliUpdate: state };
         persistence.writeDaemonState(fileState);
@@ -8930,10 +9121,17 @@ async function startDaemon() {
         relayMoveInFlight = null;
       });
     });
-    const refreshCliUpdate = () => updateController.refresh().catch((error) => {
+    const policyRefresh = createPolicyRefreshTrigger({
+      refresh: () => updateController.refresh(),
+      log: (message, level) => level === "warn" ? logger.logger.warn(`[DAEMON RUN] ${message}`) : logger.logger.debug(`[DAEMON RUN] ${message}`)
+    });
+    const refreshCliUpdate = () => updateController.refresh().then(policyRefresh.noteRefreshed).catch((error) => {
       logger.logger.debug("[DAEMON RUN] CLI update policy check failed:", error);
     });
-    void refreshCliUpdate();
+    apiMachine.setControlConnectedHandler(() => {
+      policyRefresh.request("connect");
+    });
+    policyRefresh.request("startup");
     const cliUpdateIntervalMs = cliUpdate.resolveCliUpdateCheckInterval(process.env.HAPPY_CLI_UPDATE_CHECK_INTERVAL);
     if (process.env.HAPPY_CLI_UPDATE_CHECK_INTERVAL && cliUpdateIntervalMs === cliUpdate.DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS && process.env.HAPPY_CLI_UPDATE_CHECK_INTERVAL.trim() !== String(cliUpdate.DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS)) {
       logger.logger.warn(`[DAEMON RUN] Ignoring invalid HAPPY_CLI_UPDATE_CHECK_INTERVAL; using ${cliUpdate.DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS}ms`);
@@ -8970,6 +9168,7 @@ async function startDaemon() {
     });
     apiMachine.setHarnessInstallHandler((params) => harnessInstaller.request(params));
     const heartbeatIntervalMs = parseInt(process.env.HAPPY_DAEMON_HEARTBEAT_INTERVAL || "60000");
+    const wakeDetector = createWakeDetector(heartbeatIntervalMs);
     const restartOnStaleVersionAndHeartbeat = setInterval(serialTask(async () => {
       try {
         if (process.env.DEBUG) {
@@ -8981,6 +9180,7 @@ async function startDaemon() {
             onChildExited(pid);
           }
         }
+        if (!daemonOwnership.owns()) return;
         await updateController.tick();
         await updateController.withHandover(async () => {
           handoverInFlight = true;
@@ -9017,6 +9217,7 @@ async function startDaemon() {
               clearInterval(restartOnStaleVersionAndHeartbeat);
               clearInterval(cliUpdateInterval);
               policyAnnouncements.stop();
+              policyRefresh.stop();
               stopAgentVersionChecks();
               claudeAuthService.stop();
               stopAccountWatch();
@@ -9044,12 +9245,9 @@ async function startDaemon() {
             handoverInFlight = false;
           }
         });
-        const daemonState = await persistence.readDaemonState();
-        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;
-        }
+        if (!daemonOwnership.owns()) return;
+        const woke = wakeDetector.beat();
+        if (woke || updateController.policyStale()) policyRefresh.request(woke ? "wake" : "stale");
         try {
           fileState = withDaemonHeartbeat(fileState, (/* @__PURE__ */ new Date()).toLocaleString());
           persistence.writeDaemonState(fileState);
@@ -9161,6 +9359,7 @@ async function startDaemon() {
       clearInterval(cliUpdateInterval);
       clearInterval(autoRestartSweep);
       policyAnnouncements.stop();
+      policyRefresh.stop();
       stopAgentVersionChecks();
       await apiMachine.updateDaemonState((state) => ({
         ...state,