very-happy-cli 0.2.178 → 0.2.180

package/dist/{runClaude-zrrNcQC_.mjs → runClaude-C6oxWYbp.mjs}

@@ -1,57 +1,60 @@
 import os from 'node:os';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyHibernationReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-DBdtZGOL.mjs';
-import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-DTk4sNpd.mjs';
-import { D as DEFAULT_CLAUDE_PERMISSION_MODE, H as HibernationProbe, c as commitHibernation } from './defaultPermissionMode-B8kJG9uI.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-nBXdJxJm.mjs';
+import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-BFUOHW5h.mjs';
+import { D as DEFAULT_CLAUDE_PERMISSION_MODE, H as HibernationProbe, c as commitHibernation } from './defaultPermissionMode-i5KzdK09.mjs';
 import { randomUUID } from 'node:crypto';
-import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-Dib0dmqC.mjs';
-import { l as logger } from './logger--vAVtXB_.mjs';
-import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-8Fuj2-IV.mjs';
-import { p as packageJson } from './package-B7B03ejW.mjs';
-import { P as PROMPT_QUEUE_CAPABILITY } from './index-Clqlu17M.mjs';
+import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-Hov8p7CA.mjs';
+import { l as logger } from './logger-BUngm5Xg.mjs';
+import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-DDIChCx8.mjs';
+import { p as packageJson } from './package-7Ld1YMhh.mjs';
+import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-C6Vn5Eac.mjs';
 import { F as FORK_BACKFILL_CAPABILITY, p as publishForkBackfillWhenCommitted } from './forkBackfill-DYIjlN1Z.mjs';
-import { c as configuration } from './configuration-DVrb61aY.mjs';
-import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-BYKyGyxj.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-B1H9gNbN.mjs';
+import { c as configuration } from './configuration-PxzEJumr.mjs';
+import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-DoeYovwP.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-BXN_bKU3.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { resolve, join } from 'node:path';
+import { c as createSessionForStartup } from './startupSessionCreate-uZ6BM0ty.mjs';
 import { a as applySandboxPermissionPolicy, r as resolveInitialClaudePermissionMode, m as mapToClaudeMode, b as reconcilePublishedPermissionMode } from './permissionMode-CH4FoZfU.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
 import { readFile } from 'node:fs/promises';
-import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-DkkdpSSJ.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-CIn4iPEk.mjs';
 import { T as TranscriptPathHints } from './transcriptCursor-B7T_gkQ0.mjs';
 import { p as planClaudeStartup } from './startupPlan-DFMyNgAs.mjs';
 import 'node:fs';
+import './processTreeSnapshot-CuLJDNC-.mjs';
+import 'node:child_process';
 import 'zod';
 import 'axios';
-import './lidState-DNMlIhX0.mjs';
+import './lidState-bBrmaQd2.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
-import './attachmentLimits-UyFn8fkQ.mjs';
+import './pushNotifications-DCiBEVeC.mjs';
+import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-BuGWTVP6.mjs';
-import './registerCommonHandlers-CvIedVRf.mjs';
+import './time-D3ETL7Jb.mjs';
+import './registerCommonHandlers-CTkCvjxt.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
-import './sync-DbW07iQS.mjs';
-import './backgroundTaskActivity-BVwJBl02.mjs';
-import './contentLogMetadata-BlWI0egu.mjs';
+import './sync-BvVhDO40.mjs';
+import './backgroundTaskActivity-8PdPxrvy.mjs';
 import 'chalk';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-BezKSFDi.mjs';
