happy-imou-cloud 2.1.7 → 2.1.8

package/dist/lib.d.cts

@@ -2036,8 +2036,8 @@ declare class ApiSessionClient extends EventEmitter {
     private metadataLock;
     private encryptionKey;
     private encryptionVariant;
-    private pendingReliableCodexMessages;
-    private pendingReliableCodexMessageBytes;
+    private pendingReliableSessionMessages;
+    private pendingReliableSessionMessageBytes;
     private reconnectAfterServerDisconnectTimer;
     private lastSocketServerError;
     private protocolV3SessionSync;
@@ -2125,9 +2125,12 @@ declare class ApiSessionClient extends EventEmitter {
     private bufferLiveSessionEvent;
     private supportsKnownProtocolCapability;
     private emitEncryptedSessionMessage;
-    private flushReliableCodexMessages;
+    private bufferReliableSessionMessage;
+    private flushReliableSessionMessages;
     private shouldBufferReliableCodexMessage;
-    private trimPendingReliableCodexMessages;
+    private shouldBufferReliableAcpMessage;
+    private shouldBufferReliableSessionEvent;
+    private trimPendingReliableSessionMessages;
     private retryAfterServerDisconnect;
     private clearReconnectAfterServerDisconnectTimer;
     private normalizeSocketError;

package/dist/lib.d.mts

@@ -2036,8 +2036,8 @@ declare class ApiSessionClient extends EventEmitter {
     private metadataLock;
     private encryptionKey;
     private encryptionVariant;
-    private pendingReliableCodexMessages;
-    private pendingReliableCodexMessageBytes;
+    private pendingReliableSessionMessages;
+    private pendingReliableSessionMessageBytes;
     private reconnectAfterServerDisconnectTimer;
     private lastSocketServerError;
     private protocolV3SessionSync;
@@ -2125,9 +2125,12 @@ declare class ApiSessionClient extends EventEmitter {
     private bufferLiveSessionEvent;
     private supportsKnownProtocolCapability;
     private emitEncryptedSessionMessage;
-    private flushReliableCodexMessages;
+    private bufferReliableSessionMessage;
+    private flushReliableSessionMessages;
     private shouldBufferReliableCodexMessage;
-    private trimPendingReliableCodexMessages;
+    private shouldBufferReliableAcpMessage;
+    private shouldBufferReliableSessionEvent;
+    private trimPendingReliableSessionMessages;
     private retryAfterServerDisconnect;
     private clearReconnectAfterServerDisconnectTimer;
     private normalizeSocketError;

package/dist/lib.mjs

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

package/dist/{persistence-CMvrZ4SA.cjs → persistence-Czyd-Uei.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-CdGT5hsH.cjs');
+var api = require('./api-CeIpGPqs.cjs');
 var z = require('zod');
 require('axios');
 require('chalk');

package/dist/{persistence-B8Wgn6aN.mjs → persistence-DgpGouOO.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-BYKV7vX6.mjs';
+import { c as configuration, l as logger, e as encodeBase64 } from './api-DRdn4-dL.mjs';
 import * as z from 'zod';
 import 'axios';
 import 'chalk';

package/dist/{registerKillSessionHandler-DjxtkGMv.cjs → registerKillSessionHandler-DECzSYvQ.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var index = require('./index-D_S_7bqK.cjs');
-var persistence = require('./persistence-CMvrZ4SA.cjs');
+var index = require('./index-D68EOBHW.cjs');
+var persistence = require('./persistence-Czyd-Uei.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-CdGT5hsH.cjs');
+var api = require('./api-CeIpGPqs.cjs');
 var crypto = require('crypto');
 require('axios');
 require('node:events');

package/dist/{registerKillSessionHandler-5DVlZaJx.mjs → registerKillSessionHandler-Dg0DFPae.mjs}

@@ -1,7 +1,7 @@
-import { k as initialMachineMetadata, R as RuntimeShell, l as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-BAhlFq45.mjs';
-import { readSettings } from './persistence-B8Wgn6aN.mjs';
+import { k as initialMachineMetadata, R as RuntimeShell, l as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-C4S85XB7.mjs';
+import { readSettings } from './persistence-DgpGouOO.mjs';
 import { randomUUID } from 'node:crypto';
-import { 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-BYKV7vX6.mjs';
+import { 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-DRdn4-dL.mjs';
 import { createHash } from 'crypto';
 import 'axios';
 import 'node:events';

package/dist/{runClaude-DNZFsQY0.cjs → runClaude-DtCH-nx-.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-CdGT5hsH.cjs');
+var api = require('./api-CeIpGPqs.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
-var index = require('./index-D_S_7bqK.cjs');
+var index = require('./index-D68EOBHW.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-CMvrZ4SA.cjs');
+require('./persistence-Czyd-Uei.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-DI9QK1iY.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-BZVtGMAn.cjs');
 var types = require('./types-DVk3crez.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DjxtkGMv.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-DECzSYvQ.cjs');
 require('socket.io-client');
 require('expo-server-sdk');
 var node_util = require('node:util');
@@ -1386,6 +1386,10 @@ ${systemPrompt}` : systemPrompt,
       let message = pending;
       pending = null;
       if (!message) {
+        if (!shouldExit && session.queue.size() === 0 && !readyAlreadySent) {
+          sendReady();
+          readyAlreadySent = true;
+        }
         const waitSignal = abortController.signal;
         const batch = await session.queue.waitForMessagesAndGetAsString(waitSignal);
         if (!batch) {

package/dist/{runClaude-WB884iOO.mjs → runClaude-OWT6ZYiP.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-BYKV7vX6.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-DRdn4-dL.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
-import { m as getProjectPath, F as Future, n as claudeLocal, E as ExitCodeError, o as trimIdent, q as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, u as claudeCheckSession, w as projectPath, x as mapToClaudeMode, P as PushableAsyncIterable, y as query, A as AbortError, e as stopCaffeinate, p as publishSessionRegistration, z as getEnvironmentInfo, a as createSessionMetadata, B as startCaffeinate, b as closeProviderSession } from './index-BAhlFq45.mjs';
+import { m as getProjectPath, F as Future, n as claudeLocal, E as ExitCodeError, o as trimIdent, q as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, u as claudeCheckSession, w as projectPath, x as mapToClaudeMode, P as PushableAsyncIterable, y as query, A as AbortError, e as stopCaffeinate, p as publishSessionRegistration, z as getEnvironmentInfo, a as createSessionMetadata, B as startCaffeinate, b as closeProviderSession } from './index-C4S85XB7.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-B8Wgn6aN.mjs';
+import './persistence-DgpGouOO.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-WT-tvePy.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-BleheBks.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
-import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, k as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler } from './registerKillSessionHandler-5DVlZaJx.mjs';
+import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, k as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler } from './registerKillSessionHandler-Dg0DFPae.mjs';
 import 'socket.io-client';
 import 'expo-server-sdk';
 import { isDeepStrictEqual } from 'node:util';
@@ -1384,6 +1384,10 @@ ${systemPrompt}` : systemPrompt,
       let message = pending;
       pending = null;
       if (!message) {
+        if (!shouldExit && session.queue.size() === 0 && !readyAlreadySent) {
+          sendReady();
+          readyAlreadySent = true;
+        }
         const waitSignal = abortController.signal;
         const batch = await session.queue.waitForMessagesAndGetAsString(waitSignal);
         if (!batch) {

package/dist/{runCodex-MJar-238.mjs → runCodex-BU3BA1l8.mjs}

@@ -1,6 +1,6 @@
-import { l as logger, b as connectionState, A as ApiClient } from './api-BYKV7vX6.mjs';
-import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, c as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-5DVlZaJx.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as readManagedSessionTag, j as resolveManagedSessionTag } from './index-BAhlFq45.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-DRdn4-dL.mjs';
+import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, c as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-Dg0DFPae.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as readManagedSessionTag, j as resolveManagedSessionTag } from './index-C4S85XB7.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
@@ -14,7 +14,7 @@ import 'node:path';
 import 'node:os';
 import 'node:child_process';
 import 'node:readline';
-import './persistence-B8Wgn6aN.mjs';
+import './persistence-DgpGouOO.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-WT-tvePy.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-C0A6Jr8V.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-BleheBks.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DJ9zxAdt.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -977,6 +977,10 @@ async function codexRemoteLauncher(session) {
       let message = pending;
       pending = null;
       if (!message) {
+        if (!shouldExit && session.queue.size() === 0 && !readyAlreadySent) {
+          sendReady();
+          readyAlreadySent = true;
+        }
         const waitSignal = abortController.signal;
         const batch = await session.queue.waitForMessagesAndGetAsString(waitSignal);
         if (!batch) {
@@ -1155,6 +1159,58 @@ async function codexLoop(opts) {
   });
 }
 
+function normalizeFatalProcessError(error) {
+  if (error instanceof Error) {
+    return error;
+  }
+  const message = typeof error === "string" ? error : (() => {
+    try {
+      const serialized = JSON.stringify(error);
+      return serialized && serialized !== "{}" ? serialized : String(error);
+    } catch {
+      return String(error);
+    }
+  })();
+  return new Error(message || "Unknown fatal process error");
+}
+function installFatalProcessHandlers(options) {
+  const target = options.target ?? process;
+  const exit = options.exit ?? process.exit;
+  let shuttingDown = false;
+  let disposed = false;
+  const handleFatalEvent = async (event, reason) => {
+    const error = normalizeFatalProcessError(reason);
+    logger.debug(`[${options.label}] Fatal ${event}`, error);
+    if (shuttingDown) {
+      logger.debug(`[${options.label}] Ignoring duplicate fatal ${event} while shutdown is already in progress`);
+      return;
+    }
+    shuttingDown = true;
+    try {
+      await options.cleanup({ event, error });
+    } catch (cleanupError) {
+      logger.debug(`[${options.label}] Fatal cleanup failed`, cleanupError);
+    }
+    exit(1);
+  };
+  const onUncaughtException = (error) => {
+    void handleFatalEvent("uncaughtException", error);
+  };
+  const onUnhandledRejection = (reason) => {
+    void handleFatalEvent("unhandledRejection", reason);
+  };
+  target.on("uncaughtException", onUncaughtException);
+  target.on("unhandledRejection", onUnhandledRejection);
+  return () => {
+    if (disposed) {
+      return;
+    }
+    disposed = true;
+    target.off("uncaughtException", onUncaughtException);
+    target.off("unhandledRejection", onUnhandledRejection);
+  };
+}
+
 function resolveInitialCodexPermissionMode(opts) {
   if (opts.permissionMode) {
     return opts.permissionMode;
@@ -1296,30 +1352,49 @@ async function runCodex(opts) {
   let loopError;
   let closeError;
   let observerCloseError;
-  try {
-    exitCode = await codexLoop({
-      session: codexSession,
-      startingMode: requestedStartingMode
-    });
-    logger.debug(`[codex] codexLoop resolved with exit code ${exitCode}`);
-  } catch (error) {
-    loopError = error;
-  } finally {
+  let cleanupStarted = false;
+  const cleanupResources = async (closeOptions = {
+    archiveOnClose: true
+  }) => {
+    if (cleanupStarted) {
+      return;
+    }
+    cleanupStarted = true;
     try {
-      await closeProviderSession(sessionClient, {
-        archiveOnClose: true
-      });
+      await closeProviderSession(sessionClient, closeOptions);
     } catch (error) {
-      closeError = error;
+      closeError = closeError ?? error;
     }
     try {
       await userScopedObserver?.close();
     } catch (error) {
-      observerCloseError = error;
+      observerCloseError = observerCloseError ?? error;
     }
     stopCaffeinate();
     reconnectionHandle?.cancel();
-    codexSession.cleanup();
+    codexSession?.cleanup();
+  };
+  const disposeFatalProcessHandlers = installFatalProcessHandlers({
+    label: "codex",
+    cleanup: async ({ event, error }) => {
+      await cleanupResources({
+        archiveReason: `Fatal ${event}: ${error.message}`
+      });
+    }
+  });
+  try {
+    exitCode = await codexLoop({
+      session: codexSession,
+      startingMode: requestedStartingMode
+    });
+    logger.debug(`[codex] codexLoop resolved with exit code ${exitCode}`);
+  } catch (error) {
+    loopError = error;
+  } finally {
+    disposeFatalProcessHandlers();
+    await cleanupResources({
+      archiveOnClose: true
+    });
   }
   if (loopError !== void 0) {
     logger.debug("[codex] runCodex exiting after loop error", loopError);

package/dist/{runCodex-WZ91ZLK7.cjs → runCodex-reARLjN0.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var api = require('./api-CdGT5hsH.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DjxtkGMv.cjs');
-var index = require('./index-D_S_7bqK.cjs');
+var api = require('./api-CeIpGPqs.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-DECzSYvQ.cjs');
+var index = require('./index-D68EOBHW.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
@@ -16,7 +16,7 @@ require('node:path');
 require('node:os');
 require('node:child_process');
 require('node:readline');
-require('./persistence-CMvrZ4SA.cjs');
+require('./persistence-Czyd-Uei.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-DI9QK1iY.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-iSuaFeZH.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-BZVtGMAn.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-CbqNgi4p.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -979,6 +979,10 @@ async function codexRemoteLauncher(session) {
       let message = pending;
       pending = null;
       if (!message) {
+        if (!shouldExit && session.queue.size() === 0 && !readyAlreadySent) {
+          sendReady();
+          readyAlreadySent = true;
+        }
         const waitSignal = abortController.signal;
         const batch = await session.queue.waitForMessagesAndGetAsString(waitSignal);
         if (!batch) {
@@ -1157,6 +1161,58 @@ async function codexLoop(opts) {
   });
 }
 
+function normalizeFatalProcessError(error) {
+  if (error instanceof Error) {
+    return error;
+  }
+  const message = typeof error === "string" ? error : (() => {
+    try {
+      const serialized = JSON.stringify(error);
+      return serialized && serialized !== "{}" ? serialized : String(error);
+    } catch {
+      return String(error);
+    }
+  })();
+  return new Error(message || "Unknown fatal process error");
+}
+function installFatalProcessHandlers(options) {
+  const target = options.target ?? process;
+  const exit = options.exit ?? process.exit;
+  let shuttingDown = false;
+  let disposed = false;
+  const handleFatalEvent = async (event, reason) => {
+    const error = normalizeFatalProcessError(reason);
+    api.logger.debug(`[${options.label}] Fatal ${event}`, error);
+    if (shuttingDown) {
+      api.logger.debug(`[${options.label}] Ignoring duplicate fatal ${event} while shutdown is already in progress`);
+      return;
+    }
+    shuttingDown = true;
+    try {
+      await options.cleanup({ event, error });
+    } catch (cleanupError) {
+      api.logger.debug(`[${options.label}] Fatal cleanup failed`, cleanupError);
+    }
+    exit(1);
+  };
+  const onUncaughtException = (error) => {
+    void handleFatalEvent("uncaughtException", error);
+  };
+  const onUnhandledRejection = (reason) => {
+    void handleFatalEvent("unhandledRejection", reason);
+  };
+  target.on("uncaughtException", onUncaughtException);
+  target.on("unhandledRejection", onUnhandledRejection);
+  return () => {
+    if (disposed) {
+      return;
+    }
+    disposed = true;
+    target.off("uncaughtException", onUncaughtException);
+    target.off("unhandledRejection", onUnhandledRejection);
+  };
+}
+
 function resolveInitialCodexPermissionMode(opts) {
   if (opts.permissionMode) {
     return opts.permissionMode;
@@ -1298,30 +1354,49 @@ async function runCodex(opts) {
   let loopError;
   let closeError;
   let observerCloseError;
-  try {
-    exitCode = await codexLoop({
-      session: codexSession,
-      startingMode: requestedStartingMode
-    });
-    api.logger.debug(`[codex] codexLoop resolved with exit code ${exitCode}`);
-  } catch (error) {
-    loopError = error;
-  } finally {
+  let cleanupStarted = false;
+  const cleanupResources = async (closeOptions = {
+    archiveOnClose: true
+  }) => {
+    if (cleanupStarted) {
+      return;
+    }
+    cleanupStarted = true;
     try {
-      await index.closeProviderSession(sessionClient, {
-        archiveOnClose: true
-      });
+      await index.closeProviderSession(sessionClient, closeOptions);
     } catch (error) {
-      closeError = error;
+      closeError = closeError ?? error;
     }
     try {
       await userScopedObserver?.close();
     } catch (error) {
-      observerCloseError = error;
+      observerCloseError = observerCloseError ?? error;
     }
     index.stopCaffeinate();
     reconnectionHandle?.cancel();
-    codexSession.cleanup();
+    codexSession?.cleanup();
+  };
+  const disposeFatalProcessHandlers = installFatalProcessHandlers({
+    label: "codex",
+    cleanup: async ({ event, error }) => {
+      await cleanupResources({
+        archiveReason: `Fatal ${event}: ${error.message}`
+      });
+    }
+  });
+  try {
+    exitCode = await codexLoop({
+      session: codexSession,
+      startingMode: requestedStartingMode
+    });
+    api.logger.debug(`[codex] codexLoop resolved with exit code ${exitCode}`);
+  } catch (error) {
+    loopError = error;
+  } finally {
+    disposeFatalProcessHandlers();
+    await cleanupResources({
+      archiveOnClose: true
+    });
   }
   if (loopError !== void 0) {
     api.logger.debug("[codex] runCodex exiting after loop error", loopError);

package/dist/{runGemini-B_wCHgPU.cjs → runGemini-BvJUvOvj.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-CdGT5hsH.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DjxtkGMv.cjs');
-var index = require('./index-D_S_7bqK.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-iSuaFeZH.cjs');
+var api = require('./api-CeIpGPqs.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-DECzSYvQ.cjs');
+var index = require('./index-D68EOBHW.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-CbqNgi4p.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-CMvrZ4SA.cjs');
+require('./persistence-Czyd-Uei.cjs');
 require('open');
 require('chalk');
 require('fs');
@@ -677,6 +677,7 @@ async function runGemini(opts) {
   let shouldInjectHistoryOnNextSession = false;
   let currentModeHash = null;
   let unexpectedRuntimeStopRecovery = null;
+  let readyAlreadySent = false;
   async function handleAbort() {
     api.logger.debug("[Gemini] Abort requested - stopping current task");
     if (!turnAbortedSent) {
@@ -1102,6 +1103,10 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       let message = pending;
       pending = null;
       if (!message) {
+        if (!shouldExit && messageQueue.size() === 0 && !readyAlreadySent) {
+          sendReady();
+          readyAlreadySent = true;
+        }
         api.logger.debug("[gemini] Main loop: waiting for messages from queue...");
         const waitSignal = abortController.signal;
         const batch = await messageQueue.waitForMessagesAndGetAsString(waitSignal);
@@ -1136,6 +1141,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         currentModeHash = message.hash;
       }
       currentModeHash = message.hash;
+      readyAlreadySent = false;
       const userMessageToShow = message.mode?.originalUserMessage || message.message;
       messageBuffer.addMessage(userMessageToShow, "user");
       isProcessingMessage = true;

package/dist/{runGemini-BPGpwljp.mjs → runGemini-DeLxSapY.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-BYKV7vX6.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, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-5DVlZaJx.mjs';
-import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, b as closeProviderSession, s as saveGeminiModelToConfig, d as createGeminiBackend, e as stopCaffeinate } from './index-BAhlFq45.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-C0A6Jr8V.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-DRdn4-dL.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, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-Dg0DFPae.mjs';
+import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, b as closeProviderSession, s as saveGeminiModelToConfig, d as createGeminiBackend, e as stopCaffeinate } from './index-C4S85XB7.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DJ9zxAdt.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-B8Wgn6aN.mjs';
+import './persistence-DgpGouOO.mjs';
 import 'open';
 import 'chalk';
 import 'fs';
@@ -675,6 +675,7 @@ async function runGemini(opts) {
   let shouldInjectHistoryOnNextSession = false;
   let currentModeHash = null;
   let unexpectedRuntimeStopRecovery = null;
+  let readyAlreadySent = false;
   async function handleAbort() {
     logger.debug("[Gemini] Abort requested - stopping current task");
     if (!turnAbortedSent) {
@@ -1100,6 +1101,10 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       let message = pending;
       pending = null;
       if (!message) {
+        if (!shouldExit && messageQueue.size() === 0 && !readyAlreadySent) {
+          sendReady();
+          readyAlreadySent = true;
+        }
         logger.debug("[gemini] Main loop: waiting for messages from queue...");
         const waitSignal = abortController.signal;
         const batch = await messageQueue.waitForMessagesAndGetAsString(waitSignal);
@@ -1134,6 +1139,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         currentModeHash = message.hash;
       }
       currentModeHash = message.hash;
+      readyAlreadySent = false;
       const userMessageToShow = message.mode?.originalUserMessage || message.message;
       messageBuffer.addMessage(userMessageToShow, "user");
       isProcessingMessage = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",

package/scripts/devtools/README.md

@@ -1,9 +1,9 @@
-# CLI Devtools
-
-这组脚本用于 CLI 本地开发辅助。
-
-当前包含：
-
-- mock credentials 生成器
-
-新增 CLI 专属开发脚本应优先放在这里。
+# CLI Devtools
+
+这组脚本用于 CLI 本地开发辅助。
+
+当前包含：
+
+- mock credentials 生成器
+
+新增 CLI 专属开发脚本应优先放在这里。