happy-imou-cloud 2.0.3 → 2.0.5

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
 require('chalk');
-require('./api-D9dIR956.cjs');
-require('./persistence-PzKU0QCa.cjs');
+require('./api-DaqnNHfl.cjs');
+require('./persistence-D6Y0604_.cjs');
 require('zod');
-require('./index-LYPXVO_L.cjs');
+require('./index-Dc92gnxM.cjs');
 require('node:child_process');
 require('node:fs');
 require('@agentclientprotocol/sdk');

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import 'chalk';
-import './api-DpQIC-DJ.mjs';
-import './persistence-CqgPgbzN.mjs';
+import './api-DoHt-HyL.mjs';
+import './persistence-QqeBvUxX.mjs';
 import 'zod';
-import './index-CriPm_z9.mjs';
+import './index-C5wR2qKT.mjs';
 import 'node:child_process';
 import 'node:fs';
 import '@agentclientprotocol/sdk';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var api = require('./api-D9dIR956.cjs');
+var api = require('./api-DaqnNHfl.cjs');
 var types = require('./types-DVk3crez.cjs');
 require('axios');
 require('chalk');

package/dist/lib.mjs

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

package/dist/{persistence-PzKU0QCa.cjs → persistence-D6Y0604_.cjs}

@@ -3,7 +3,7 @@
 var promises = require('node:fs/promises');
 var node_fs = require('node:fs');
 var node_path = require('node:path');
-var api = require('./api-D9dIR956.cjs');
+var api = require('./api-DaqnNHfl.cjs');
 var z = require('zod');
 require('axios');
 require('chalk');

package/dist/{persistence-CqgPgbzN.mjs → persistence-QqeBvUxX.mjs}

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

