very-happy-cli 0.2.175 → 0.2.177

package/dist/{runGemini-Bu69Zu1u.cjs → runGemini-BtZqGFkp.cjs}

@@ -4,81 +4,82 @@ var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var api = require('./api-KZmVqSKO.cjs');
-var logger = require('./logger-C7dRaCkE.cjs');
-var persistence = require('./persistence-DweHi8xa.cjs');
-var createSessionMetadata = require('./createSessionMetadata-2IuH5nlA.cjs');
+var api = require('./api-BWX10o97.cjs');
+var logger = require('./logger-LvwVeATU.cjs');
+var persistence = require('./persistence-DXbKOHxl.cjs');
+var createSessionMetadata = require('./createSessionMetadata-BCFmYlBo.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
-var machineMetadata = require('./machineMetadata-DYYuK_0c.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CcX84g-T.cjs');
-var deterministicJson = require('./deterministicJson-je21npNx.cjs');
+var machineMetadata = require('./machineMetadata-29h7vgf4.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-pqChBKwO.cjs');
+var deterministicJson = require('./deterministicJson-ChGfQEF6.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
-var controlClient = require('./controlClient-CtsQMw--.cjs');
+var controlClient = require('./controlClient-SX8gSza2.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-CS_8Da8R.cjs');
-var AcpBackend = require('./AcpBackend-Sb6N_HcB.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-DVA0VpQL.cjs');
+var AcpBackend = require('./AcpBackend-B-ny68XM.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
-var config = require('./config-D89sE3wK.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-BbLYwd13.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-_S1PbSvH.cjs');
+var config = require('./config-DhdrvOLV.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-DR6nxuEn.cjs');
+var codexTermination = require('./codexTermination-BBU7e92y.cjs');
 require('axios');
-require('./lidState-BmJp2pLt.cjs');
+require('./lidState-DxbK0qfu.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./attachmentLimits-D6bT2jU1.cjs');
+require('./attachmentLimits-DtFqqiwR.cjs');
 require('zod');
-require('./index-BZdhwBKa.cjs');
+require('./index-De8L5lFK.cjs');
 require('@paralleldrive/cuid2');
 require('./limits-C-a7gr04.cjs');
-require('./time-0szhiPo4.cjs');
-require('./configuration-UV4EE5ui.cjs');
+require('./time-Dg5tVB8S.cjs');
+require('./configuration-DZPy0T9Z.cjs');
 require('node:fs');
 require('node:os');
-require('./package-VqWv7EI5.cjs');
+require('./package-Ch9WGDV_.cjs');
 require('node:fs/promises');
-require('./registerCommonHandlers-B7QZxkCL.cjs');
+require('./registerCommonHandlers-60VuTkdg.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('./sync-BK-IBkuB.cjs');
+require('./sync-C7sxoUYG.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('chalk');
 require('node:util');
 require('./detectCLI-DR9ZaN6B.cjs');
 require('fs');
-require('./localHappyAgentAuth-9SP7hdiw.cjs');
+require('./localHappyAgentAuth-D5tANdRD.cjs');
 require('tweetnacl');
 require('./types-CRS-srZK.cjs');
-require('./client-BHZVyQwi.cjs');
-require('./context-BmH2BKip.cjs');
-require('./sessionOps-9MChM9Op.cjs');
+require('./client-DyvBTYee.cjs');
+require('./context-BKbrZ55r.cjs');
+require('./sessionOps-Dmt7WUUs.cjs');
 require('./resources-JDPugcDq.cjs');
-require('./tools-C77-Ssan.cjs');
-require('./reportProgressTool-DzMi4mvH.cjs');
-require('./client-BhLhjj_x.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-BktGmlpd.cjs');
+require('./peerTools-DtGKWli5.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-CL3akj0K.cjs');
+require('./remoteSessionClient-B7NvjHD3.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./downloadTarget-JC7FZl7W.cjs');
+require('./downloadTarget-Dj3WoVJa.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('node:child_process');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-DTJ6-vYT.cjs');
+require('./bootstrap-6OI698q9.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('url');
 require('@agentclientprotocol/sdk');
+require('./processTree-CMHWlVse.cjs');
 
 const GEMINI_TIMEOUTS = {
   /** Gemini CLI can be slow on first start (downloading models, etc.) */
@@ -602,7 +603,7 @@ class GeminiPermissionHandler extends BasePermissionHandler.BasePermissionHandle
   }
 }
 
-class GeminiReasoningProcessor extends BaseReasoningProcessor.BaseReasoningProcessor {
+class GeminiReasoningProcessor extends codexTermination.BaseReasoningProcessor {
   getToolName() {
     return "GeminiReasoning";
   }
@@ -893,6 +894,74 @@ ${formattedMessages}
   }
 }
 
+function factsOf(error) {
+  if (error instanceof Error) {
+    const record = error;
+    const details = typeof record.data?.details === "string" ? record.data.details : typeof record.details === "string" ? record.details : "";
+    return { code: record.code, details, message: error.message, whole: `${details} ${error.message}`, empty: false };
+  }
+  if (error && typeof error === "object") {
+    const record = error;
+    const details = typeof record.data?.details === "string" ? record.data.details : typeof record.details === "string" ? record.details : "";
+    const message = typeof record.message === "string" ? record.message : typeof record.error?.message === "string" ? record.error.message : "";
+    let whole = `${details} ${message}`;
+    try {
+      whole += ` ${JSON.stringify(error)}`;
+    } catch {
+    }
+    return { code: record.code ?? record.status ?? record.response?.status, details, message, whole, empty: Object.keys(error).length === 0 };
+  }
+  return { code: void 0, details: "", message: String(error), whole: String(error), empty: false };
+}
+function quotaResetSuffix(text) {
+  const match = text.match(/reset after (\d+h)?(\d+m)?(\d+s)?/i);
+  if (!match) return "";
+  const parts = match.slice(1).filter(Boolean).join("");
+  return parts ? ` Quota resets in ${parts}.` : "";
+}
+const EMPTY_RESPONSE = /empty response|Model stream ended/i;
+const TRANSIENT = /overloaded|UNAVAILABLE|\b503\b|ECONNRESET|socket hang up|ETIMEDOUT/i;
+function isRetryableGeminiError(error) {
+  if (AcpBackend.isAgentExitError(error)) return false;
+  const facts = factsOf(error);
+  if (/exhausted|quota|capacity/i.test(facts.whole)) return false;
+  return EMPTY_RESPONSE.test(facts.whole) || TRANSIENT.test(facts.whole);
+}
+function describeGeminiFailure(error, ctx) {
+  if (AcpBackend.isAgentExitError(error)) {
+    return { kind: "exited", message: `Process exited unexpectedly: ${error.message}` };
+  }
+  const f = factsOf(error);
+  if (f.code === 404 || /notFound|\b404\b/.test(f.details) || /not found|\b404\b/.test(f.message)) {
+    return { kind: "not-found", message: `Gemini error: model "${ctx.model}" not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite` };
+  }
+  if (EMPTY_RESPONSE.test(f.whole)) {
+    return { kind: "empty", message: "Gemini error: the API returned an empty response after retries. This is usually temporary \u2014 please try again." };
+  }
+  if (f.code === 429 || /\b429\b|rateLimitExceeded|RESOURCE_EXHAUSTED|Rate limit exceeded|Resource exhausted/i.test(f.whole)) {
+    return { kind: "rate-limit", message: "Gemini error: API rate limit exceeded. Please wait a moment and try again." };
+  }
+  if (/quota|exhausted|capacity/i.test(f.whole)) {
+    return { kind: "quota", message: `Gemini error: quota exceeded.${quotaResetSuffix(f.whole)} Try another model (gemini-2.5-flash-lite) or wait for the quota to reset.` };
+  }
+  if (f.code === -32e3 || /Authentication required/i.test(f.whole)) {
+    return {
+      kind: "auth",
+      message: "Gemini error: authentication required. For Google Workspace accounts set a Google Cloud project: `very-happy gemini project set <your-project-id>`; or use another Google account: `very-happy connect gemini`. Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca"
+    };
+  }
+  if (f.empty) {
+    return { kind: "not-installed", message: 'Gemini error: failed to start Gemini. Is the "gemini" CLI installed? Run: npm install -g @google/gemini-cli' };
+  }
+  const text = (f.details || f.message || "process error occurred").replace(/\s+/g, " ").trim();
+  return { kind: "other", message: `Gemini error: ${text.length > 400 ? `${text.slice(0, 399)}\u2026` : text}` };
+}
+function describeGeminiRetry(attempt, maxAttempts, error) {
+  const f = factsOf(error);
+  const why = EMPTY_RESPONSE.test(f.whole) ? "an empty response" : "a transient API error";
+  return `Gemini is retrying after ${why} (attempt ${attempt}/${maxAttempts})`;
+}
+
 async function runGemini(opts) {
   const sessionTag = node_crypto.randomUUID();
   api.connectionState.setBackend("Gemini");
@@ -1097,8 +1166,12 @@ async function runGemini(opts) {
   let geminiBackend = null;
   let acpSessionId = null;
   let wasSessionCreated = false;
+  let turnEnding = "completed";
+  const turnAborted = () => turnEnding === "aborted";
+  let backendGone = null;
   async function handleAbort() {
     logger.logger.debug("[Gemini] Abort requested - stopping current task");
+    turnEnding = "aborted";
     session.sendAgentMessage("gemini", {
       type: "turn_aborted",
       id: node_crypto.randomUUID()
@@ -1106,6 +1179,7 @@ async function runGemini(opts) {
     reasoningProcessor.abort();
     diffProcessor.reset();
     try {
+      permissionHandler.abortAll();
       abortController.abort();
       messageQueue.reset();
       if (geminiBackend && acpSessionId) {
@@ -1118,22 +1192,13 @@ async function runGemini(opts) {
       abortController = new AbortController();
     }
   }
-  const handleKillSession = async () => {
-    logger.logger.debug("[Gemini] Kill session requested - terminating process");
+  const handleKillSession = async (intent = "archive") => {
+    logger.logger.debug(`[Gemini] Kill session requested (${intent}) - terminating process`);
     await handleAbort();
     logger.logger.debug("[Gemini] Abort completed, proceeding with termination");
     try {
       if (session) {
-        session.updateMetadata((currentMetadata) => ({
-          ...currentMetadata,
-          lifecycleState: "archived",
-          lifecycleStateSince: Date.now(),
-          archivedBy: "cli",
-          archiveReason: "User terminated"
-        }));
-        session.sendSessionDeath();
-        await session.flush();
-        await session.close();
+        await codexTermination.settleCodexSession(session, intent, (id) => api$1.deactivateSession(id), (m, e) => logger.logger.debug(m, e));
       }
       happyServer.stop();
       if (geminiBackend) {
@@ -1147,7 +1212,7 @@ async function runGemini(opts) {
     }
   };
   session.rpcHandlerManager.registerHandler("abort", handleAbort);
-  registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session);
+  registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
   const messageBuffer$1 = new messageBuffer.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -1250,10 +1315,9 @@ async function runGemini(opts) {
           });
           if (msg.status === "error") {
             logger.logger.debug("[gemini] Error status received:", contentLogMetadata.contentLogMetadata(statusDetail));
-            session.sendAgentMessage("gemini", {
-              type: "turn_aborted",
-              id: node_crypto.randomUUID()
-            });
+          }
+          if (msg.status === "stopped") {
+            backendGone = new Error(statusDetail || "gemini process exited");
           }
           if (msg.status === "running") {
             thinking = true;
@@ -1268,31 +1332,6 @@ async function runGemini(opts) {
             messageBuffer$1.addMessage("Thinking...", "system");
           } else if (msg.status === "idle" || msg.status === "stopped") {
             reasoningProcessor.complete();
-          } else if (msg.status === "error") {
-            thinking = false;
-            session.keepAlive(thinking, "remote");
-            accumulatedResponse = "";
-            isResponseInProgress = false;
-            let errorMessage = "Unknown error";
-            if (msg.detail) {
-              if (typeof msg.detail === "object") {
-                const detailObj = msg.detail;
-                errorMessage = detailObj.message || detailObj.details || JSON.stringify(detailObj);
-              } else {
-                errorMessage = String(msg.detail);
-              }
-            }
-            if (errorMessage.includes("Authentication required")) {
-              errorMessage = `Authentication required.
-For Google Workspace accounts, run: very-happy gemini project set <project-id>
-Or use a different Google account: very-happy connect gemini
-Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
-            }
-            messageBuffer$1.addMessage(`Error: ${errorMessage}`, "status");
-            session.sendAgentMessage("gemini", {
-              type: "message",
-              message: `Error: ${errorMessage}`
-            });
           }
           break;
         case "tool-call":
@@ -1485,55 +1524,68 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       if (!message) {
         break;
       }
-      let injectHistoryContext = false;
-      if (wasSessionCreated && currentModeHash && message.hash !== currentModeHash) {
-        logger.logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
-        messageBuffer$1.addMessage("\u2550".repeat(40), "status");
-        if (conversationHistory.hasHistory()) {
-          messageBuffer$1.addMessage(`Switching model (preserving ${conversationHistory.size()} messages of context)...`, "status");
-          injectHistoryContext = true;
-          logger.logger.debug("[Gemini] Will inject conversation history");
-        } else {
-          messageBuffer$1.addMessage("Starting new Gemini session (mode changed)...", "status");
-        }
-        permissionHandler.reset();
-        reasoningProcessor.abort();
-        if (geminiBackend) {
-          await geminiBackend.dispose();
-          geminiBackend = null;
-        }
-        const modelToUse = message.mode?.model === void 0 ? void 0 : message.mode.model || null;
-        const backendResult = createGeminiBackend({
-          cwd: process.cwd(),
-          mcpServers,
-          permissionHandler,
-          cloudToken,
-          currentUserEmail,
-          // Pass model from message - if undefined, will use local config/env/default
-          // If explicitly null, will skip local config and use env/default
-          model: modelToUse
-        });
-        geminiBackend = backendResult.backend;
-        setupGeminiMessageHandler(geminiBackend);
-        const actualModel = backendResult.model;
-        logger.logger.debug(`[gemini] Model change - modelToUse=${modelToUse}, actualModel=${actualModel} (from ${backendResult.modelSource})`);
-        conversationHistory.setCurrentModel(actualModel);
-        logger.logger.debug("[gemini] Starting new ACP session with model:", actualModel);
-        const { sessionId } = await geminiBackend.startSession();
-        acpSessionId = sessionId;
-        logger.logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
-        logger.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
-        updateDisplayedModel(actualModel, false);
-        updatePermissionMode(message.mode.permissionMode);
-        wasSessionCreated = true;
-        currentModeHash = message.hash;
-        first = false;
+      if (!thinking) {
+        thinking = true;
+        session.keepAlive(thinking, "remote");
       }
+      turnEnding = "completed";
+      let injectHistoryContext = false;
+      let restartAfterExit = false;
       currentModeHash = message.hash;
       const userMessageToShow = message.mode?.originalUserMessage || message.message;
       messageBuffer$1.addMessage(userMessageToShow, "user");
       isProcessingMessage = true;
       try {
+        restartAfterExit = backendGone !== null;
+        if (restartAfterExit) {
+          logger.logger.debug(`[Gemini] Restarting Gemini after it exited: ${backendGone?.message ?? "unknown"}`);
+          backendGone = null;
+          session.sendSessionEvent({ type: "message", message: `Gemini was restarted after its process exited; the conversation so far is re-sent to it as context.` });
+        }
+        if (restartAfterExit || wasSessionCreated && currentModeHash && message.hash !== currentModeHash) {
+          logger.logger.debug("[Gemini] Mode changed or process gone \u2013 restarting Gemini session");
+          messageBuffer$1.addMessage("\u2550".repeat(40), "status");
+          if (conversationHistory.hasHistory()) {
+            messageBuffer$1.addMessage(`${restartAfterExit ? "Restarting Gemini" : "Switching model"} (preserving ${conversationHistory.size()} messages of context)...`, "status");
+            injectHistoryContext = true;
+            logger.logger.debug("[Gemini] Will inject conversation history");
+          } else {
+            messageBuffer$1.addMessage(restartAfterExit ? "Restarting Gemini..." : "Starting new Gemini session (mode changed)...", "status");
+          }
+          permissionHandler.reset();
+          reasoningProcessor.abort();
+          if (geminiBackend) {
+            await geminiBackend.dispose();
+            geminiBackend = null;
+          }
+          acpSessionId = null;
+          const modelToUse = message.mode?.model === void 0 ? void 0 : message.mode.model || null;
+          const backendResult = createGeminiBackend({
+            cwd: process.cwd(),
+            mcpServers,
+            permissionHandler,
+            cloudToken,
+            currentUserEmail,
+            // Pass model from message - if undefined, will use local config/env/default
+            // If explicitly null, will skip local config and use env/default
+            model: modelToUse
+          });
+          geminiBackend = backendResult.backend;
+          setupGeminiMessageHandler(geminiBackend);
+          const actualModel = backendResult.model;
+          logger.logger.debug(`[gemini] Model change - modelToUse=${modelToUse}, actualModel=${actualModel} (from ${backendResult.modelSource})`);
+          conversationHistory.setCurrentModel(actualModel);
+          logger.logger.debug("[gemini] Starting new ACP session with model:", actualModel);
+          const { sessionId } = await geminiBackend.startSession();
+          acpSessionId = sessionId;
+          logger.logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
+          logger.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
+          updateDisplayedModel(actualModel, false);
+          updatePermissionMode(message.mode.permissionMode);
+          wasSessionCreated = true;
+          currentModeHash = message.hash;
+          first = false;
+        }
         if (first || !wasSessionCreated) {
           if (!geminiBackend) {
             const modelToUse = message.mode?.model === void 0 ? void 0 : message.mode.model || null;
@@ -1587,49 +1639,37 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         logger.logger.debug("[gemini] Sending prompt to Gemini:", contentLogMetadata.contentLogMetadata(promptToSend));
         const MAX_RETRIES = 3;
         const RETRY_DELAY_MS = 2e3;
-        let lastError = null;
         for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
           try {
-            await geminiBackend.sendPrompt(acpSessionId, promptToSend);
-            logger.logger.debug("[gemini] Prompt sent successfully");
-            if (geminiBackend.waitForResponseComplete) {
-              await geminiBackend.waitForResponseComplete(12e4);
-              logger.logger.debug("[gemini] Response complete");
+            accumulatedResponse = "";
+            isResponseInProgress = false;
+            const outcome = await geminiBackend.sendPrompt(acpSessionId, promptToSend);
+            const stopReason = outcome && typeof outcome === "object" ? outcome.stopReason : void 0;
+            logger.logger.debug(`[gemini] Prompt answered (stopReason=${stopReason ?? "none"})`);
+            if (stopReason === "cancelled") {
+              if (!turnAborted()) {
+                turnEnding = "aborted";
+                session.sendAgentMessage("gemini", { type: "turn_aborted", id: node_crypto.randomUUID() });
+              }
+            } else if (stopReason === "error") {
+              throw new Error("the turn ended with an error reported by the agent");
+            } else if (stopReason && stopReason !== "end_turn") {
+              session.sendSessionEvent({ type: "message", message: `Gemini stopped the turn: ${stopReason}` });
             }
             break;
           } catch (promptError) {
-            lastError = promptError;
-            const errObj = promptError;
-            const errorDetails = errObj?.data?.details || errObj?.details || errObj?.message || "";
-            const errorCode = errObj?.code;
-            const isQuotaError = errorDetails.includes("exhausted") || errorDetails.includes("quota") || errorDetails.includes("capacity");
-            if (isQuotaError) {
-              const resetTimeMatch = errorDetails.match(/reset after (\d+h)?(\d+m)?(\d+s)?/i);
-              let resetTimeMsg = "";
-              if (resetTimeMatch) {
-                const parts = resetTimeMatch.slice(1).filter(Boolean).join("");
-                resetTimeMsg = ` Quota resets in ${parts}.`;
-              }
-              const quotaMsg = `Gemini quota exceeded.${resetTimeMsg} Try using a different model (gemini-2.5-flash-lite) or wait for quota reset.`;
-              messageBuffer$1.addMessage(quotaMsg, "status");
-              session.sendAgentMessage("gemini", { type: "message", message: quotaMsg });
-              throw promptError;
-            }
-            const isEmptyResponseError = errorDetails.includes("empty response") || errorDetails.includes("Model stream ended");
-            const isInternalError = errorCode === -32603;
-            const isRetryable = isEmptyResponseError || isInternalError;
-            if (isRetryable && attempt < MAX_RETRIES) {
-              logger.logger.debug(`[gemini] Retryable error on attempt ${attempt}/${MAX_RETRIES}:`, contentLogMetadata.contentLogMetadata(errorDetails));
-              messageBuffer$1.addMessage(`Gemini returned empty response, retrying (${attempt}/${MAX_RETRIES})...`, "status");
+            if (isRetryableGeminiError(promptError) && attempt < MAX_RETRIES) {
+              const notice = describeGeminiRetry(attempt, MAX_RETRIES, promptError);
+              logger.logger.debug(`[gemini] Retryable error on attempt ${attempt}/${MAX_RETRIES}:`, contentLogMetadata.errorLogMetadata(promptError));
+              messageBuffer$1.addMessage(notice, "status");
+              session.sendSessionEvent({ type: "message", message: notice });
               await new Promise((resolve2) => setTimeout(resolve2, RETRY_DELAY_MS * attempt));
+              if (turnAborted()) throw promptError;
               continue;
             }
             throw promptError;
           }
         }
-        if (lastError && MAX_RETRIES > 1) {
-          logger.logger.debug("[gemini] Prompt succeeded after retries");
-        }
         if (first) {
           first = false;
         }
@@ -1637,49 +1677,22 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         logger.logger.debug("[gemini] Error in gemini session:", contentLogMetadata.errorLogMetadata(error));
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (isAbortError) {
+          turnEnding = "aborted";
           messageBuffer$1.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
         } else {
-          let errorMsg = "Process error occurred";
-          if (typeof error === "object" && error !== null) {
-            const errObj = error;
-            const errorDetails = errObj.data?.details || errObj.details || "";
-            const errorCode = errObj.code || errObj.status || errObj.response?.status;
-            const errorMessage = errObj.message || errObj.error?.message || "";
-            const errorString = String(error);
-            if (errorCode === 404 || errorDetails.includes("notFound") || errorDetails.includes("404") || errorMessage.includes("not found") || errorMessage.includes("404")) {
-              const currentModel2 = displayedModel || "gemini-2.5-pro";
-              errorMsg = `Model "${currentModel2}" not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite`;
-            } else if (errorCode === -32603 || errorDetails.includes("empty response") || errorDetails.includes("Model stream ended")) {
-              errorMsg = "Gemini API returned empty response after retries. This is a temporary issue - please try again.";
-            } else if (errorCode === 429 || errorDetails.includes("429") || errorMessage.includes("429") || errorString.includes("429") || errorDetails.includes("rateLimitExceeded") || errorDetails.includes("RESOURCE_EXHAUSTED") || errorMessage.includes("Rate limit exceeded") || errorMessage.includes("Resource exhausted") || errorString.includes("rateLimitExceeded") || errorString.includes("RESOURCE_EXHAUSTED")) {
-              errorMsg = "Gemini API rate limit exceeded. Please wait a moment and try again. The API will retry automatically.";
-            } else if (errorDetails.includes("quota") || errorMessage.includes("quota") || errorString.includes("quota") || errorDetails.includes("exhausted") || errorDetails.includes("capacity")) {
-              const resetTimeMatch = (errorDetails + errorMessage + errorString).match(/reset after (\d+h)?(\d+m)?(\d+s)?/i);
-              let resetTimeMsg = "";
-              if (resetTimeMatch) {
-                const parts = resetTimeMatch.slice(1).filter(Boolean).join("");
-                resetTimeMsg = ` Quota resets in ${parts}.`;
-              }
-              errorMsg = `Gemini quota exceeded.${resetTimeMsg} Try using a different model (gemini-2.5-flash-lite) or wait for quota reset.`;
-            } else if (errorMessage.includes("Authentication required") || errorDetails.includes("Authentication required") || errorCode === -32e3) {
-              errorMsg = `Authentication required. For Google Workspace accounts, you need to set a Google Cloud Project:
-  very-happy gemini project set <your-project-id>
-Or use a different Google account: very-happy connect gemini
-Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
-            } else if (Object.keys(error).length === 0) {
-              errorMsg = 'Failed to start Gemini. Is "gemini" CLI installed? Run: npm install -g @google/gemini-cli';
-            } else if (errObj.message || errorMessage) {
-              errorMsg = errorDetails || errorMessage || errObj.message;
-            }
-          } else if (error instanceof Error) {
-            errorMsg = error.message;
+          const failure = describeGeminiFailure(error, { model: displayedModel || "gemini-2.5-pro" });
+          if (failure.kind === "exited" && error instanceof Error) {
+            backendGone = error;
+          } else if (restartAfterExit && !acpSessionId && error instanceof Error) {
+            backendGone = error;
+          }
+          messageBuffer$1.addMessage(failure.message, "status");
+          session.sendSessionEvent({ type: "message", message: failure.message });
+          if (!turnAborted()) {
+            turnEnding = "failed";
+            session.sendAgentMessage("gemini", { type: "turn_aborted", id: node_crypto.randomUUID() });
           }
-          messageBuffer$1.addMessage(errorMsg, "status");
-          session.sendAgentMessage("gemini", {
-            type: "message",
-            message: errorMsg
-          });
         }
       } finally {
         permissionHandler.reset();
@@ -1707,10 +1720,12 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           accumulatedResponse = "";
           isResponseInProgress = false;
         }
-        session.sendAgentMessage("gemini", {
-          type: "task_complete",
-          id: node_crypto.randomUUID()
-        });
+        if (turnEnding === "completed") {
+          session.sendAgentMessage("gemini", {
+            type: "task_complete",
+            id: node_crypto.randomUUID()
+          });
+        }
         hadToolCallInTurn = false;
         pendingChangeTitle = false;
         changeTitleCompleted = false;