happy-imou-cloud 2.1.4 → 2.1.6

package/dist/{runClaude-DjnTGJGC.cjs → runClaude-bAlUdUGw.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-B6ESNpGB.cjs');
+var api = require('./api-CvtU4DI-.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
-var index = require('./index-D1BP-fEm.cjs');
+var index = require('./index-DA-K28E3.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-EDmI-c8T.cjs');
+require('./persistence-CKgPuZRR.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-Bavm9TDG.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-Drg2Pp1-.cjs');
 var types = require('./types-DVk3crez.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-71xCO8e_.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-3ytO-yBI.cjs');
 require('socket.io-client');
 require('expo-server-sdk');
 var node_util = require('node:util');
@@ -1403,6 +1403,7 @@ ${systemPrompt}` : systemPrompt,
       permissionHandler.setPermissionMode(message.mode.permissionMode);
       messageBuffer.addMessage(message.message, "user");
       let shouldClearHistoryAfterTurn = false;
+      let shouldCommitAccumulatedResponse = false;
       let turnStatus = "task_complete";
       try {
         turnInFlight = true;
@@ -1424,18 +1425,19 @@ ${systemPrompt}` : systemPrompt,
         conversationHistory.addUserMessage(message.message);
         await activeRuntimeHandle.sendPrompt(promptToSend);
         await registerKillSessionHandler.waitForResponseCompleteWithAbort(activeRuntimeHandle.backend, abortController.signal);
+        shouldCommitAccumulatedResponse = true;
         shouldInjectHistoryOnNextSession = false;
         shouldClearHistoryAfterTurn = specialCommand.type === "compact";
       } catch (error) {
         api.logger.warn("[ClaudeACP] Error in Claude ACP session:", error);
         const isAbortError = error instanceof Error && error.name === "AbortError";
         const isExpectedInterruption = isAbortError || abortController.signal.aborted || shouldExit;
+        turnStatus = "turn_aborted";
+        session.client.sendAgentMessage("claude", {
+          type: "turn_aborted",
+          id: node_crypto.randomUUID()
+        });
         if (isExpectedInterruption) {
-          turnStatus = "turn_aborted";
-          session.client.sendAgentMessage("claude", {
-            type: "turn_aborted",
-            id: node_crypto.randomUUID()
-          });
           emitStatusMessage("Aborted by user");
         } else {
           const errorMessage = normalizeClaudeBackendError(error);
@@ -1465,7 +1467,9 @@ ${systemPrompt}` : systemPrompt,
           emitStatusMessage(finalizedTurn.terminateMessage);
         }
         accumulatedResponse = finalizedTurn.cleanedText;
-        emitFinalAssistantMessage(finalizedTurn.cleanedText);
+        if (shouldCommitAccumulatedResponse) {
+          emitFinalAssistantMessage(finalizedTurn.cleanedText);
+        }
         if (shouldClearHistoryAfterTurn) {
           conversationHistory.clear();
           emitStatusMessage("Compaction completed");
@@ -1734,6 +1738,7 @@ class PermissionHandler {
   toolCalls = [];
   responses = /* @__PURE__ */ new Map();
   pendingRequests = /* @__PURE__ */ new Map();
+  pendingToolCallResolutions = /* @__PURE__ */ new Set();
   session;
   allowedTools = /* @__PURE__ */ new Set();
   allowedBashLiterals = /* @__PURE__ */ new Set();
@@ -1813,23 +1818,20 @@ class PermissionHandler {
     if (this.permissionMode === "acceptEdits" && descriptor.edit) {
       return { behavior: "allow", updatedInput: input };
     }
-    let toolCallId = this.resolveToolCallId(toolName, input);
-    if (!toolCallId) {
-      await api.delay(1e3);
-      toolCallId = this.resolveToolCallId(toolName, input);
-      if (!toolCallId) {
-        throw new Error(`Could not resolve tool call ID for ${toolName}`);
-      }
-    }
+    const toolCallId = await this.waitForToolCallId(toolName, input, options.signal);
     return this.handlePermissionRequest(toolCallId, toolName, input, options.signal);
   };
   /**
    * Handles individual permission requests
    */
   async handlePermissionRequest(id, toolName, input, signal) {
+    if (signal.aborted) {
+      throw new Error("Permission request aborted");
+    }
     return new Promise((resolve, reject) => {
       const abortHandler = () => {
         this.pendingRequests.delete(id);
+        this.moveRequestToCompleted(id, "canceled", "Permission request aborted");
         reject(new Error("Permission request aborted"));
       };
       signal.addEventListener("abort", abortHandler, { once: true });
@@ -1872,6 +1874,31 @@ class PermissionHandler {
       api.logger.debug(`Permission request sent for tool call ${id}: ${toolName}`);
     });
   }
+  moveRequestToCompleted(id, status, reason, extra = {}) {
+    this.session.client.updateAgentState((currentState) => {
+      const request = currentState.requests?.[id];
+      if (!request) {
+        return currentState;
+      }
+      const requests = { ...currentState.requests || {} };
+      delete requests[id];
+      return {
+        ...currentState,
+        requests,
+        completedRequests: {
+          ...currentState.completedRequests,
+          [id]: {
+            ...request,
+            completedAt: Date.now(),
+            status,
+            reason,
+            mode: extra.mode,
+            allowTools: extra.allowTools
+          }
+        }
+      };
+    });
+  }
   /**
    * Parses Bash permission strings into literal and prefix sets
    */
@@ -1908,6 +1935,49 @@ class PermissionHandler {
     }
     return null;
   }
+  async waitForToolCallId(toolName, input, signal) {
+    const existingToolCallId = this.resolveToolCallId(toolName, input);
+    if (existingToolCallId) {
+      return existingToolCallId;
+    }
+    if (signal.aborted) {
+      throw new Error("Permission request aborted before tool call was observed");
+    }
+    return new Promise((resolve, reject) => {
+      const pendingResolution = {};
+      const cleanup = () => {
+        signal.removeEventListener("abort", pendingResolution.abortHandler);
+        this.pendingToolCallResolutions.delete(pendingResolution);
+      };
+      pendingResolution.toolName = toolName;
+      pendingResolution.input = input;
+      pendingResolution.resolve = (toolCallId) => {
+        cleanup();
+        resolve(toolCallId);
+      };
+      pendingResolution.reject = (error) => {
+        cleanup();
+        reject(error);
+      };
+      pendingResolution.abortHandler = () => {
+        pendingResolution.reject(new Error("Permission request aborted before tool call was observed"));
+      };
+      this.pendingToolCallResolutions.add(pendingResolution);
+      signal.addEventListener("abort", pendingResolution.abortHandler, { once: true });
+      this.resolvePendingToolCallResolutions();
+    });
+  }
+  resolvePendingToolCallResolutions() {
+    if (this.pendingToolCallResolutions.size === 0) {
+      return;
+    }
+    for (const pending of Array.from(this.pendingToolCallResolutions)) {
+      const toolCallId = this.resolveToolCallId(pending.toolName, pending.input);
+      if (toolCallId) {
+        pending.resolve(toolCallId);
+      }
+    }
+  }
   /**
    * Handles messages to track tool calls
    */
@@ -1925,6 +1995,7 @@ class PermissionHandler {
             });
           }
         }
+        this.resolvePendingToolCallResolutions();
       }
     }
     if (message.type === "user") {
@@ -1963,6 +2034,10 @@ class PermissionHandler {
     this.allowedTools.clear();
     this.allowedBashLiterals.clear();
     this.allowedBashPrefixes.clear();
+    for (const pendingResolution of Array.from(this.pendingToolCallResolutions)) {
+      pendingResolution.reject(new Error("Session reset"));
+    }
+    this.pendingToolCallResolutions.clear();
     for (const [, pending] of this.pendingRequests.entries()) {
       pending.reject(new Error("Session reset"));
     }
@@ -2001,27 +2076,15 @@ class PermissionHandler {
       this.responses.set(id, { ...message, receivedAt: Date.now() });
       this.pendingRequests.delete(id);
       this.handlePermissionResponse(message, pending);
-      this.session.client.updateAgentState((currentState) => {
-        const request = currentState.requests?.[id];
-        if (!request) return currentState;
-        let r = { ...currentState.requests };
-        delete r[id];
-        return {
-          ...currentState,
-          requests: r,
-          completedRequests: {
-            ...currentState.completedRequests,
-            [id]: {
-              ...request,
-              completedAt: Date.now(),
-              status: message.approved ? "approved" : "denied",
-              reason: message.reason,
-              mode: message.mode,
-              allowTools: message.allowTools
-            }
-          }
-        };
-      });
+      this.moveRequestToCompleted(
+        id,
+        message.approved ? "approved" : "denied",
+        message.reason,
+        {
+          mode: message.mode,
+          allowTools: message.allowTools
+        }
+      );
     });
   }
   /**
@@ -3248,7 +3311,7 @@ async function runClaude(credentials, options = {}) {
     throw error;
   }
   api.logger.debug(`Using machineId: ${machineId}`);
-  const { state, metadata } = registerKillSessionHandler.createSessionMetadata({
+  const { state, metadata } = index.createSessionMetadata({
     flavor: "claude",
     machineId,
     startedBy: options.startedBy
@@ -3343,7 +3406,7 @@ async function runClaude(credentials, options = {}) {
     try {
       if (session) {
         currentSession?.cleanup();
-        await registerKillSessionHandler.closeProviderSession(session, {
+        await index.closeProviderSession(session, {
           archiveReason: "User terminated"
         });
       }
@@ -3394,7 +3457,7 @@ async function runClaude(credentials, options = {}) {
   currentSession?.cleanup();
   api.logger.debug("Waiting for socket to flush...");
   api.logger.debug("Closing session...");
-  await registerKillSessionHandler.closeProviderSession(session, {
+  await index.closeProviderSession(session, {
     archiveOnClose: true
   });
   index.stopCaffeinate();

package/dist/{runCodex-DUs_jBE-.mjs → runCodex-B31D_imZ.mjs}

@@ -1,9 +1,9 @@
-import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient } from './api-l8X03rs-.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-DAVhkb-l.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate } from './index-D72RMo5Z.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-DF9A136-.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-DmG1p8l7.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-B5e-MA1d.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
+import { randomUUID } from 'node:crypto';
 import 'ps-list';
 import 'fs';
 import 'path';
@@ -14,7 +14,7 @@ import 'node:path';
 import 'node:os';
 import 'node:child_process';
 import 'node:readline';
-import './persistence-CyFjFOlN.mjs';
+import './persistence-BsWBBi7E.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-CGTnB7ba.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-lTsZVuAU.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-C3kHFqeq.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-CRXr7Axk.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -1180,7 +1180,8 @@ function resolveIncomingCodexPermissionMode(opts) {
   };
 }
 async function runCodex(opts) {
-  const sessionTag = randomUUID();
+  const managedSessionTag = readManagedSessionTag();
+  const sessionTag = managedSessionTag ?? resolveManagedSessionTag();
   connectionState.setBackend("Codex");
   const requestedStartingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
   const initialPermissionMode = resolveInitialCodexPermissionMode({
@@ -1225,6 +1226,7 @@ async function runCodex(opts) {
     machineId,
     startedBy: opts.startedBy,
     authFallbackLogMessage: "[codex] Falling back to offline session stub after authentication failure",
+    reconcileMetadataOnAttach: managedSessionTag !== null,
     onSessionSwap: (newSession) => {
       sessionClient = newSession;
       codexSession?.updateClient(newSession);

package/dist/{runCodex-BHq7Rnq7.cjs → runCodex-CiIbJ1wa.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var node_crypto = require('node:crypto');
-var api = require('./api-B6ESNpGB.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-71xCO8e_.cjs');
-var index = require('./index-D1BP-fEm.cjs');
+var api = require('./api-CvtU4DI-.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-3ytO-yBI.cjs');
+var index = require('./index-DA-K28E3.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
+var node_crypto = require('node:crypto');
 require('ps-list');
 require('fs');
 require('path');
@@ -16,7 +16,7 @@ require('node:path');
 require('node:os');
 require('node:child_process');
 require('node:readline');
-require('./persistence-EDmI-c8T.cjs');
+require('./persistence-CKgPuZRR.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-Bavm9TDG.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DgdsExMH.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-Drg2Pp1-.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-C3oDrA4i.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -926,7 +926,7 @@ async function codexRemoteLauncher(session) {
     api.logger.debug("[Codex] Kill session requested - terminating process");
     await handleAbort();
     try {
-      await registerKillSessionHandler.closeProviderSession(session.runtimeSession, {
+      await index.closeProviderSession(session.runtimeSession, {
         archiveReason: "User terminated"
       });
       await disposeRuntimeHandle();
@@ -1182,7 +1182,8 @@ function resolveIncomingCodexPermissionMode(opts) {
   };
 }
 async function runCodex(opts) {
-  const sessionTag = node_crypto.randomUUID();
+  const managedSessionTag = index.readManagedSessionTag();
+  const sessionTag = managedSessionTag ?? index.resolveManagedSessionTag();
   api.connectionState.setBackend("Codex");
   const requestedStartingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
   const initialPermissionMode = resolveInitialCodexPermissionMode({
@@ -1227,6 +1228,7 @@ async function runCodex(opts) {
     machineId,
     startedBy: opts.startedBy,
     authFallbackLogMessage: "[codex] Falling back to offline session stub after authentication failure",
+    reconcileMetadataOnAttach: managedSessionTag !== null,
     onSessionSwap: (newSession) => {
       sessionClient = newSession;
       codexSession?.updateClient(newSession);
@@ -1307,7 +1309,7 @@ async function runCodex(opts) {
     loopError = error;
   } finally {
     try {
-      await registerKillSessionHandler.closeProviderSession(sessionClient, {
+      await index.closeProviderSession(sessionClient, {
         archiveOnClose: true
       });
     } catch (error) {

package/dist/{runGemini-pmvBZ6qU.mjs → runGemini-BJ7PxLyl.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-l8X03rs-.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-DAVhkb-l.mjs';
-import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-D72RMo5Z.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-lTsZVuAU.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-DF9A136-.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-DmG1p8l7.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-B5e-MA1d.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-CRXr7Axk.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-CyFjFOlN.mjs';
+import './persistence-BsWBBi7E.mjs';
 import 'open';
 import 'chalk';
 import 'fs';

package/dist/{runGemini-hkZeOnA_.cjs → runGemini-BZJR84o-.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-B6ESNpGB.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-71xCO8e_.cjs');
-var index = require('./index-D1BP-fEm.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DgdsExMH.cjs');
+var api = require('./api-CvtU4DI-.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-3ytO-yBI.cjs');
+var index = require('./index-DA-K28E3.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-C3oDrA4i.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-EDmI-c8T.cjs');
+require('./persistence-CKgPuZRR.cjs');
 require('open');
 require('chalk');
 require('fs');
@@ -707,7 +707,7 @@ async function runGemini(opts) {
     api.logger.debug("[Gemini] Abort completed, proceeding with termination");
     try {
       if (session) {
-        await registerKillSessionHandler.closeProviderSession(session, {
+        await index.closeProviderSession(session, {
           archiveReason: "User terminated"
         });
       }
@@ -1338,7 +1338,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       reconnectionHandle.cancel();
     }
     try {
-      await registerKillSessionHandler.closeProviderSession(session, {
+      await index.closeProviderSession(session, {
         archiveOnClose: true
       });
     } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",
@@ -125,7 +125,7 @@
     "shx": "^0.3.3",
     "ts-node": "^10",
     "tsx": "^4.20.6",
-    "typescript": "5.9.3",
+    "typescript": "5.9.3",
     "vitest": "^3.2.4"
   },
   "resolutions": {