package/dist/{registerKillSessionHandler-BDBPoQSA.cjs → registerKillSessionHandler-C6yXr8ky.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-LYPXVO_L.cjs');
-var api = require('./api-D9dIR956.cjs');
+var index = require('./index-Dc92gnxM.cjs');
+var api = require('./api-DaqnNHfl.cjs');
 var crypto = require('crypto');
 require('axios');
 require('node:events');

package/dist/{registerKillSessionHandler-C3M_-4Zg.mjs → registerKillSessionHandler-CC9zGBPE.mjs}

@@ -1,5 +1,5 @@
-import { f as formatDisplayMessage } from './index-CriPm_z9.mjs';
-import { l as logger } from './api-DpQIC-DJ.mjs';
+import { f as formatDisplayMessage } from './index-C5wR2qKT.mjs';
+import { l as logger } from './api-DoHt-HyL.mjs';
 import { createHash } from 'crypto';
 import 'axios';
 import 'node:events';

package/dist/{runClaude-D6Pdkevn.mjs → runClaude-CZ8gxaJL.mjs}

@@ -1,13 +1,13 @@
 import os, { homedir } from 'node:os';
 import { randomUUID } from 'node:crypto';
-import { l as logger, d as backoff, f as delay, g as AsyncLock, c as configuration, b as connectionState, A as ApiClient, p as packageJson, i as isAuthenticationRequiredError, s as startOfflineReconnection } from './api-DpQIC-DJ.mjs';
-import { e as getProjectPath, h as claudeLocal, E as ExitCodeError, j as isBun, k as trimIdent, l as claudeCheckSession, p as projectPath, m as getEnvironmentInfo, i as initialMachineMetadata, b as stopCaffeinate, n as notifyDaemonSessionStarted, o as startCaffeinate } from './index-CriPm_z9.mjs';
+import { l as logger, d as backoff, f as delay, g as AsyncLock, c as configuration, b as connectionState, A as ApiClient, p as packageJson, i as isAuthenticationRequiredError, s as startOfflineReconnection } from './api-DoHt-HyL.mjs';
+import { e as getProjectPath, h as claudeLocal, E as ExitCodeError, j as isBun, k as trimIdent, l as claudeCheckSession, p as projectPath, m as getEnvironmentInfo, i as initialMachineMetadata, b as stopCaffeinate, n as notifyDaemonSessionStarted, o as startCaffeinate } from './index-C5wR2qKT.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import { dirname, basename, join, resolve } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { stat, watch, access } from 'fs/promises';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { a as MessageBuffer, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler } from './registerKillSessionHandler-C3M_-4Zg.mjs';
+import { a as MessageBuffer, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler } from './registerKillSessionHandler-CC9zGBPE.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { execSync, spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
@@ -20,7 +20,7 @@ import 'tweetnacl';
 import 'expo-server-sdk';
 import 'chalk';
 import { isDeepStrictEqual } from 'node:util';
-import { readSettings } from './persistence-CqgPgbzN.mjs';
+import { readSettings } from './persistence-QqeBvUxX.mjs';
 import { createServer } from 'node:http';
 import 'fs';
 import 'zod';

package/dist/{runClaude-IeRSC5qX.cjs → runClaude-gHKFB1UG.cjs}

@@ -2,14 +2,14 @@
 
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var api = require('./api-D9dIR956.cjs');
-var index = require('./index-LYPXVO_L.cjs');
+var api = require('./api-DaqnNHfl.cjs');
+var index = require('./index-Dc92gnxM.cjs');
 var types = require('./types-DVk3crez.cjs');
 var node_path = require('node:path');
 var promises = require('node:fs/promises');
 var fs = require('fs/promises');
 var ink = require('ink');
-var registerKillSessionHandler = require('./registerKillSessionHandler-BDBPoQSA.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-C6yXr8ky.cjs');
 var React = require('react');
 var node_child_process = require('node:child_process');
 var node_readline = require('node:readline');
@@ -22,7 +22,7 @@ require('tweetnacl');
 require('expo-server-sdk');
 require('chalk');
 var node_util = require('node:util');
-var persistence = require('./persistence-PzKU0QCa.cjs');
+var persistence = require('./persistence-D6Y0604_.cjs');
 var node_http = require('node:http');
 require('fs');
 require('zod');
@@ -937,7 +937,7 @@ class AbortError extends Error {
   }
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('runClaude-IeRSC5qX.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('runClaude-gHKFB1UG.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {

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

@@ -1,13 +1,14 @@
 '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-DaqnNHfl.cjs');
+var persistence = require('./persistence-D6Y0604_.cjs');
+var index = require('./index-Dc92gnxM.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DPVZIJ4n.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-C6yXr8ky.cjs');
 var React = require('react');
 var ink = require('ink');
+var happyProtocol = require('happy-protocol');
 require('axios');
 require('chalk');
 require('fs');
@@ -738,7 +739,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 +753,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 +875,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()) {
@@ -940,21 +953,28 @@ async function codexRemoteLauncher(session) {
         }
         case "tool-call": {
           const toolArgs = msg.args ? index.truncateDisplayMessage(msg.args, 100) : "";
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(
             `Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}` : ""}`,
             "tool"
           );
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: msg.toolName,
+            name: canonicalToolName,
             callId: msg.callId,
-            input: msg.args,
+            input: happyProtocol.attachToolHappierMetaV2(msg.args, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: msg.toolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           return;
         }
         case "tool-result": {
-          const isError = msg.result && typeof msg.result === "object" && "error" in msg.result;
+          const isError = happyProtocol.inferToolResultError(msg.result);
           const resultText = index.truncateDisplayMessage(msg.result, 200) || (isError ? "Unknown error" : "");
           messageBuffer.addMessage(
             `${isError ? "Error:" : "Result:"} ${resultText}`.trim(),
@@ -963,8 +983,15 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.callId,
-            output: msg.result,
-            id: node_crypto.randomUUID()
+            output: happyProtocol.attachToolHappierMetaV2(msg.result, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: msg.toolName,
+              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2(msg.toolName)
+            }),
+            id: node_crypto.randomUUID(),
+            isError
           });
           return;
         }
@@ -985,7 +1012,7 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "terminal-output",
             data: terminalOutput,
-            callId: node_crypto.randomUUID()
+            callId: msg.callId ?? node_crypto.randomUUID()
           });
           return;
         }
@@ -1003,11 +1030,19 @@ async function codexRemoteLauncher(session) {
         case "exec-approval-request": {
           const { call_id, type, ...inputs } = msg;
           messageBuffer.addMessage(`Exec approval requested: ${call_id}`, "tool");
+          const rawToolName = "CodexBash";
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: "CodexBash",
+            name: canonicalToolName,
             callId: call_id,
-            input: inputs,
+            input: happyProtocol.attachToolHappierMetaV2(inputs, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           return;
@@ -1016,14 +1051,22 @@ async function codexRemoteLauncher(session) {
           const changeCount = Object.keys(msg.changes || {}).length;
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
           messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
+          const rawToolName = "CodexPatch";
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: "CodexPatch",
+            name: canonicalToolName,
             callId: msg.call_id,
-            input: {
+            input: happyProtocol.attachToolHappierMetaV2({
               auto_approved: msg.auto_approved,
               changes: msg.changes
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           return;
@@ -1037,12 +1080,19 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.call_id,
-            output: {
+            output: happyProtocol.attachToolHappierMetaV2({
               stdout: msg.stdout,
               stderr: msg.stderr,
               success: msg.success
-            },
-            id: node_crypto.randomUUID()
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: "CodexPatch",
+              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2("CodexPatch")
+            }),
+            id: node_crypto.randomUUID(),
+            isError: !msg.success
           });
           return;
         }
@@ -1255,7 +1305,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 +1414,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 +1501,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 +1528,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 +1562,9 @@ async function runCodex(opts) {
   }
 }
 
+exports.resolveIncomingCodexPermissionMode = resolveIncomingCodexPermissionMode;
+exports.resolveInitialCodexPermissionMode = resolveInitialCodexPermissionMode;
+exports.resolveQueuedCodexPermissionMode = resolveQueuedCodexPermissionMode;
 exports.runCodex = runCodex;
 exports.shouldSupersedeCodexPendingInteractions = shouldSupersedeCodexPendingInteractions;
 exports.supportsAgentStateUpdateEvents = supportsAgentStateUpdateEvents;