very-happy-cli 0.2.166 → 0.2.168

package/dist/{run-DPEwJpQR.mjs → run-BZjIDOGM.mjs}

@@ -1,23 +1,23 @@
-import { i as isClaudeSessionId, f as extractCompleteLines, g as decideBackfill, h as parseTerminalHookPayload, j as decideMirrorBinding, M as MIRROR_BACKFILL_LINES_DEFAULT, m as mirrorLineKey, k as mirrorLocalId, d as summarizeSpawnSessionForLog, n as startAgentVersionChecks } from './mirrorProtocol-h5WHpdhh.mjs';
-import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel, d as detectDaemonSupervisor } from './piRunnerArgs-7FaTyNOq.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-CQ5fAUgq.mjs';
+import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel, d as detectDaemonSupervisor } from './piRunnerArgs-vNIUWHqo.mjs';
 import fs from 'fs/promises';
 import * as tmp from 'tmp';
 import axios from 'axios';
-import { T as TurnActivityTracker, A as ApiClient } from './api-Cmz3XS4P.mjs';
+import { T as TurnActivityTracker, A as ApiClient } from './api-hXLwtgMi.mjs';
 import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta } from './spawnAgents-HDaE3C0-.mjs';
-import { l as logger } from './logger-BpQcwNnt.mjs';
+import { l as logger } from './logger-C6zzu57a.mjs';
 import { readdirSync, statSync, unlinkSync, realpathSync, mkdirSync, writeFileSync, accessSync, constants as constants$1, existsSync, readFileSync, openSync, fsyncSync, closeSync, renameSync } from 'node:fs';
 import { join, isAbsolute, resolve, dirname, sep, basename, delimiter } from 'node:path';
-import { p as pruneStaleCompileCaches } from './index-HQsigW_J.mjs';
-import { a as authAndSetupMachineIfNeeded } from './auth-pzWIFdOD.mjs';
-import { c as configuration, f as ensurePrivateDirectorySync, w as writePrivateFileSync } from './configuration-D2v3puap.mjs';
+import { p as pruneStaleCompileCaches } from './index-D2hg_u5i.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-BFeFguVs.mjs';
+import { c as configuration, f as ensurePrivateDirectorySync, w as writePrivateFileSync } from './configuration-BZo1JWNV.mjs';
 import { spawn, execSync } from 'child_process';
-import { p as packageJson } from './package-BqwrPxL0.mjs';
-import { a as globalPrefixForPackage, g as getEnvironmentInfo } from './doctor-BlXXyQ1L.mjs';
-import { s as spawnHappyCLI } from './spawnHappyCLI-BAa49m0q.mjs';
-import { readPersistedSessions, readSettings, persistSession, readDaemonState, acquireDaemonLock, deletePersistedSessions, writeDaemonState, writeSettings, releaseDaemonLock } from './persistence-B9LmhAE2.mjs';
-import { i as isDaemonRunningCurrentlyInstalledHappyVersion, a as stopDaemon, q as cleanupDaemonState } from './controlClient-BMUJfUeF.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-BnaEaOKs.mjs';
+import { p as packageJson } from './package-5xAdq5fu.mjs';
+import { a as globalPrefixForPackage, g as getEnvironmentInfo } from './doctor-C98yYhYr.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-BCnZfffk.mjs';
+import { b 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 releaseDaemonLock } from './persistence-B6M_W5iC.mjs';
+import { i as isDaemonRunningCurrentlyInstalledHappyVersion, b as stopDaemon, t as cleanupDaemonState } from './controlClient-CXD-Xdny.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-CBXsQGV5.mjs';
 import fastify from 'fastify';
 import { z } from 'zod';
 import { validatorCompiler, serializerCompiler } from 'fastify-type-provider-zod';
@@ -25,45 +25,45 @@ import { d as decodeBase64, e as encodeBase64, h as decrypt } from './authRelay-
 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-Dhfhbtqu.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-CeCe-3lk.mjs';
