happy-imou-cloud 2.1.0 → 2.1.2

package/dist/lib.d.mts

@@ -437,13 +437,6 @@ declare const HappyOrgMetadataSchema: z.ZodObject<{
         repeatFingerprint: string | null;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    repeat?: {
-        threshold: number;
-        fingerprints: Record<string, {
-            count: number;
-            lastSeenAt: number;
-        }>;
-    } | undefined;
     taskContext?: {
         taskId: string;
         organizationId: string;
@@ -461,6 +454,13 @@ declare const HappyOrgMetadataSchema: z.ZodObject<{
         ownerRunId: string;
         claimedAt: number;
     } | null | undefined;
+    repeat?: {
+        threshold: number;
+        fingerprints: Record<string, {
+            count: number;
+            lastSeenAt: number;
+        }>;
+    } | undefined;
     lastTurnReport?: {
         summary: string;
         taskId: string;
@@ -475,13 +475,6 @@ declare const HappyOrgMetadataSchema: z.ZodObject<{
         repeatFingerprint: string | null;
     } | undefined;
 }, {
-    repeat?: {
-        threshold: number;
-        fingerprints: Record<string, {
-            count: number;
-            lastSeenAt: number;
-        }>;
-    } | undefined;
     taskContext?: {
         taskId: string;
         organizationId: string;
@@ -499,6 +492,13 @@ declare const HappyOrgMetadataSchema: z.ZodObject<{
         ownerRunId: string;
         claimedAt: number;
     } | null | undefined;
+    repeat?: {
+        threshold: number;
+        fingerprints: Record<string, {
+            count: number;
+            lastSeenAt: number;
+        }>;
+    } | undefined;
     lastTurnReport?: {
         summary: string;
         taskId: string;
@@ -626,19 +626,19 @@ declare const UpdateSchema: z.ZodObject<{
             flavor?: string | null | undefined;
         }>>>;
     }, "strip", z.ZodTypeAny, {
-        id: string;
         t: "new-session";
+        id: string;
         seq: number;
         metadata: string;
         metadataVersion: number;
         agentState: string | null;
         agentStateVersion: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         sessionIndex?: {
             machineId?: string | null | undefined;
             hostPid?: number | null | undefined;
@@ -647,19 +647,19 @@ declare const UpdateSchema: z.ZodObject<{
             flavor?: string | null | undefined;
         } | null | undefined;
     }, {
-        id: string;
         t: "new-session";
+        id: string;
         seq: number;
         metadata: string;
         metadataVersion: number;
         agentState: string | null;
         agentStateVersion: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         sessionIndex?: {
             machineId?: string | null | undefined;
             hostPid?: number | null | undefined;
@@ -685,21 +685,21 @@ declare const UpdateSchema: z.ZodObject<{
             createdAt: z.ZodOptional<z.ZodNumber>;
             updatedAt: z.ZodOptional<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            id: string;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
             createdAt?: number | undefined;
             updatedAt?: number | undefined;
             localId?: string | null | undefined;
         }, {
-            id: string;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
             createdAt?: number | undefined;
             updatedAt?: number | undefined;
@@ -709,11 +709,11 @@ declare const UpdateSchema: z.ZodObject<{
         t: z.ZodLiteral<"new-message">;
     }, "strip", z.ZodTypeAny, {
         message: {
-            id: string;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
             createdAt?: number | undefined;
             updatedAt?: number | undefined;
@@ -723,11 +723,11 @@ declare const UpdateSchema: z.ZodObject<{
         sid: string;
     }, {
         message: {
-            id: string;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
             createdAt?: number | undefined;
             updatedAt?: number | undefined;
@@ -883,22 +883,22 @@ declare const UpdateSchema: z.ZodObject<{
     createdAt: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
     id: string;
-    createdAt: number;
     seq: number;
+    createdAt: number;
     body: {
-        id: string;
         t: "new-session";
+        id: string;
         seq: number;
         metadata: string;
         metadataVersion: number;
         agentState: string | null;
         agentStateVersion: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         sessionIndex?: {
             machineId?: string | null | undefined;
             hostPid?: number | null | undefined;
@@ -908,11 +908,11 @@ declare const UpdateSchema: z.ZodObject<{
         } | null | undefined;
     } | {
         message: {
-            id: string;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
             createdAt?: number | undefined;
             updatedAt?: number | undefined;
@@ -959,22 +959,22 @@ declare const UpdateSchema: z.ZodObject<{
     };
 }, {
     id: string;
-    createdAt: number;
     seq: number;
+    createdAt: number;
     body: {
-        id: string;
         t: "new-session";
+        id: string;
         seq: number;
         metadata: string;
         metadataVersion: number;
         agentState: string | null;
         agentStateVersion: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         sessionIndex?: {
             machineId?: string | null | undefined;
             hostPid?: number | null | undefined;
@@ -984,11 +984,11 @@ declare const UpdateSchema: z.ZodObject<{
         } | null | undefined;
     } | {
         message: {
-            id: string;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
             createdAt?: number | undefined;
             updatedAt?: number | undefined;
@@ -1160,32 +1160,32 @@ declare const ProtocolV3SessionSnapshotResponseSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
     }, {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
@@ -1208,52 +1208,52 @@ declare const ProtocolV3SessionSnapshotResponseSchema: z.ZodObject<{
             createdAt: z.ZodNumber;
             updatedAt: z.ZodNumber;
         }, "strip", z.ZodTypeAny, {
-            id: string;
-            createdAt: number;
-            updatedAt: number;
             content: {
                 c: string;
                 t: "encrypted";
             };
-            seq: number;
-            localId: string | null;
-        }, {
             id: string;
+            seq: number;
             createdAt: number;
             updatedAt: number;
+            localId: string | null;
+        }, {
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
+            createdAt: number;
+            updatedAt: number;
             localId: string | null;
         }>, "many">;
         truncated: z.ZodBoolean;
         oldestRetainedSeq: z.ZodNullable<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         messages: {
-            id: string;
-            createdAt: number;
-            updatedAt: number;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
+            createdAt: number;
+            updatedAt: number;
             localId: string | null;
         }[];
         truncated: boolean;
         oldestRetainedSeq: number | null;
     }, {
         messages: {
-            id: string;
-            createdAt: number;
-            updatedAt: number;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
+            createdAt: number;
+            updatedAt: number;
             localId: string | null;
         }[];
         truncated: boolean;
@@ -1272,30 +1272,30 @@ declare const ProtocolV3SessionSnapshotResponseSchema: z.ZodObject<{
     session: {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
     };
     snapshot: {
         messages: {
-            id: string;
-            createdAt: number;
-            updatedAt: number;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
+            createdAt: number;
+            updatedAt: number;
             localId: string | null;
         }[];
         truncated: boolean;
@@ -1314,30 +1314,30 @@ declare const ProtocolV3SessionSnapshotResponseSchema: z.ZodObject<{
     session: {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
     };
     snapshot: {
         messages: {
-            id: string;
-            createdAt: number;
-            updatedAt: number;
             content: {
                 c: string;
                 t: "encrypted";
             };
+            id: string;
             seq: number;
+            createdAt: number;
+            updatedAt: number;
             localId: string | null;
         }[];
         truncated: boolean;
@@ -1453,32 +1453,32 @@ declare const ProtocolV3SessionChangesResponseSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
     }, {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
@@ -1525,16 +1525,16 @@ declare const ProtocolV3SessionChangesResponseSchema: z.ZodObject<{
     session: {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
@@ -1563,16 +1563,16 @@ declare const ProtocolV3SessionChangesResponseSchema: z.ZodObject<{
     session: {
         id: string;
         lastChangeSeq: number;
-        createdAt?: number | undefined;
-        updatedAt?: number | undefined;
-        active?: boolean | undefined;
         title?: string | null | undefined;
         metadata?: string | undefined;
         metadataVersion?: number | undefined;
         agentState?: string | null | undefined;
         agentStateVersion?: number | undefined;
         dataEncryptionKey?: string | null | undefined;
+        active?: boolean | undefined;
         activeAt?: number | undefined;
+        createdAt?: number | undefined;
+        updatedAt?: number | undefined;
         pendingCount?: number | undefined;
         pendingVersion?: number | undefined;
         deleted?: boolean | undefined;
@@ -2344,4 +2344,5 @@ declare class Configuration {
 }
 declare const configuration: Configuration;
 
-export { ApiClient, ApiSessionClient, type RawJSONLines, RawJSONLinesSchema, configuration, logger };
+export { ApiClient, ApiSessionClient, RawJSONLinesSchema, configuration, logger };
+export type { RawJSONLines };

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-w_CUxb9Q.mjs';
+export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-Cxifhw5r.mjs';
 export { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import 'axios';
 import 'chalk';

package/dist/{persistence-MSy70is3.mjs → persistence-6d4U4Sh8.mjs}

@@ -1,7 +1,7 @@
 import { unlink, readFile, mkdir, open, stat, writeFile, rename } from 'node:fs/promises';
 import { existsSync, unlinkSync, readdirSync, constants, writeFileSync, readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { c as configuration, l as logger, e as encodeBase64 } from './api-w_CUxb9Q.mjs';
+import { c as configuration, l as logger, e as encodeBase64 } from './api-Cxifhw5r.mjs';
 import * as z from 'zod';
 import 'axios';
 import 'chalk';

package/dist/{persistence-BL06LLVz.cjs → persistence-C8-MtdQK.cjs}

@@ -3,7 +3,7 @@
 var promises = require('node:fs/promises');
 var fs = require('node:fs');
 var path = require('node:path');
-var api = require('./api-Bd-MnOS4.cjs');
+var api = require('./api-DZimmN4C.cjs');
 var z = require('zod');
 require('axios');
 require('chalk');

package/dist/{registerKillSessionHandler-CjWfUfc3.mjs → registerKillSessionHandler-BFBkz_XT.mjs}

@@ -1,8 +1,8 @@
-import { i as initialMachineMetadata, e as projectPath, R as RuntimeShell, h as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-GuXV-pxB.mjs';
-import { readSettings } from './persistence-MSy70is3.mjs';
+import { i as initialMachineMetadata, e as projectPath, R as RuntimeShell, h as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-Des7I5WX.mjs';
+import { readSettings } from './persistence-6d4U4Sh8.mjs';
 import os from 'node:os';
 import { resolve } from 'node:path';
-import { c as configuration, p as packageJson, H as HAPPY_ORG_TURN_REPORT_TAG, d as HAPPY_ORG_SUMMARY_MAX_LENGTH, f as HAPPY_ORG_REPEAT_THRESHOLD, l as logger } from './api-w_CUxb9Q.mjs';
+import { c as configuration, p as packageJson, H as HAPPY_ORG_TURN_REPORT_TAG, d as HAPPY_ORG_SUMMARY_MAX_LENGTH, f as HAPPY_ORG_REPEAT_THRESHOLD, l as logger } from './api-Cxifhw5r.mjs';
 import { randomUUID } from 'node:crypto';
 import { createHash } from 'crypto';
 import 'axios';

package/dist/{registerKillSessionHandler-D9kwxy6B.cjs → registerKillSessionHandler-BapPCRmp.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
-var index = require('./index-BQmJ4NAa.cjs');
-var persistence = require('./persistence-BL06LLVz.cjs');
+var index = require('./index-Cuvs0lFS.cjs');
+var persistence = require('./persistence-C8-MtdQK.cjs');
 var os = require('node:os');
 var path = require('node:path');
-var api = require('./api-Bd-MnOS4.cjs');
+var api = require('./api-DZimmN4C.cjs');
 var node_crypto = require('node:crypto');
 var crypto = require('crypto');
 require('axios');

package/dist/{runClaude-DpZ95Twb.mjs → runClaude-CPV5Uap2.mjs}

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, g as backoff, h as delay, j as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-w_CUxb9Q.mjs';
+import { l as logger, g as backoff, h as delay, j as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-Cxifhw5r.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
-import { j as getProjectPath, F as Future, k as claudeLocal, E as ExitCodeError, l as trimIdent, m as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, n as claudeCheckSession, e as projectPath, o as mapToClaudeMode, P as PushableAsyncIterable, q as query, A as AbortError, b as stopCaffeinate, p as publishSessionRegistration, u as getEnvironmentInfo, w as startCaffeinate } from './index-GuXV-pxB.mjs';
+import { j as getProjectPath, F as Future, k as claudeLocal, E as ExitCodeError, l as trimIdent, m as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, n as claudeCheckSession, e as projectPath, o as mapToClaudeMode, P as PushableAsyncIterable, q as query, A as AbortError, b as stopCaffeinate, p as publishSessionRegistration, u as getEnvironmentInfo, w as startCaffeinate } from './index-Des7I5WX.mjs';
 import 'ps-list';
 import 'fs';
 import 'path';
@@ -13,7 +13,7 @@ import { dirname, basename, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { execSync } from 'node:child_process';
 import 'node:readline';
-import './persistence-MSy70is3.mjs';
+import './persistence-6d4U4Sh8.mjs';
 import { readFile } from 'node:fs/promises';
 import { stat, watch, access } from 'fs/promises';
 import 'crypto';
@@ -24,9 +24,9 @@ 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 { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-Q8pl7e-d.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
-import { B as BasePermissionHandler, f as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, n as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, c as createSessionMetadata, b as MessageQueue2, h as hashObject, d as registerKillSessionHandler, k as closeProviderSession } from './registerKillSessionHandler-CjWfUfc3.mjs';
+import { B as BasePermissionHandler, f as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, n as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, c as createSessionMetadata, b as MessageQueue2, h as hashObject, d as registerKillSessionHandler, k as closeProviderSession } from './registerKillSessionHandler-BFBkz_XT.mjs';
 import 'socket.io-client';
 import 'expo-server-sdk';
 import { isDeepStrictEqual } from 'node:util';
@@ -993,6 +993,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;
@@ -1003,6 +1004,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(session.client, "Claude");
@@ -1111,6 +1113,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) => {
       forwardAgentMessageToProviderSession(agentMessage, {
@@ -1159,6 +1183,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") {
@@ -1376,6 +1403,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()) {
@@ -1418,6 +1446,7 @@ ${systemPrompt}` : systemPrompt,
           currentModeHash = null;
         }
       } finally {
+        turnInFlight = false;
         const finalizedTurn = finalizeHappyOrgTurn({
           metadata: session.client.getMetadataSnapshot?.() ?? null,
           queuedTurn: message.mode.happyOrg,