happy-imou-cloud 2.0.3 → 2.0.4

package/dist/{runCodex-WRmgSK6L.cjs → runCodex-BtZplK1R.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-D9dIR956.cjs');
-var persistence = require('./persistence-PzKU0QCa.cjs');
-var index = require('./index-LYPXVO_L.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-_wxlqKB8.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-BDBPoQSA.cjs');
+var api = require('./api-CyJG1mr6.cjs');
+var persistence = require('./persistence-BeFVx6kI.cjs');
+var index = require('./index-1zlH6s7a.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DEEfNi5Y.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CCxqGFjZ.cjs');
 var React = require('react');
 var ink = require('ink');
 require('axios');
@@ -738,7 +738,8 @@ function normalizeCodexBackendError(error) {
   const text = index.formatDisplayMessage(error).trim();
   const stderrText = record ? index.formatDisplayMessage(record.stderr).trim() : "";
   const detailText = record ? index.formatDisplayMessage(record.detail).trim() : "";
-  const searchableText = [text, stderrText, detailText].filter(Boolean).join("\n");
+  const dataText = record ? index.formatDisplayMessage(record.data).trim() : "";
+  const searchableText = [text, stderrText, detailText, dataText].filter(Boolean).join("\n");
   const prefix = typeof error === "object" && error !== null ? [
     record?.code !== void 0 && record?.code !== null ? `[code=${String(record.code)}]` : "",
     record?.status !== void 0 && record?.status !== null ? `[status=${String(record.status)}]` : ""
@@ -751,6 +752,9 @@ function normalizeCodexBackendError(error) {
     const hint = "The configured Codex ACP command does not speak the ACP protocol. Make sure HAPPY_CODEX_ACP_BIN points to codex-acp, not the codex CLI.";
     return prefix ? `${prefix} ${hint}` : hint;
   }
+  if (typeof record?.message === "string" && record.message.trim().toLowerCase() === "internal error" && dataText) {
+    return prefix ? `${prefix} ${dataText}` : dataText;
+  }
   if (error instanceof Error && text) {
     return text;
   }
@@ -870,6 +874,14 @@ async function codexRemoteLauncher(session) {
     messageBuffer.addMessage(message, "status");
     session.runtimeSession.sendSessionEvent({ type: "message", message });
   };
+  const emitUserVisibleErrorMessage = (message) => {
+    emitStatusMessage(message);
+    session.runtimeSession.sendCodexMessage({
+      type: "message",
+      message,
+      id: node_crypto.randomUUID()
+    });
+  };
   const queueHistoryInjectionForRestart = (reason) => {
     messageBuffer.addMessage("\u2550".repeat(40), "status");
     if (conversationHistory.hasHistory()) {
@@ -964,7 +976,8 @@ async function codexRemoteLauncher(session) {
             type: "tool-call-result",
             callId: msg.callId,
             output: msg.result,
-            id: node_crypto.randomUUID()
+            id: node_crypto.randomUUID(),
+            isError
           });
           return;
         }
@@ -1042,7 +1055,8 @@ async function codexRemoteLauncher(session) {
               stderr: msg.stderr,
               success: msg.success
             },
-            id: node_crypto.randomUUID()
+            id: node_crypto.randomUUID(),
+            isError: !msg.success
           });
           return;
         }