+import { b as sanitizeRateLimitReport } from './rateLimitWindows-CJ1xDAxa.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-uDR6MG0-.mjs';
 import os, { hostname, homedir, userInfo, 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-B2DtWuNP.mjs';
-import { assistantHome, bootstrapAssistantHome } from './bootstrap-XE8A7Ut2.mjs';
-import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-DQplgo0W.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-Dx0M2MXV.mjs';
+import { assistantHome, bootstrapAssistantHome } from './bootstrap-DklT121U.mjs';
+import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-Dgqk3lfG.mjs';
 import { existsSync as existsSync$1, statSync as statSync$1, mkdtempSync, rmSync } from 'fs';
 import { 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 { g as getInitialMachineMetadata, a as getStartupCliAvailability } from './machineMetadata-CBdxABeI.mjs';
-import { buildResumeLaunch } from './handleResumeCommand-Ci7wacT-.mjs';
+import { g as getInitialMachineMetadata, a as getStartupCliAvailability } from './machineMetadata-DmTGIZAV.mjs';
+import { buildResumeLaunch } from './handleResumeCommand-BzcANj0i.mjs';
 import { access, symlink, readFile, rm, unlink, readlink, lstat, constants, 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 { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-Cbl3ejoq.mjs';
 import { createRequire } from 'node:module';
 import { g as getProjectPath } from './path-D2wdaNSk.mjs';
 import { b as extractClaudeEditPaths } from './editPaths-BVfS_FFL.mjs';
-import { s as startFileWatcher } from './startFileWatcher-Dfs4whzr.mjs';
-import { I as InvalidateSync } from './sync-BLpH13Kb.mjs';
+import { s as startFileWatcher } from './startFileWatcher-De7rN8QW.mjs';
+import { I as InvalidateSync } from './sync-CHOB3Org.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 } from './sessionLock-DqVyHFAQ.mjs';
+import { p as processIdentityFields, r as readSessionLock, t as terminateProcess } from './sessionLock-DCKf-gjd.mjs';
 import { findAllHappyProcesses } from './doctor-BPkYWSuq.mjs';
 import { T as TEAM_SKILL } from './resources-BdFBQi8r.mjs';
 import { promisify } from 'node:util';
 import { t as AUTOMATION_SUMMARY_MAX_CHARS, u as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, v as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, a as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, w as AUTOMATION_CLAIM_MAX_RUNS, x as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, y as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal } from './index-B0HEEYGh.mjs';
-import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-GjTnsq6F.mjs';
 import { c as clipText, r as renderAction, b as renderTemplate } from './template-CiOPa2rd.mjs';
 import { d as describeAgentHome } from './loginShellEnv-Dw8M7tkI.mjs';
-import './sessionModeFile-M4OpiyrF.mjs';
-import './lidState-BfximpjX.mjs';
+import './sessionModeFile-BYxsFSvc.mjs';
+import './lidState-CJ3XkJRn.mjs';
 import 'os';
 import 'node:events';
 import 'socket.io-client';
-import './attachmentLimits-C1PCCM79.mjs';
+import './attachmentLimits-CxG3T18E.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-CfDKj6Bx.mjs';
-import './registerCommonHandlers-DdfGsFbM.mjs';
+import './time-CN0jVVir.mjs';
+import './registerCommonHandlers-BLHKlk5Z.mjs';
 import 'util';
 import 'crypto';
 import 'cross-spawn';
@@ -71,12 +71,12 @@ import '@paralleldrive/cuid2';
 import './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
 import 'tweetnacl';
-import './browser-DDFi1T8C.mjs';
+import './browser-DUf1dth8.mjs';
 import 'open';
 import './ids-DU6sLx4C.mjs';
 import 'url';
 import './detectCLI-CSGMlV51.mjs';
-import './localHappyAgentAuth-Ct1aXwqd.mjs';
+import './localHappyAgentAuth-DkLbntlf.mjs';
 import 'ps-list';
 
 async function resolveRelaunchMetadata(snapshot, fetchServer) {
@@ -396,6 +396,29 @@ function isAuthorizedDaemonControlRequest(authorization, controlToken) {
   return configuredTokenIsUsable && timingSafeEqual(expectedDigest, candidateDigest);
 }
 
+const WrapperIdleSnapshotSchema = z.object({
+  flavor: z.string().max(64),
+  resumable: z.boolean(),
+  uiSession: z.boolean(),
+  variant: z.string().max(64).optional(),
+  spawnedBy: z.string().max(64).optional(),
+  tags: z.array(z.string().max(128)).max(64).optional(),
+  keepAwake: z.boolean(),
+  keepAwakeSetting: z.boolean().optional(),
+  thinking: z.boolean(),
+  queuedInputs: z.number().int().nonnegative(),
+  waitingForInput: z.boolean(),
+  pendingRequests: z.number().int().nonnegative(),
+  backgroundTasks: z.number().int().nonnegative(),
+  scheduledWakeups: z.number().int().nonnegative().optional(),
+  lastActivityAt: z.number(),
+  exiting: z.boolean().optional()
+}).passthrough();
+const HibernateCheckBodySchema = z.object({
+  sessionId: z.string().min(1).max(200),
+  pid: z.number().int().positive(),
+  report: WrapperIdleSnapshotSchema
+});
 const BackgroundTaskInfoSchema = z.object({
   id: z.string().min(1).max(200),
   type: z.string().max(64),
@@ -429,7 +452,8 @@ function startDaemonControlServer({
   onSessionEdit,
   listPeers,
   isTurnActive,
-  onRateLimits
+  onRateLimits,
+  onHibernateCheck
 }) {
   return new Promise((resolve) => {
     const app = fastify({
@@ -512,6 +536,29 @@ function startDaemonControlServer({
       onSessionStateEvent?.(sessionId, event, spawnedBy);
       return { status: "ok" };
     });
+    if (onHibernateCheck) {
+      typed.post("/session-hibernate-check", {
+        schema: {
+          body: HibernateCheckBodySchema,
+          response: {
+            200: z.object({
+              hibernate: z.boolean(),
+              reason: z.string().optional(),
+              idleMs: z.number().optional(),
+              nextCheckMs: z.number().optional(),
+              keepAwake: z.boolean().optional()
+            })
+          }
+        }
+      }, async (request) => {
+        try {
+          return await onHibernateCheck(request.body);
+        } catch (error) {
+          logger.debug("[CONTROL SERVER] hibernate check failed:", error);
+          return { hibernate: false, reason: "error" };
+        }
+      });
+    }
     typed.post("/list", {
       schema: {
         response: {
@@ -2391,6 +2438,133 @@ function createUpdateController(deps) {
   return { refresh, retry, request, tick, withHandover, holdHandover, isRunning: () => running };
 }
 
+const AUTOMATION_BINDINGS_TTL_MS = 10 * 60 * 1e3;
+const HIBERNATION_IN_FLIGHT_MS = 6e4;
+const HIBERNATION_EXIT_WAIT_MS = 15e3;
+async function waitForPidsToExit(pids, isAlive, timeoutMs = HIBERNATION_EXIT_WAIT_MS, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), now = Date.now) {
+  const deadline = now() + timeoutMs;
+  while (pids.some(isAlive)) {
+    if (now() >= deadline) return false;
+    await sleep(100);
+  }
+  return true;
+}
+function createDaemonHibernation(deps) {
+  const now = () => (deps.now ?? Date.now)();
+  const signatures = /* @__PURE__ */ new Map();
+  const approved = /* @__PURE__ */ new Map();
+  let bindings = null;
+  let bindingsInFlight = null;
+  async function automationBound(fresh = false) {
+    if (!fresh && bindings && now() - bindings.at < AUTOMATION_BINDINGS_TTL_MS) return bindings.ids;
+    if (fresh && bindingsInFlight) await bindingsInFlight;
+    if (!bindingsInFlight) {
+      bindingsInFlight = deps.loadAutomationBindings().then((ids) => {
+        bindings = { at: now(), ids: new Set(ids) };
+        return bindings.ids;
+      }).catch((error) => {
+        deps.log?.(`[hibernate] automation bindings unknown: ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+      }).finally(() => {
+        bindingsInFlight = null;
+      });
+    }
+    return bindingsInFlight;
+  }
+  function inFlight(except) {
+    const t = now();
+    for (const [id, at] of approved) {
+      if (t - at > HIBERNATION_IN_FLIGHT_MS) approved.delete(id);
+      else if (id !== except) return true;
+    }
+    return false;
+  }
+  async function check(request) {
+    const idleMs = deps.idleMs();
+    const t = now();
+    const tracked = deps.tracked(request.sessionId, request.pid);
+    const latchedBefore = deps.readKeepAwake?.(request.sessionId) ?? false;
+    const latched = latchKeepAwake(request.report.keepAwakeSetting, latchedBefore || request.report.keepAwake);
+    if (latched !== latchedBefore) deps.writeKeepAwake?.(request.sessionId, latched);
+    if (latched && !request.report.keepAwake) request = { ...request, report: { ...request.report, keepAwake: true } };
+    const signature = reportSignature(request.report);
+    const previousSignature = signatures.get(request.sessionId);
+    signatures.set(request.sessionId, signature);
+    const base = {
+      idleMs,
+      now: t,
+      sessionId: request.sessionId,
+      pid: request.pid,
+      report: request.report,
+      trackedLive: !!tracked?.live,
+      trackedSpawnedBy: tracked?.spawnedBy,
+      teamsMember: deps.teamsMember(request.sessionId),
+      turnActive: deps.turnActive(request.sessionId),
+      backgroundTasks: deps.backgroundTasks(request.sessionId),
+      previousSignature,
+      hibernationInFlight: inFlight(request.sessionId)
+    };
+    let verdict = decideDaemonHibernation({ ...base, automationBound: /* @__PURE__ */ new Set() });
+    if (verdict.ok || verdict.reason === "unconfirmed" || verdict.reason === "busy") {
+      verdict = decideDaemonHibernation({ ...base, automationBound: await automationBound() });
+    }
+    if (verdict.ok) {
+      verdict = decideDaemonHibernation({ ...base, automationBound: await automationBound(true) });
+    }
+    if (verdict.ok) {
+      approved.set(request.sessionId, t);
+      signatures.delete(request.sessionId);
+      deps.log?.(`[hibernate] approved ${request.sessionId} (pid ${request.pid}, idle ${Math.round((t - request.report.lastActivityAt) / 1e3)}s)`);
+      return { hibernate: true, idleMs, ...latched ? { keepAwake: true } : {} };
+    }
+    const next = verdict.reason === "unconfirmed" ? deps.checkMs : nextCheckDelay(verdict, request.report, idleMs, deps.checkMs, t);
+    return { hibernate: false, reason: verdict.reason, idleMs, nextCheckMs: next, ...latched ? { keepAwake: true } : {} };
+  }
+  return {
+    check,
+    /** Called when the wrapper exits: true when this exit is the hibernation we approved. */
+    consumeExit(sessionId) {
+      const at = approved.get(sessionId);
+      approved.delete(sessionId);
+      signatures.delete(sessionId);
+      return at !== void 0 && now() - at <= HIBERNATION_IN_FLIGHT_MS * 5;
+    },
+    /** Review P1-2: an approved hibernation whose wrapper has not exited yet. */
+    pendingExit(sessionId) {
+      const at = approved.get(sessionId);
+      return at !== void 0 && now() - at <= HIBERNATION_IN_FLIGHT_MS * 5;
+    },
+    forget(sessionId) {
+      signatures.delete(sessionId);
+    },
+    /** Drop the cached Automations bindings (e.g. after the setting changed). */
+    invalidateBindings() {
+      bindings = null;
+    }
+  };
+}
+async function collectAutomationBindings(client, machineId) {
+  const ids = /* @__PURE__ */ new Set();
+  const automations = await client.list(machineId);
+  for (const automation of automations) {
+    const action = automation.action;
+    if (action?.kind === "send" && typeof action.sessionId === "string") ids.add(action.sessionId);
+    if (action?.kind === "spawn" && action.sticky) {
+      for (const sticky of await client.stickies(automation.id)) ids.add(sticky.sessionId);
+    }
+  }
+  return [...ids];
+}
+const AUTOMATION_WAKE_TIMEOUT_MS = 6e4;
+async function waitForSessionLive(sessionId, live, timeoutMs = AUTOMATION_WAKE_TIMEOUT_MS, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), now = Date.now) {
+  const deadline = now() + timeoutMs;
+  while (!live(sessionId)) {
+    if (now() >= deadline) return false;
+    await sleep(250);
+  }
+  return true;
+}
+
 const CLAUDE_KEYCHAIN_SERVICE_PREFIX = "Claude Code";
 function keychainIdentity(env = process.env, deps = {}) {
   const home = deps.home ?? homedir();
@@ -3536,7 +3710,7 @@ function writeReceipt$1(home, receipt) {
 
 const exec = promisify(execFile);
 const git = async (directory, args) => (await exec("git", ["-C", directory, ...args], { timeout: 3e4, maxBuffer: 2 * 1024 * 1024 })).stdout.trim();
-async function prepareTeamWorktree(home, repository, id) {
+async function prepareTeamWorktree(home, repository, id, origin = "teams") {
   if (repository === "~") repository = homedir();
   else if (repository.startsWith("~/") || process.platform === "win32" && repository.startsWith("~\\")) repository = join(homedir(), repository.slice(2));
   if (!isAbsolute(repository) || !/^[a-zA-Z0-9_-]{1,128}$/.test(id)) throw new Error("A team task requires an absolute repository path and valid operation id");
@@ -3553,6 +3727,7 @@ async function prepareTeamWorktree(home, repository, id) {
     if (resolve(common) !== resolve(expected)) throw new Error("Team worktree belongs to another repository");
   } else {
     await git(repository, ["worktree", "add", "-b", branch, directory, "HEAD"]);
+    await initializeOwnedWorktree({ source: repository, worktree: directory, branch, origin });
   }
   return { directory, repository, branch };
 }
@@ -4200,6 +4375,35 @@ function createAutomationRunner(deps) {
       }
     })();
   }
+  function wakeThenSend(claimed, sessionId, text, stickyKey) {
+    const { run, automation } = claimed;
+    const item = track(claimed, "send", sessionId);
+    item.waking = true;
+    gating++;
+    void (async () => {
+      try {
+        const woke = await deps.wakeHibernated(sessionId).catch(() => false);
+        if (!tracked.has(run.id) || closed) return;
+        item.waking = false;
+        if (!woke || !deps.live(sessionId)) {
+          await finish(item, { claimId: run.claimId, status: "failed", sessionId, error: `Session ${sessionId} was hibernated and could not be woken in time`, needsAttention: true, attentionReason: "session_wake_failed" });
+          return;
+        }
+        persist({ runId: run.id, automationId: automation.id, kind: "send", phase: "running", claimId: run.claimId, sessionId, ...stickyKey ? { stickyKey } : {} });
+        try {
+          await send(sessionId, text, { localId: `automation-${run.id}` });
+        } catch (error) {
+          await finish(item, { claimId: run.claimId, status: "failed", sessionId, error: clipText(`Message delivery failed: ${error instanceof Error ? error.message : String(error)}`, AUTOMATION_SUMMARY_MAX_CHARS), needsAttention: true, attentionReason: "send_failed" });
+          return;
+        }
+        await reportRunning(item, sessionId, stickyKey);
+      } finally {
+        item.waking = false;
+        gating--;
+      }
+    })();
+  }
+  const wakeable = (sessionId) => !deps.live(sessionId) && !!deps.wakeHibernated && deps.isHibernated?.(sessionId) === true;
   async function perform(claimed, action, context, env) {
     const { run, automation } = claimed;
     const header = automationPromptHeader(automation.name, run.id);
@@ -4227,6 +4431,11 @@ function createAutomationRunner(deps) {
       return;
     }
     if (action.kind === "send") {
+      if (wakeable(action.sessionId)) {
+        wakeThenSend(claimed, action.sessionId, `${header}
+${action.prompt}`);
+        return;
+      }
       if (!deps.live(action.sessionId)) {
         await failNow(claimed, "send", `Session ${action.sessionId} is not running on this machine`, "session_not_live", action.sessionId);
         return;
@@ -4255,6 +4464,11 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
     const stickyKey = action.sticky ? renderTemplate(action.sticky.key, context) : void 0;
     if (stickyKey) {
       const bound = claimed.stickies.find((sticky) => sticky.key === stickyKey);
+      if (bound && wakeable(bound.sessionId)) {
+        wakeThenSend(claimed, bound.sessionId, `${header}
+${action.prompt}`, stickyKey);
+        return;
+      }
       if (bound && deps.live(bound.sessionId)) {
         persist({ runId: run.id, automationId: automation.id, kind: "send", phase: "running", claimId: run.claimId, sessionId: bound.sessionId, stickyKey });
         try {
@@ -4276,7 +4490,7 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
     }
     if (action.worktree) {
       try {
-        directory = (await prepareWorktree(home, directory, `auto-${run.id}`)).directory;
+        directory = (await prepareWorktree(home, directory, `auto-${run.id}`, "automation")).directory;
       } catch (error) {
         await failNow(claimed, "spawn", `Worktree preparation failed: ${error instanceof Error ? error.message : String(error)}`, "worktree_failed");
         return;
@@ -4308,7 +4522,7 @@ ${action.prompt}`, { localId: `automation-${run.id}`, ...meta });
         await finish(item, item.pendingFinal);
         continue;
       }
-      if (item.kind === "script") continue;
+      if (item.kind === "script" || item.waking) continue;
       const sessionId = item.sessionId;
       const active = deps.turnActive(sessionId);
       if (active) item.sawTurn = true;
@@ -4526,6 +4740,7 @@ async function startDaemon() {
   let cliUpdateStateRef = null;
   let lastHandoverHold = null;
   let claudeCredentialStoreSetting = (await readSettings()).claudeCredentialStore === "file" ? "file" : "auto";
+  let agentHibernationSetting = (await readSettings()).agentHibernationIdleMs;
   try {
     const homes = await refreshAgentHomes();
     logger.debug(`[DAEMON RUN] Claude config dir: ${describeAgentHome(homes.claudeConfigDir)}; Codex home: ${describeAgentHome(homes.codexHome)}`);
@@ -4612,6 +4827,40 @@ async function startDaemon() {
     const turnActivity = new TurnActivityTracker();
     const backgroundTasks = new BackgroundTaskTracker();
     const peerCoordinator = createPeerCoordinator({ getChildren: () => Array.from(pidToTrackedSession.values()) });
+    const hibernationAutomations = createAutomationsClient({ serverUrl: configuration.serverUrl, token: credentials.token, client: "daemon-hibernate" });
+    const daemonHibernation = createDaemonHibernation({
+      idleMs: () => resolveIdleMs(agentHibernationSetting),
+      checkMs: resolveCheckMs(),
+      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;
+        }
+        return { live, ...tracked.spawnedBy ? { spawnedBy: tracked.spawnedBy } : {} };
+      },
+      teamsMember: (sessionId) => teamWorker?.hasSession(sessionId) === true,
+      turnActive: (sessionId) => turnActivity.activeSessions().includes(sessionId),
+      backgroundTasks: (sessionId) => backgroundTasks.count(sessionId),
+      loadAutomationBindings: async () => {
+        try {
+          return await collectAutomationBindings(hibernationAutomations, machineId);
+        } catch (error) {
+          if (isAutomationsUnavailable(error)) return [];
+          throw error;
+        }
+      },
+      log: (message) => logger.debug(`[DAEMON RUN] ${message}`),
+      readKeepAwake: (sessionId) => readPersistedSessions()[sessionId]?.keepAwake === true,
+      writeKeepAwake: (sessionId, value) => {
+        const record = readPersistedSessions()[sessionId];
+        if (record) persistSession(sessionId, { ...record, keepAwake: value || void 0 });
+      }
+    });
     const sessionIdToFinishedSession = /* @__PURE__ */ new Map();
     let teamWorker;
     let automationRunner;
@@ -5225,6 +5474,13 @@ async function startDaemon() {
     };
     const resumeSessionImpl = async (happySessionId, options) => {
       try {
+        if (daemonHibernation.pendingExit(happySessionId)) {
+          const dying = [...pidToTrackedSession.entries()].filter(([, s]) => s.happySessionId === happySessionId).map(([pid]) => pid);
+          const exited = await waitForPidsToExit(dying, isPidAlive);
+          logger.debug(`[DAEMON RUN] resume ${happySessionId}: waited for hibernating wrapper(s) ${dying.join(", ")} \u2192 ${exited ? "exited" : "still alive after timeout"}`);
+          if (!exited) return { type: "error", errorMessage: `Session ${happySessionId} is still going to sleep; try again in a few seconds.` };
+          for (const pid of dying) if (pidToTrackedSession.has(pid)) onChildExited(pid);
+        }
         for (const [pid, live] of pidToTrackedSession.entries()) {
           if (live.happySessionId !== happySessionId) continue;
           if (isPidAlive(pid)) {
@@ -5485,6 +5741,14 @@ async function startDaemon() {
       if (session?.happySessionId) turnActivity.forget(session.happySessionId);
       if (session?.happySessionId) backgroundTasks.forget(session.happySessionId);
       if (session?.happySessionId) peerCoordinator.forget(session.happySessionId);
+      if (session?.happySessionId && daemonHibernation.consumeExit(session.happySessionId)) {
+        const persisted2 = readPersistedSessions()[session.happySessionId];
+        if (persisted2) {
+          const at = Date.now();
+          persistSession(session.happySessionId, { ...persisted2, savedAt: at, hibernatedAt: at });
+        }
+        logger.debug(`[DAEMON RUN] Session ${session.happySessionId} hibernated (PID ${pid} exited)`);
+      }
       if (session?.happySessionId && session.encryption) {
         sessionIdToFinishedSession.set(session.happySessionId, session);
         logger.debug(`[DAEMON RUN] Process PID ${pid} exited, preserved session ${session.happySessionId} for resume`);
@@ -5580,6 +5844,7 @@ async function startDaemon() {
       onRateLimits: (report) => {
         apiMachineRef?.reportRateLimits(report);
       },
+      onHibernateCheck: (body) => daemonHibernation.check(body),
       listPeers: () => peerCoordinator.list(),
       // B-505: `daemon list` shows which sessions have a turn in flight, so an
       // operator can check the WHOLE machine before a supervised restart.
@@ -5701,6 +5966,13 @@ async function startDaemon() {
       setStore: (store) => claudeAuthService.setStore(store)
     });
     claudeAuthService.start();
+    apiMachine.setAgentHibernationHandlers(resolveIdleMs(agentHibernationSetting), async (requested) => {
+      const value = requested <= 0 ? 0 : settingIdleMs(requested);
+      await updateSettings((current) => ({ ...current, agentHibernationIdleMs: value }));
+      agentHibernationSetting = value;
+      daemonHibernation.invalidateBindings();
+      return resolveIdleMs(agentHibernationSetting);
+    });
     apiMachine.connect();
     if (identityConflict?.confidence === "weak") {
       void apiMachine.updateMachineMetadata((current) => ({
@@ -5848,18 +6120,32 @@ async function startDaemon() {
       live: (id) => [...pidToTrackedSession.values()].some((s) => s.happySessionId === id && isPidAlive(s.pid)),
       turnActive: (id) => turnActivity.activeSessions().includes(id),
       backgroundTasks: (id) => backgroundTasks.count(id),
+      // B-587 review P2-5: a hibernated target is woken (resume) and the send
+      // waits until its wrapper is back; anything else stays session_not_live.
+      isHibernated: (id) => {
+        const record = readPersistedSessions()[id];
+        return !!record && typeof record.hibernatedAt === "number" && record.hibernatedAt >= record.savedAt;
+      },
+      wakeHibernated: async (id) => {
+        const result = await resumeSession(id);
+        if (result.type !== "success") return false;
+        return waitForSessionLive(id, (sid) => [...pidToTrackedSession.values()].some((s) => s.happySessionId === sid && isPidAlive(s.pid)));
+      },
       log: (message) => logger.debug(`[DAEMON RUN] ${message}`)
     });
     void apiMachine.updateMachineMetadata((current) => ({
       ...current ?? initialMachineMetadata,
       teamsVersion: 1,
-      teamLaunchVersion: 1
+      teamLaunchVersion: 1,
+      // B-586: this daemon serves the worktree-* RPCs (web gates 「在新 worktree 中」 on it).
+      worktreeVersion: WORKTREE_CAPABILITY_VERSION
     })).catch(() => logger.debug("[DAEMON RUN] Teams capability publication will retry on reconnect"));
     const cleanupAndShutdown = async (source, errorMessage) => {
       logger.debug(`[DAEMON RUN] Starting proper cleanup (source: ${source}, errorMessage: ${errorMessage})...`);
       const scrollbackFlush = apiMachine.flushTerminalScrollback();
       teamWorker?.stop();
       automationRunner?.stop({ killScripts: true });
+      currentWorktreeService()?.stopAll();
       if (restartOnStaleVersionAndHeartbeat) {
         clearInterval(restartOnStaleVersionAndHeartbeat);
         logger.debug("[DAEMON RUN] Health check interval cleared");