very-happy-cli 0.2.176 → 0.2.177

package/dist/{index-jeD70GGH.cjs → index-BRJzH4sc.cjs}

@@ -1,35 +1,36 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-9_ZI1Bv3.cjs');
-var logger = require('./logger-zoO54Zsy.cjs');
+var AcpBackend = require('./AcpBackend-B-ny68XM.cjs');
+var logger = require('./logger-LvwVeATU.cjs');
 var AcpSessionManager = require('./AcpSessionManager-CjdJLofq.cjs');
 var index = require('./index-De8L5lFK.cjs');
 var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var configuration = require('./configuration-CpBrilxV.cjs');
-var attachmentContent = require('./attachmentContent-CFzzTeV9.cjs');
-var piRuntime = require('./piRuntime-B-SPcWIr.cjs');
+var configuration = require('./configuration-DZPy0T9Z.cjs');
+var attachmentContent = require('./attachmentContent-kJKXpkMX.cjs');
+var piRuntime = require('./piRuntime-D7eio8Ix.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var api = require('./api-Buc_ejoA.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-WQra3T9B.cjs');
-var deterministicJson = require('./deterministicJson-aHxtYLha.cjs');
-var persistence = require('./persistence-Cih2AWml.cjs');
-var machineMetadata = require('./machineMetadata-BAKVtr-k.cjs');
-var createSessionMetadata = require('./createSessionMetadata-D4Sj6H95.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-B9Tw1Ouj.cjs');
-var controlClient = require('./controlClient-bs_YqwDl.cjs');
+var api = require('./api-BWX10o97.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-pqChBKwO.cjs');
+var deterministicJson = require('./deterministicJson-ChGfQEF6.cjs');
+var persistence = require('./persistence-DXbKOHxl.cjs');
+var machineMetadata = require('./machineMetadata-29h7vgf4.cjs');
+var createSessionMetadata = require('./createSessionMetadata-BCFmYlBo.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-DVA0VpQL.cjs');
+var controlClient = require('./controlClient-SX8gSza2.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
 var streamRelay = require('./streamRelay-Cx01enfe.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-DPvLN7aR.cjs');
-var titleGenerator = require('./titleGenerator-CXr7t6cf.cjs');
-var sessionModeFile = require('./sessionModeFile-DVukoSp7.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-DR6nxuEn.cjs');
+var titleGenerator = require('./titleGenerator-BMEaDTwU.cjs');
+var sessionModeFile = require('./sessionModeFile-CsLtn_PL.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
-require('./time-s8CaneqW.cjs');
+require('./time-Dg5tVB8S.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
-require('./package-A7zOGx8B.cjs');
+require('./processTree-CMHWlVse.cjs');
+require('./package-Ch9WGDV_.cjs');
 require('chalk');
 require('node:util');
 require('node:fs');
@@ -40,46 +41,46 @@ require('node:fs/promises');
 require('./attachmentLimits-DtFqqiwR.cjs');
 require('./resources-JDPugcDq.cjs');
 require('axios');
-require('./lidState-UasMvPzw.cjs');
+require('./lidState-DxbK0qfu.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./registerCommonHandlers-CqO075-X.cjs');
+require('./registerCommonHandlers-60VuTkdg.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('./sync-BgZuthoS.cjs');
+require('./sync-C7sxoUYG.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('tweetnacl');
 require('./types-CRS-srZK.cjs');
-require('./client-D7sSU04O.cjs');
-require('./context-Hk0j2Y9-.cjs');
-require('./sessionOps-Nryt1DZt.cjs');
-require('./tools-lotMyxIE.cjs');
-require('./reportProgressTool-C2gn_HWD.cjs');
-require('./client-D9pEOhn4.cjs');
+require('./client-DyvBTYee.cjs');
+require('./context-BKbrZ55r.cjs');
+require('./sessionOps-Dmt7WUUs.cjs');
+require('./tools-DDKTB5aQ.cjs');
+require('./reportProgressTool-Du_zAK4h.cjs');
+require('./client-COmgDDy0.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('./trimIdent-4gvk9Wk6.cjs');
-require('./peerTools-dPc9hRC5.cjs');
+require('./peerTools-DtGKWli5.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-f3DYorl8.cjs');
+require('./remoteSessionClient-B7NvjHD3.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./downloadTarget-CmdlljZW.cjs');
+require('./downloadTarget-Dj3WoVJa.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-BboDz_w2.cjs');
+require('./bootstrap-6OI698q9.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('./detectCLI-DR9ZaN6B.cjs');
 require('fs');
-require('./localHappyAgentAuth-CA02WOny.cjs');
+require('./localHappyAgentAuth-D5tANdRD.cjs');
 require('url');
 require('node:module');
 require('./oneShotPrompts-CL0dip9C.cjs');
@@ -98,6 +99,35 @@ function createAcpBackend(options) {
   return new AcpBackend.AcpBackend(backendOptions);
 }
 
+const MAX_DETAIL_CHARS = 400;
+function detailOf(error) {
+  if (error instanceof Error) return error.message;
+  if (error && typeof error === "object") {
+    const record = error;
+    const data = record.data && typeof record.data === "object" ? record.data : null;
+    const details = typeof data?.details === "string" ? data.details : null;
+    const message = typeof record.message === "string" ? record.message : null;
+    const text = details && message && details !== message ? `${message}: ${details}` : details ?? message;
+    if (text) return text;
+    try {
+      return JSON.stringify(error);
+    } catch {
+      return String(error);
+    }
+  }
+  return String(error);
+}
+function oneLine(text) {
+  const folded = text.replace(/\s+/g, " ").trim();
+  return folded.length > MAX_DETAIL_CHARS ? `${folded.slice(0, MAX_DETAIL_CHARS - 1)}\u2026` : folded;
+}
+function describeAcpTurnFailure(agentName, error) {
+  if (AcpBackend.isAgentExitError(error)) {
+    return { message: `Process exited unexpectedly: ${oneLine(error.message)}`, exited: true };
+  }
+  return { message: `${agentName} error: ${oneLine(detailOf(error))}`, exited: false };
+}
+
 const SUPPORTED_CATEGORIES = /* @__PURE__ */ new Set(["mode", "model", "thought_level"]);
 function isRecord$1(value) {
   return !!value && typeof value === "object";
@@ -265,7 +295,6 @@ function mergeAcpSessionConfigIntoMetadata(metadata, snapshot) {
   return next;
 }
 
-const TURN_TIMEOUT_MS = 5 * 60 * 1e3;
 const ACP_EVENT_PREVIEW_CHARS = 240;
 const ACP_RAW_PREVIEW_CHARS = 2e3;
 const ACP_COLOR_RESET = "\x1B[0m";
@@ -733,7 +762,7 @@ async function runAcp(opts) {
     }
   };
   const teamsPiEnv = opts.agentName === "pi" ? await piRuntime.preparePiTeamsRuntime() : {};
-  const backend = new AcpBackend.AcpBackend({
+  const createBackend = () => new AcpBackend.AcpBackend({
     agentName: opts.agentName,
     cwd: process.cwd(),
     command: opts.command,
@@ -752,6 +781,7 @@ async function runAcp(opts) {
     transportHandler: new AcpBackend.DefaultTransport(opts.agentName),
     verbose
   });
+  let backend = createBackend();
   let thinking = false;
   const setThinking = (next) => {
     if (thinking === next) {
@@ -763,34 +793,15 @@ async function runAcp(opts) {
   let acpSessionId = null;
   let shouldExit = false;
   let abortController = new AbortController();
-  let pendingTurn = null;
   let turnCancelled = false;
-  const clearPendingTurn = (error) => {
-    if (!pendingTurn) {
-      return;
-    }
-    clearTimeout(pendingTurn.timeout);
-    const current = pendingTurn;
-    pendingTurn = null;
-    if (error) {
-      current.reject(error);
-      return;
-    }
-    current.resolve();
-  };
-  const waitForTurnEnd = () => new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
-      pendingTurn = null;
-      reject(new Error(`Timed out waiting for ${opts.agentName} to finish the turn`));
-    }, TURN_TIMEOUT_MS);
-    pendingTurn = { resolve, reject, timeout };
-  });
+  let backendStarted = false;
+  let backendGone = null;
+  let todoDiscoverySent = false;
   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();
-    clearPendingTurn(new Error(reason));
   };
   const sendEnvelopes = (envelopes) => {
     for (const envelope of envelopes) {
@@ -1056,14 +1067,21 @@ async function runAcp(opts) {
       const suffix = msg.detail ? `: ${msg.detail}` : "";
       const statusLine = `Status: ${msg.status}${suffix}`;
       logAcp("muted", statusLine);
-      if (msg.status === "idle") {
-        clearPendingTurn();
-      }
       if (msg.status === "error" || msg.status === "stopped") {
         if (msg.status === "error") opts.onBackendError?.(msg.detail);
-        stopRunnerFromBackendStatus(msg.status, msg.detail);
+        if (!backendStarted) {
+          stopRunnerFromBackendStatus(msg.status, msg.detail);
+        } else if (msg.status === "stopped") {
+          backendGone = new Error(msg.detail ?? `${opts.agentName} process exited`);
+        }
       }
     }
+    if (msg.type === "event" && msg.name === "notice") {
+      const message = AcpBackend.acpNoticeMessage(opts.agentName, msg.payload);
+      logAcp("muted", message);
+      session.sendSessionEvent({ type: "message", message });
+      return;
+    }
     const frontendMessage = formatAcpMessageForFrontend(opts.agentName, msg, verbose);
     if (frontendMessage) {
       logAcp(frontendMessage.kind, frontendMessage.text);
@@ -1115,8 +1133,9 @@ async function runAcp(opts) {
   const keepAliveInterval = setInterval(() => {
     session.keepAlive(thinking, "remote");
   }, 2e3);
+  let promptInFlight = false;
   async function handleAbort() {
-    turnCancelled = thinking;
+    turnCancelled = thinking && promptInFlight;
     try {
       if (acpSessionId) {
         await backend.cancel(acpSessionId);
@@ -1149,15 +1168,12 @@ async function runAcp(opts) {
   const disposeTermination = registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, async () => {
     shouldExit = true;
     messageQueue.close();
-    clearPendingTurn(new Error("Session terminated"));
     await handleAbort();
   }, session, { processSignals: true });
-  try {
-    const started = await backend.startSession();
-    acpSessionId = started.sessionId;
-    if (opts.model) {
-      await switchModelIfRequested(opts.model);
-      const applied = isCurrentRequestedModel(opts.model);
+  const afterSessionStarted = async (requestedModel) => {
+    if (requestedModel) {
+      await switchModelIfRequested(requestedModel);
+      const applied = isCurrentRequestedModel(requestedModel);
       if (!applied) session.sendSessionEvent({ type: "message", message: "The saved model is unavailable for this agent; using its current model." });
     }
     session.updateMetadata((current) => ({
@@ -1166,8 +1182,33 @@ async function runAcp(opts) {
     }));
     if (permissionModeIsFileBacked()) {
       fileBackedModeActive = true;
-      publishFileBackedPermissionMode(initialPermissionMode);
+      publishFileBackedPermissionMode(fileBackedPermissionMode ?? initialPermissionMode);
+    }
+  };
+  const restartBackend = async () => {
+    const gone = backendGone;
+    backend.offMessage?.(onBackendMessage);
+    acpSessionId = null;
+    try {
+      await backend.dispose();
+    } catch (error) {
+      logger.logger.debug(`[${opts.agentName}] dispose of the dead backend failed:`, error);
     }
+    backend = createBackend();
+    backend.onMessage(onBackendMessage);
+    const started = await backend.startSession();
+    acpSessionId = started.sessionId;
+    backendGone = null;
+    todoDiscoverySent = false;
+    await afterSessionStarted(currentModel ?? opts.model);
+    logger.logger.debug(`[${opts.agentName}] Restarted the agent after it exited: ${gone?.message ?? "unknown"}`);
+    session.sendSessionEvent({ type: "message", message: `${opts.agentName} was restarted after its process exited; it does not remember the earlier conversation (the transcript here is kept).` });
+  };
+  try {
+    const started = await backend.startSession();
+    acpSessionId = started.sessionId;
+    backendStarted = true;
+    await afterSessionStarted(opts.model);
     if (verbose) {
       if (!sawSlashCommands) {
         logAcp("muted", `Outgoing slash commands from ${opts.agentName}: not reported yet`);
@@ -1179,7 +1220,6 @@ async function runAcp(opts) {
         logAcp("muted", `Outgoing models from ${opts.agentName}: not reported yet`);
       }
     }
-    let todoDiscoverySent = false;
     while (!shouldExit) {
       const waitSignal = abortController.signal;
       const batch = await messageQueue.waitForMessagesAndGetAsString(waitSignal);
@@ -1192,17 +1232,17 @@ async function runAcp(opts) {
         }
         break;
       }
-      if (!acpSessionId) {
-        throw new Error("ACP session is not started");
-      }
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
       sendEnvelopes(sessionManager.startTurn());
       turnCancelled = false;
       setThinking(true);
-      const turnEnded = waitForTurnEnd();
-      void turnEnded.catch(() => {
-      });
       try {
+        if (backendGone) {
+          await restartBackend();
+        }
+        if (!acpSessionId) {
+          throw new Error("ACP session is not started");
+        }
         if (typeof batch.mode.permissionMode === "string" && batch.mode.permissionMode.length > 0) {
           await switchPermissionModeIfRequested(batch.mode.permissionMode);
         }
@@ -1218,10 +1258,23 @@ ${index.BUILTIN_TODO_DISCOVERY}`;
           happyHomeDir: configuration.configuration.happyHomeDir,
           sessionId: session.sessionId
         }) : [];
-        await backend.sendPrompt(acpSessionId, attachmentContent.appendStagedAttachmentsToPrompt(prompt, staged), attachments);
+        promptInFlight = true;
+        let outcome;
+        try {
+          outcome = await backend.sendPrompt(acpSessionId, attachmentContent.appendStagedAttachmentsToPrompt(prompt, staged), attachments);
+        } finally {
+          promptInFlight = false;
+        }
         todoDiscoverySent = true;
-        await turnEnded;
-        sendEnvelopes(sessionManager.endTurn(turnCancelled ? "cancelled" : "completed"));
+        const stopReason = outcome && typeof outcome === "object" ? outcome.stopReason : void 0;
+        if (stopReason === "error") {
+          throw new Error("the turn ended with an error reported by the agent");
+        }
+        const cancelled = turnCancelled || stopReason === "cancelled";
+        sendEnvelopes(sessionManager.endTurn(cancelled ? "cancelled" : "completed"));
+        if (!cancelled && stopReason && stopReason !== "end_turn") {
+          session.sendSessionEvent({ type: "message", message: `${opts.agentName} stopped the turn: ${stopReason}` });
+        }
         streamRelay$1.endTurn();
         setThinking(false);
         session.sendSessionEvent({ type: "ready" });
@@ -1229,14 +1282,16 @@ ${index.BUILTIN_TODO_DISCOVERY}`;
           logAcp("muted", `Outgoing prompt completion from ${opts.agentName}`);
         }
       } catch (error) {
-        session.sendSessionEvent({ type: "message", message: "The agent could not process this message or its attachments. Please check the agent and try again." });
+        const failure = describeAcpTurnFailure(opts.agentName, error);
+        session.sendSessionEvent({ type: "message", message: failure.message });
         sendEnvelopes(sessionManager.endTurn("failed"));
         streamRelay$1.endTurn();
         setThinking(false);
         session.sendSessionEvent({ type: "ready" });
         logAcp("error", `Prompt error from ${opts.agentName}: ${error instanceof Error ? error.message : String(error)}`);
-        clearPendingTurn(error instanceof Error ? error : new Error(String(error)));
-        throw error;
+        if (failure.exited && error instanceof Error) {
+          backendGone = error;
+        }
       }
     }
   } finally {
@@ -1246,7 +1301,6 @@ ${index.BUILTIN_TODO_DISCOVERY}`;
     streamRelay$1.endTurn();
     streamRelay$1.dispose();
     reconnectionHandle?.cancel();
-    clearPendingTurn(new Error("ACP runner shutting down"));
     try {
       permissionHandler.reset();
     } catch (error) {