very-happy-cli 0.2.165 → 0.2.167

package/dist/{runClaude-B1T9DLLi.cjs → runClaude-C7jPa8VP.cjs}

@@ -1,58 +1,59 @@
 'use strict';
 
 var os = require('node:os');
-var sessionLock = require('./sessionLock-B1GgaO1q.cjs');
+var sessionLock = require('./sessionLock-LBWNjpHf.cjs');
+var persistence = require('./persistence-BYGl0QYw.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-DNKNzk7l.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-AzdzTKFs.cjs');
-var logger = require('./logger-D0hkk7Vo.cjs');
-var _package = require('./package-UkmvSFsg.cjs');
-var persistence = require('./persistence-C6ztVW1W.cjs');
-var createSessionMetadata = require('./createSessionMetadata-CPGTztXP.cjs');
-var index = require('./index-DqlyNgt4.cjs');
+var api = require('./api-BZYLRDM9.cjs');
+var logger = require('./logger-B_MWPbZz.cjs');
+var createSessionMetadata = require('./createSessionMetadata-zQSz3hgk.cjs');
+var _package = require('./package-C9ZP9bpX.cjs');
+var index = require('./index-C9hI8a10.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
-var configuration = require('./configuration-BE61XNsg.cjs');
-var controlClient = require('./controlClient-RWTlQA4_.cjs');
-var machineMetadata = require('./machineMetadata-BDCYOXQg.cjs');
+var configuration = require('./configuration-C3piBtxY.cjs');
+var controlClient = require('./controlClient-BI6Fw3fQ.cjs');
+var machineMetadata = require('./machineMetadata-BafS4JY8.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 var path = require('node:path');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 var promises = require('node:fs/promises');
-var defaultPermissionMode = require('./defaultPermissionMode-CxmTXUQR.cjs');
-var attachmentContent = require('./attachmentContent-muDCe4Gy.cjs');
+var attachmentContent = require('./attachmentContent-HcJqFQW8.cjs');
+var transcriptCursor = require('./transcriptCursor-DcXGLeSc.cjs');
 var startupPlan = require('./startupPlan-BLMbfQIH.cjs');
 require('node:fs');
+require('zod');
 require('axios');
-require('./lidState-z9ekRpZu.cjs');
+require('./lidState-Bc2K9H9l.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./attachmentLimits-eJZ4ZBjF.cjs');
-require('zod');
+require('./attachmentLimits-BEYEEBm8.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-BbzJ7PJQ.cjs');
-require('./registerCommonHandlers--8ds2auE.cjs');
+require('./time-BXvtjhe9.cjs');
+require('./registerCommonHandlers-DVYB3iVn.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
-require('./sync-DwUUGGFz.cjs');
+require('./sync-Bvc-vh6C.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
 require('node:util');
 require('./detectCLI-DR9ZaN6B.cjs');
 require('fs');
-require('./localHappyAgentAuth-BCx0y1qW.cjs');
+require('./localHappyAgentAuth-T5GOvRha.cjs');
 require('tweetnacl');
 require('url');
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-BGjNGfuZ.cjs'); });
+const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-5kzncqME.cjs'); });
 async function runClaude(credentials, options = {}) {
   logger.logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -66,7 +67,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-B1dMZA-u.cjs'); });
+      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-Dj8WBiR2.cjs'); });
       await bootstrapAssistantHome();
     } catch (error) {
       logger.logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -141,7 +142,7 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...attachmentContent.CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
-    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY],
+    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY],
     // Effective mode this process enforces. Kept current by
     // publishPermissionMode below; the web renders it instead of guessing.
     permissionMode: permissionMode.mapToClaudeMode(initialPermissionMode ?? "default"),
@@ -158,7 +159,9 @@ async function runClaude(credentials, options = {}) {
     // itself — that one is the variant above and never joins the lists at
     // all. (Shared helper: the other flavors get the same tag via
     // createSessionMetadata.)
-    ...originTags ? { tags: originTags } : {}
+    ...originTags ? { tags: originTags } : {},
+    // B-586: linked git worktree → branch shown in the session list.
+    ...createSessionMetadata.sessionWorktreeMetadata(workingDirectory)
   };
   const reconnectSessionId = process.env.HAPPY_RECONNECT_SESSION_ID;
   const reconnectKeyBase64 = process.env.HAPPY_RECONNECT_ENCRYPTION_KEY;
@@ -184,7 +187,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-G5UmJ81F.cjs'); });
+    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-CGsq7Kul.cjs'); });
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = api.startOfflineReconnection({
       serverUrl: configuration.configuration.serverUrl,
@@ -231,12 +234,17 @@ async function runClaude(credentials, options = {}) {
     throw new Error(`Failed to reactivate archived session ${response.id}`);
   }
   let reconnectSeeded = false;
+  let wakingFromHibernation = false;
   if (reconnectSessionId) {
     const snapshot = await api$1.getSession(response.id, response.encryptionKey, response.encryptionVariant);
     if (snapshot.ok) {
       response = sessionLock.applyServerSnapshot(response, snapshot.session);
       reconnectSeeded = true;
       logger.logger.debug(`[START] Reconnect seeded from server: seq=${snapshot.session.seq} metadataVersion=${snapshot.session.metadataVersion}`);
+      const wake = sessionLock.applyHibernationReplay(response);
+      response = wake.response;
+      wakingFromHibernation = wake.replaying;
+      if (wake.replaying) logger.logger.debug(`[START] Waking from hibernation: replaying records after seq=${response.seq}`);
     } else {
       response = sessionLock.withoutServerSnapshot(response);
       logger.logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
@@ -328,7 +336,7 @@ async function runClaude(credentials, options = {}) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
-    void session.cancelUndeliveredQueuedInputs();
+    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs();
     session.updateMetadata((meta) => ({
       ...sessionLock.mergeReconnectMetadata(meta, metadata, Date.now()),
       queueCancellation: true,
@@ -423,9 +431,11 @@ async function runClaude(credentials, options = {}) {
   });
   options = { ...options, claudeEnvVars: { ...options.claudeEnvVars, VH_PEER_SESSION_ID: response.id } };
   const initialScannerSessionId = forkClaudeSessionId ?? (metadata.claudeSessionId ?? null);
+  const transcriptPathHints = new transcriptCursor.TranscriptPathHints();
   const remoteScanner = await createSessionScanner({
     sessionId: initialScannerSessionId,
     workingDirectory,
+    transcriptPathHints,
     onMessage: (raw) => {
       if (currentRunMode !== "remote") return;
       if (raw.type !== "user") return;
@@ -456,6 +466,7 @@ async function runClaude(credentials, options = {}) {
         return;
       }
       logger.logger.debug(`[START] Session hook received: ${sessionId}`, contentLogMetadata(data));
+      transcriptPathHints.note(sessionId, data.transcript_path);
       announceSessionToScanner(sessionId);
       if (currentSession) {
         const previousSessionId = currentSession.sessionId;
@@ -777,12 +788,14 @@ async function runClaude(credentials, options = {}) {
     });
   });
   const exitGate = new SessionExitGate();
+  let hibernationProbe = null;
   const cleanup = async (opts = { archive: true }) => {
-    const intent = exitGate.claim(exitIntentFromArchiveFlag(opts.archive));
+    const intent = opts.hibernation ? "hibernate" : exitGate.claim(exitIntentFromArchiveFlag(opts.archive));
     if (intent === null) {
       logger.logger.debug(`[START] Termination (archive=${opts.archive ?? true}) ignored: cleanup already running as ${exitGate.current}`);
       return;
     }
+    hibernationProbe?.stop();
     logger.logger.debug(`[START] Received termination signal, cleaning up (archive=${intent === "archive"})...`);
     promptQueueDrain.close();
     cleanupPrewarm();
@@ -791,6 +804,7 @@ async function runClaude(credentials, options = {}) {
         currentSession?.cleanup();
         await settleSessionOnExit(session.sessionId, intent, {
           updateMetadata: (handler) => session.updateMetadata(handler),
+          updateMetadataAndWait: (handler) => session.updateMetadataAndWait(handler),
           sendSessionDeath: () => session.sendSessionDeath(),
           archiveSession: (id) => api$1.archiveSession(id),
           deactivateSession: (id) => api$1.deactivateSession(id),
@@ -833,6 +847,58 @@ async function runClaude(credentials, options = {}) {
     void cleanup({ archive: true });
   });
   registerKillSessionHandler(session.rpcHandlerManager, () => cleanup({ archive: true }), session);
+  let keepAwakeLatch = false;
+  const hibernationSnapshot = () => {
+    const agentState = session.getAgentState();
+    const current = currentSession;
+    const meta = session.getMetadata();
+    return {
+      flavor: "claude",
+      resumable: typeof meta?.claudeSessionId === "string" && meta.claudeSessionId.length > 0,
+      uiSession: options.startedBy === "daemon" && options.startingMode === "remote" && agentState?.controlledByUser !== true,
+      ...isAssistantVariant ? { variant: "assistant" } : {},
+      ...process.env.HAPPY_SPAWNED_BY ? { spawnedBy: process.env.HAPPY_SPAWNED_BY } : {},
+      ...meta?.tags ? { tags: meta.tags } : {},
+      keepAwake: keepAwakeLatch = persistence.latchKeepAwake(meta?.keepAwake, keepAwakeLatch),
+      ...typeof meta?.keepAwake === "boolean" ? { keepAwakeSetting: meta.keepAwake } : {},
+      thinking: current?.thinking === true,
+      queuedInputs: messageQueue.size() + (session.promptQueueHasPending() ? 1 : 0),
+      waitingForInput: messageQueue.isWaiting(),
+      pendingRequests: Object.keys(agentState?.requests ?? {}).length,
+      backgroundTasks: current?.backgroundTasks.length ?? 0,
+      scheduledWakeups: current?.scheduledWakeups.pending() ?? 0,
+      lastActivityAt: session.lastActivityAt,
+      ...exitGate.current && exitGate.current !== "hibernate" ? { exiting: true } : {}
+    };
+  };
+  if (options.startedBy === "daemon" && options.startingMode === "remote" && !isAssistantVariant) {
+    hibernationProbe = new defaultPermissionMode.HibernationProbe({
+      checkMs: persistence.resolveCheckMs(),
+      snapshot: hibernationSnapshot,
+      ask: (report) => controlClient.checkDaemonHibernation({ sessionId: session.sessionId, pid: process.pid, report }),
+      commit: (idleMs) => defaultPermissionMode.commitHibernation({
+        client: session,
+        claimExit: () => exitGate.claim("hibernate") !== null,
+        exitRequested: () => exitGate.exitRequested,
+        markCommitted: () => exitGate.commitHibernate(),
+        // Review P1-1: an archive / kill / SIGTERM deferred during the
+        // commit window runs now instead of being lost.
+        releaseExit: () => {
+          const deferred = exitGate.release("hibernate");
+          if (deferred) void cleanup({ archive: deferred === "archive" });
+        },
+        recheck: () => persistence.evaluateWrapperIdle(hibernationSnapshot(), idleMs, Date.now()),
+        idleMs,
+        finish: (stamp) => cleanup({ archive: false, hibernation: stamp })
+      }),
+      // Review P3-3: the daemon still holds keep-awake but an old web
+      // stripped the field — put it back so every web shows it checked.
+      onKeepAwakeLatched: () => {
+        if (session.getMetadata()?.keepAwake === void 0) session.updateMetadata((m) => m.keepAwake === void 0 ? { ...m, keepAwake: true } : m);
+      }
+    });
+    hibernationProbe.start();
+  }
   const exitCode = await loop({
     path: workingDirectory,
     model: options.model,
@@ -851,6 +917,7 @@ async function runClaude(credentials, options = {}) {
     },
     onSessionReady: (sessionInstance) => {
       currentSession = sessionInstance;
+      sessionInstance.transcriptPathHints = transcriptPathHints;
       sessionInstance.addSessionFoundCallback?.(announceSessionToScanner);
     },
     // B-515: lease for a warm Claude process, taken once by the first

package/dist/{runClaude-aBfBweec.mjs → runClaude-DGkr5E7s.mjs}

@@ -1,56 +1,57 @@
 import os from 'node:os';
-import { c as claimSessionOrExit, a as applyServerSnapshot, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-Dm8QyGo4.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyHibernationReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-AwOYsKT7.mjs';
+import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-ON0zpHfb.mjs';
+import { D as DEFAULT_CLAUDE_PERMISSION_MODE, H as HibernationProbe, c as commitHibernation } from './defaultPermissionMode-Cif_RHGb.mjs';
 import { randomUUID } from 'node:crypto';
-import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-DTVPUE7g.mjs';
-import { l as logger } from './logger-CknSVkIe.mjs';
-import { p as packageJson } from './package-VIUXrYZ1.mjs';
-import { readSettings } from './persistence-DujtUH94.mjs';
-import { s as spawnOriginTags } from './createSessionMetadata-CWR-AB2A.mjs';
-import { P as PROMPT_QUEUE_CAPABILITY } from './index-vVWpCoTr.mjs';
+import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-CReZazeT.mjs';
+import { l as logger } from './logger-CbBv3q_b.mjs';
+import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-BEZ4DIDA.mjs';
+import { p as packageJson } from './package-DU1DxhH9.mjs';
+import { P as PROMPT_QUEUE_CAPABILITY } from './index-B0HEEYGh.mjs';
 import { F as FORK_BACKFILL_CAPABILITY, p as publishForkBackfillWhenCommitted } from './forkBackfill-DYIjlN1Z.mjs';
-import { c as configuration } from './configuration-L1qcGTFM.mjs';
-import { n as notifyDaemonSessionStarted } from './controlClient-Ci7HTMII.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-Cj1DoFot.mjs';
+import { c as configuration } from './configuration-WspKd2C2.mjs';
+import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-DTheOlvC.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-DHg238U4.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { resolve, join } from 'node:path';
 import { a as applySandboxPermissionPolicy, r as resolveInitialClaudePermissionMode, m as mapToClaudeMode, b as reconcilePublishedPermissionMode } from './permissionMode-CH4FoZfU.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DSAvg1uv.mjs';
 import { readFile } from 'node:fs/promises';
-import { D as DEFAULT_CLAUDE_PERMISSION_MODE } from './defaultPermissionMode-BnxJPVHT.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-dzIs-wis.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-j875mwU7.mjs';
+import { T as TranscriptPathHints } from './transcriptCursor-B7T_gkQ0.mjs';
 import { p as planClaudeStartup } from './startupPlan-DFMyNgAs.mjs';
 import 'node:fs';
+import 'zod';
 import 'axios';
-import './lidState-BLHLmhwd.mjs';
+import './lidState-B2ZxdREe.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
-import './attachmentLimits-B8nzhw-i.mjs';
-import 'zod';
+import './attachmentLimits-CxG3T18E.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-v1Y_qEJp.mjs';
-import './registerCommonHandlers-BR0J4g64.mjs';
+import './time-PG5Dfwdv.mjs';
+import './registerCommonHandlers-B0PVff2U.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
-import './sync-Dfm6K2te.mjs';
+import './sync-CCwYpJMS.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-BWvmc_Hg.mjs';
+import './localHappyAgentAuth-B5XPEMwk.mjs';
 import 'tweetnacl';
 import 'url';
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => import('./runClaudeDeps-BOrPP4J1.mjs');
+const importRunClaudeDeps = () => import('./runClaudeDeps-CX_TxS78.mjs');
 async function runClaude(credentials, options = {}) {
   logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -64,7 +65,7 @@ async function runClaude(credentials, options = {}) {
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await import('./bootstrap-D_ExGrY2.mjs');
+      const { bootstrapAssistantHome } = await import('./bootstrap-BSOxYpaP.mjs');
       await bootstrapAssistantHome();
     } catch (error) {
       logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -139,7 +140,7 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
-    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY],
+    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY],
     // Effective mode this process enforces. Kept current by
     // publishPermissionMode below; the web renders it instead of guessing.
     permissionMode: mapToClaudeMode(initialPermissionMode ?? "default"),
@@ -156,7 +157,9 @@ async function runClaude(credentials, options = {}) {
     // itself — that one is the variant above and never joins the lists at
     // all. (Shared helper: the other flavors get the same tag via
     // createSessionMetadata.)
-    ...originTags ? { tags: originTags } : {}
+    ...originTags ? { tags: originTags } : {},
+    // B-586: linked git worktree → branch shown in the session list.
+    ...sessionWorktreeMetadata(workingDirectory)
   };
   const reconnectSessionId = process.env.HAPPY_RECONNECT_SESSION_ID;
   const reconnectKeyBase64 = process.env.HAPPY_RECONNECT_ENCRYPTION_KEY;
@@ -182,7 +185,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await import('./claudeLocal-BeHToEK5.mjs');
+    const { claudeLocal } = await import('./claudeLocal-D5-eA9SC.mjs');
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = startOfflineReconnection({
       serverUrl: configuration.serverUrl,
@@ -229,12 +232,17 @@ async function runClaude(credentials, options = {}) {
     throw new Error(`Failed to reactivate archived session ${response.id}`);
   }
   let reconnectSeeded = false;
+  let wakingFromHibernation = false;
   if (reconnectSessionId) {
     const snapshot = await api.getSession(response.id, response.encryptionKey, response.encryptionVariant);
     if (snapshot.ok) {
       response = applyServerSnapshot(response, snapshot.session);
       reconnectSeeded = true;
       logger.debug(`[START] Reconnect seeded from server: seq=${snapshot.session.seq} metadataVersion=${snapshot.session.metadataVersion}`);
+      const wake = applyHibernationReplay(response);
+      response = wake.response;
+      wakingFromHibernation = wake.replaying;
+      if (wake.replaying) logger.debug(`[START] Waking from hibernation: replaying records after seq=${response.seq}`);
     } else {
       response = withoutServerSnapshot(response);
       logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
@@ -326,7 +334,7 @@ async function runClaude(credentials, options = {}) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
-    void session.cancelUndeliveredQueuedInputs();
+    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs();
     session.updateMetadata((meta) => ({
       ...mergeReconnectMetadata(meta, metadata, Date.now()),
       queueCancellation: true,
@@ -421,9 +429,11 @@ async function runClaude(credentials, options = {}) {
   });
   options = { ...options, claudeEnvVars: { ...options.claudeEnvVars, VH_PEER_SESSION_ID: response.id } };
   const initialScannerSessionId = forkClaudeSessionId ?? (metadata.claudeSessionId ?? null);
+  const transcriptPathHints = new TranscriptPathHints();
   const remoteScanner = await createSessionScanner({
     sessionId: initialScannerSessionId,
     workingDirectory,
+    transcriptPathHints,
     onMessage: (raw) => {
       if (currentRunMode !== "remote") return;
       if (raw.type !== "user") return;
@@ -454,6 +464,7 @@ async function runClaude(credentials, options = {}) {
         return;
       }
       logger.debug(`[START] Session hook received: ${sessionId}`, contentLogMetadata(data));
+      transcriptPathHints.note(sessionId, data.transcript_path);
       announceSessionToScanner(sessionId);
       if (currentSession) {
         const previousSessionId = currentSession.sessionId;
@@ -775,12 +786,14 @@ async function runClaude(credentials, options = {}) {
     });
   });
   const exitGate = new SessionExitGate();
+  let hibernationProbe = null;
   const cleanup = async (opts = { archive: true }) => {
-    const intent = exitGate.claim(exitIntentFromArchiveFlag(opts.archive));
+    const intent = opts.hibernation ? "hibernate" : exitGate.claim(exitIntentFromArchiveFlag(opts.archive));
     if (intent === null) {
       logger.debug(`[START] Termination (archive=${opts.archive ?? true}) ignored: cleanup already running as ${exitGate.current}`);
       return;
     }
+    hibernationProbe?.stop();
     logger.debug(`[START] Received termination signal, cleaning up (archive=${intent === "archive"})...`);
     promptQueueDrain.close();
     cleanupPrewarm();
@@ -789,6 +802,7 @@ async function runClaude(credentials, options = {}) {
         currentSession?.cleanup();
         await settleSessionOnExit(session.sessionId, intent, {
           updateMetadata: (handler) => session.updateMetadata(handler),
+          updateMetadataAndWait: (handler) => session.updateMetadataAndWait(handler),
           sendSessionDeath: () => session.sendSessionDeath(),
           archiveSession: (id) => api.archiveSession(id),
           deactivateSession: (id) => api.deactivateSession(id),
@@ -831,6 +845,58 @@ async function runClaude(credentials, options = {}) {
     void cleanup({ archive: true });
   });
   registerKillSessionHandler(session.rpcHandlerManager, () => cleanup({ archive: true }), session);
+  let keepAwakeLatch = false;
+  const hibernationSnapshot = () => {
+    const agentState = session.getAgentState();
+    const current = currentSession;
+    const meta = session.getMetadata();
+    return {
+      flavor: "claude",
+      resumable: typeof meta?.claudeSessionId === "string" && meta.claudeSessionId.length > 0,
+      uiSession: options.startedBy === "daemon" && options.startingMode === "remote" && agentState?.controlledByUser !== true,
+      ...isAssistantVariant ? { variant: "assistant" } : {},
+      ...process.env.HAPPY_SPAWNED_BY ? { spawnedBy: process.env.HAPPY_SPAWNED_BY } : {},
+      ...meta?.tags ? { tags: meta.tags } : {},
+      keepAwake: keepAwakeLatch = latchKeepAwake(meta?.keepAwake, keepAwakeLatch),
+      ...typeof meta?.keepAwake === "boolean" ? { keepAwakeSetting: meta.keepAwake } : {},
+      thinking: current?.thinking === true,
+      queuedInputs: messageQueue.size() + (session.promptQueueHasPending() ? 1 : 0),
+      waitingForInput: messageQueue.isWaiting(),
+      pendingRequests: Object.keys(agentState?.requests ?? {}).length,
+      backgroundTasks: current?.backgroundTasks.length ?? 0,
+      scheduledWakeups: current?.scheduledWakeups.pending() ?? 0,
+      lastActivityAt: session.lastActivityAt,
+      ...exitGate.current && exitGate.current !== "hibernate" ? { exiting: true } : {}
+    };
+  };
+  if (options.startedBy === "daemon" && options.startingMode === "remote" && !isAssistantVariant) {
+    hibernationProbe = new HibernationProbe({
+      checkMs: resolveCheckMs(),
+      snapshot: hibernationSnapshot,
+      ask: (report) => checkDaemonHibernation({ sessionId: session.sessionId, pid: process.pid, report }),
+      commit: (idleMs) => commitHibernation({
+        client: session,
+        claimExit: () => exitGate.claim("hibernate") !== null,
+        exitRequested: () => exitGate.exitRequested,
+        markCommitted: () => exitGate.commitHibernate(),
+        // Review P1-1: an archive / kill / SIGTERM deferred during the
+        // commit window runs now instead of being lost.
+        releaseExit: () => {
+          const deferred = exitGate.release("hibernate");
+          if (deferred) void cleanup({ archive: deferred === "archive" });
+        },
+        recheck: () => evaluateWrapperIdle(hibernationSnapshot(), idleMs, Date.now()),
+        idleMs,
+        finish: (stamp) => cleanup({ archive: false, hibernation: stamp })
+      }),
+      // Review P3-3: the daemon still holds keep-awake but an old web
+      // stripped the field — put it back so every web shows it checked.
+      onKeepAwakeLatched: () => {
+        if (session.getMetadata()?.keepAwake === void 0) session.updateMetadata((m) => m.keepAwake === void 0 ? { ...m, keepAwake: true } : m);
+      }
+    });
+    hibernationProbe.start();
+  }
   const exitCode = await loop({
     path: workingDirectory,
     model: options.model,
@@ -849,6 +915,7 @@ async function runClaude(credentials, options = {}) {
     },
     onSessionReady: (sessionInstance) => {
       currentSession = sessionInstance;
+      sessionInstance.transcriptPathHints = transcriptPathHints;
       sessionInstance.addSessionFoundCallback?.(announceSessionToScanner);
     },
     // B-515: lease for a warm Claude process, taken once by the first