@zonease/happy 0.6.56 → 0.6.58

package/dist/lib.mjs

@@ -1,5 +1,5 @@
-export { A as ApiClient, a as ApiSessionClient } from './api-9wvM_aF-.mjs';
-export { c as configuration, l as logger } from './persistence-IdEuIeMz.mjs';
+export { A as ApiClient, a as ApiSessionClient } from './api-B9shq-xZ.mjs';
+export { c as configuration, l as logger } from './persistence-Da0uhblK.mjs';
 export { R as RawJSONLinesSchema } from './types-BoJh4Qfv.mjs';
 import 'axios';
 import 'node:events';
@@ -28,6 +28,6 @@ import 'crypto';
 import 'tweetnacl';
 import '@stablelib/base64';
 import 'expo-server-sdk';
-import './sessionKeyCache-DDzTs7E5.mjs';
+import './sessionKeyCache-BBzsFcnN.mjs';
 import 'chalk';
 import 'fs';

package/dist/{loadableToolOutput-BKDTnyoF.mjs → loadableToolOutput-C0tAWFJM.mjs}

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './persistence-IdEuIeMz.mjs';
-import { s as saveToolOutputRecord } from './api-9wvM_aF-.mjs';
+import { l as logger } from './persistence-Da0uhblK.mjs';
+import { s as saveToolOutputRecord } from './api-B9shq-xZ.mjs';
 
 class BaseReasoningProcessor {
   accumulator = "";

package/dist/{loadableToolOutput-Cb-18__b.cjs → loadableToolOutput-C5EQglQm.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./persistence-CNXsXPLm.cjs');
-var api = require('./api-BGc484qf.cjs');
+var logger = require('./persistence-50wmDoBE.cjs');
+var api = require('./api-ByiU9yXy.cjs');
 
 class BaseReasoningProcessor {
   accumulator = "";

package/dist/{persistence-CNXsXPLm.cjs → persistence-50wmDoBE.cjs}

@@ -35,7 +35,7 @@ function isDebug() {
 }
 
 var name = "@zonease/happy";
-var version = "0.6.56";
+var version = "0.6.58";
 var description = "Mobile and Web client for Claude Code, Codex, and Gemini";
 var author = "ZonEaseTech";
 var license = "MIT";

package/dist/{persistence-IdEuIeMz.mjs → persistence-Da0uhblK.mjs}

@@ -14,7 +14,7 @@ function isDebug() {
 }
 
 var name = "@zonease/happy";
-var version = "0.6.56";
+var version = "0.6.58";
 var description = "Mobile and Web client for Claude Code, Codex, and Gemini";
 var author = "ZonEaseTech";
 var license = "MIT";
@@ -944,4 +944,4 @@ var persistence = /*#__PURE__*/Object.freeze({
     writeDaemonState: writeDaemonState
 });
 
-export { getProfileEnvironmentVariables as A, encryptLegacy as B, getRandomBytes as C, libsodiumEncryptForPublicKey as D, logger$1 as E, persistence as F, readSettings as a, clearCredentials as b, configuration as c, clearMachineId as d, encodeBase64 as e, encrypt as f, decrypt as g, decodeBase64 as h, isDebug as i, encryptWithDataKey as j, decryptWithDataKey as k, logger as l, readDaemonState as m, clearDaemonState as n, libsodiumPublicKeyFromSecretKey as o, packageJson as p, decryptLegacy as q, readCredentials as r, encodeBase64Url as s, writeCredentialsLegacy as t, updateSettings as u, acquireDaemonLock as v, writeCredentialsDataKey as w, writeDaemonState as x, releaseDaemonLock as y, validateProfileForAgent as z };
+export { getProfileEnvironmentVariables as A, encryptLegacy as B, getRandomBytes as C, libsodiumEncryptForPublicKey as D, logger$1 as E, persistence as F, readSettings as a, clearCredentials as b, configuration as c, clearMachineId as d, encodeBase64 as e, encrypt as f, decrypt as g, decodeBase64 as h, isDebug as i, encryptWithDataKey as j, decryptWithDataKey as k, logger as l, readDaemonState as m, clearDaemonState as n, decryptLegacy as o, packageJson as p, libsodiumPublicKeyFromSecretKey as q, readCredentials as r, encodeBase64Url as s, writeCredentialsLegacy as t, updateSettings as u, acquireDaemonLock as v, writeCredentialsDataKey as w, writeDaemonState as x, releaseDaemonLock as y, validateProfileForAgent as z };

package/dist/{push-tXs96IyG.mjs → push-BR82p4YC.mjs}

@@ -1,7 +1,7 @@
 import { stat, readFile } from 'node:fs/promises';
 import { io } from 'socket.io-client';
-import { c as configuration, e as encodeBase64, f as encrypt, g as decrypt, h as decodeBase64 } from './persistence-IdEuIeMz.mjs';
-import { resolveDeviceForCommand } from './ssh-DSVjanff.mjs';
+import { c as configuration, e as encodeBase64, f as encrypt, g as decrypt, h as decodeBase64 } from './persistence-Da0uhblK.mjs';
+import { resolveDeviceForCommand } from './ssh-CBvM1RVJ.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
@@ -10,16 +10,16 @@ import 'node:crypto';
 import 'tweetnacl';
 import 'chalk';
 import 'fs';
-import './deviceKeys-DvfaTff3.mjs';
+import './deviceKeys-DSXcQgLf.mjs';
 import 'axios';
-import './auth-BnEa31tI.mjs';
+import './auth-DnRtIM3d.mjs';
 import 'qrcode-terminal';
 import './time-DgsBLJA_.mjs';
-import './browser-CkQP96Zi.mjs';
+import './browser-BeERlPhN.mjs';
 import 'open';
 import 'react';
 import 'ink';
-import './controlClient-VY0CGL8k.mjs';
+import './controlClient-BuKaeD-y.mjs';
 import './projectPath-BTBIMB57.mjs';
 import 'path';
 import 'url';

package/dist/{push-XL6Sb0Vw.cjs → push-Bbf139Sy.cjs}

@@ -2,8 +2,8 @@
 
 var promises = require('node:fs/promises');
 var socket_ioClient = require('socket.io-client');
-var logger = require('./persistence-CNXsXPLm.cjs');
-var ssh = require('./ssh-D31o750w.cjs');
+var logger = require('./persistence-50wmDoBE.cjs');
+var ssh = require('./ssh-DXOMR-gb.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
@@ -12,16 +12,16 @@ require('node:crypto');
 require('tweetnacl');
 require('chalk');
 require('fs');
-require('./deviceKeys-c_sN01Mm.cjs');
+require('./deviceKeys-CSfs6juX.cjs');
 require('axios');
-require('./auth-B6vskzfm.cjs');
+require('./auth-DnFrlXqp.cjs');
 require('qrcode-terminal');
 require('./time-Bj2HRkKH.cjs');
-require('./browser-CnxzD1lA.cjs');
+require('./browser-DjONS-B5.cjs');
 require('open');
 require('react');
 require('ink');
-require('./controlClient-DWBW6jRF.cjs');
+require('./controlClient-BqCwo6Pm.cjs');
 require('./projectPath-ChLhdOyt.cjs');
 require('path');
 require('url');

package/dist/{registerKillSessionHandler-D9tmPdw5.cjs → registerKillSessionHandler-CHPzUrtO.cjs}

@@ -7,8 +7,8 @@ var node_http = require('node:http');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var z = require('zod');
-var logger = require('./persistence-CNXsXPLm.cjs');
-var deviceKeys = require('./deviceKeys-c_sN01Mm.cjs');
+var logger = require('./persistence-50wmDoBE.cjs');
+var deviceKeys = require('./deviceKeys-CSfs6juX.cjs');
 var axios = require('axios');
 var promises = require('node:fs/promises');
 var node_crypto = require('node:crypto');
@@ -18,7 +18,7 @@ require('./index-DBev4hhV.cjs');
 var node_child_process = require('node:child_process');
 require('node:events');
 require('socket.io-client');
-require('./api-BGc484qf.cjs');
+require('./api-ByiU9yXy.cjs');
 require('tweetnacl');
 require('ws');
 require('crypto');

package/dist/{registerKillSessionHandler-vF5c8YZF.mjs → registerKillSessionHandler-CxHjAcQu.mjs}

@@ -5,8 +5,8 @@ import { createServer } from 'node:http';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
-import { c as configuration, l as logger, r as readCredentials } from './persistence-IdEuIeMz.mjs';
-import { l as listDevices, d as deviceExec } from './deviceKeys-DvfaTff3.mjs';
+import { c as configuration, l as logger, r as readCredentials } from './persistence-Da0uhblK.mjs';
+import { l as listDevices, d as deviceExec } from './deviceKeys-DSXcQgLf.mjs';
 import axios from 'axios';
 import { stat, readFile } from 'node:fs/promises';
 import { randomUUID } from 'node:crypto';
@@ -16,7 +16,7 @@ import './index-7P6T8CE4.mjs';
 import { execSync } from 'node:child_process';
 import 'node:events';
 import 'socket.io-client';
-import './api-9wvM_aF-.mjs';
+import './api-B9shq-xZ.mjs';
 import 'tweetnacl';
 import 'ws';
 import 'crypto';

package/dist/{run-BKfeeheJ.cjs → run-C6hmGRwH.cjs}

@@ -3,15 +3,17 @@
 var fs$1 = require('fs/promises');
 var os = require('os');
 var tmp = require('tmp');
-var api = require('./api-BGc484qf.cjs');
-var logger = require('./persistence-CNXsXPLm.cjs');
-var auth = require('./auth-B6vskzfm.cjs');
+var api = require('./api-ByiU9yXy.cjs');
+var logger = require('./persistence-50wmDoBE.cjs');
+var doctor$1 = require('./doctor-C08m5Z9f.cjs');
+var sessionDecrypt = require('./sessionDecrypt-DWm_k5dq.cjs');
+var auth = require('./auth-DnFrlXqp.cjs');
 var child_process = require('child_process');
-var doctor = require('./doctor-CD46A-_Y.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-BbMkZhMk.cjs');
-var controlClient = require('./controlClient-DWBW6jRF.cjs');
-var deviceKeys = require('./deviceKeys-c_sN01Mm.cjs');
-var install = require('./install-C4cwObCN.cjs');
+var doctor = require('./doctor-CxWWwoLX.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-BNUBk0w5.cjs');
+var controlClient = require('./controlClient-BqCwo6Pm.cjs');
+var deviceKeys = require('./deviceKeys-CSfs6juX.cjs');
+var install = require('./install-Td8RvuEV.cjs');
 var fastify = require('fastify');
 var fs = require('node:fs');
 var promises = require('node:fs/promises');
@@ -42,6 +44,104 @@ function _interopNamespaceDefault(e) {
 
 var tmp__namespace = /*#__PURE__*/_interopNamespaceDefault(tmp);
 
+function pickAgent(metadata) {
+  switch (metadata.flavor) {
+    case "codex":
+    case "gemini":
+    case "cursor":
+      return metadata.flavor;
+    default:
+      return "claude";
+  }
+}
+function pickForkSource(id, agent, metadata) {
+  switch (agent) {
+    case "claude":
+      return typeof metadata.claudeSessionId === "string" ? metadata.claudeSessionId : null;
+    case "codex":
+      return typeof metadata.codexSessionId === "string" ? metadata.codexSessionId : null;
+    case "cursor":
+      return typeof metadata.cursorSessionId === "string" ? metadata.cursorSessionId : null;
+    case "gemini":
+      return id;
+  }
+}
+function planSessionAdoption(opts) {
+  const plan = { track: [], resume: [], skipped: [] };
+  const mine = opts.sessions.filter((s) => s.active && s.metadata && s.metadata.machineId === opts.machineId).sort((a, b) => b.activeAt - a.activeAt);
+  for (const session of mine) {
+    const metadata = session.metadata;
+    const pid = typeof metadata.hostPid === "number" ? metadata.hostPid : null;
+    if (pid !== null && opts.alivePids.has(pid)) {
+      plan.track.push({ id: session.id, pid, metadata });
+      continue;
+    }
+    const directory = typeof metadata.path === "string" ? metadata.path : null;
+    if (!directory) {
+      plan.skipped.push({ id: session.id, reason: "no path in metadata" });
+      continue;
+    }
+    const agent = pickAgent(metadata);
+    const forkSource = pickForkSource(session.id, agent, metadata);
+    if (!forkSource) {
+      plan.skipped.push({ id: session.id, reason: `no ${agent} session id to resume from` });
+      continue;
+    }
+    plan.resume.push({
+      id: session.id,
+      agent,
+      directory,
+      forkSource,
+      title: typeof metadata.summary?.text === "string" ? metadata.summary.text : typeof metadata.name === "string" ? metadata.name : void 0,
+      metadata
+    });
+  }
+  return plan;
+}
+async function adoptSessionsFromPreviousRun(deps) {
+  const report = { tracked: 0, resumed: [], failed: [], skipped: [] };
+  const [sessions, alivePids] = await Promise.all([deps.listActiveSessions(), deps.listAliveSessionPids()]);
+  const plan = planSessionAdoption({ sessions, alivePids, machineId: deps.machineId });
+  report.skipped = plan.skipped;
+  for (const session of plan.track) {
+    deps.track(session);
+    report.tracked++;
+  }
+  for (const session of plan.resume) {
+    try {
+      const forked = await deps.fork(session.agent, session.forkSource);
+      if (!forked.success || !forked.resumeSessionId) {
+        report.failed.push({ id: session.id, reason: forked.errorMessage || `${session.agent} fork failed` });
+        continue;
+      }
+      const spawned = await deps.spawnSession({
+        machineId: deps.machineId,
+        directory: session.directory,
+        agent: session.agent,
+        resumeSessionId: forked.resumeSessionId,
+        intent: "resume",
+        sessionTitle: session.title,
+        skipForkSession: true,
+        approvedNewDirectoryCreation: false
+      });
+      if (spawned.type !== "success") {
+        report.failed.push({
+          id: session.id,
+          reason: spawned.type === "error" ? spawned.errorMessage : `directory missing: ${spawned.directory}`
+        });
+        continue;
+      }
+      if (!await deps.archiveSession(session.id)) {
+        logger.logger.warn(`[DAEMON ADOPT] Resumed ${session.id} as ${spawned.sessionId} but could not mark the old session inactive`);
+      }
+      report.resumed.push({ from: session.id, to: spawned.sessionId });
+    } catch (error) {
+      report.failed.push({ id: session.id, reason: error instanceof Error ? error.message : String(error) });
+    }
+  }
+  return report;
+}
+
 let caffeinateProcess = null;
 function startCaffeinate() {
   if (logger.configuration.disableCaffeinate) {
@@ -2082,6 +2182,65 @@ ${error.message}
     });
     apiMachine.connect();
     connectedMachine = apiMachine;
+    const adoptionTimer = setTimeout(() => {
+      adoptSessionsFromPreviousRun({
+        machineId,
+        listActiveSessions: async () => {
+          const rows = await api$1.listSessionsUpdatedSince(Date.now() - 4 * 60 * 60 * 1e3);
+          return rows.map((row) => ({
+            id: row.id,
+            active: !!row.active,
+            activeAt: typeof row.activeAt === "number" ? row.activeAt : 0,
+            metadata: sessionDecrypt.decryptSessionRow(credentials, row)?.metadata ?? null
+          }));
+        },
+        listAliveSessionPids: async () => {
+          const processes = await doctor$1.findAllHappyProcesses();
+          return new Set(processes.filter((p) => p.type === "daemon-spawned-session" || p.type === "user-session" || p.type === "dev-daemon-spawned" || p.type === "dev-session").map((p) => p.pid));
+        },
+        fork: async (agent, source) => {
+          switch (agent) {
+            case "claude": {
+              const projectId = await api.findClaudeProjectId(source);
+              if (!projectId) return { success: false, errorMessage: `Claude session ${source} not found on disk` };
+              const r = await api.forkSession(projectId, source);
+              return { success: r.success, resumeSessionId: r.newSessionId, errorMessage: r.errorMessage };
+            }
+            case "codex": {
+              const r = await api.forkCodexSession(source);
+              return { success: r.success, resumeSessionId: r.newFilePath, errorMessage: r.errorMessage };
+            }
+            case "gemini": {
+              const r = await api.forkGeminiSession(source);
+              return { success: r.success, resumeSessionId: r.newSessionId, errorMessage: r.errorMessage };
+            }
+            case "cursor": {
+              const r = await api.forkCursorSession(source);
+              return { success: r.success, resumeSessionId: r.newChatId, errorMessage: r.errorMessage };
+            }
+          }
+        },
+        spawnSession,
+        archiveSession: (sessionId) => api$1.archiveSession(sessionId),
+        track: ({ id, pid, metadata }) => {
+          if (pidToTrackedSession.has(pid)) return;
+          pidToTrackedSession.set(pid, {
+            startedBy: "adopted after daemon restart",
+            happySessionId: id,
+            happySessionMetadataFromLocalWebhook: metadata,
+            pid
+          });
+        }
+      }).then((report) => {
+        logger.logger.info(`[DAEMON ADOPT] tracked ${report.tracked} running session(s), resumed ${report.resumed.length}, failed ${report.failed.length}, skipped ${report.skipped.length}`);
+        for (const r of report.resumed) logger.logger.info(`[DAEMON ADOPT] resumed ${r.from} as ${r.to}`);
+        for (const f of report.failed) logger.logger.warn(`[DAEMON ADOPT] could not resume ${f.id}: ${f.reason}`);
+        for (const s of report.skipped) logger.logger.debug(`[DAEMON ADOPT] skipped ${s.id}: ${s.reason}`);
+      }).catch((error) => {
+        logger.logger.warn("[DAEMON ADOPT] failed to adopt previous sessions", error);
+      });
+    }, 5e3);
+    adoptionTimer.unref();
     apiMachine.updateMachineMetadata((current) => ({ ...current, ...machineMetadata })).catch((error) => {
       logger.logger.debug("[DAEMON RUN] Failed to update machine metadata", error);
     });

package/dist/{run-BvpCwXkt.mjs → run-DjaUrH7x.mjs}

@@ -1,15 +1,17 @@
 import fs from 'fs/promises';
 import os from 'os';
 import * as tmp from 'tmp';
-import { A as ApiClient } from './api-9wvM_aF-.mjs';
-import { c as configuration, l as logger, p as packageJson, v as acquireDaemonLock, a as readSettings, i as isDebug, e as encodeBase64, x as writeDaemonState, m as readDaemonState, y as releaseDaemonLock, z as validateProfileForAgent, A as getProfileEnvironmentVariables } from './persistence-IdEuIeMz.mjs';
-import { authAndSetupMachineIfNeeded } from './auth-BnEa31tI.mjs';
+import { A as ApiClient, f as forkCursorSession, c as forkGeminiSession, d as forkCodexSession, e as findClaudeProjectId, g as forkSession } from './api-B9shq-xZ.mjs';
+import { l as logger, c as configuration, p as packageJson, v as acquireDaemonLock, a as readSettings, i as isDebug, e as encodeBase64, x as writeDaemonState, m as readDaemonState, y as releaseDaemonLock, z as validateProfileForAgent, A as getProfileEnvironmentVariables } from './persistence-Da0uhblK.mjs';
+import { findAllHappyProcesses } from './doctor-ON7pN5G5.mjs';
+import { d as decryptSessionRow } from './sessionDecrypt-BsOlrqRs.mjs';
+import { authAndSetupMachineIfNeeded } from './auth-DnRtIM3d.mjs';
 import { spawn, execSync, exec } from 'child_process';
-import { getEnvironmentInfo } from './doctor-DQtQbfG-.mjs';
-import { s as spawnHappyCLI } from './spawnHappyCLI-DlTg87jS.mjs';
-import { isDaemonRunningCurrentlyInstalledHappyVersion, stopDaemon, cleanupDaemonState } from './controlClient-VY0CGL8k.mjs';
-import { a as readCachedDeviceKey, d as deviceExec } from './deviceKeys-DvfaTff3.mjs';
-import { P as PLIST_LABEL } from './install-1Y6dAcMp.mjs';
+import { getEnvironmentInfo } from './doctor-C77QV3rd.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-Cv2VARTw.mjs';
+import { isDaemonRunningCurrentlyInstalledHappyVersion, stopDaemon, cleanupDaemonState } from './controlClient-BuKaeD-y.mjs';
+import { a as readCachedDeviceKey, d as deviceExec } from './deviceKeys-DSXcQgLf.mjs';
+import { P as PLIST_LABEL } from './install-DbRGuSWv.mjs';
 import fastify from 'fastify';
 import { createReadStream } from 'node:fs';
 import { stat } from 'node:fs/promises';
@@ -21,6 +23,104 @@ import { join } from 'path';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { b as buildOutputSummary, m as mapFinishStatus, a as buildOrchestratorEnv, c as appendOutputChunk } from './common-BdNgghUJ.mjs';
 
+function pickAgent(metadata) {
+  switch (metadata.flavor) {
+    case "codex":
+    case "gemini":
+    case "cursor":
+      return metadata.flavor;
+    default:
+      return "claude";
+  }
+}
+function pickForkSource(id, agent, metadata) {
+  switch (agent) {
+    case "claude":
+      return typeof metadata.claudeSessionId === "string" ? metadata.claudeSessionId : null;
+    case "codex":
+      return typeof metadata.codexSessionId === "string" ? metadata.codexSessionId : null;
+    case "cursor":
+      return typeof metadata.cursorSessionId === "string" ? metadata.cursorSessionId : null;
+    case "gemini":
+      return id;
+  }
+}
+function planSessionAdoption(opts) {
+  const plan = { track: [], resume: [], skipped: [] };
+  const mine = opts.sessions.filter((s) => s.active && s.metadata && s.metadata.machineId === opts.machineId).sort((a, b) => b.activeAt - a.activeAt);
+  for (const session of mine) {
+    const metadata = session.metadata;
+    const pid = typeof metadata.hostPid === "number" ? metadata.hostPid : null;
+    if (pid !== null && opts.alivePids.has(pid)) {
+      plan.track.push({ id: session.id, pid, metadata });
+      continue;
+    }
+    const directory = typeof metadata.path === "string" ? metadata.path : null;
+    if (!directory) {
+      plan.skipped.push({ id: session.id, reason: "no path in metadata" });
+      continue;
+    }
+    const agent = pickAgent(metadata);
+    const forkSource = pickForkSource(session.id, agent, metadata);
+    if (!forkSource) {
+      plan.skipped.push({ id: session.id, reason: `no ${agent} session id to resume from` });
+      continue;
+    }
+    plan.resume.push({
+      id: session.id,
+      agent,
+      directory,
+      forkSource,
+      title: typeof metadata.summary?.text === "string" ? metadata.summary.text : typeof metadata.name === "string" ? metadata.name : void 0,
+      metadata
+    });
+  }
+  return plan;
+}
+async function adoptSessionsFromPreviousRun(deps) {
+  const report = { tracked: 0, resumed: [], failed: [], skipped: [] };
+  const [sessions, alivePids] = await Promise.all([deps.listActiveSessions(), deps.listAliveSessionPids()]);
+  const plan = planSessionAdoption({ sessions, alivePids, machineId: deps.machineId });
+  report.skipped = plan.skipped;
+  for (const session of plan.track) {
+    deps.track(session);
+    report.tracked++;
+  }
+  for (const session of plan.resume) {
+    try {
+      const forked = await deps.fork(session.agent, session.forkSource);
+      if (!forked.success || !forked.resumeSessionId) {
+        report.failed.push({ id: session.id, reason: forked.errorMessage || `${session.agent} fork failed` });
+        continue;
+      }
+      const spawned = await deps.spawnSession({
+        machineId: deps.machineId,
+        directory: session.directory,
+        agent: session.agent,
+        resumeSessionId: forked.resumeSessionId,
+        intent: "resume",
+        sessionTitle: session.title,
+        skipForkSession: true,
+        approvedNewDirectoryCreation: false
+      });
+      if (spawned.type !== "success") {
+        report.failed.push({
+          id: session.id,
+          reason: spawned.type === "error" ? spawned.errorMessage : `directory missing: ${spawned.directory}`
+        });
+        continue;
+      }
+      if (!await deps.archiveSession(session.id)) {
+        logger.warn(`[DAEMON ADOPT] Resumed ${session.id} as ${spawned.sessionId} but could not mark the old session inactive`);
+      }
+      report.resumed.push({ from: session.id, to: spawned.sessionId });
+    } catch (error) {
+      report.failed.push({ id: session.id, reason: error instanceof Error ? error.message : String(error) });
+    }
+  }
+  return report;
+}
+
 let caffeinateProcess = null;
 function startCaffeinate() {
   if (configuration.disableCaffeinate) {
@@ -2061,6 +2161,65 @@ ${error.message}
     });
     apiMachine.connect();
     connectedMachine = apiMachine;
+    const adoptionTimer = setTimeout(() => {
+      adoptSessionsFromPreviousRun({
+        machineId,
+        listActiveSessions: async () => {
+          const rows = await api.listSessionsUpdatedSince(Date.now() - 4 * 60 * 60 * 1e3);
+          return rows.map((row) => ({
+            id: row.id,
+            active: !!row.active,
+            activeAt: typeof row.activeAt === "number" ? row.activeAt : 0,
+            metadata: decryptSessionRow(credentials, row)?.metadata ?? null
+          }));
+        },
+        listAliveSessionPids: async () => {
+          const processes = await findAllHappyProcesses();
+          return new Set(processes.filter((p) => p.type === "daemon-spawned-session" || p.type === "user-session" || p.type === "dev-daemon-spawned" || p.type === "dev-session").map((p) => p.pid));
+        },
+        fork: async (agent, source) => {
+          switch (agent) {
+            case "claude": {
+              const projectId = await findClaudeProjectId(source);
+              if (!projectId) return { success: false, errorMessage: `Claude session ${source} not found on disk` };
+              const r = await forkSession(projectId, source);
+              return { success: r.success, resumeSessionId: r.newSessionId, errorMessage: r.errorMessage };
+            }
+            case "codex": {
+              const r = await forkCodexSession(source);
+              return { success: r.success, resumeSessionId: r.newFilePath, errorMessage: r.errorMessage };
+            }
+            case "gemini": {
+              const r = await forkGeminiSession(source);
+              return { success: r.success, resumeSessionId: r.newSessionId, errorMessage: r.errorMessage };
+            }
+            case "cursor": {
+              const r = await forkCursorSession(source);
+              return { success: r.success, resumeSessionId: r.newChatId, errorMessage: r.errorMessage };
+            }
+          }
+        },
+        spawnSession,
+        archiveSession: (sessionId) => api.archiveSession(sessionId),
+        track: ({ id, pid, metadata }) => {
+          if (pidToTrackedSession.has(pid)) return;
+          pidToTrackedSession.set(pid, {
+            startedBy: "adopted after daemon restart",
+            happySessionId: id,
+            happySessionMetadataFromLocalWebhook: metadata,
+            pid
+          });
+        }
+      }).then((report) => {
+        logger.info(`[DAEMON ADOPT] tracked ${report.tracked} running session(s), resumed ${report.resumed.length}, failed ${report.failed.length}, skipped ${report.skipped.length}`);
+        for (const r of report.resumed) logger.info(`[DAEMON ADOPT] resumed ${r.from} as ${r.to}`);
+        for (const f of report.failed) logger.warn(`[DAEMON ADOPT] could not resume ${f.id}: ${f.reason}`);
+        for (const s of report.skipped) logger.debug(`[DAEMON ADOPT] skipped ${s.id}: ${s.reason}`);
+      }).catch((error) => {
+        logger.warn("[DAEMON ADOPT] failed to adopt previous sessions", error);
+      });
+    }, 5e3);
+    adoptionTimer.unref();
     apiMachine.updateMachineMetadata((current) => ({ ...current, ...machineMetadata })).catch((error) => {
       logger.debug("[DAEMON RUN] Failed to update machine metadata", error);
     });

package/dist/{runClaude-DDsG7eMR.cjs → runClaude-BR15B5bw.cjs}

@@ -4,20 +4,20 @@ var os = require('node:os');
 var node_crypto = require('node:crypto');
 var fs$1 = require('node:fs');
 var promises = require('node:fs/promises');
-var api = require('./api-BGc484qf.cjs');
-var logger = require('./persistence-CNXsXPLm.cjs');
-var claudeLocal = require('./claudeLocal-CV4fT0Gg.cjs');
+var api = require('./api-ByiU9yXy.cjs');
+var logger = require('./persistence-50wmDoBE.cjs');
+var claudeLocal = require('./claudeLocal-CuHH7tvQ.cjs');
 var types = require('./types-DWeB7aqh.cjs');
 var path = require('node:path');
 var time = require('./time-Bj2HRkKH.cjs');
 var fs = require('fs/promises');
 var ink = require('ink');
-var downloadImage = require('./downloadImage-DGdHCFi3.cjs');
+var downloadImage = require('./downloadImage-DZBxkdwy.cjs');
 var React = require('react');
 var node_child_process = require('node:child_process');
 var node_readline = require('node:readline');
 var node_url = require('node:url');
-var spawnHappyCLI = require('./spawnHappyCLI-BbMkZhMk.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-BNUBk0w5.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 require('axios');
 require('node:events');
@@ -28,12 +28,12 @@ require('crypto');
 require('@stablelib/base64');
 require('expo-server-sdk');
 require('chalk');
-var formatImageMessage = require('./formatImageMessage-DttKW75w.cjs');
+var formatImageMessage = require('./formatImageMessage-CHjdeDGM.cjs');
 var node_util = require('node:util');
-var run = require('./run-BKfeeheJ.cjs');
-var doctor = require('./doctor-CD46A-_Y.cjs');
-var controlClient = require('./controlClient-DWBW6jRF.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-D9tmPdw5.cjs');
+var run = require('./run-C6hmGRwH.cjs');
+var doctor = require('./doctor-CxWWwoLX.cjs');
+var controlClient = require('./controlClient-BqCwo6Pm.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CHPzUrtO.cjs');
 var node_http = require('node:http');
 require('zod');
 require('./index-DBev4hhV.cjs');
@@ -42,7 +42,7 @@ require('child_process');
 require('util');
 require('path');
 require('node:module');
-require('./sessionKeyCache-JjjYAxdf.cjs');
+require('./sessionKeyCache-CmORI8jN.cjs');
 require('fs');
 require('./prompt-BTWDZZO0.cjs');
 require('./trimIdent-4gvk9Wk6.cjs');
@@ -50,17 +50,18 @@ require('./common-CZvSRU4p.cjs');
 require('url');
 require('os');
 require('tmp');
-require('./auth-B6vskzfm.cjs');
+require('./doctor-C08m5Z9f.cjs');
+require('ps-list');
+require('cross-spawn');
+require('./sessionDecrypt-DWm_k5dq.cjs');
+require('./auth-DnFrlXqp.cjs');
 require('qrcode-terminal');
-require('./browser-CnxzD1lA.cjs');
+require('./browser-DjONS-B5.cjs');
 require('open');
-require('./deviceKeys-c_sN01Mm.cjs');
-require('./install-C4cwObCN.cjs');
+require('./deviceKeys-CSfs6juX.cjs');
+require('./install-Td8RvuEV.cjs');
 require('fastify');
 require('fastify-type-provider-zod');
-require('./doctor-C08m5Z9f.cjs');
-require('ps-list');
-require('cross-spawn');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('@modelcontextprotocol/sdk/types.js');
@@ -732,7 +733,7 @@ class AbortError extends Error {
   }
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('runClaude-DDsG7eMR.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('runClaude-BR15B5bw.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {