very-happy-cli 0.2.138 → 0.2.140

package/dist/{index-CRRK5P1r.cjs → index-__h-pCTK.cjs}

@@ -3,13 +3,13 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var api = require('./types-CRxf_3n8.cjs');
-var persistence = require('./limits-CfzVummd.cjs');
+var api = require('./types-DCVS050m.cjs');
+var persistence = require('./limits-Dbip6eVO.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
 var node_fs = require('node:fs');
-var agentGuidance = require('./agentGuidance-4HV-BOge.cjs');
+var agentGuidance = require('./agentGuidance-Dl3apItH.cjs');
 var promises = require('node:fs/promises');
 var fs = require('fs/promises');
 var ink = require('ink');
@@ -115,212 +115,6 @@ function withoutServerSnapshot(response) {
   return { ...response, metadataVersion: 0, agentStateVersion: 0 };
 }
 
-function daemonControlHeaders(controlToken) {
-  return {
-    "Content-Type": "application/json",
-    ...controlToken ? { Authorization: `Bearer ${controlToken}` } : {}
-  };
-}
-async function daemonPost(path, body) {
-  const state = await persistence.readDaemonState();
-  if (!state?.httpPort) {
-    const errorMessage = "No daemon running, no state file found";
-    persistence.logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-    return {
-      error: errorMessage
-    };
-  }
-  try {
-    process.kill(state.pid, 0);
-  } catch (error) {
-    const errorMessage = "Daemon is not running, file is stale";
-    persistence.logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-    return {
-      error: errorMessage
-    };
-  }
-  try {
-    const timeout = process.env.HAPPY_DAEMON_HTTP_TIMEOUT ? parseInt(process.env.HAPPY_DAEMON_HTTP_TIMEOUT) : 1e4;
-    const response = await fetch(`http://127.0.0.1:${state.httpPort}${path}`, {
-      method: "POST",
-      // A state written by an old daemon has no token and must remain callable;
-      // a new daemon always writes one and rejects requests without it.
-      headers: daemonControlHeaders(state.controlToken),
-      body: JSON.stringify(body || {}),
-      // Mostly increased for stress test
-      signal: AbortSignal.timeout(timeout)
-    });
-    if (!response.ok) {
-      const failure = await response.json().catch(() => null);
-      const reason = typeof failure?.error === "string" && failure.error ? failure.error : `HTTP ${response.status}`;
-      const errorMessage = `Request failed: ${path}, ${reason}`;
-      persistence.logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-      return {
-        error: errorMessage
-      };
-    }
-    return await response.json();
-  } catch (error) {
-    const errorMessage = `Request failed: ${path}, ${error instanceof Error ? error.message : "Unknown error"}`;
-    persistence.logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-    return {
-      error: errorMessage
-    };
-  }
-}
-const SESSION_STARTED_RETRY_TIMEOUT_MS = 3e3;
-const SESSION_STARTED_RETRY_INTERVAL_MS = 100;
-async function notifyDaemonSessionStarted(sessionId, metadata, encryption) {
-  const payload = { sessionId, metadata, encryption };
-  const deadline = Date.now() + SESSION_STARTED_RETRY_TIMEOUT_MS;
-  let result;
-  while (true) {
-    result = await daemonPost("/session-started", payload);
-    if (!result?.error) {
-      return result;
-    }
-    if (Date.now() >= deadline) {
-      return result;
-    }
-    await new Promise((resolve) => setTimeout(resolve, SESSION_STARTED_RETRY_INTERVAL_MS));
-  }
-}
-async function listDaemonSessions() {
-  const result = await daemonPost("/list");
-  return result.children || [];
-}
-async function stopDaemonSession(sessionId) {
-  const result = await daemonPost("/stop-session", { sessionId });
-  return result.success || false;
-}
-async function spawnDaemonSession(directory, sessionId, opts) {
-  const result = await daemonPost("/spawn-session", {
-    directory,
-    sessionId,
-    spawnedBy: opts?.spawnedBy,
-    permissionMode: opts?.permissionMode,
-    agent: opts?.agent,
-    environmentVariables: opts?.environmentVariables
-  });
-  return result;
-}
-async function notifyDaemonSessionEvent(sessionId, event, spawnedBy) {
-  return daemonPost("/session-event", { sessionId, event, spawnedBy });
-}
-async function notifyDaemonClaudeAuthFailed(sessionId) {
-  return daemonPost("/session-event", { sessionId, event: "auth_failed" });
-}
-async function stopDaemonHttp() {
-  await daemonPost("/stop");
-}
-async function pushClipboardViaDaemon(text) {
-  const result = await daemonPost("/clipboard", { text });
-  if (result?.error && result.delivered === void 0) {
-    return { delivered: false, error: result.error };
-  }
-  return result;
-}
-async function setTerminalTitleViaDaemon(terminalId, title, ifAbsent = false) {
-  const result = await daemonPost("/terminal-title", { terminalId, title, ifAbsent });
-  if (result?.error) {
-    return { ok: false, error: result.error };
-  }
-  return { ok: result?.status === "ok", error: result?.status === "ok" ? void 0 : "unexpected daemon response" };
-}
-async function checkIfDaemonRunningAndCleanupStaleState() {
-  const state = await persistence.readDaemonState();
-  if (!state) {
-    return false;
-  }
-  try {
-    process.kill(state.pid, 0);
-  } catch {
-    persistence.logger.debug("[DAEMON RUN] Daemon PID not running, cleaning up state");
-    await cleanupDaemonState();
-    return false;
-  }
-  if (state.httpPort) {
-    try {
-      const response = await fetch(`http://127.0.0.1:${state.httpPort}/list`, {
-        method: "POST",
-        headers: daemonControlHeaders(state.controlToken),
-        body: "{}",
-        signal: AbortSignal.timeout(2e3)
-      });
-      if (response.ok) {
-        return true;
-      }
-    } catch {
-      persistence.logger.debug(`[DAEMON RUN] PID ${state.pid} is alive but HTTP health check failed on port ${state.httpPort}, cleaning up stale state`);
-      await cleanupDaemonState();
-      return false;
-    }
-  }
-  return true;
-}
-async function isDaemonRunningCurrentlyInstalledHappyVersion() {
-  persistence.logger.debug("[DAEMON CONTROL] Checking if daemon is running same version");
-  const runningDaemon = await checkIfDaemonRunningAndCleanupStaleState();
-  if (!runningDaemon) {
-    persistence.logger.debug("[DAEMON CONTROL] No daemon running, returning false");
-    return false;
-  }
-  const state = await persistence.readDaemonState();
-  if (!state) {
-    persistence.logger.debug("[DAEMON CONTROL] No daemon state found, returning false");
-    return false;
-  }
-  const currentCliVersion = persistence.configuration.currentCliVersion;
-  persistence.logger.debug(`[DAEMON CONTROL] Current CLI version: ${currentCliVersion}, Daemon started with version: ${state.startedWithCliVersion}`);
-  return currentCliVersion === state.startedWithCliVersion;
-}
-async function cleanupDaemonState() {
-  try {
-    await persistence.clearDaemonState();
-    persistence.logger.debug("[DAEMON RUN] Daemon state file removed");
-  } catch (error) {
-    persistence.logger.debug("[DAEMON RUN] Error cleaning up daemon metadata", error);
-  }
-}
-async function stopDaemon() {
-  try {
-    const state = await persistence.readDaemonState();
-    if (!state) {
-      persistence.logger.debug("No daemon state found");
-      return;
-    }
-    persistence.logger.debug(`Stopping daemon with PID ${state.pid}`);
-    try {
-      await stopDaemonHttp();
-      await waitForProcessDeath(state.pid, 2e3);
-      persistence.logger.debug("Daemon stopped gracefully via HTTP");
-      return;
-    } catch (error) {
-      persistence.logger.debug("HTTP stop failed, will force kill", error);
-    }
-    try {
-      process.kill(state.pid, "SIGKILL");
-      persistence.logger.debug("Force killed daemon");
-    } catch (error) {
-      persistence.logger.debug("Daemon already dead");
-    }
-  } catch (error) {
-    persistence.logger.debug("Error stopping daemon", error);
-  }
-}
-async function waitForProcessDeath(pid, timeout) {
-  const start = Date.now();
-  while (Date.now() - start < timeout) {
-    try {
-      process.kill(pid, 0);
-      await new Promise((resolve) => setTimeout(resolve, 100));
-    } catch {
-      return;
-    }
-  }
-  throw new Error("Process did not die within timeout");
-}
-
 class Session {
   path;
   logPath;
@@ -493,7 +287,7 @@ class Session {
   reportEventToDaemon = (event) => {
     const spawnedBy = process.env.HAPPY_SPAWNED_BY;
     if (!spawnedBy) return;
-    void notifyDaemonSessionEvent(this.client.sessionId, event, spawnedBy).catch((error) => persistence.logger.debug("[Session] Failed to report session event to daemon:", error));
+    void api.notifyDaemonSessionEvent(this.client.sessionId, event, spawnedBy).catch((error) => persistence.logger.debug("[Session] Failed to report session event to daemon:", error));
   };
   /** Produce an `error` notification for an unexpected session failure. */
   onSessionError = (message) => {
@@ -3924,6 +3718,7 @@ function applyClaudeSdkMetadata(current, update) {
 function createTurnSteeringController() {
   let interrupt = null;
   let steering = false;
+  let interrupting = false;
   return {
     setInterrupt(next) {
       interrupt = next;
@@ -3948,17 +3743,31 @@ function createTurnSteeringController() {
      */
     async interruptTurn() {
       if (!interrupt) return false;
-      await interrupt();
-      return true;
+      interrupting = true;
+      try {
+        await interrupt();
+        return true;
+      } catch (error) {
+        interrupting = false;
+        throw error;
+      }
     },
     consumeReady() {
       if (!steering) return false;
       steering = false;
       return true;
     },
+    /** The next `result` belongs to a stop-button interrupt: close the
+     *  turn as cancelled and say "Aborted by user", not "failed". */
+    consumeInterrupted() {
+      if (!interrupting) return false;
+      interrupting = false;
+      return true;
+    },
     reset() {
       interrupt = null;
       steering = false;
+      interrupting = false;
     }
   };
 }
@@ -4120,6 +3929,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
         return;
       }
       persistence.logger.debug("[remote]: interrupt did not stop the turn in time; escalating to hard abort");
+      turnSteering.consumeInterrupted();
     }
     await abort();
   }
@@ -4442,7 +4252,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
           },
           onAuthFailure: (reason) => {
             session.client.sendSessionEvent({ type: "message", message: `Claude Code auth: ${reason}`, kind: "claude-auth-failed" });
-            void notifyDaemonClaudeAuthFailed(session.client.sessionId).catch((error) => persistence.logger.debug("[remote]: auth_failed report to daemon failed:", error));
+            void api.notifyDaemonClaudeAuthFailed(session.client.sessionId).catch((error) => persistence.logger.debug("[remote]: auth_failed report to daemon failed:", error));
           },
           onSessionReset: () => {
             persistence.logger.debug("[remote]: Session reset");
@@ -4453,6 +4263,11 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
               session.client.closeClaudeSessionTurn("cancelled");
               return;
             }
+            if (turnSteering.consumeInterrupted()) {
+              session.client.closeClaudeSessionTurn("cancelled");
+              session.client.sendSessionEvent({ type: "message", message: "Aborted by user" });
+              return;
+            }
             applyClaudeResultLifecycle(result, {
               closeCompleted: () => session.client.closeClaudeSessionTurn("completed"),
               closeFailed: (error) => session.client.closeClaudeSessionTurn("failed", { error }),
@@ -5313,7 +5128,7 @@ function getLogFiles(logDir) {
 async function runDoctorDaemon() {
   console.log(chalk.bold("\n\u{1F916} Daemon Status"));
   try {
-    const isRunning = await checkIfDaemonRunningAndCleanupStaleState();
+    const isRunning = await api.checkIfDaemonRunningAndCleanupStaleState();
     const state = await persistence.readDaemonState();
     if (isRunning && state) {
       console.log(chalk.green("\u2713 Daemon is running"));
@@ -5516,7 +5331,7 @@ ${typeLabels[type] || type}:`));
   }
   console.log(chalk.bold("\n\u{1F916} Daemon Status"));
   try {
-    const isRunning = await checkIfDaemonRunningAndCleanupStaleState();
+    const isRunning = await api.checkIfDaemonRunningAndCleanupStaleState();
     const state = await persistence.readDaemonState();
     const summary = daemonReadiness(authenticated, isRunning, Boolean(state));
     if (summary.level === "ready" && state) {
@@ -6281,6 +6096,7 @@ function startDaemonControlServer({
   onHappySessionWebhook,
   onSessionStateEvent,
   onClaudeAuthFailed,
+  onSessionTurnEvent,
   pushClipboard,
   onTerminalHook,
   setTerminalTitle
@@ -6337,7 +6153,7 @@ function startDaemonControlServer({
       schema: {
         body: z.z.object({
           sessionId: z.z.string(),
-          event: z.z.enum(["completed", "needs_input", "auth_failed"]),
+          event: z.z.enum(["completed", "needs_input", "auth_failed", "turn_started", "turn_ended"]),
           spawnedBy: z.z.string().optional()
         }),
         response: {
@@ -6353,6 +6169,10 @@ function startDaemonControlServer({
         onClaudeAuthFailed?.(sessionId);
         return { status: "ok" };
       }
+      if (event === "turn_started" || event === "turn_ended") {
+        onSessionTurnEvent?.(sessionId, event);
+        return { status: "ok" };
+      }
       onSessionStateEvent?.(sessionId, event, spawnedBy);
       return { status: "ok" };
     });
@@ -8055,7 +7875,7 @@ function parseJsonObject(text) {
     return null;
   }
 }
-function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CRRK5P1r.cjs', document.baseURI).href))).resolve(s)) {
+function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-__h-pCTK.cjs', document.baseURI).href))).resolve(s)) {
   const platformArch = `${platform}-${arch}`;
   const candidates = [
     `@anthropic-ai/claude-agent-sdk-${platformArch}/claude`,
@@ -9670,7 +9490,7 @@ function toSummary(id, persisted, extra) {
   };
 }
 async function listSessions(options = {}) {
-  const live = await listDaemonSessions();
+  const live = await api.listDaemonSessions();
   return mergeSessionSummaries(live, persistence.readPersistedSessions(), options);
 }
 function summarizeAccountSession(row, persisted, liveIds, now) {
@@ -9740,7 +9560,7 @@ async function listAccountSessions(options = {}) {
   });
   const rows = Array.isArray(response.data?.sessions) ? response.data.sessions : [];
   const persisted = persistence.readPersistedSessions();
-  const live = await listDaemonSessions();
+  const live = await api.listDaemonSessions();
   const liveIds = new Set(live.map((child) => child.happySessionId).filter((id) => typeof id === "string"));
   const now = Date.now();
   const summaries = rows.filter((row) => typeof row?.id === "string").map((row) => summarizeAccountSession(row, persisted[row.id], liveIds, now)).filter((summary) => options.includeArchived || !summary.archived);
@@ -9774,7 +9594,7 @@ async function readSessionTranscript(sessionId, limit) {
   const messages = Array.isArray(response.data?.messages) ? response.data.messages : [];
   messages.reverse();
   const key = persistence.decodeBase64(persisted.encryptionKey);
-  const live = await listDaemonSessions();
+  const live = await api.listDaemonSessions();
   const bodies = messages.map((message) => {
     if (message.content?.t !== "encrypted") return null;
     try {
@@ -9790,7 +9610,7 @@ async function readSessionTranscript(sessionId, limit) {
   };
 }
 async function stopSession(sessionId) {
-  return await stopDaemonSession(sessionId);
+  return await api.stopDaemonSession(sessionId);
 }
 async function archiveSession(sessionId) {
   const token = await bearerToken();
@@ -10218,7 +10038,7 @@ async function startDaemon() {
   });
   persistence.logger.debug("[DAEMON RUN] Starting daemon process...");
   persistence.logger.debugLargeJson("[DAEMON RUN] Environment", getEnvironmentInfo());
-  const runningDaemonVersionMatches = await isDaemonRunningCurrentlyInstalledHappyVersion();
+  const runningDaemonVersionMatches = await api.isDaemonRunningCurrentlyInstalledHappyVersion();
   const runningDaemonState = await persistence.readDaemonState();
   const runningDaemonEndpointsMatch = Boolean(runningDaemonState) && daemonEndpointsMatch(
     runningDaemonState?.serverUrl,
@@ -10228,7 +10048,7 @@ async function startDaemon() {
   );
   if (!runningDaemonVersionMatches || !runningDaemonEndpointsMatch) {
     persistence.logger.debug("[DAEMON RUN] Daemon version or endpoint mismatch detected, restarting daemon");
-    await stopDaemon();
+    await api.stopDaemon();
   } else {
     persistence.logger.debug("[DAEMON RUN] Daemon version matches, keeping existing daemon");
     console.log("Daemon already running with matching version");
@@ -10247,6 +10067,7 @@ async function startDaemon() {
     const { credentials, machineId } = await authAndSetupMachineIfNeeded();
     persistence.logger.debug("[DAEMON RUN] Auth and machine setup complete");
     const pidToTrackedSession = /* @__PURE__ */ new Map();
+    const turnActivity = new api.TurnActivityTracker();
     const sessionIdToFinishedSession = /* @__PURE__ */ new Map();
     let teamWorker;
     const persisted = persistence.readPersistedSessions();
@@ -10518,6 +10339,9 @@ async function startDaemon() {
         if (options.resumeCodexThreadId) {
           extraEnv.HAPPY_FORK_CODEX_THREAD_ID = options.resumeCodexThreadId;
         }
+        if (options.importCodexThreadId && UUID_RE.test(options.importCodexThreadId)) {
+          extraEnv.HAPPY_IMPORT_CODEX_THREAD_ID = options.importCodexThreadId;
+        }
         if (options.variant === "assistant") {
           extraEnv.HAPPY_SESSION_VARIANT = "assistant";
         }
@@ -11082,6 +10906,7 @@ async function startDaemon() {
     const onChildExited = (pid) => {
       const session = pidToTrackedSession.get(pid);
       if (session?.happySessionId && (session.spawnedBy === "teams" || teamWorker?.hasSession(session.happySessionId))) teamWorker?.report(session.happySessionId, "exited");
+      if (session?.happySessionId) turnActivity.forget(session.happySessionId);
       if (session?.happySessionId && session.encryption) {
         sessionIdToFinishedSession.set(session.happySessionId, session);
         persistence.logger.debug(`[DAEMON RUN] Process PID ${pid} exited, preserved session ${session.happySessionId} for resume`);
@@ -11163,6 +10988,7 @@ async function startDaemon() {
       onHappySessionWebhook,
       onSessionStateEvent,
       onClaudeAuthFailed: (sessionId) => claudeAuthServiceRef?.signalAuthFailed(sessionId),
+      onSessionTurnEvent: (sessionId, event) => turnActivity.apply(sessionId, event),
       pushClipboard: (text) => {
         if (!apiMachineRef) {
           return { delivered: false, truncated: false, totalBytes: 0, error: "daemon is still starting up" };
@@ -11275,7 +11101,10 @@ async function startDaemon() {
     const updateController = createUpdateController({
       policy: () => api.fetchCliUpdateState(persistence.configuration.serverUrl, persistence.packageJson.version),
       enabled: async () => ((await persistence.readSettings()).cliAutoUpdate ?? "idle") !== "off",
-      idle: () => pidToTrackedSession.size === 0 && !apiMachine.hasLiveTerminals(),
+      // B-466: "idle" = no agent turn in flight. Idle wrappers survive a
+      // handover (they talk to the server themselves) and web terminals live
+      // in tmux, so neither is a reason to hold an update.
+      idle: () => !turnActivity.hasActiveTurn(),
       install: installCliSafely,
       publish: (state) => {
         cliUpdateStateRef = state;
@@ -11330,7 +11159,7 @@ async function startDaemon() {
             } catch {
             }
           }
-          if (bundleReplaced && !teamWorker?.busy && !updateController.isRunning() && pidToTrackedSession.size === 0 && !apiMachine.hasLiveTerminals()) {
+          if (bundleReplaced && !teamWorker?.busy && !updateController.isRunning() && !turnActivity.hasActiveTurn()) {
             const preflight = await preflightNewBundle(bundlePath);
             if (preflight.action === "hold") {
               if (lastHandoverHold !== preflight.reason) {
@@ -11340,7 +11169,7 @@ async function startDaemon() {
               updateController.holdHandover(preflight.reason);
               return;
             }
-            if (teamWorker?.busy || updateController.isRunning() || pidToTrackedSession.size > 0 || apiMachine.hasLiveTerminals()) return;
+            if (teamWorker?.busy || updateController.isRunning() || turnActivity.hasActiveTurn()) return;
             lastHandoverHold = null;
             persistence.logger.debug("[DAEMON RUN] Daemon bundle replaced on disk and verified, handing off to new daemon");
             teamWorker?.stop();
@@ -11350,7 +11179,7 @@ async function startDaemon() {
             claudeAuthService.stop();
             apiMachine.shutdown();
             await stopControlServer();
-            await cleanupDaemonState();
+            await api.cleanupDaemonState();
             await persistence.releaseDaemonLock(daemonLockHandle);
             await stopCaffeinate();
             try {
@@ -11423,7 +11252,7 @@ async function startDaemon() {
       }
       apiMachine.shutdown();
       await stopControlServer();
-      await cleanupDaemonState();
+      await api.cleanupDaemonState();
       await stopCaffeinate();
       await persistence.releaseDaemonLock(daemonLockHandle);
       persistence.logger.debug("[DAEMON RUN] Cleanup completed, exiting process");
@@ -11731,7 +11560,7 @@ ${body}`);
     if (!normalized.ok) return fail(normalized.error);
     const directory = normalized.directory;
     try {
-      const result = await spawnDaemonSession(directory, void 0, { spawnedBy: "assistant" });
+      const result = await api.spawnDaemonSession(directory, void 0, { spawnedBy: "assistant" });
       if (result?.error || !result?.sessionId) {
         return fail(`Failed to spawn session: ${result?.error ?? "daemon returned no session id"}`);
       }
@@ -12498,7 +12327,7 @@ function registerSideQuestionHandler(rpc, deps) {
   const retainMs = deps.retainMs ?? SIDE_QUESTION_RETAIN_MS;
   const maxRunMs = deps.maxRunMs ?? SIDE_QUESTION_MAX_RUN_MS;
   const run = deps.run ?? (async (input) => {
-    const { query } = await Promise.resolve().then(function () { return require('./index-CHP265gs.cjs'); });
+    const { query } = await Promise.resolve().then(function () { return require('./index-BuQn9kUK.cjs'); });
     return runSideQuestion(query, input);
   });
   const slots = /* @__PURE__ */ new Map();
@@ -12600,7 +12429,7 @@ const MAX_TITLE_CHARS = 60;
 const GENERATION_TIMEOUT_MS = 3e4;
 function resolveClaudeBinary() {
   try {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CRRK5P1r.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-__h-pCTK.cjs', document.baseURI).href)));
     const utilsPath = path.resolve(path.join(api.projectPath(), "scripts", "claude_version_utils.cjs"));
     const { getClaudeCliPath } = require$1(utilsPath);
     const path$1 = getClaudeCliPath();
@@ -13162,7 +12991,7 @@ async function runClaude(credentials, options = {}) {
   }
   try {
     persistence.logger.debug(`[START] Reporting session ${response.id} to daemon`);
-    const result = await notifyDaemonSessionStarted(response.id, metadata, {
+    const result = await api.notifyDaemonSessionStarted(response.id, metadata, {
       encryptionKey: persistence.encodeBase64(response.encryptionKey),
       encryptionVariant: response.encryptionVariant,
       seq: response.seq,
@@ -13890,7 +13719,7 @@ async function handleAuthLogin(args) {
     console.log(chalk.gray("  \u2022 Re-authenticate and register machine\n"));
     try {
       persistence.logger.debug("Stopping daemon for force auth...");
-      await stopDaemon();
+      await api.stopDaemon();
       console.log(chalk.gray("\u2713 Stopped daemon"));
     } catch (error) {
       persistence.logger.debug("Daemon was not running or failed to stop:", error);
@@ -13955,7 +13784,7 @@ async function handleAuthLogout() {
   if (answer.toLowerCase() === "y" || answer.toLowerCase() === "yes") {
     try {
       try {
-        await stopDaemon();
+        await api.stopDaemon();
         console.log(chalk.gray("Stopped daemon"));
       } catch {
       }
@@ -14000,7 +13829,7 @@ async function handleAuthStatus() {
   console.log(chalk.gray(`
   Data directory: ${persistence.configuration.happyHomeDir}`));
   try {
-    const running = await checkIfDaemonRunningAndCleanupStaleState();
+    const running = await api.checkIfDaemonRunningAndCleanupStaleState();
     if (running) {
       console.log(chalk.green("\u2713 Daemon running"));
     } else {
@@ -14826,9 +14655,9 @@ function resolveLocalSignupBootstrap(configuredMode, configuredInviteCodes, gene
   };
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CRRK5P1r.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('index-__h-pCTK.cjs', document.baseURI).href)));
 const __dirname$1 = path.dirname(__filename$1);
-const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CRRK5P1r.cjs', document.baseURI).href)));
+const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-__h-pCTK.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -15217,7 +15046,7 @@ const DAEMON_READY_TIMEOUT_MS = 5e3;
 const DAEMON_READY_POLL_INTERVAL_MS = 100;
 async function ensureDaemonRunning() {
   persistence.logger.debug("Ensuring Happy background service is running & matches our version...");
-  const versionMatches = await isDaemonRunningCurrentlyInstalledHappyVersion();
+  const versionMatches = await api.isDaemonRunningCurrentlyInstalledHappyVersion();
   const state = await persistence.readDaemonState();
   const endpointsMatch = Boolean(state) && daemonEndpointsMatch(
     state?.serverUrl,
@@ -15228,9 +15057,9 @@ async function ensureDaemonRunning() {
   if (versionMatches && endpointsMatch) {
     return;
   }
-  if (await checkIfDaemonRunningAndCleanupStaleState()) {
+  if (await api.checkIfDaemonRunningAndCleanupStaleState()) {
     persistence.logger.debug("Stopping daemon whose version or configured relay no longer matches...");
-    await stopDaemon();
+    await api.stopDaemon();
   }
   persistence.logger.debug("Starting Happy background service...");
   const daemonProcess = spawnHappyCLI(["daemon", "start-sync"], {
@@ -15241,7 +15070,7 @@ async function ensureDaemonRunning() {
   daemonProcess.unref();
   const deadline = Date.now() + DAEMON_READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
-    if (await checkIfDaemonRunningAndCleanupStaleState()) {
+    if (await api.checkIfDaemonRunningAndCleanupStaleState()) {
       persistence.logger.debug("Happy background service is ready");
       return;
     }
@@ -16594,6 +16423,43 @@ async function resumeExistingThread(opts) {
   }
 }
 
+const IMPORT_CODEX_THREAD_ENV = "HAPPY_IMPORT_CODEX_THREAD_ID";
+async function importCodexThread(opts) {
+  let forked;
+  try {
+    forked = await opts.client.forkThread({
+      threadId: opts.threadId,
+      cwd: opts.cwd,
+      mcpServers: opts.mcpServers
+    });
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to import Codex thread ${opts.threadId}: ${reason}`);
+  }
+  if (!forked.threadId || forked.threadId === opts.threadId) {
+    throw new Error(`Failed to import Codex thread ${opts.threadId}: Codex did not create an independent copy`);
+  }
+  opts.session.updateMetadata((currentMetadata) => ({
+    ...currentMetadata,
+    codexThreadId: forked.threadId,
+    importedFromCodexThreadId: opts.threadId
+  }));
+  let thread = forked.thread;
+  if (!Array.isArray(thread?.turns)) {
+    thread = (await opts.client.readThread({ threadId: forked.threadId, includeTurns: true })).thread;
+  }
+  const envelopes = mapCodexThreadToSessionEnvelopes(thread);
+  for (const envelope of envelopes) {
+    opts.session.sendSessionProtocolMessage(envelope);
+  }
+  opts.messageBuffer.addMessage(`Imported thread ${agentGuidance.trimIdent(opts.threadId)} as ${agentGuidance.trimIdent(forked.threadId)}`, "status");
+  opts.session.sendSessionEvent({
+    type: "message",
+    message: `Imported Codex thread ${opts.threadId} (continuing as ${forked.threadId})`
+  });
+  return { threadId: forked.threadId, model: forked.model, replayed: envelopes.length };
+}
+
 function emitReadyIfIdle({ pending, queueSize, shouldExit, sendReady, notify }) {
   if (shouldExit) {
     return false;
@@ -16808,6 +16674,12 @@ async function runCodex(opts) {
     ...forkedFromMessageId ? { forkedFromMessageId } : {}
   });
   metadata.attachmentKinds = [...CLAUDE_ATTACHMENT_KINDS];
+  const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
+  if (importCodexThreadId) {
+    metadata.importedFromCodexThreadId = importCodexThreadId;
+    const importTitle = process.env.HAPPY_IMPORT_TITLE;
+    if (importTitle) metadata.summary = { text: importTitle, updatedAt: Date.now() };
+  }
   const reconnectSessionId = process.env.HAPPY_RECONNECT_SESSION_ID;
   const reconnectKeyBase64 = process.env.HAPPY_RECONNECT_ENCRYPTION_KEY;
   const reconnectVariant = process.env.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
@@ -16878,7 +16750,7 @@ async function runCodex(opts) {
   if (response) {
     try {
       persistence.logger.debug(`[START] Reporting session ${response.id} to daemon`);
-      const result = await notifyDaemonSessionStarted(response.id, metadata, {
+      const result = await api.notifyDaemonSessionStarted(response.id, metadata, {
         encryptionKey: persistence.encodeBase64(response.encryptionKey),
         encryptionVariant: response.encryptionVariant,
         seq: response.seq,
@@ -17326,6 +17198,18 @@ async function runCodex(opts) {
       first = false;
       appendSystemPromptInjected = true;
     }
+    if (!reconnectSessionId && !opts.resumeThreadId && importCodexThreadId) {
+      await importCodexThread({
+        client,
+        session,
+        messageBuffer,
+        threadId: importCodexThreadId,
+        cwd: process.cwd(),
+        mcpServers
+      });
+      first = false;
+      appendSystemPromptInjected = true;
+    }
     const forkCodexThreadId = process.env.HAPPY_FORK_CODEX_THREAD_ID;
     if (!reconnectSessionId && forkCodexThreadId) {
       try {
@@ -17679,7 +17563,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 Promise.resolve().then(function () { return require('./installTerminalHooks-CWGkoWDD.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-D3jfvbyY.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -17696,7 +17580,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-BORLpj60.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-BhUK0Vt2.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17708,7 +17592,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-9A-uoJL_.cjs'); });
+      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-CGBBgVZn.cjs'); });
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17720,7 +17604,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-BkypdBpK.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-DP_S3wn0.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17826,9 +17710,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 Promise.resolve().then(function () { return require('./config-DpuZN2Rs.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./limits-CfzVummd.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-CRxf_3n8.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-D0-jnCOC.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./limits-Dbip6eVO.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-DCVS050m.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -17859,7 +17743,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 Promise.resolve().then(function () { return require('./config-DpuZN2Rs.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-D0-jnCOC.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -17899,7 +17783,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BUVjTJKn.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-D34eCFpz.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -17929,7 +17813,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-3N-qu-RG.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-DJvzGXVN.cjs'); });
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -17957,7 +17841,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 Promise.resolve().then(function () { return require('./index-3N-qu-RG.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-DJvzGXVN.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -17997,7 +17881,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-Bj2EgRHB.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-B8F8D--R.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -18048,7 +17932,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "todo") {
     try {
-      const { handleTodoCommand } = await Promise.resolve().then(function () { return require('./todo-DydKcknX.cjs'); });
+      const { handleTodoCommand } = await Promise.resolve().then(function () { return require('./todo-CeJX0z_2.cjs'); });
       await handleTodoCommand(args.slice(1));
     } catch (error) {
       console.error(JSON.stringify({ error: error instanceof Error ? error.message : "Todo command failed" }));
@@ -18057,7 +17941,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "teams") {
     try {
-      const { handleTeamsCommand } = await Promise.resolve().then(function () { return require('./teams-9x2FO9RW.cjs'); });
+      const { handleTeamsCommand } = await Promise.resolve().then(function () { return require('./teams-C29nEHFD.cjs'); });
       await handleTeamsCommand(args.slice(1));
     } catch (error) {
       console.error(error instanceof Error ? error.message : "Teams command failed");
@@ -18066,7 +17950,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 Promise.resolve().then(function () { return require('./mcp-CN2UVfut.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-DeapmTWN.cjs'); });
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}
@@ -18089,7 +17973,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     const daemonSubcommand = args[1];
     if (daemonSubcommand === "list") {
       try {
-        const sessions = await listDaemonSessions();
+        const sessions = await api.listDaemonSessions();
         if (sessions.length === 0) {
           console.log("No active sessions this daemon is aware of (they might have been started by a previous version of the daemon)");
         } else {
@@ -18107,7 +17991,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
         process.exit(1);
       }
       try {
-        const success = await stopDaemonSession(sessionId);
+        const success = await api.stopDaemonSession(sessionId);
         console.log(success ? "Session stopped" : "Failed to stop session");
       } catch (error) {
         console.log("No daemon running");
@@ -18115,7 +17999,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       return;
     } else if (daemonSubcommand === "start") {
       const currentState = await persistence.readDaemonState();
-      const running = await checkIfDaemonRunningAndCleanupStaleState();
+      const running = await api.checkIfDaemonRunningAndCleanupStaleState();
       const currentDaemonMatches = currentState && currentState.startedWithCliVersion === persistence.configuration.currentCliVersion && daemonEndpointsMatch(
         currentState.serverUrl,
         currentState.webappUrl,
@@ -18124,7 +18008,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       );
       if (running && !currentDaemonMatches) {
         console.log("Configured relay or CLI version changed; restarting the existing daemon");
-        await stopDaemon();
+        await api.stopDaemon();
       }
       const child = spawnHappyCLI(["daemon", "start-sync"], {
         detached: true,
@@ -18134,7 +18018,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       child.unref();
       let started = false;
       for (let i = 0; i < 50; i++) {
-        if (await checkIfDaemonRunningAndCleanupStaleState()) {
+        if (await api.checkIfDaemonRunningAndCleanupStaleState()) {
           started = true;
           break;
         }
@@ -18151,7 +18035,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       await startDaemon();
       process.exit(0);
     } else if (daemonSubcommand === "stop") {
-      await stopDaemon();
+      await api.stopDaemon();
       process.exit(0);
     } else if (daemonSubcommand === "status") {
       await runDoctorDaemon();
@@ -18448,7 +18332,6 @@ exports.TEAM_SKILL = TEAM_SKILL;
 exports.TitleGenerator = TitleGenerator;
 exports.appendStagedAttachmentsToPrompt = appendStagedAttachmentsToPrompt;
 exports.archiveSession = archiveSession;
-exports.checkIfDaemonRunningAndCleanupStaleState = checkIfDaemonRunningAndCleanupStaleState;
 exports.createSessionMetadata = createSessionMetadata;
 exports.hashObject = hashObject;
 exports.initialMachineMetadata = initialMachineMetadata;
@@ -18456,8 +18339,6 @@ exports.isValidSpawnOrigin = isValidSpawnOrigin;
 exports.listAccountSessions = listAccountSessions;
 exports.listSessions = listSessions;
 exports.normalizeAcpPermissionMode = normalizeAcpPermissionMode;
-exports.notifyDaemonSessionStarted = notifyDaemonSessionStarted;
-exports.pushClipboardViaDaemon = pushClipboardViaDaemon;
 exports.query = query;
 exports.readSessionTranscript = readSessionTranscript;
 exports.registerAgentAttachmentDownloads = registerAgentAttachmentDownloads;
@@ -18468,9 +18349,7 @@ exports.resolvePermissionRequest = resolvePermissionRequest;
 exports.sanitizeSpawnPermissionMode = sanitizeSpawnPermissionMode;
 exports.sendUserMessage = sendUserMessage;
 exports.sessionWebUrl = sessionWebUrl;
-exports.setTerminalTitleViaDaemon = setTerminalTitleViaDaemon;
 exports.setupOfflineReconnection = setupOfflineReconnection;
-exports.spawnDaemonSession = spawnDaemonSession;
 exports.stageClaudeAttachments = stageClaudeAttachments;
 exports.startHappyServer = startHappyServer;
 exports.stopSession = stopSession;