very-happy-cli 0.2.93 → 0.2.95

package/dist/{index-17NbIAkU.cjs → index-CbPc1iVx.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-COv_3umE.cjs');
-var persistence = require('./types-BHVxYajT.cjs');
-var AcpSessionManager = require('./AcpSessionManager-vm4rIcH0.cjs');
+var AcpBackend = require('./AcpBackend-BXsbwTbl.cjs');
+var persistence = require('./types-HRuZ13LS.cjs');
+var AcpSessionManager = require('./AcpSessionManager-BXGmMoe8.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index = require('./index-DaVhaBF2.cjs');
+var index = require('./index-BzbaMrIa.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
 require('axios');

package/dist/{index-C00jxV83.mjs → index-DVEdpWq0.mjs}

@@ -1,11 +1,11 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir } from 'node:os';
 import { randomUUID, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { n as readDaemonState, l as logger, c as configuration, o as clearDaemonState, q as getProjectPath, p as projectPath, s as initializeSandbox, t as wrapCommand, d as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, g as delay, u as AsyncLock, v as ensurePrivateDirectory, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, x as hardenPrivateFile, f as packageJson, i as readSettings, y as readCredentials, z as credentialRelayProblem, B as deriveLocalCliUpdateSummary, j as encodeBase64, C as updateSettings, D as encodeBase64Url, E as decodeBase64, F as writeCredentialsLegacy, G as writeCredentialsDataKey, H as readCredentialsForConfiguredRelay, J as encrypt, r as readPersistedSessions, K as isClaudeSessionId, L as getLocalHappyAgentCredentialPath, N as readLocalHappyAgentCredentials, O as decryptWithDataKey, P as decryptLegacy, Q as extractCompleteLines, S as decideBackfill, T as parseTerminalHookPayload, U as tmuxArgs, V as scrubTmuxClientEnv, W as decideMirrorBinding, X as persistSession, Y as MIRROR_BACKFILL_LINES_DEFAULT, Z as mirrorLineKey, _ as mirrorLocalId, $ as detectResumeSupport, a0 as detectCLIAvailability, a1 as acquireDaemonLock, a2 as summarizeSpawnSessionForLog, a3 as deletePersistedSessions, a4 as decrypt, a5 as writeDaemonState, A as ApiClient, a6 as fetchCliUpdateState, a7 as resolveCliUpdateCheckInterval, a8 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a9 as releaseDaemonLock, aa as isValidSessionId, ab as listVhTerminals, ac as isValidTerminalId, ad as readVhTerminal, ae as sendToVhTerminal, h as connectionState, af as startOfflineReconnection, ag as clearCredentials, ah as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, ai as SandboxConfigSchema, b as createEnvelope, aj as CodexAppServerClient, ak as getLatestDaemonLog } from './types-Cx5wn5Hf.mjs';
+import { n as readDaemonState, l as logger, c as configuration, o as clearDaemonState, q as getProjectPath, p as projectPath, s as initializeSandbox, t as wrapCommand, d as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, g as delay, u as AsyncLock, v as ensurePrivateDirectory, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, x as hardenPrivateFile, f as packageJson, i as readSettings, y as readCredentials, z as credentialRelayProblem, B as deriveLocalCliUpdateSummary, j as encodeBase64, C as updateSettings, D as encodeBase64Url, E as decodeBase64, F as writeCredentialsLegacy, G as writeCredentialsDataKey, H as readCredentialsForConfiguredRelay, J as encrypt, r as readPersistedSessions, K as isClaudeSessionId, L as getLocalHappyAgentCredentialPath, N as readLocalHappyAgentCredentials, O as decryptWithDataKey, P as decryptLegacy, Q as extractCompleteLines, S as decideBackfill, T as parseTerminalHookPayload, U as tmuxArgs, V as scrubTmuxClientEnv, W as decideMirrorBinding, X as MIRROR_BACKFILL_LINES_DEFAULT, Y as persistSession, Z as mirrorLineKey, _ as mirrorLocalId, w as writePrivateFileSync, $ as detectResumeSupport, a0 as detectCLIAvailability, a1 as acquireDaemonLock, a2 as summarizeSpawnSessionForLog, a3 as deletePersistedSessions, a4 as decrypt, a5 as writeDaemonState, A as ApiClient, a6 as fetchCliUpdateState, a7 as resolveCliUpdateCheckInterval, a8 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a9 as releaseDaemonLock, aa as isValidSessionId, ab as listVhTerminals, ac as isValidTerminalId, ad as readVhTerminal, ae as sendToVhTerminal, h as connectionState, af as startOfflineReconnection, ag as clearCredentials, ah as clearMachineId, k as ensurePrivateDirectorySync, ai as SandboxConfigSchema, b as createEnvelope, aj as CodexAppServerClient, ak as getLatestDaemonLog } from './types-BLE8Hfmh.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, basename, isAbsolute, normalize, sep, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
-import { existsSync, readFileSync, readdirSync, statSync, mkdirSync, unlinkSync, writeFileSync, rmSync, chmodSync as chmodSync$1 } from 'node:fs';
+import { existsSync, readFileSync, readdirSync, statSync, mkdirSync, unlinkSync, renameSync, writeFileSync, rmSync, chmodSync as chmodSync$1 } from 'node:fs';
 import { t as trimIdent, A as AGENT_GUIDANCE, P as PREVIEW_TOOL_NAME, R as REPORT_PROGRESS_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, c as REPORT_PROGRESS_TOOL_TITLE, d as REPORT_PROGRESS_TOOL_DESCRIPTION } from './agentGuidance-C2_pkgRI.mjs';
 import { readFile, writeFile, rename, unlink, mkdir, stat, open as open$1, appendFile } from 'node:fs/promises';
 import fs, { watch, access } from 'fs/promises';
@@ -6766,10 +6766,20 @@ function createMirrorScanner(opts) {
 }
 
 const TERMINAL_MIRROR_FLAVOR = "terminal-mirror";
+const RECONCILE_HYSTERESIS_MS = 2e4;
 function createMirrorManager(deps) {
   const backfillLines = deps.backfillLines ?? MIRROR_BACKFILL_LINES_DEFAULT;
   const bindings = /* @__PURE__ */ new Map();
+  const lastEndedAt = /* @__PURE__ */ new Map();
   let chain = Promise.resolve();
+  const reactivate = async (binding) => {
+    try {
+      const ok = await deps.api.reactivateSession(binding.happySessionId);
+      binding.needsReactivate = !ok;
+    } catch {
+      binding.needsReactivate = true;
+    }
+  };
   const isTerminalAlive = deps.isTerminalAlive ?? ((terminalId) => {
     try {
       return spawnSync("tmux", tmuxArgs(["has-session", "-t", `=vh-${terminalId}:`]), { stdio: "ignore", timeout: 3e3, env: scrubTmuxClientEnv({ ...process.env }) }).status === 0;
@@ -6821,6 +6831,8 @@ function createMirrorManager(deps) {
   const endBinding = async (binding, reason) => {
     if (binding.status === "ended") return;
     binding.status = "ended";
+    lastEndedAt.set(binding.terminalId, Date.now());
+    binding.needsReactivate = false;
     logger.debug(`[MIRROR] ending binding for terminal ${binding.terminalId} (${reason})`);
     await binding.scanner?.cleanup();
     binding.scanner = null;
@@ -6848,6 +6860,76 @@ function createMirrorManager(deps) {
     }
     await binding.client.close();
   };
+  const adoptPersisted = async (terminalId, persisted) => {
+    if (bindings.has(terminalId)) return;
+    let best = null;
+    for (const [sessionId2, entry2] of Object.entries(persisted)) {
+      const meta2 = entry2.metadata;
+      if (meta2?.flavor !== TERMINAL_MIRROR_FLAVOR) continue;
+      if (meta2.machineId !== deps.machineId) continue;
+      if (meta2.terminalId !== terminalId) continue;
+      if (!meta2.claudeSessionId) continue;
+      if (!best || entry2.savedAt > best.entry.savedAt) best = { sessionId: sessionId2, entry: entry2 };
+    }
+    if (!best) return;
+    const { sessionId, entry } = best;
+    const meta = entry.metadata;
+    const session = {
+      id: sessionId,
+      seq: entry.seq,
+      metadata: meta,
+      metadataVersion: entry.metadataVersion,
+      agentState: null,
+      agentStateVersion: entry.agentStateVersion,
+      encryptionKey: decodeBase64(entry.encryptionKey),
+      encryptionVariant: entry.encryptionVariant
+    };
+    const client = deps.api.sessionSyncClient(session);
+    client.skipExistingMessages();
+    const binding = {
+      terminalId,
+      happySessionId: sessionId,
+      claudeSessionId: meta.claudeSessionId,
+      status: "active",
+      client,
+      scanner: null,
+      persist: {
+        encryptionKey: entry.encryptionKey,
+        encryptionVariant: entry.encryptionVariant,
+        seq: entry.seq,
+        metadataVersion: entry.metadataVersion,
+        agentStateVersion: entry.agentStateVersion
+      },
+      metadata: meta
+    };
+    bindings.set(terminalId, binding);
+    await reactivate(binding);
+    updateBindingMetadata(binding, {
+      lifecycleState: "running",
+      lifecycleStateSince: Date.now(),
+      archivedBy: void 0,
+      archiveReason: void 0
+    });
+    const scanner = attachScanner(binding, { withTruncationNotice: false });
+    scanner.addFile(join(getProjectPath(meta.path), `${meta.claudeSessionId}.jsonl`), "backfill-tail");
+    logger.debug(`[MIRROR] reconcile adopted terminal ${terminalId} \u2192 ${sessionId}`);
+    deps.onBindingsChanged?.();
+  };
+  const reactivateInPlace = async (binding) => {
+    if (binding.status !== "ended") return;
+    binding.status = "active";
+    await reactivate(binding);
+    updateBindingMetadata(binding, {
+      lifecycleState: "running",
+      lifecycleStateSince: Date.now(),
+      archivedBy: void 0,
+      archiveReason: void 0
+    });
+    const scanner = binding.scanner ?? attachScanner(binding, { withTruncationNotice: false });
+    scanner.addFile(join(getProjectPath(binding.metadata.path), `${binding.claudeSessionId}.jsonl`), "backfill-tail");
+    logger.debug(`[MIRROR] reconcile reactivated (in place) terminal ${binding.terminalId}`);
+    deps.onBindingsChanged?.();
+  };
   const createBinding = async (event, replaces) => {
     if (replaces) {
       await teardownBinding(replaces, "superseded by a fresh conversation");
@@ -6908,6 +6990,7 @@ function createMirrorManager(deps) {
     binding.claudeSessionId = event.claudeSessionId;
     if (binding.status === "ended") {
       binding.status = "active";
+      await reactivate(binding);
       updateBindingMetadata(binding, {
         lifecycleState: "running",
         lifecycleStateSince: Date.now(),
@@ -6977,6 +7060,43 @@ function createMirrorManager(deps) {
         }
       }
     },
+    reconcile(list) {
+      let persisted = null;
+      const now = Date.now();
+      for (const item of list) {
+        const binding = bindings.get(item.id) ?? null;
+        if (item.agentState === "shell") {
+          if (binding && binding.status === "active") {
+            chain = chain.then(() => {
+              const b = bindings.get(item.id);
+              return b && b.status === "active" ? endBinding(b, "claude exited (pane observation)") : void 0;
+            }).catch((e) => logger.debug(`[MIRROR] reconcile end failed for ${item.id}:`, e));
+          }
+          continue;
+        }
+        if (binding && binding.status === "active" && binding.needsReactivate) {
+          chain = chain.then(() => {
+            const b = bindings.get(item.id);
+            return b && b.status === "active" && b.needsReactivate ? reactivate(b) : void 0;
+          }).catch((e) => logger.debug(`[MIRROR] reconcile reactivate-retry failed for ${item.id}:`, e));
+        }
+        if (!item.claudeConfident) continue;
+        const endedAt = lastEndedAt.get(item.id);
+        if (endedAt !== void 0 && now - endedAt < RECONCILE_HYSTERESIS_MS) continue;
+        if (binding && binding.status === "ended") {
+          chain = chain.then(() => {
+            const b = bindings.get(item.id);
+            return b && b.status === "ended" ? reactivateInPlace(b) : void 0;
+          }).catch((e) => logger.debug(`[MIRROR] reconcile in-place reactivate failed for ${item.id}:`, e));
+        } else if (!binding) {
+          persisted ??= readPersistedSessions();
+          const p = persisted;
+          chain = chain.then(() => {
+            return bindings.has(item.id) ? void 0 : adoptPersisted(item.id, p);
+          }).catch((e) => logger.debug(`[MIRROR] reconcile adopt failed for ${item.id}:`, e));
+        }
+      }
+    },
     resolveMirrorSessionId(terminalId) {
       return bindings.get(terminalId)?.happySessionId;
     },
@@ -7091,6 +7211,144 @@ function recoverableSessionPid(metadata, liveHappyPids) {
   const pid = metadata?.hostPid;
   return typeof pid === "number" && Number.isInteger(pid) && pid > 0 && liveHappyPids.has(pid) ? pid : null;
 }
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function sessionAgentConversationId(metadata) {
+  if (!metadata) return null;
+  if (metadata.flavor === "codex") return metadata.codexThreadId ?? null;
+  return metadata.claudeSessionId ?? metadata.codexThreadId ?? null;
+}
+function isDaemonWrapperForConversation(command, conversationId) {
+  if (!command || !conversationId) return false;
+  const startedByDaemon = /(?:^|\s)--started-by\s+daemon(?:\s|$)/.test(command);
+  if (!startedByDaemon) return false;
+  const resume = new RegExp(`(?:^|\\s)--resume(?:\\s+|=)${escapeRegExp(conversationId)}(?:\\s|$)`);
+  return resume.test(command);
+}
+function findSessionWrapperPids(metadata, liveHappyProcesses, options = {}) {
+  const out = [];
+  const livePids = new Set(liveHappyProcesses.map((p) => p.pid));
+  const lockPid = options.lockPid ?? null;
+  if (lockPid !== null && lockPid !== options.excludePid && livePids.has(lockPid)) out.push(lockPid);
+  const persisted = recoverableSessionPid(metadata, livePids);
+  if (persisted !== null && persisted !== options.excludePid && !out.includes(persisted)) out.push(persisted);
+  const conversationId = sessionAgentConversationId(metadata);
+  if (conversationId) {
+    for (const proc of liveHappyProcesses) {
+      if (proc.pid === options.excludePid || out.includes(proc.pid)) continue;
+      if (isDaemonWrapperForConversation(proc.command, conversationId)) out.push(proc.pid);
+    }
+  }
+  return out;
+}
+function mergeRestoreMetadata(stale, reported) {
+  if (!reported) return stale;
+  return { ...stale, ...processIdentityFields(reported) };
+}
+
+const SESSION_LOCK_DIR = "session-locks";
+const defaultRuntime = () => ({
+  dir: join(configuration.happyHomeDir, SESSION_LOCK_DIR),
+  selfPid: process.pid,
+  now: () => Date.now(),
+  signal: (pid, signal) => process.kill(pid, signal),
+  isAlive: (pid) => {
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch {
+      return false;
+    }
+  },
+  schedule: (callback, delayMs) => {
+    setTimeout(callback, delayMs);
+  }
+});
+function sessionLockPath(happySessionId, dir = join(configuration.happyHomeDir, SESSION_LOCK_DIR)) {
+  return join(dir, `${happySessionId}.json`);
+}
+function readSessionLock(happySessionId, dir) {
+  try {
+    const path = sessionLockPath(happySessionId, dir);
+    if (!existsSync(path)) return null;
+    const parsed = JSON.parse(readFileSync(path, "utf-8"));
+    if (typeof parsed?.pid !== "number" || !Number.isInteger(parsed.pid) || parsed.pid <= 0) return null;
+    return {
+      pid: parsed.pid,
+      startedAt: typeof parsed.startedAt === "number" ? parsed.startedAt : 0,
+      version: typeof parsed.version === "string" ? parsed.version : "",
+      ...typeof parsed.flavor === "string" ? { flavor: parsed.flavor } : {}
+    };
+  } catch {
+    return null;
+  }
+}
+function liveSessionLockHolder(happySessionId, runtime = defaultRuntime()) {
+  const record = readSessionLock(happySessionId, runtime.dir);
+  if (!record || record.pid === runtime.selfPid) return null;
+  return runtime.isAlive(record.pid) ? record : null;
+}
+function writeSessionLock(happySessionId, record, dir) {
+  mkdirSync(dir, { recursive: true, mode: 448 });
+  const path = sessionLockPath(happySessionId, dir);
+  const tmp = `${path}.${record.pid}.tmp`;
+  writePrivateFileSync(tmp, JSON.stringify(record));
+  renameSync(tmp, path);
+}
+function acquireSessionLock(happySessionId, options, runtime = defaultRuntime()) {
+  const record = () => ({
+    pid: runtime.selfPid,
+    startedAt: runtime.now(),
+    version: options.version,
+    ...options.flavor ? { flavor: options.flavor } : {}
+  });
+  const holder = liveSessionLockHolder(happySessionId, runtime);
+  if (!holder) {
+    writeSessionLock(happySessionId, record(), runtime.dir);
+    return Promise.resolve({ ok: true, replaced: null });
+  }
+  if (!options.takeover) {
+    return Promise.resolve({ ok: false, holder });
+  }
+  return new Promise((resolve) => {
+    const requested = terminateProcess(holder.pid, (stopped) => {
+      if (!stopped) {
+        resolve({ ok: false, holder });
+        return;
+      }
+      writeSessionLock(happySessionId, record(), runtime.dir);
+      resolve({ ok: true, replaced: holder });
+    }, runtime, options.graceMs ?? 2e3);
+    if (!requested) resolve({ ok: false, holder });
+  });
+}
+function releaseSessionLock(happySessionId, runtime = defaultRuntime()) {
+  try {
+    const record = readSessionLock(happySessionId, runtime.dir);
+    if (record && record.pid === runtime.selfPid) {
+      unlinkSync(sessionLockPath(happySessionId, runtime.dir));
+    }
+  } catch {
+  }
+}
+async function claimSessionOrExit(happySessionId, options) {
+  const result = await acquireSessionLock(happySessionId, {
+    takeover: options.takeover,
+    version: configuration.currentCliVersion,
+    flavor: options.flavor
+  });
+  if (!result.ok) {
+    const message = `Session ${happySessionId} is already run by very-happy pid ${result.holder.pid} (v${result.holder.version || "?"}); this process yields.`;
+    logger.debug(`[SESSION LOCK] ${message}`);
+    console.error(message);
+    process.exit(0);
+  }
+  if (result.replaced) {
+    logger.debug(`[SESSION LOCK] Took over session ${happySessionId} from pid ${result.replaced.pid} (v${result.replaced.version || "?"})`);
+  }
+  process.on("exit", () => releaseSessionLock(happySessionId));
+}
 
 function shellescape(s) {
   return "'" + s.replace(/'/g, "'\\''") + "'";
@@ -7182,7 +7440,7 @@ async function startDaemon() {
     const pidToTrackedSession = /* @__PURE__ */ new Map();
     const sessionIdToFinishedSession = /* @__PURE__ */ new Map();
     const persisted = readPersistedSessions();
-    const liveHappyPids = new Set((await findAllHappyProcesses()).map((entry) => entry.pid));
+    const liveHappyProcesses = await findAllHappyProcesses();
     for (const [id, s] of Object.entries(persisted)) {
       const tracked = {
         startedBy: "persisted",
@@ -7197,12 +7455,20 @@ async function startDaemon() {
         },
         pid: 0
       };
-      const livePid = recoverableSessionPid(s.metadata, liveHappyPids);
-      if (livePid !== null) {
+      const livePids = findSessionWrapperPids(s.metadata, liveHappyProcesses, { excludePid: process.pid, lockPid: readSessionLock(id)?.pid });
+      if (livePids.length > 0) {
+        const [livePid, ...duplicates] = livePids;
         tracked.pid = livePid;
         tracked.startedBy = "recovered after daemon restart";
         pidToTrackedSession.set(livePid, tracked);
-        persistSession(id, { ...s, savedAt: Date.now() });
+        if (livePid !== s.metadata?.hostPid) {
+          logger.debug(`[DAEMON RUN] Session ${id}: persisted hostPid ${s.metadata?.hostPid} is stale; adopted live wrapper ${livePid} by its --resume command line`);
+        }
+        for (const dup of duplicates) {
+          logger.warn(`[DAEMON RUN] Session ${id} has a duplicate live wrapper ${dup} (kept ${livePid}); restart the session to collapse them`);
+          pidToTrackedSession.set(dup, { ...tracked, pid: dup, startedBy: "recovered after daemon restart (duplicate wrapper)" });
+        }
+        persistSession(id, { ...s, metadata: { ...s.metadata, hostPid: livePid }, savedAt: Date.now() });
       } else {
         sessionIdToFinishedSession.set(id, tracked);
       }
@@ -7232,6 +7498,11 @@ async function startDaemon() {
           savedAt: Date.now()
         });
       }
+      for (const [otherPid, other] of pidToTrackedSession.entries()) {
+        if (other.happySessionId === sessionId && otherPid !== pid && isPidAlive(otherPid)) {
+          logger.warn(`[DAEMON RUN] Session ${sessionId} now has two live wrappers (${otherPid} and ${pid}); restart the session to collapse them`);
+        }
+      }
       const existingSession = pidToTrackedSession.get(pid);
       if (existingSession && existingSession.startedBy === "daemon") {
         existingSession.happySessionId = sessionId;
@@ -7659,6 +7930,21 @@ async function startDaemon() {
       }
       return sessionIdToFinishedSession.get(happySessionId);
     };
+    const persistRestoreRecord = (happySessionId, fallback, metadata) => {
+      const candidates = [...pidToTrackedSession.values()].filter((s) => s.happySessionId === happySessionId && isPidAlive(s.pid));
+      const live = candidates.find((s) => s.childProcess) ?? candidates[0];
+      const encryption = live?.encryption ?? fallback.encryption;
+      if (!encryption) return;
+      persistSession(happySessionId, {
+        encryptionKey: encodeBase64(encryption.encryptionKey),
+        encryptionVariant: encryption.encryptionVariant,
+        seq: encryption.seq,
+        metadataVersion: encryption.metadataVersion,
+        agentStateVersion: encryption.agentStateVersion,
+        metadata: mergeRestoreMetadata(metadata, live?.happySessionMetadataFromLocalWebhook),
+        savedAt: Date.now()
+      });
+    };
     const fetchServerSessionMetadata = async (sessionId, encryptionKey, encryptionVariant) => {
       try {
         const byId = await axios.get(`${configuration.serverUrl}/v1/sessions/${encodeURIComponent(sessionId)}`, {
@@ -7715,6 +8001,14 @@ async function startDaemon() {
         if (!tracked) {
           return { type: "error", errorMessage: `resume-precheck:not-tracked: Session ${happySessionId} is not tracked by this daemon. It may have been started before the daemon, more than 14 days ago, or on another machine.` };
         }
+        const orphans = findSessionWrapperPids(tracked.happySessionMetadataFromLocalWebhook, await findAllHappyProcesses(), { excludePid: process.pid, lockPid: readSessionLock(happySessionId)?.pid }).filter((pid) => isPidAlive(pid) && !pidToTrackedSession.has(pid));
+        if (orphans.length > 0) {
+          for (const pid of orphans) {
+            pidToTrackedSession.set(pid, { ...tracked, pid, startedBy: "adopted untracked wrapper" });
+          }
+          logger.debug(`[DAEMON RUN] resume ${happySessionId}: adopted untracked live wrapper(s) ${orphans.join(", ")} \u2014 idempotent success`);
+          return { type: "success", sessionId: happySessionId };
+        }
         if (!tracked.happySessionMetadataFromLocalWebhook) {
           return { type: "error", errorMessage: `resume-precheck:no-metadata: Session ${happySessionId} has no metadata. Cannot resume.` };
         }
@@ -7762,15 +8056,7 @@ async function startDaemon() {
           }
         });
         if (result.type === "success") {
-          persistSession(happySessionId, {
-            encryptionKey: encodeBase64(tracked.encryption.encryptionKey),
-            encryptionVariant: tracked.encryption.encryptionVariant,
-            seq: tracked.encryption.seq,
-            metadataVersion: tracked.encryption.metadataVersion,
-            agentStateVersion: tracked.encryption.agentStateVersion,
-            metadata,
-            savedAt: Date.now()
-          });
+          persistRestoreRecord(happySessionId, tracked, metadata);
         }
         return result;
       } catch (error) {
@@ -7783,17 +8069,18 @@ async function startDaemon() {
       }
     };
     const restartCounts = /* @__PURE__ */ new Map();
-    const stopSessionAndWait = (happySessionId, timeoutMs = 8e3) => {
-      let targetPid = null;
-      for (const [pid2, s] of pidToTrackedSession.entries()) {
-        if (s.happySessionId === happySessionId && isPidAlive(pid2)) {
-          targetPid = pid2;
-          break;
-        }
-      }
-      if (targetPid === null) return Promise.resolve();
-      const pid = targetPid;
-      return new Promise((resolve) => {
+    const stopSessionAndWait = async (happySessionId, timeoutMs = 8e3) => {
+      const targets = /* @__PURE__ */ new Set();
+      for (const [pid, s] of pidToTrackedSession.entries()) {
+        if (s.happySessionId === happySessionId && isPidAlive(pid)) targets.add(pid);
+      }
+      const known = findTrackedSessionById(happySessionId)?.happySessionMetadataFromLocalWebhook;
+      for (const pid of findSessionWrapperPids(known, await findAllHappyProcesses(), { excludePid: process.pid, lockPid: readSessionLock(happySessionId)?.pid })) {
+        if (isPidAlive(pid)) targets.add(pid);
+      }
+      if (targets.size === 0) return;
+      logger.debug(`[DAEMON RUN] restart ${happySessionId}: stopping live wrapper(s) ${[...targets].join(", ")}`);
+      await Promise.all([...targets].map((pid) => new Promise((resolve) => {
         let settled = false;
         const done = () => {
           if (!settled) {
@@ -7813,7 +8100,7 @@ async function startDaemon() {
         });
         if (!requested) done();
         setTimeout(done, timeoutMs).unref?.();
-      });
+      })));
     };
     const restartSession = async (happySessionId, options) => {
       let gate = resumeGates.get(happySessionId);
@@ -7895,15 +8182,7 @@ async function startDaemon() {
           }
         });
         if (result.type === "success") {
-          persistSession(happySessionId, {
-            encryptionKey: encodeBase64(tracked.encryption.encryptionKey),
-            encryptionVariant: tracked.encryption.encryptionVariant,
-            seq: tracked.encryption.seq,
-            metadataVersion: tracked.encryption.metadataVersion,
-            agentStateVersion: tracked.encryption.agentStateVersion,
-            metadata,
-            savedAt: Date.now()
-          });
+          persistRestoreRecord(happySessionId, tracked, metadata);
         }
         return result;
       } catch (error) {
@@ -8074,6 +8353,7 @@ async function startDaemon() {
       resolveMirrorSessionId: (terminalId) => mirrorManager.resolveMirrorSessionId(terminalId),
       onTerminalClosed: (terminalId) => mirrorManager.onTerminalClosed(terminalId),
       onTerminalList: (terminals) => mirrorManager.observeTerminalList(terminals),
+      onTerminalListTick: (terminals) => mirrorManager.reconcile(terminals),
       isMirrorInputAllowed: (terminalId) => mirrorManager.isMirrorInputAllowed(terminalId)
     });
     mirrorManager.restore().catch((error) => {
@@ -9671,6 +9951,7 @@ async function runClaude(credentials, options = {}) {
     process.exit(0);
   }
   logger.debug(`Session created: ${response.id}`);
+  await claimSessionOrExit(response.id, { takeover: !!reconnectSessionId, flavor: "claude" });
   if (reconnectSessionId && !await api.reactivateSession(response.id)) {
     throw new Error(`Failed to reactivate archived session ${response.id}`);
   }
@@ -13185,6 +13466,9 @@ async function runCodex(opts) {
   } else {
     response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   }
+  if (response) {
+    await claimSessionOrExit(response.id, { takeover: !!reconnectSessionId, flavor: "codex" });
+  }
   if (reconnectSessionId && response && !await api.reactivateSession(response.id)) {
     throw new Error(`Failed to reactivate archived session ${response.id}`);
   }
@@ -13951,7 +14235,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     process.exit(0);
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-DsECLFy3.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-FiujjEvb.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13968,7 +14252,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await import('./spawn-DgZUVvT2.mjs');
+      const { handleSpawnCommand } = await import('./spawn-uTPD3qOt.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13980,7 +14264,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await import('./send-DlHES1EO.mjs');
+      const { handleSendCommand } = await import('./send-CxLL0z9J.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -14086,9 +14370,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await import('./config-BJjvra5x.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-Cx5wn5Hf.mjs').then(function (n) { return n.al; });
-        const { ApiClient: ApiClient2 } = await import('./types-Cx5wn5Hf.mjs').then(function (n) { return n.am; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-2GD21yg_.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-BLE8Hfmh.mjs').then(function (n) { return n.al; });
+        const { ApiClient: ApiClient2 } = await import('./types-BLE8Hfmh.mjs').then(function (n) { return n.am; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -14119,7 +14403,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await import('./config-BJjvra5x.mjs');
+        const { readGeminiLocalConfig } = await import('./config-2GD21yg_.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -14159,7 +14443,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-CrSCxKqI.mjs');
+      const { runGemini } = await import('./runGemini-D_InkOhk.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -14181,7 +14465,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-D-U-7DAy.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-DZ0uw6ef.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -14221,7 +14505,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await import('./runOpenClaw-Cnagj-hv.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-BjebGmV6.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -14272,7 +14556,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && args.length === 1) {
     try {
-      const { handleMcpCommand } = await import('./mcp-Bs6R9P7q.mjs');
+      const { handleMcpCommand } = await import('./mcp-0mZcHPtz.mjs');
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-D-U-7DAy.mjs → index-DZ0uw6ef.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-C5507ePk.mjs';
-export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-C5507ePk.mjs';
-import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-Cx5wn5Hf.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-Bd1trXWx.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-Cuiff4Nu.mjs';
+export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-Cuiff4Nu.mjs';
+import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-BLE8Hfmh.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-BU69q_vR.mjs';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, f as startHappyServer, r as registerKillSessionHandler, B as BasePermissionHandler } from './index-C00jxV83.mjs';
+import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, f as startHappyServer, r as registerKillSessionHandler, B as BasePermissionHandler } from './index-DVEdpWq0.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-DaVhaBF2.cjs');
-require('./types-BHVxYajT.cjs');
+require('./index-BzbaMrIa.cjs');
+require('./types-HRuZ13LS.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-C00jxV83.mjs';
-import './types-Cx5wn5Hf.mjs';
+import './index-DVEdpWq0.mjs';
+import './types-BLE8Hfmh.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-CRjlRj9K.cjs → installTerminalHooks-BrrsyTMd.cjs}

@@ -5,8 +5,8 @@ var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
 var chalk = require('chalk');
-var persistence = require('./types-BHVxYajT.cjs');
-var index = require('./index-DaVhaBF2.cjs');
+var persistence = require('./types-HRuZ13LS.cjs');
+var index = require('./index-BzbaMrIa.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/{installTerminalHooks-DsECLFy3.mjs → installTerminalHooks-FiujjEvb.mjs}

@@ -3,8 +3,8 @@ import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { spawnSync } from 'node:child_process';
 import chalk from 'chalk';
-import { p as projectPath } from './types-Cx5wn5Hf.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-C00jxV83.mjs';
+import { p as projectPath } from './types-BLE8Hfmh.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-DVEdpWq0.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';