@@ -1255,7 +1269,7 @@ async function codexRemoteLauncher(session) {
           emitStatusMessage("Aborted by user");
         } else {
           const errorMessage = normalizeCodexBackendError(error);
-          emitStatusMessage(errorMessage);
+          emitUserVisibleErrorMessage(errorMessage);
           if (conversationHistory.hasHistory()) {
             shouldInjectHistoryOnNextSession = true;
           }
@@ -1364,10 +1378,39 @@ async function syncControlledByUserState(sessionClient, controlledByUser) {
 function shouldSupersedeCodexPendingInteractions(opts) {
   return true;
 }
+function resolveInitialCodexPermissionMode(opts) {
+  if (opts.permissionMode) {
+    return opts.permissionMode;
+  }
+  const startingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
+  if (opts.startedBy === "daemon" && startingMode === "remote") {
+    return "yolo";
+  }
+  return void 0;
+}
+function resolveQueuedCodexPermissionMode(opts) {
+  if (opts.preserveCurrentOnDefault && opts.messagePermissionMode === "default" && opts.currentPermissionMode) {
+    return opts.currentPermissionMode;
+  }
+  return opts.messagePermissionMode ?? opts.currentPermissionMode ?? "default";
+}
+function resolveIncomingCodexPermissionMode(opts) {
+  const resolvedPermissionMode = resolveQueuedCodexPermissionMode(opts);
+  return {
+    resolvedPermissionMode,
+    nextCurrentPermissionMode: resolvedPermissionMode
+  };
+}
 async function runCodex(opts) {
   const sessionTag = node_crypto.randomUUID();
   api.connectionState.setBackend("Codex");
   const requestedStartingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
+  const initialPermissionMode = resolveInitialCodexPermissionMode({
+    permissionMode: opts.permissionMode,
+    startedBy: opts.startedBy,
+    startingMode: requestedStartingMode
+  });
+  const preserveCurrentPermissionModeForRemoteDefault = opts.startedBy === "daemon" && requestedStartingMode === "remote";
   if (opts.startedBy === "daemon" && requestedStartingMode === "local") {
     throw new Error("Daemon-spawned Codex sessions cannot use local mode.");
   }
@@ -1422,14 +1465,20 @@ async function runCodex(opts) {
     }
   }
   const messageQueue = new registerKillSessionHandler.MessageQueue2(getCodexExecutionFingerprint);
-  let currentPermissionMode;
+  let currentPermissionMode = initialPermissionMode;
   let currentModel;
   sessionClient.onUserMessage((message) => {
-    let messagePermissionMode = currentPermissionMode;
+    const previousPermissionMode = currentPermissionMode;
+    let messagePermissionMode = previousPermissionMode;
     if (message.meta?.permissionMode) {
       messagePermissionMode = message.meta.permissionMode;
-      currentPermissionMode = messagePermissionMode;
     }
+    const permissionResolution = resolveIncomingCodexPermissionMode({
+      messagePermissionMode,
+      currentPermissionMode: previousPermissionMode,
+      preserveCurrentOnDefault: preserveCurrentPermissionModeForRemoteDefault
+    });
+    currentPermissionMode = permissionResolution.nextCurrentPermissionMode;
     let messageModel = currentModel;
     if (message.meta?.hasOwnProperty("model")) {
       messageModel = message.meta.model || void 0;
@@ -1443,7 +1492,7 @@ async function runCodex(opts) {
       codexSession?.supersedePendingInteractions(BaseReasoningProcessor.INTERACTION_SUPERSEDED_ERROR);
     }
     messageQueue.push(message.content.text, {
-      permissionMode: messagePermissionMode || "default",
+      permissionMode: permissionResolution.resolvedPermissionMode,
       model: messageModel
     });
   });
@@ -1477,6 +1526,9 @@ async function runCodex(opts) {
   }
 }
 
+exports.resolveIncomingCodexPermissionMode = resolveIncomingCodexPermissionMode;
+exports.resolveInitialCodexPermissionMode = resolveInitialCodexPermissionMode;
+exports.resolveQueuedCodexPermissionMode = resolveQueuedCodexPermissionMode;
 exports.runCodex = runCodex;
 exports.shouldSupersedeCodexPendingInteractions = shouldSupersedeCodexPendingInteractions;
 exports.supportsAgentStateUpdateEvents = supportsAgentStateUpdateEvents;

package/dist/{runCodex-CsfUU1Wb.mjs → runCodex-DgKKw3IU.mjs}

@@ -1,9 +1,9 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-DpQIC-DJ.mjs';
-import { readSettings } from './persistence-CqgPgbzN.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate, i as initialMachineMetadata, n as notifyDaemonSessionStarted } from './index-CriPm_z9.mjs';
-import { B as BasePermissionHandler, g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, b as INTERACTION_TIMED_OUT_ERROR, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-B37yOHxo.mjs';
-import { h as hashObject, a as MessageBuffer, r as registerKillSessionHandler, M as MessageQueue2 } from './registerKillSessionHandler-C3M_-4Zg.mjs';
+import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-CIHTNilH.mjs';
+import { readSettings } from './persistence-sLEqV8vk.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate, i as initialMachineMetadata, n as notifyDaemonSessionStarted } from './index-vNYxNqVZ.mjs';
+import { B as BasePermissionHandler, g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, b as INTERACTION_TIMED_OUT_ERROR, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-Di1yEMMv.mjs';
+import { h as hashObject, a as MessageBuffer, r as registerKillSessionHandler, M as MessageQueue2 } from './registerKillSessionHandler-uVHqIC4h.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import 'axios';
@@ -736,7 +736,8 @@ function normalizeCodexBackendError(error) {
   const text = formatDisplayMessage(error).trim();
   const stderrText = record ? formatDisplayMessage(record.stderr).trim() : "";
   const detailText = record ? formatDisplayMessage(record.detail).trim() : "";
-  const searchableText = [text, stderrText, detailText].filter(Boolean).join("\n");
+  const dataText = record ? formatDisplayMessage(record.data).trim() : "";
+  const searchableText = [text, stderrText, detailText, dataText].filter(Boolean).join("\n");
   const prefix = typeof error === "object" && error !== null ? [
     record?.code !== void 0 && record?.code !== null ? `[code=${String(record.code)}]` : "",
     record?.status !== void 0 && record?.status !== null ? `[status=${String(record.status)}]` : ""
@@ -749,6 +750,9 @@ function normalizeCodexBackendError(error) {
     const hint = "The configured Codex ACP command does not speak the ACP protocol. Make sure HAPPY_CODEX_ACP_BIN points to codex-acp, not the codex CLI.";
     return prefix ? `${prefix} ${hint}` : hint;
   }
+  if (typeof record?.message === "string" && record.message.trim().toLowerCase() === "internal error" && dataText) {
+    return prefix ? `${prefix} ${dataText}` : dataText;
+  }
   if (error instanceof Error && text) {
     return text;
   }
@@ -868,6 +872,14 @@ async function codexRemoteLauncher(session) {
     messageBuffer.addMessage(message, "status");
     session.runtimeSession.sendSessionEvent({ type: "message", message });
   };
+  const emitUserVisibleErrorMessage = (message) => {
+    emitStatusMessage(message);
+    session.runtimeSession.sendCodexMessage({
+      type: "message",
+      message,
+      id: randomUUID()
+    });
+  };
   const queueHistoryInjectionForRestart = (reason) => {
     messageBuffer.addMessage("\u2550".repeat(40), "status");
     if (conversationHistory.hasHistory()) {
@@ -962,7 +974,8 @@ async function codexRemoteLauncher(session) {
             type: "tool-call-result",
             callId: msg.callId,
             output: msg.result,
-            id: randomUUID()
+            id: randomUUID(),
+            isError
           });
           return;
         }
@@ -1040,7 +1053,8 @@ async function codexRemoteLauncher(session) {
               stderr: msg.stderr,
               success: msg.success
             },
-            id: randomUUID()
+            id: randomUUID(),
+            isError: !msg.success
           });
           return;
         }
@@ -1253,7 +1267,7 @@ async function codexRemoteLauncher(session) {
           emitStatusMessage("Aborted by user");
         } else {
           const errorMessage = normalizeCodexBackendError(error);
-          emitStatusMessage(errorMessage);
+          emitUserVisibleErrorMessage(errorMessage);
           if (conversationHistory.hasHistory()) {
             shouldInjectHistoryOnNextSession = true;
           }
@@ -1362,10 +1376,39 @@ async function syncControlledByUserState(sessionClient, controlledByUser) {
 function shouldSupersedeCodexPendingInteractions(opts) {
   return true;
 }
+function resolveInitialCodexPermissionMode(opts) {
+  if (opts.permissionMode) {
+    return opts.permissionMode;
+  }
+  const startingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
+  if (opts.startedBy === "daemon" && startingMode === "remote") {
+    return "yolo";
+  }
+  return void 0;
+}
+function resolveQueuedCodexPermissionMode(opts) {
+  if (opts.preserveCurrentOnDefault && opts.messagePermissionMode === "default" && opts.currentPermissionMode) {
+    return opts.currentPermissionMode;
+  }
+  return opts.messagePermissionMode ?? opts.currentPermissionMode ?? "default";
+}
+function resolveIncomingCodexPermissionMode(opts) {
+  const resolvedPermissionMode = resolveQueuedCodexPermissionMode(opts);
+  return {
+    resolvedPermissionMode,
+    nextCurrentPermissionMode: resolvedPermissionMode
+  };
+}
 async function runCodex(opts) {
   const sessionTag = randomUUID();
   connectionState.setBackend("Codex");
   const requestedStartingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
+  const initialPermissionMode = resolveInitialCodexPermissionMode({
+    permissionMode: opts.permissionMode,
+    startedBy: opts.startedBy,
+    startingMode: requestedStartingMode
+  });
+  const preserveCurrentPermissionModeForRemoteDefault = opts.startedBy === "daemon" && requestedStartingMode === "remote";
   if (opts.startedBy === "daemon" && requestedStartingMode === "local") {
     throw new Error("Daemon-spawned Codex sessions cannot use local mode.");
   }
@@ -1420,14 +1463,20 @@ async function runCodex(opts) {
     }
   }
   const messageQueue = new MessageQueue2(getCodexExecutionFingerprint);
-  let currentPermissionMode;
+  let currentPermissionMode = initialPermissionMode;
   let currentModel;
   sessionClient.onUserMessage((message) => {
-    let messagePermissionMode = currentPermissionMode;
+    const previousPermissionMode = currentPermissionMode;
+    let messagePermissionMode = previousPermissionMode;
     if (message.meta?.permissionMode) {
       messagePermissionMode = message.meta.permissionMode;
-      currentPermissionMode = messagePermissionMode;
     }
+    const permissionResolution = resolveIncomingCodexPermissionMode({
+      messagePermissionMode,
+      currentPermissionMode: previousPermissionMode,
+      preserveCurrentOnDefault: preserveCurrentPermissionModeForRemoteDefault
+    });
+    currentPermissionMode = permissionResolution.nextCurrentPermissionMode;
     let messageModel = currentModel;
     if (message.meta?.hasOwnProperty("model")) {
       messageModel = message.meta.model || void 0;
@@ -1441,7 +1490,7 @@ async function runCodex(opts) {
       codexSession?.supersedePendingInteractions(INTERACTION_SUPERSEDED_ERROR);
     }
     messageQueue.push(message.content.text, {
-      permissionMode: messagePermissionMode || "default",
+      permissionMode: permissionResolution.resolvedPermissionMode,
       model: messageModel
     });
   });
@@ -1475,4 +1524,4 @@ async function runCodex(opts) {
   }
 }
 
-export { runCodex, shouldSupersedeCodexPendingInteractions, supportsAgentStateUpdateEvents, syncControlledByUserState };
+export { resolveIncomingCodexPermissionMode, resolveInitialCodexPermissionMode, resolveQueuedCodexPermissionMode, runCodex, shouldSupersedeCodexPendingInteractions, supportsAgentStateUpdateEvents, syncControlledByUserState };

package/dist/{runGemini-CrH3dQ0Y.mjs → runGemini-CM1v3I24.mjs}

@@ -1,11 +1,11 @@
 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, i as isAuthenticationRequiredError } from './api-DpQIC-DJ.mjs';
-import { readSettings } from './persistence-CqgPgbzN.mjs';
-import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-B37yOHxo.mjs';
-import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-CriPm_z9.mjs';
-import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-C3M_-4Zg.mjs';
+import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-CIHTNilH.mjs';
+import { readSettings } from './persistence-sLEqV8vk.mjs';
+import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-Di1yEMMv.mjs';
+import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-vNYxNqVZ.mjs';
+import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-uVHqIC4h.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -958,7 +958,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           });
           break;
         case "tool-result":
-          const isError = msg.result && typeof msg.result === "object" && "error" in msg.result;
+          const isError = Boolean(msg.result && typeof msg.result === "object" && "error" in msg.result);
           const resultText = typeof msg.result === "string" ? msg.result.substring(0, 200) : JSON.stringify(msg.result).substring(0, 200);
           const truncatedResult = resultText + (typeof msg.result === "string" && msg.result.length > 200 ? "..." : "");
           const resultSize = typeof msg.result === "string" ? msg.result.length : JSON.stringify(msg.result).length;
@@ -980,7 +980,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             type: "tool-result",
             callId: msg.callId,
             output: msg.result,
-            id: randomUUID()
+            id: randomUUID(),
+            isError
           });
           break;
         case "fs-edit":
