happy-imou-cloud 2.1.0 → 2.1.2

package/dist/{runClaude-D2ZEXue8.cjs → runClaude-DVnqKa1q.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-Bd-MnOS4.cjs');
+var api = require('./api-DZimmN4C.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
-var index = require('./index-BQmJ4NAa.cjs');
+var index = require('./index-Cuvs0lFS.cjs');
 require('ps-list');
 require('fs');
 require('path');
@@ -15,7 +15,7 @@ var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
 require('node:readline');
-require('./persistence-BL06LLVz.cjs');
+require('./persistence-C8-MtdQK.cjs');
 var promises = require('node:fs/promises');
 var fs = require('fs/promises');
 require('crypto');
@@ -26,9 +26,9 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-5Dedbm8j.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-wwbfeK_s.cjs');
 var types = require('./types-DVk3crez.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-D9kwxy6B.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BapPCRmp.cjs');
 require('socket.io-client');
 require('expo-server-sdk');
 var node_util = require('node:util');
@@ -995,6 +995,7 @@ async function claudeAcpRemoteLauncher(session) {
   let inkInstance = null;
   let shouldExit = false;
   let abortController = new AbortController();
+  let turnInFlight = false;
   let runtimeHandle = null;
   let unsubscribeRuntimeMessages = null;
   let currentModeHash = null;
@@ -1005,6 +1006,7 @@ async function claudeAcpRemoteLauncher(session) {
   let currentAssistantMessageId = null;
   let currentThinkingMessageId = null;
   let shouldInjectHistoryOnNextSession = false;
+  let unexpectedRuntimeStopRecovery = null;
   let readyAlreadySent = false;
   const permissionHandler = new ClaudeAcpPermissionHandler(session.client);
   const selectionHandler = new ProviderSelectionHandler.ProviderSelectionHandler(session.client, "Claude");
@@ -1113,6 +1115,28 @@ async function claudeAcpRemoteLauncher(session) {
     }
     emitStatusMessage(reason);
   };
+  const recoverUnexpectedRuntimeStop = async (detail) => {
+    if (shouldExit || session.queue.isClosed() || unexpectedRuntimeStopRecovery) {
+      return;
+    }
+    const errorMessage = normalizeClaudeBackendError(detail);
+    unexpectedRuntimeStopRecovery = (async () => {
+      queueHistoryInjectionForRestart(
+        `Claude runtime stopped unexpectedly (${errorMessage}). Starting a new Claude ACP session on the next message...`
+      );
+      await disposeRuntimeHandle();
+      session.clearSessionId();
+      currentModeHash = null;
+      permissionHandler.reset();
+      selectionHandler.reset();
+      resetTurnState();
+    })();
+    try {
+      await unexpectedRuntimeStopRecovery;
+    } finally {
+      unexpectedRuntimeStopRecovery = null;
+    }
+  };
   const setupRuntimeMessageHandler = (activeRuntimeHandle) => {
     const forwardAgentMessage = (agentMessage) => {
       registerKillSessionHandler.forwardAgentMessageToProviderSession(agentMessage, {
@@ -1161,6 +1185,9 @@ async function claudeAcpRemoteLauncher(session) {
           }
           if (msg.status === "idle" || msg.status === "stopped") {
             session.onThinkingChange(false);
+            if (msg.status === "stopped" && !turnInFlight) {
+              void recoverUnexpectedRuntimeStop(msg.detail);
+            }
             return;
           }
           if (msg.status === "error") {
@@ -1378,6 +1405,7 @@ ${systemPrompt}` : systemPrompt,
       let shouldClearHistoryAfterTurn = false;
       let turnStatus = "task_complete";
       try {
+        turnInFlight = true;
         const activeRuntimeHandle = runtimeHandle ?? await createRuntimeHandle(message.mode);
         let promptToSend = message.message;
         if (shouldInjectHistoryOnNextSession && conversationHistory.hasHistory()) {
@@ -1420,6 +1448,7 @@ ${systemPrompt}` : systemPrompt,
           currentModeHash = null;
         }
       } finally {
+        turnInFlight = false;
         const finalizedTurn = registerKillSessionHandler.finalizeHappyOrgTurn({
           metadata: session.client.getMetadataSnapshot?.() ?? null,
           queuedTurn: message.mode.happyOrg,

package/dist/{runCodex-Dz_1ho8d.cjs → runCodex-Bzsp8gFO.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-Bd-MnOS4.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-D9kwxy6B.cjs');
-var index = require('./index-BQmJ4NAa.cjs');
+var api = require('./api-DZimmN4C.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BapPCRmp.cjs');
+var index = require('./index-Cuvs0lFS.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');
@@ -16,7 +16,7 @@ require('node:path');
 require('node:os');
 require('node:child_process');
 require('node:readline');
-require('./persistence-BL06LLVz.cjs');
+require('./persistence-C8-MtdQK.cjs');
 require('node:fs/promises');
 require('fs/promises');
 require('crypto');
@@ -27,8 +27,8 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-5Dedbm8j.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-C9mH8EVn.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-wwbfeK_s.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-CzvqwxuY.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -575,8 +575,8 @@ async function codexRemoteLauncher(session) {
   let shouldCommitAccumulatedResponse = false;
   let currentAssistantMessageId = null;
   let currentThinkingMessageId = null;
-  let fatalRuntimeStopError = null;
   let currentHappyOrgTurn = null;
+  let unexpectedRuntimeStopRecovery = null;
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new registerKillSessionHandler.ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
@@ -656,16 +656,27 @@ async function codexRemoteLauncher(session) {
       report
     });
   };
-  const handleUnexpectedRuntimeStop = (detail) => {
-    if (shouldExit || fatalRuntimeStopError) {
+  const recoverUnexpectedRuntimeStop = async (detail) => {
+    if (shouldExit || session.queue.isClosed() || unexpectedRuntimeStopRecovery) {
       return;
     }
     const errorMessage = normalizeCodexBackendError(detail);
-    fatalRuntimeStopError = new Error(errorMessage);
-    emitUserVisibleErrorMessage(errorMessage);
-    session.runtimeSession.sendSessionDeath();
-    shouldExit = true;
-    abortController.abort();
+    unexpectedRuntimeStopRecovery = (async () => {
+      queueHistoryInjectionForRestart(
+        `Codex runtime stopped unexpectedly (${errorMessage}). Starting a new Codex session on the next message...`
+      );
+      await disposeRuntimeHandle();
+      session.clearSessionId();
+      currentModeHash = null;
+      permissionHandler.reset();
+      selectionHandler.reset();
+      resetTurnState();
+    })();
+    try {
+      await unexpectedRuntimeStopRecovery;
+    } finally {
+      unexpectedRuntimeStopRecovery = null;
+    }
   };
   const queueHistoryInjectionForRestart = (reason) => {
     messageBuffer.addMessage("\u2550".repeat(40), "status");
@@ -768,7 +779,7 @@ async function codexRemoteLauncher(session) {
             emitPendingAssistantMessageDelta();
             reasoningProcessor.completeCurrent();
             if (msg.status === "stopped" && !turnInFlight) {
-              handleUnexpectedRuntimeStop(msg.detail);
+              void recoverUnexpectedRuntimeStop(msg.detail);
             }
             return;
           }
@@ -1116,9 +1127,6 @@ async function codexRemoteLauncher(session) {
     }
     messageBuffer.clear();
   }
-  if (fatalRuntimeStopError) {
-    throw fatalRuntimeStopError;
-  }
   api.logger.debug("[Codex] ACP remote launcher returning: exit", {
     shouldExit,
     queueClosed: session.queue.isClosed(),

package/dist/{runCodex-CJwaep2R.mjs → runCodex-CwtLSTMJ.mjs}

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient } from './api-w_CUxb9Q.mjs';
-import { B as BasePermissionHandler, h as hashObject, f as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, d as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, m as inferToolResultError, n as forwardAgentMessageToProviderSession, k as closeProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-CjWfUfc3.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate } from './index-GuXV-pxB.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-Cxifhw5r.mjs';
+import { B as BasePermissionHandler, h as hashObject, f as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, d as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, m as inferToolResultError, n as forwardAgentMessageToProviderSession, k as closeProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-BFBkz_XT.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate } from './index-Des7I5WX.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';
@@ -14,7 +14,7 @@ import 'node:path';
 import 'node:os';
 import 'node:child_process';
 import 'node:readline';
-import './persistence-MSy70is3.mjs';
+import './persistence-6d4U4Sh8.mjs';
 import 'node:fs/promises';
 import 'fs/promises';
 import 'crypto';
@@ -25,8 +25,8 @@ import 'tweetnacl';
 import 'open';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-BlrrLPlo.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DQkzwRuf.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-Q8pl7e-d.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-BaOWkVcu.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -573,8 +573,8 @@ async function codexRemoteLauncher(session) {
   let shouldCommitAccumulatedResponse = false;
   let currentAssistantMessageId = null;
   let currentThinkingMessageId = null;
-  let fatalRuntimeStopError = null;
   let currentHappyOrgTurn = null;
+  let unexpectedRuntimeStopRecovery = null;
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new ConversationHistory$1({ maxMessages: 20, maxCharacters: 5e4 });
@@ -654,16 +654,27 @@ async function codexRemoteLauncher(session) {
       report
     });
   };
-  const handleUnexpectedRuntimeStop = (detail) => {
-    if (shouldExit || fatalRuntimeStopError) {
+  const recoverUnexpectedRuntimeStop = async (detail) => {
+    if (shouldExit || session.queue.isClosed() || unexpectedRuntimeStopRecovery) {
       return;
     }
     const errorMessage = normalizeCodexBackendError(detail);
-    fatalRuntimeStopError = new Error(errorMessage);
-    emitUserVisibleErrorMessage(errorMessage);
-    session.runtimeSession.sendSessionDeath();
-    shouldExit = true;
-    abortController.abort();
+    unexpectedRuntimeStopRecovery = (async () => {
+      queueHistoryInjectionForRestart(
+        `Codex runtime stopped unexpectedly (${errorMessage}). Starting a new Codex session on the next message...`
+      );
+      await disposeRuntimeHandle();
+      session.clearSessionId();
+      currentModeHash = null;
+      permissionHandler.reset();
+      selectionHandler.reset();
+      resetTurnState();
+    })();
+    try {
+      await unexpectedRuntimeStopRecovery;
+    } finally {
+      unexpectedRuntimeStopRecovery = null;
+    }
   };
   const queueHistoryInjectionForRestart = (reason) => {
     messageBuffer.addMessage("\u2550".repeat(40), "status");
@@ -766,7 +777,7 @@ async function codexRemoteLauncher(session) {
             emitPendingAssistantMessageDelta();
             reasoningProcessor.completeCurrent();
             if (msg.status === "stopped" && !turnInFlight) {
-              handleUnexpectedRuntimeStop(msg.detail);
+              void recoverUnexpectedRuntimeStop(msg.detail);
             }
             return;
           }
@@ -1114,9 +1125,6 @@ async function codexRemoteLauncher(session) {
     }
     messageBuffer.clear();
   }
-  if (fatalRuntimeStopError) {
-    throw fatalRuntimeStopError;
-  }
   logger.debug("[Codex] ACP remote launcher returning: exit", {
     shouldExit,
     queueClosed: session.queue.isClosed(),

package/dist/{runGemini-Dfu6LltX.cjs → runGemini-6Dwyk_Km.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-Bd-MnOS4.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-D9kwxy6B.cjs');
-var index = require('./index-BQmJ4NAa.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-C9mH8EVn.cjs');
+var api = require('./api-DZimmN4C.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BapPCRmp.cjs');
+var index = require('./index-Cuvs0lFS.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-CzvqwxuY.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');
@@ -17,7 +17,7 @@ require('node:child_process');
 require('node:readline');
 require('tweetnacl');
 require('axios');
-require('./persistence-BL06LLVz.cjs');
+require('./persistence-C8-MtdQK.cjs');
 require('open');
 require('chalk');
 require('fs');
@@ -519,6 +519,29 @@ function bindGeminiUserMessageQueue(opts) {
   });
 }
 
+function normalizeGeminiBackendError(error) {
+  if (typeof error === "string") {
+    return error.trim() || "Gemini runtime exited unexpectedly";
+  }
+  if (error instanceof Error) {
+    return error.message.trim() || "Gemini runtime exited unexpectedly";
+  }
+  if (typeof error === "object" && error !== null) {
+    const record = error;
+    const fields = [record.message, record.details, record.detail, record.stderr].map((value) => typeof value === "string" ? value.trim() : "").filter(Boolean);
+    if (fields.length > 0) {
+      return fields.join("\n");
+    }
+    try {
+      const serialized = JSON.stringify(record);
+      if (serialized && serialized !== "{}") {
+        return serialized;
+      }
+    } catch {
+    }
+  }
+  return "Gemini runtime exited unexpectedly";
+}
 async function runGemini(opts) {
   const sessionTag = node_crypto.randomUUID();
   api.connectionState.setBackend("Gemini");
@@ -650,6 +673,10 @@ async function runGemini(opts) {
   let handleQueuedUserMessage = null;
   let emitGeminiStatusMessage = null;
   let turnAbortedSent = false;
+  let turnInFlight = false;
+  let shouldInjectHistoryOnNextSession = false;
+  let currentModeHash = null;
+  let unexpectedRuntimeStopRecovery = null;
   async function handleAbort() {
     api.logger.debug("[Gemini] Abort requested - stopping current task");
     if (!turnAbortedSent) {
@@ -802,6 +829,17 @@ async function runGemini(opts) {
   let isResponseInProgress = false;
   let hadToolCallInTurn = false;
   let taskStartedSent = false;
+  const resetTurnState = () => {
+    reasoningProcessor.abort();
+    diffProcessor.reset();
+    accumulatedResponse = "";
+    isResponseInProgress = false;
+    hadToolCallInTurn = false;
+    taskStartedSent = false;
+    turnAbortedSent = false;
+    thinking = false;
+    session.keepAlive(thinking, "remote");
+  };
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -816,6 +854,37 @@ async function runGemini(opts) {
       api.logger.debug("[Gemini] Error disposing runtime session:", error);
     }
   };
+  const queueHistoryInjectionForRestart = (reason) => {
+    messageBuffer.addMessage("\u2550".repeat(40), "status");
+    if (conversationHistory.hasHistory()) {
+      shouldInjectHistoryOnNextSession = true;
+      const message = `${reason} Preserving ${conversationHistory.size()} earlier messages of context.`;
+      emitGeminiStatusMessage?.(message);
+      api.logger.debug(`[Gemini] Will inject conversation history after restart: ${conversationHistory.getSummary()}`);
+      return;
+    }
+    emitGeminiStatusMessage?.(reason);
+  };
+  const recoverUnexpectedRuntimeStop = async (detail) => {
+    if (shouldExit || messageQueue.isClosed() || unexpectedRuntimeStopRecovery) {
+      return;
+    }
+    const errorMessage = normalizeGeminiBackendError(detail);
+    unexpectedRuntimeStopRecovery = (async () => {
+      queueHistoryInjectionForRestart(
+        `Gemini runtime stopped unexpectedly (${errorMessage}). Starting a new Gemini session on the next message...`
+      );
+      await disposeRuntimeHandle();
+      currentModeHash = null;
+      permissionHandler.reset();
+      resetTurnState();
+    })();
+    try {
+      await unexpectedRuntimeStopRecovery;
+    } finally {
+      unexpectedRuntimeStopRecovery = null;
+    }
+  };
   function setupGeminiMessageHandler(activeRuntimeHandle) {
     const forwardAgentMessage = (agentMessage) => {
       registerKillSessionHandler.forwardAgentMessageToProviderSession(agentMessage, {
@@ -866,6 +935,9 @@ async function runGemini(opts) {
             messageBuffer.addMessage("Thinking...", "system");
           } else if (msg.status === "idle" || msg.status === "stopped") {
             reasoningProcessor.complete();
+            if (msg.status === "stopped" && !turnInFlight) {
+              void recoverUnexpectedRuntimeStop(msg.detail);
+            }
           } else if (msg.status === "error") {
             thinking = false;
             session.keepAlive(thinking, "remote");
@@ -1025,7 +1097,6 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
     };
   }
   try {
-    let currentModeHash = null;
     let pending = null;
     while (!shouldExit) {
       let message = pending;
@@ -1048,19 +1119,11 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       if (!message) {
         break;
       }
-      let injectHistoryContext = false;
       if (runtimeHandle && currentModeHash && message.hash !== currentModeHash) {
         api.logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
-        messageBuffer.addMessage("\u2550".repeat(40), "status");
-        if (conversationHistory.hasHistory()) {
-          messageBuffer.addMessage(`Switching model (preserving ${conversationHistory.size()} messages of context)...`, "status");
-          injectHistoryContext = true;
-          api.logger.debug(`[Gemini] Will inject conversation history: ${conversationHistory.getSummary()}`);
-        } else {
-          messageBuffer.addMessage("Starting new Gemini session (mode changed)...", "status");
-        }
+        queueHistoryInjectionForRestart("Starting new Gemini session (execution settings changed)...");
         permissionHandler.reset();
-        reasoningProcessor.abort();
+        resetTurnState();
         await disposeRuntimeHandle();
         const launchedRuntime = await launchGeminiRuntimeHandle(message.mode);
         const actualModel = launchedRuntime.model;
@@ -1078,6 +1141,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       isProcessingMessage = true;
       let turnStatus = "task_complete";
       try {
+        turnInFlight = true;
         let activeHandle = runtimeHandle;
         if (!activeHandle) {
           const launchedRuntime = await launchGeminiRuntimeHandle(message.mode);
@@ -1099,7 +1163,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         taskStartedSent = false;
         turnAbortedSent = false;
         let promptToSend = message.message;
-        if (injectHistoryContext && conversationHistory.hasHistory()) {
+        if (shouldInjectHistoryOnNextSession && conversationHistory.hasHistory()) {
           const historyContext = conversationHistory.getContextForNewSession();
           promptToSend = historyContext + promptToSend;
           api.logger.debug(`[gemini] Injected conversation history context (${historyContext.length} chars)`);
@@ -1119,6 +1183,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             api.logger.debug("[gemini] Prompt sent successfully");
             await registerKillSessionHandler.waitForResponseCompleteWithAbort(activeHandle.backend, abortController.signal, 10 * 6e4);
             api.logger.debug("[gemini] Response complete");
+            shouldInjectHistoryOnNextSession = false;
             break;
           } catch (promptError) {
             lastError = promptError;
@@ -1210,6 +1275,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           });
         }
       } finally {
+        turnInFlight = false;
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();

package/dist/{runGemini-BehqjM73.mjs → runGemini-Bmoxehlh.mjs}

@@ -1,10 +1,10 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient } from './api-w_CUxb9Q.mjs';
-import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, d as registerKillSessionHandler, f as MessageBuffer, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, k as closeProviderSession, l as launchRuntimeHandleWithFactoryResult, m as inferToolResultError, n as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-CjWfUfc3.mjs';
-import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-GuXV-pxB.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DQkzwRuf.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-Cxifhw5r.mjs';
+import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, d as registerKillSessionHandler, f as MessageBuffer, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, k as closeProviderSession, l as launchRuntimeHandleWithFactoryResult, m as inferToolResultError, n as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-BFBkz_XT.mjs';
+import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-Des7I5WX.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-BaOWkVcu.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';
@@ -15,7 +15,7 @@ import 'node:child_process';
 import 'node:readline';
 import 'tweetnacl';
 import 'axios';
-import './persistence-MSy70is3.mjs';
+import './persistence-6d4U4Sh8.mjs';
 import 'open';
 import 'chalk';
 import 'fs';
@@ -517,6 +517,29 @@ function bindGeminiUserMessageQueue(opts) {
   });
 }
 
+function normalizeGeminiBackendError(error) {
+  if (typeof error === "string") {
+    return error.trim() || "Gemini runtime exited unexpectedly";
+  }
+  if (error instanceof Error) {
+    return error.message.trim() || "Gemini runtime exited unexpectedly";
+  }
+  if (typeof error === "object" && error !== null) {
+    const record = error;
+    const fields = [record.message, record.details, record.detail, record.stderr].map((value) => typeof value === "string" ? value.trim() : "").filter(Boolean);
+    if (fields.length > 0) {
+      return fields.join("\n");
+    }
+    try {
+      const serialized = JSON.stringify(record);
+      if (serialized && serialized !== "{}") {
+        return serialized;
+      }
+    } catch {
+    }
+  }
+  return "Gemini runtime exited unexpectedly";
+}
 async function runGemini(opts) {
   const sessionTag = randomUUID();
   connectionState.setBackend("Gemini");
@@ -648,6 +671,10 @@ async function runGemini(opts) {
   let handleQueuedUserMessage = null;
   let emitGeminiStatusMessage = null;
   let turnAbortedSent = false;
+  let turnInFlight = false;
+  let shouldInjectHistoryOnNextSession = false;
+  let currentModeHash = null;
+  let unexpectedRuntimeStopRecovery = null;
   async function handleAbort() {
     logger.debug("[Gemini] Abort requested - stopping current task");
     if (!turnAbortedSent) {
@@ -800,6 +827,17 @@ async function runGemini(opts) {
   let isResponseInProgress = false;
   let hadToolCallInTurn = false;
   let taskStartedSent = false;
+  const resetTurnState = () => {
+    reasoningProcessor.abort();
+    diffProcessor.reset();
+    accumulatedResponse = "";
+    isResponseInProgress = false;
+    hadToolCallInTurn = false;
+    taskStartedSent = false;
+    turnAbortedSent = false;
+    thinking = false;
+    session.keepAlive(thinking, "remote");
+  };
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -814,6 +852,37 @@ async function runGemini(opts) {
       logger.debug("[Gemini] Error disposing runtime session:", error);
     }
   };
+  const queueHistoryInjectionForRestart = (reason) => {
+    messageBuffer.addMessage("\u2550".repeat(40), "status");
+    if (conversationHistory.hasHistory()) {
+      shouldInjectHistoryOnNextSession = true;
+      const message = `${reason} Preserving ${conversationHistory.size()} earlier messages of context.`;
+      emitGeminiStatusMessage?.(message);
+      logger.debug(`[Gemini] Will inject conversation history after restart: ${conversationHistory.getSummary()}`);
+      return;
+    }
+    emitGeminiStatusMessage?.(reason);
+  };
+  const recoverUnexpectedRuntimeStop = async (detail) => {
+    if (shouldExit || messageQueue.isClosed() || unexpectedRuntimeStopRecovery) {
+      return;
+    }
+    const errorMessage = normalizeGeminiBackendError(detail);
+    unexpectedRuntimeStopRecovery = (async () => {
+      queueHistoryInjectionForRestart(
+        `Gemini runtime stopped unexpectedly (${errorMessage}). Starting a new Gemini session on the next message...`
+      );
+      await disposeRuntimeHandle();
+      currentModeHash = null;
+      permissionHandler.reset();
+      resetTurnState();
+    })();
+    try {
+      await unexpectedRuntimeStopRecovery;
+    } finally {
+      unexpectedRuntimeStopRecovery = null;
+    }
+  };
   function setupGeminiMessageHandler(activeRuntimeHandle) {
     const forwardAgentMessage = (agentMessage) => {
       forwardAgentMessageToProviderSession(agentMessage, {
@@ -864,6 +933,9 @@ async function runGemini(opts) {
             messageBuffer.addMessage("Thinking...", "system");
           } else if (msg.status === "idle" || msg.status === "stopped") {
             reasoningProcessor.complete();
+            if (msg.status === "stopped" && !turnInFlight) {
+              void recoverUnexpectedRuntimeStop(msg.detail);
+            }
           } else if (msg.status === "error") {
             thinking = false;
             session.keepAlive(thinking, "remote");
@@ -1023,7 +1095,6 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
     };
   }
   try {
-    let currentModeHash = null;
     let pending = null;
     while (!shouldExit) {
       let message = pending;
@@ -1046,19 +1117,11 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       if (!message) {
         break;
       }
-      let injectHistoryContext = false;
       if (runtimeHandle && currentModeHash && message.hash !== currentModeHash) {
         logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
-        messageBuffer.addMessage("\u2550".repeat(40), "status");
-        if (conversationHistory.hasHistory()) {
-          messageBuffer.addMessage(`Switching model (preserving ${conversationHistory.size()} messages of context)...`, "status");
-          injectHistoryContext = true;
-          logger.debug(`[Gemini] Will inject conversation history: ${conversationHistory.getSummary()}`);
-        } else {
-          messageBuffer.addMessage("Starting new Gemini session (mode changed)...", "status");
-        }
+        queueHistoryInjectionForRestart("Starting new Gemini session (execution settings changed)...");
         permissionHandler.reset();
-        reasoningProcessor.abort();
+        resetTurnState();
         await disposeRuntimeHandle();
         const launchedRuntime = await launchGeminiRuntimeHandle(message.mode);
         const actualModel = launchedRuntime.model;
@@ -1076,6 +1139,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       isProcessingMessage = true;
       let turnStatus = "task_complete";
       try {
+        turnInFlight = true;
         let activeHandle = runtimeHandle;
         if (!activeHandle) {
           const launchedRuntime = await launchGeminiRuntimeHandle(message.mode);
@@ -1097,7 +1161,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         taskStartedSent = false;
         turnAbortedSent = false;
         let promptToSend = message.message;
-        if (injectHistoryContext && conversationHistory.hasHistory()) {
+        if (shouldInjectHistoryOnNextSession && conversationHistory.hasHistory()) {
           const historyContext = conversationHistory.getContextForNewSession();
           promptToSend = historyContext + promptToSend;
           logger.debug(`[gemini] Injected conversation history context (${historyContext.length} chars)`);
@@ -1117,6 +1181,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             logger.debug("[gemini] Prompt sent successfully");
             await waitForResponseCompleteWithAbort(activeHandle.backend, abortController.signal, 10 * 6e4);
             logger.debug("[gemini] Response complete");
+            shouldInjectHistoryOnNextSession = false;
             break;
           } catch (promptError) {
             lastError = promptError;
@@ -1208,6 +1273,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           });
         }
       } finally {
+        turnInFlight = false;
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();