+import './localHappyAgentAuth-Dn1jYDpt.mjs';
 import 'tweetnacl';
 import 'url';
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => import('./runClaudeDeps-CVBCokOS.mjs');
+const importRunClaudeDeps = () => import('./runClaudeDeps-BcZ68cX3.mjs');
 async function runClaude(credentials, options = {}) {
   logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -65,7 +68,7 @@ async function runClaude(credentials, options = {}) {
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await import('./bootstrap-BUagGC_-.mjs');
+      const { bootstrapAssistantHome } = await import('./bootstrap-Dt5I1SOl.mjs');
       await bootstrapAssistantHome();
     } catch (error) {
       logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -140,7 +143,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, HIBERNATION_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, PROJECT_SESSION_CAPABILITY],
     // Effective mode this process enforces. Kept current by
     // publishPermissionMode below; the web renders it instead of guessing.
     permissionMode: mapToClaudeMode(initialPermissionMode ?? "default"),
@@ -181,11 +184,11 @@ async function runClaude(credentials, options = {}) {
       agentStateVersion: parseInt(reconnectAgentStateVersion || "0", 10)
     };
   } else {
-    response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+    response = await createSessionForStartup(() => api.getOrCreateSession({ tag: sessionTag, metadata, state }), { startedBy: options.startedBy, log: (m) => logger.debug(m) });
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await import('./claudeLocal-CCCvAeMd.mjs');
+    const { claudeLocal } = await import('./claudeLocal-OHWQigCl.mjs');
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = startOfflineReconnection({
       serverUrl: configuration.serverUrl,
@@ -233,16 +236,18 @@ async function runClaude(credentials, options = {}) {
   }
   let reconnectSeeded = false;
   let wakingFromHibernation = false;
+  let reconnectReplay = null;
   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);
+      const wake = applyReconnectReplay(response);
       response = wake.response;
-      wakingFromHibernation = wake.replaying;
-      if (wake.replaying) logger.debug(`[START] Waking from hibernation: replaying records after seq=${response.seq}`);
+      reconnectReplay = wake.replay;
+      wakingFromHibernation = wake.replay?.source === "hibernation";
+      if (wake.replay) logger.debug(`[START] Resuming (${wake.replay.source}): replaying records after seq=${response.seq}`);
     } else {
       response = withoutServerSnapshot(response);
       logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
@@ -307,7 +312,9 @@ async function runClaude(credentials, options = {}) {
     claudeCheckSession,
     createSessionScanner,
     getProjectPath,
-    RawJSONLinesSchema,
+    replayClaudeForkJsonl,
+    snapshotTree,
+    terminateSurvivors,
     TitleGenerator,
     BoardAnalyzer,
     FileRateLimiter,
@@ -334,7 +341,7 @@ async function runClaude(credentials, options = {}) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
-    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs();
+    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs(reconnectReplay ? { maxSeq: reconnectReplay.seq } : void 0);
     session.updateMetadata((meta) => ({
       ...mergeReconnectMetadata(meta, metadata, Date.now()),
       queueCancellation: true,
@@ -349,21 +356,10 @@ async function runClaude(credentials, options = {}) {
     const jsonlPath = join(getProjectPath(workingDirectory), `${forkClaudeSessionId}.jsonl`);
     try {
       const file = await readFile(jsonlPath, "utf-8");
-      const lines = file.split("\n");
-      let backfilled = 0;
-      for (const line of lines) {
-        if (line.trim().length === 0) continue;
-        let parsed;
-        try {
-          parsed = JSON.parse(line);
-        } catch {
-          continue;
-        }
-        const result = RawJSONLinesSchema.safeParse(parsed);
-        if (!result.success) continue;
-        session.sendClaudeSessionMessage(result.data);
-        backfilled += 1;
-      }
+      const backfilled = replayClaudeForkJsonl(file, {
+        send: (line) => session.sendClaudeSessionMessage(line),
+        closeTurn: () => session.closeReplayedClaudeTurn()
+      });
       logger.debug(`[FORK BACKFILL] Replayed ${backfilled} historical messages from ${jsonlPath}`);
       session.updateMetadata((meta) => ({ ...meta, claudeSessionId: forkClaudeSessionId }));
       void publishForkBackfillWhenCommitted(session, { count: backfilled }).then((published) => logger.debug(`[FORK BACKFILL] ${published ? "Committed" : "Session closed before commit of"} ${backfilled} replayed messages`));
@@ -447,7 +443,7 @@ async function runClaude(credentials, options = {}) {
       session.sendClaudeSessionMessage(raw);
     }
   });
-  const happyServer = await startHappyServer(session, { assistant: isAssistantVariant, selfReportState: boardSelfReport });
+  const happyServer = await startHappyServer(session, { assistant: isAssistantVariant, selfReportState: boardSelfReport, push: { sendAttention: (input) => api.push().sendAttention(input) } });
   logger.debug(`[START] Happy MCP server started at ${happyServer.url}`);
   let currentSession = null;
   const prewarmHookGate = new PrewarmHookGate();
@@ -801,12 +797,16 @@ async function runClaude(credentials, options = {}) {
     logger.debug(`[START] Received termination signal, cleaning up (archive=${intent === "archive"})...`);
     promptQueueDrain.close();
     cleanupPrewarm();
+    const wrapperTree = snapshotTree(process.pid);
     try {
       if (session) {
+        const exitCursor = intent === "offline" ? exitCursorStamp(session.messageCursor, Date.now()) : void 0;
+        if (exitCursor) session.freezeInbound();
         currentSession?.cleanup();
         await settleSessionOnExit(session.sessionId, intent, {
           updateMetadata: (handler) => session.updateMetadata(handler),
-          updateMetadataAndWait: (handler) => session.updateMetadataAndWait(handler),
+          updateMetadataAndWait: (handler, timeoutMs) => session.updateMetadataAndWait(handler, timeoutMs),
+          exitCursor,
           sendSessionDeath: () => session.sendSessionDeath(),
           archiveSession: (id) => api.archiveSession(id),
           deactivateSession: (id) => api.deactivateSession(id),
@@ -820,9 +820,11 @@ async function runClaude(credentials, options = {}) {
       cleanupHookSettingsFile(hookSettingsPath);
       await remoteScanner.cleanup();
       logger.debug("[START] Cleanup complete, exiting");
+      await terminateSurvivors(wrapperTree);
       process.exit(0);
     } catch (error) {
       logger.debug("[START] Error during cleanup:", error);
+      await terminateSurvivors(wrapperTree).catch(() => void 0);
       process.exit(1);
     }
   };

package/dist/{runClaude-MHI5IKM-.cjs → runClaude-CRRKt-tm.cjs}

@@ -1,59 +1,62 @@
 'use strict';
 
 var os = require('node:os');
-var sessionLock = require('./sessionLock-DWX6BbiU.cjs');
-var persistence = require('./persistence-BfX72dne.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-BEWCqJU-.cjs');
+var sessionLock = require('./sessionLock-DRZUcKHT.cjs');
+var persistence = require('./persistence-9BMYspxG.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-PkZGsQDk.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-JANhFdZV.cjs');
-var logger = require('./logger-DXTWlPzP.cjs');
-var createSessionMetadata = require('./createSessionMetadata-B2NynaWZ.cjs');
-var _package = require('./package-DY4zTbKS.cjs');
-var index = require('./index-_l1Sdmbi.cjs');
+var api = require('./api-DM7b1OKj.cjs');
+var logger = require('./logger-CphW5nUE.cjs');
+var createSessionMetadata = require('./createSessionMetadata-xz767pcG.cjs');
+var _package = require('./package-KhLqBDX9.cjs');
+var index = require('./index-Dv0Q48P3.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
-var configuration = require('./configuration-4TGMrjul.cjs');
-var controlClient = require('./controlClient-BTaZlbC6.cjs');
-var machineMetadata = require('./machineMetadata-DcUupMje.cjs');
-var projectPath = require('./projectPath-ChLhdOyt.cjs');
+var configuration = require('./configuration-CYO-kPOS.cjs');
+var controlClient = require('./controlClient-Bqv5v5OM.cjs');
+var machineMetadata = require('./machineMetadata-BQm9YTcI.cjs');
+var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
+var startupSessionCreate = require('./startupSessionCreate-kdr3m1uX.cjs');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var promises = require('node:fs/promises');
-var attachmentContent = require('./attachmentContent-bpQTBJ0y.cjs');
+var attachmentContent = require('./attachmentContent-CEm13_gF.cjs');
 var transcriptCursor = require('./transcriptCursor-DcXGLeSc.cjs');
 var startupPlan = require('./startupPlan-BLMbfQIH.cjs');
 require('node:fs');
+require('./processTreeSnapshot-mDbnuojn.cjs');
+require('node:child_process');
 require('zod');
 require('axios');
-require('./lidState-BeOwj6eW.cjs');
+require('./lidState-DWGnm2H4.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./attachmentLimits-SqeAHrVC.cjs');
+require('./pushNotifications-DI92havG.cjs');
+require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-A6zR3Iy6.cjs');
-require('./registerCommonHandlers-C0_fyBQ0.cjs');
+require('./time-Cjv0zxQO.cjs');
+require('./registerCommonHandlers-C7a_dUWs.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
-require('./sync-Dhmtk66S.cjs');
+require('./sync-Bn-idAoy.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
-require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
 require('node:util');
-require('./detectCLI-DR9ZaN6B.cjs');
+require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-Br-mgogg.cjs');
+require('./localHappyAgentAuth-DZHQnIW9.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-RRw-Nusc.cjs'); });
+const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-B1ysqTvx.cjs'); });
 async function runClaude(credentials, options = {}) {
   logger.logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -67,7 +70,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-DCQ87Aan.cjs'); });
+      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-DoA7okld.cjs'); });
       await bootstrapAssistantHome();
     } catch (error) {
       logger.logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -142,7 +145,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, persistence.HIBERNATION_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, index.PROJECT_SESSION_CAPABILITY],
     // Effective mode this process enforces. Kept current by
     // publishPermissionMode below; the web renders it instead of guessing.
     permissionMode: permissionMode.mapToClaudeMode(initialPermissionMode ?? "default"),
@@ -183,11 +186,11 @@ async function runClaude(credentials, options = {}) {
       agentStateVersion: parseInt(reconnectAgentStateVersion || "0", 10)
     };
   } else {
-    response = await api$1.getOrCreateSession({ tag: sessionTag, metadata, state });
+    response = await startupSessionCreate.createSessionForStartup(() => api$1.getOrCreateSession({ tag: sessionTag, metadata, state }), { startedBy: options.startedBy, log: (m) => logger.logger.debug(m) });
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-CdIVnOZp.cjs'); });
+    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal--DNyMOSv.cjs'); });
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = api.startOfflineReconnection({
       serverUrl: configuration.configuration.serverUrl,
@@ -235,16 +238,18 @@ async function runClaude(credentials, options = {}) {
   }
   let reconnectSeeded = false;
   let wakingFromHibernation = false;
+  let reconnectReplay = null;
   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);
+      const wake = sessionLock.applyReconnectReplay(response);
       response = wake.response;
-      wakingFromHibernation = wake.replaying;
-      if (wake.replaying) logger.logger.debug(`[START] Waking from hibernation: replaying records after seq=${response.seq}`);
+      reconnectReplay = wake.replay;
+      wakingFromHibernation = wake.replay?.source === "hibernation";
+      if (wake.replay) logger.logger.debug(`[START] Resuming (${wake.replay.source}): replaying records after seq=${response.seq}`);
     } else {
       response = sessionLock.withoutServerSnapshot(response);
       logger.logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
@@ -309,7 +314,9 @@ async function runClaude(credentials, options = {}) {
     claudeCheckSession,
     createSessionScanner,
     getProjectPath,
-    RawJSONLinesSchema,
+    replayClaudeForkJsonl,
+    snapshotTree,
+    terminateSurvivors,
     TitleGenerator,
     BoardAnalyzer,
     FileRateLimiter,
@@ -336,7 +343,7 @@ async function runClaude(credentials, options = {}) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
-    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs();
+    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs(reconnectReplay ? { maxSeq: reconnectReplay.seq } : void 0);
     session.updateMetadata((meta) => ({
       ...sessionLock.mergeReconnectMetadata(meta, metadata, Date.now()),
       queueCancellation: true,
@@ -351,21 +358,10 @@ async function runClaude(credentials, options = {}) {
     const jsonlPath = path.join(getProjectPath(workingDirectory), `${forkClaudeSessionId}.jsonl`);
     try {
       const file = await promises.readFile(jsonlPath, "utf-8");
-      const lines = file.split("\n");
-      let backfilled = 0;
-      for (const line of lines) {
-        if (line.trim().length === 0) continue;
-        let parsed;
-        try {
-          parsed = JSON.parse(line);
-        } catch {
-          continue;
-        }
-        const result = RawJSONLinesSchema.safeParse(parsed);
-        if (!result.success) continue;
-        session.sendClaudeSessionMessage(result.data);
-        backfilled += 1;
-      }
+      const backfilled = replayClaudeForkJsonl(file, {
+        send: (line) => session.sendClaudeSessionMessage(line),
+        closeTurn: () => session.closeReplayedClaudeTurn()
+      });
       logger.logger.debug(`[FORK BACKFILL] Replayed ${backfilled} historical messages from ${jsonlPath}`);
       session.updateMetadata((meta) => ({ ...meta, claudeSessionId: forkClaudeSessionId }));
       void forkBackfill.publishForkBackfillWhenCommitted(session, { count: backfilled }).then((published) => logger.logger.debug(`[FORK BACKFILL] ${published ? "Committed" : "Session closed before commit of"} ${backfilled} replayed messages`));
@@ -449,7 +445,7 @@ async function runClaude(credentials, options = {}) {
       session.sendClaudeSessionMessage(raw);
     }
   });
-  const happyServer = await startHappyServer(session, { assistant: isAssistantVariant, selfReportState: boardSelfReport });
+  const happyServer = await startHappyServer(session, { assistant: isAssistantVariant, selfReportState: boardSelfReport, push: { sendAttention: (input) => api$1.push().sendAttention(input) } });
   logger.logger.debug(`[START] Happy MCP server started at ${happyServer.url}`);
   let currentSession = null;
   const prewarmHookGate = new PrewarmHookGate();
@@ -803,12 +799,16 @@ async function runClaude(credentials, options = {}) {
     logger.logger.debug(`[START] Received termination signal, cleaning up (archive=${intent === "archive"})...`);
     promptQueueDrain.close();
     cleanupPrewarm();
+    const wrapperTree = snapshotTree(process.pid);
     try {
       if (session) {
+        const exitCursor = intent === "offline" ? sessionLock.exitCursorStamp(session.messageCursor, Date.now()) : void 0;
+        if (exitCursor) session.freezeInbound();
         currentSession?.cleanup();
         await settleSessionOnExit(session.sessionId, intent, {
           updateMetadata: (handler) => session.updateMetadata(handler),
-          updateMetadataAndWait: (handler) => session.updateMetadataAndWait(handler),
+          updateMetadataAndWait: (handler, timeoutMs) => session.updateMetadataAndWait(handler, timeoutMs),
+          exitCursor,
           sendSessionDeath: () => session.sendSessionDeath(),
           archiveSession: (id) => api$1.archiveSession(id),
           deactivateSession: (id) => api$1.deactivateSession(id),
@@ -822,9 +822,11 @@ async function runClaude(credentials, options = {}) {
       cleanupHookSettingsFile(hookSettingsPath);
       await remoteScanner.cleanup();
       logger.logger.debug("[START] Cleanup complete, exiting");
+      await terminateSurvivors(wrapperTree);
       process.exit(0);
     } catch (error) {
       logger.logger.debug("[START] Error during cleanup:", error);
+      await terminateSurvivors(wrapperTree).catch(() => void 0);
       process.exit(1);
     }
   };