very-happy-cli 0.2.189 → 0.2.191

package/dist/{index-CnzsOD19.cjs → index-CauRYQKr.cjs}

@@ -1,95 +1,96 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-DRPJ2g9G.cjs');
-var logger = require('./logger-BP1SW7Cs.cjs');
-var AcpSessionManager = require('./AcpSessionManager-DM-KKg6v.cjs');
-var index = require('./index-BOe6dKnL.cjs');
-var deterministicJson = require('./deterministicJson-D0LU_XbO.cjs');
+var AcpBackend = require('./AcpBackend-DgrIc1vH.cjs');
+var logger = require('./logger-Ct2zvaq0.cjs');
+var AcpSessionManager = require('./AcpSessionManager-DVOzCD3P.cjs');
+var index = require('./index-CLUHaPU8.cjs');
+var deterministicJson = require('./deterministicJson-CpFFgUL_.cjs');
 var specialCommands = require('./specialCommands-J3JFOq0J.cjs');
-var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var configuration = require('./configuration-C0ctLGW2.cjs');
-var attachmentContent = require('./attachmentContent-Cc5b7TPr.cjs');
-var piRuntime = require('./piRuntime-DEbPE_kW.cjs');
+var heldInput = require('./heldInput-BOtqFO2r.cjs');
+var configuration = require('./configuration-DfPBa-9d.cjs');
+var attachmentContent = require('./attachmentContent-BO2njyza.cjs');
+var piRuntime = require('./piRuntime-DpS9TAIs.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var api = require('./api-BDuuyys8.cjs');
-var client = require('./client-DIfxYk7B.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DhCjrs44.cjs');
-var persistence = require('./persistence-CrzC7yr_.cjs');
-var machineMetadata = require('./machineMetadata-BKX3ov9g.cjs');
-var createSessionMetadata = require('./createSessionMetadata-DezS33OM.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-tV0Q1dgR.cjs');
-var startupSessionCreate = require('./startupSessionCreate-CYc8mra-.cjs');
-var controlClient = require('./controlClient-F7hAEEy2.cjs');
+var api = require('./api-BBxZ7y2z.cjs');
+var client = require('./client-C5-C0t2a.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-hvCsEn7b.cjs');
+var persistence = require('./persistence-A2NeERZJ.cjs');
+var machineMetadata = require('./machineMetadata-DDCVWb_x.cjs');
+var createSessionMetadata = require('./createSessionMetadata-Cf78KHtt.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-BKLfOd-i.cjs');
+var startupSessionCreate = require('./startupSessionCreate-CcF7rGGB.cjs');
+var controlClient = require('./controlClient-C13_pSKG.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var sessionLock = require('./sessionLock-DSqiP2lH.cjs');
-var acpSessionResume = require('./acpSessionResume-2BTMsB7_.cjs');
-var streamRelay = require('./streamRelay-D9a4cBEa.cjs');
+var sessionLock = require('./sessionLock-BmLA2S8K.cjs');
+var acpSessionResume = require('./acpSessionResume-TvP_4Zq2.cjs');
+var streamRelay = require('./streamRelay-BhI6jqF-.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-DjM16uJz.cjs');
-var titleGenerator = require('./titleGenerator-DVX0NZUn.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-C9Ag7yvs.cjs');
+var titleGenerator = require('./titleGenerator-RGHWP2YL.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 var node_fs = require('node:fs');
 var os = require('node:os');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
-require('./time-XwEZxKGc.cjs');
+require('./time-Cy0a-7YX.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./processTree-CMHWlVse.cjs');
-require('./package-CYDdLA6R.cjs');
+require('./package-9n7wd2dT.cjs');
 require('chalk');
 require('node:util');
 require('@paralleldrive/cuid2');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-DznxPKES.cjs');
-require('./client-D0aYWt53.cjs');
+require('./reportProgressTool-tzQLCLIw.cjs');
+require('./client-BscskEBk.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('./trimIdent-4gvk9Wk6.cjs');
 require('./pi-DlsrPCTa.cjs');
 require('./fileStore-7qhnbs6N.cjs');
 require('node:fs/promises');
-require('./client-BNmFaRXZ.cjs');
-require('./context-D-hEk5pC.cjs');
-require('./sessionOps-BzeOKIEF.cjs');
+require('./client-C-OdTbrU.cjs');
+require('./context-Co7hUaW-.cjs');
+require('./sessionOps-DXlTmS7J.cjs');
 require('axios');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-CjMafO_D.cjs');
-require('./peerTools-B4315xjX.cjs');
+require('./tools-B1x1j6tz.cjs');
+require('./peerTools-CElYh-5u.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-Dq8XTLQP.cjs');
+require('./remoteSessionClient-6ymeMVa4.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-aNcCxVRL.cjs');
+require('./downloadTarget-CikzJv1h.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-CDY-Vz8q.cjs');
+require('./bootstrap-sly4qPPY.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-CalIS9sq.cjs');
+require('./pushNotifications-23YSd-0l.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-B4dHJCeS.cjs');
+require('./lidState-C9_DoF9i.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-DZPozYxc.cjs');
+require('./registerCommonHandlers-D1MiSfcB.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-CoChLEIg.cjs');
+require('./sync-Ba8N6xba.cjs');
 require('tweetnacl');
 require('./types-CRS-srZK.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-CG2nPD_H.cjs');
+require('./localHappyAgentAuth-CCjUvOfi.cjs');
 require('./fsMkdir-0K3yENml.cjs');
+require('./cliUpdate-DsKXPFYp.cjs');
 require('./processTreeSnapshot-mDbnuojn.cjs');
 require('url');
 require('node:module');
@@ -162,6 +163,10 @@ function describeAcpTurnFailure(agentName, error) {
   return { message: `${agentName} error: ${detail}`, error: detail, exited: false };
 }
 
+function acpExitIntent(exit) {
+  return exit?.intent ?? "offline";
+}
+
 const OUT_OF_TURN_QUIET_MS = 6e4;
 function isAcpTurnContent(msg) {
   if (msg.type === "model-output") return typeof msg.textDelta === "string" && msg.textDelta.length > 0;
@@ -827,7 +832,9 @@ async function runAcp(opts) {
     machineId: settings.machineId,
     startedBy: opts.startedBy,
     sandbox: settings.sandboxConfig,
-    capabilities: [index.PROMPT_QUEUE_CAPABILITY, index.PROJECT_SESSION_CAPABILITY]
+    // B-852: a daemon-spawned pi session reports when it is quiescent, so the
+    // daemon can restart it onto new code after an upgrade.
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, ...opts.agentName === "pi" && opts.startedBy === "daemon" ? [sessionLock.AUTO_RESTART_CAPABILITY] : []]
   });
   metadata.attachmentKinds = [];
   if (opts.agentName === "gemini") metadata.configuredModel = readGeminiConfiguredModel();
@@ -920,6 +927,11 @@ async function runAcp(opts) {
     messageQueue.setOnWait(() => drain.onIdle());
   }
   attachPromptQueueDrain(session);
+  messageQueue.setOnDiscard((entries) => {
+    const keys = entries.map((entry) => entry.sourceId).filter((key) => typeof key === "string");
+    if (keys.length > 0) session.sendQueueCancelReason(keys, entries[0].reason);
+  });
+  const heldInput$1 = new heldInput.HeldInput((keys, reason) => session.sendQueueCancelReason(keys, reason));
   let currentPermissionMode;
   let currentModel;
   let modeSelector = null;
@@ -1014,7 +1026,16 @@ async function runAcp(opts) {
     session.keepAlive(thinking, "remote");
   };
   let acpSessionId = null;
+  let piProbe = null;
   let shouldExit = false;
+  let exit = null;
+  const beginExit = (intent, reason) => {
+    if (!exit) exit = { intent, reason };
+    shouldExit = true;
+    heldInput$1.drop(exit.reason);
+    messageQueue.discardAll(exit.reason);
+    messageQueue.close();
+  };
   let abortController = new AbortController();
   let turnCancelled = false;
   let backendStarted = false;
@@ -1024,8 +1045,8 @@ async function runAcp(opts) {
   const stopRunnerFromBackendStatus = (status, detail) => {
     const reason = detail ? `${opts.agentName} backend ${status}: ${detail}` : `${opts.agentName} backend ${status}`;
     logger.logger.debug(`[${opts.agentName}] ${reason}; stopping ACP runner`);
-    shouldExit = true;
-    messageQueue.close();
+    session.sendSessionEvent({ type: "message", message: reason });
+    beginExit("offline", "failed");
   };
   const sendEnvelopes = (envelopes) => {
     for (const envelope of envelopes) {
@@ -1334,7 +1355,7 @@ async function runAcp(opts) {
   };
   backend.onMessage(onBackendMessage);
   const titleGenerator$1 = new titleGenerator.TitleGenerator(session);
-  agentAttachments.registerAgentAttachmentDownloads(session);
+  heldInput.registerAgentAttachmentDownloads(session);
   let userMessageDelivery = Promise.resolve();
   session.onUserMessage((message) => {
     const downloads = session.drainAttachmentsForUserMessage();
@@ -1383,6 +1404,7 @@ async function runAcp(opts) {
     }).catch(() => {
       logger.logger.warn("[ACP] Failed to prepare user attachments");
       session.sendSessionEvent({ type: "message", message: "Could not prepare this message. Please send it again." });
+      if (message.localKey) session.sendQueueCancelReason([message.localKey], exit?.reason ?? "failed");
     });
   });
   session.keepAlive(thinking, "remote");
@@ -1422,10 +1444,15 @@ async function runAcp(opts) {
     }
   );
   const disposeTermination = registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, async () => {
-    shouldExit = true;
-    messageQueue.close();
+    beginExit("archive", "aborted");
     await handleAbort();
-  }, session, { processSignals: true });
+  }, session, {
+    processSignals: true,
+    onSignal: async () => {
+      beginExit("offline", "restarted");
+      await handleAbort();
+    }
+  });
   const afterSessionStarted = async (requestedModel) => {
     if (requestedModel) {
       await switchModelIfRequested(requestedModel);
@@ -1479,6 +1506,36 @@ async function runAcp(opts) {
       logger.logger.debug(`[${opts.agentName}] Resume of agent session ${resumeId}: ${started.resumed ?? "new"}${started.loadFailure ? ` (${started.loadFailure})` : ""}`);
       if (started.resumed !== "loaded") session.sendSessionEvent({ type: "message", message: acpSessionResume.piRestartNotice(opts.agentName, "resume", started) });
     }
+    if (opts.agentName === "pi" && opts.startedBy === "daemon") {
+      const piSnapshot = () => {
+        const meta = session.getMetadata();
+        return {
+          flavor: "acp",
+          resumable: typeof meta?.piSessionId === "string" && meta.piSessionId.length > 0,
+          uiSession: true,
+          ...isAssistantVariant ? { variant: "assistant" } : {},
+          ...process.env.HAPPY_SPAWNED_BY ? { spawnedBy: process.env.HAPPY_SPAWNED_BY } : {},
+          ...meta?.tags ? { tags: meta.tags } : {},
+          keepAwake: false,
+          thinking,
+          queuedInputs: messageQueue.size() + (session.promptQueueHasPending() ? 1 : 0),
+          waitingForInput: messageQueue.isWaiting(),
+          pendingRequests: Object.keys(session.getAgentState()?.requests ?? {}).length,
+          backgroundTasks: 0,
+          lastActivityAt: session.lastActivityAt,
+          ...shouldExit ? { exiting: true } : {}
+        };
+      };
+      piProbe = new startupSessionCreate.HibernationProbe({
+        checkMs: persistence.resolveCheckMs(),
+        snapshot: piSnapshot,
+        ask: (report) => controlClient.checkDaemonHibernation({ sessionId: session.sessionId, pid: process.pid, report }),
+        commit: async () => false
+      });
+      piProbe.start();
+    }
+    const autoUpdated = sessionLock.takeAutoRestartedEvent(process.env);
+    if (autoUpdated) session.sendSessionEvent(autoUpdated);
     if (verbose) {
       if (!sawSlashCommands) {
         logAcp("muted", `Outgoing slash commands from ${opts.agentName}: not reported yet`);
@@ -1502,6 +1559,7 @@ async function runAcp(opts) {
         }
         break;
       }
+      heldInput$1.hold(batch.sourceIds);
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
       endOutOfTurn("prompt");
       sendEnvelopes(sessionManager.startTurn());
@@ -1531,6 +1589,13 @@ async function runAcp(opts) {
           happyHomeDir: configuration.configuration.happyHomeDir,
           sessionId: session.sessionId
         }) : [];
+        if (shouldExit) {
+          sendEnvelopes(sessionManager.endTurn("cancelled"));
+          streamRelay$1.endTurn();
+          setThinking(false);
+          break;
+        }
+        heldInput$1.delivered();
         promptInFlight = true;
         let outcome;
         try {
@@ -1557,6 +1622,7 @@ async function runAcp(opts) {
       } catch (error) {
         const failure = describeAcpTurnFailure(opts.agentName, error);
         session.sendSessionEvent({ type: "message", message: failure.message });
+        heldInput$1.drop("failed");
         sendEnvelopes(sessionManager.endTurn("failed", failure.error));
         streamRelay$1.endTurn();
         setThinking(false);
@@ -1569,6 +1635,7 @@ async function runAcp(opts) {
     }
   } finally {
     disposeTermination?.();
+    piProbe?.stop();
     setThinking(false);
     clearInterval(keepAliveInterval);
     streamRelay$1.endTurn();
@@ -1595,15 +1662,27 @@ async function runAcp(opts) {
     }
     try {
       session.closePromptQueueDrain();
-      session.updateMetadata((currentMetadata) => ({
-        ...currentMetadata,
-        lifecycleState: "archived",
-        lifecycleStateSince: Date.now(),
-        archivedBy: "cli",
-        archiveReason: "Session ended"
-      }));
+      heldInput$1.drop(exit?.reason ?? "failed");
+      messageQueue.discardAll(exit?.reason ?? "failed");
+      const intent = acpExitIntent(exit);
+      if (intent === "archive") {
+        session.updateMetadata((currentMetadata) => ({
+          ...currentMetadata,
+          lifecycleState: "archived",
+          lifecycleStateSince: Date.now(),
+          archivedBy: "cli",
+          archiveReason: "Session ended"
+        }));
+      }
       session.sendSessionDeath();
       await session.flush();
+      if (intent === "offline") {
+        try {
+          await api$1.deactivateSession(session.sessionId);
+        } catch (error) {
+          logger.logger.debug(`[${opts.agentName}] deactivate on exit failed:`, error);
+        }
+      }
       await session.close();
     } catch (error) {
       logger.logger.debug(`[${opts.agentName}] Session close failed:`, error);

package/dist/{index-4TpmBb2Q.cjs → index-CmZusg8Q.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var _package = require('./package-CYDdLA6R.cjs');
+var _package = require('./package-9n7wd2dT.cjs');
 var module$1 = require('node:module');
 var node_fs = require('node:fs');
 var promises = require('node:fs/promises');
@@ -59,10 +59,10 @@ async function pruneStaleCompileCaches(happyHomeDir, cliVersion) {
 async function run(args) {
   enableCompileCacheIfPossible(_package.packageJson.version);
   if (isStandaloneVersionRequest(args) || isSelfCheckRequest(args)) {
-    const { selfCheckMain } = await Promise.resolve().then(function () { return require('./selfCheck-DFS_GUaQ.cjs'); });
+    const { selfCheckMain } = await Promise.resolve().then(function () { return require('./selfCheck-BYUDB1Uq.cjs'); });
     process.exit(await selfCheckMain({ verbose: isSelfCheckRequest(args) }));
   }
-  const { main } = await Promise.resolve().then(function () { return require('./main-ndpVIaSG.cjs'); });
+  const { main } = await Promise.resolve().then(function () { return require('./main-BHC-WIcM.cjs'); });
   await main();
 }
 void run(process.argv.slice(2));