@@ -1076,7 +1077,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
               stderr,
               success
             },
-            id: randomUUID()
+            id: randomUUID(),
+            isError: !success
           });
           break;
         case "event":

package/dist/{runGemini-qBh6zs5G.cjs → runGemini-DUyH311Z.cjs}

@@ -3,11 +3,11 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-D9dIR956.cjs');
-var persistence = require('./persistence-PzKU0QCa.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-_wxlqKB8.cjs');
-var index = require('./index-LYPXVO_L.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-BDBPoQSA.cjs');
+var api = require('./api-CyJG1mr6.cjs');
+var persistence = require('./persistence-BeFVx6kI.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DEEfNi5Y.cjs');
+var index = require('./index-1zlH6s7a.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CCxqGFjZ.cjs');
 require('axios');
 require('chalk');
 require('fs');
@@ -960,7 +960,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           });
           break;
         case "tool-result":
-          const isError = msg.result && typeof msg.result === "object" && "error" in msg.result;
+          const isError = Boolean(msg.result && typeof msg.result === "object" && "error" in msg.result);
           const resultText = typeof msg.result === "string" ? msg.result.substring(0, 200) : JSON.stringify(msg.result).substring(0, 200);
           const truncatedResult = resultText + (typeof msg.result === "string" && msg.result.length > 200 ? "..." : "");
           const resultSize = typeof msg.result === "string" ? msg.result.length : JSON.stringify(msg.result).length;
@@ -982,7 +982,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             type: "tool-result",
             callId: msg.callId,
             output: msg.result,
-            id: node_crypto.randomUUID()
+            id: node_crypto.randomUUID(),
+            isError
           });
           break;
         case "fs-edit":
@@ -1078,7 +1079,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
               stderr,
               success
             },
-            id: node_crypto.randomUUID()
+            id: node_crypto.randomUUID(),
+            isError: !success
           });
           break;
         case "event":

package/package.json

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