happy-imou-cloud 2.0.10 → 2.0.11

package/dist/{command-ComOeFLY.mjs → command-nOI80Mnm.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-CzvgPwr1.mjs';
+import { c as createDefaultRuntimeShell } from './index-DnsqY6I_.mjs';
 import 'chalk';
-import './api-BjxmW-0W.mjs';
+import './api-BcWf5v4i.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';
@@ -11,13 +11,12 @@ import 'socket.io-client';
 import 'zod';
 import 'node:crypto';
 import 'tweetnacl';
-import 'child_process';
-import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
+import 'node:child_process';
 import 'expo-server-sdk';
-import './persistence-BxP6Jw1f.mjs';
+import './persistence-BMa6cyw9.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';
@@ -26,14 +25,15 @@ import 'node:module';
 import 'open';
 import 'react';
 import 'ink';
+import 'child_process';
 import 'url';
-import 'node:child_process';
 import 'ps-list';
 import 'cross-spawn';
 import 'fastify';
 import 'fastify-type-provider-zod';
 import 'node:readline';
 import 'http';
+import 'util';
 import '@agentclientprotocol/sdk';
 
 function listRuntimeProviders() {

package/dist/{index-CzvgPwr1.mjs → index-DnsqY6I_.mjs}

@@ -1,6 +1,6 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
-import { l as logger, e as encodeBase64, c as configuration, h as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, j as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, k as encodeBase64Url, f as delay, m as buildClientHeaders, n as decodeBase64, H as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, o as getLatestDaemonLog } from './api-BjxmW-0W.mjs';
-import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-BxP6Jw1f.mjs';
+import { l as logger, e as encodeBase64, c as configuration, h as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, j as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, k as encodeBase64Url, f as delay, m as buildClientHeaders, n as decodeBase64, H as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, o as getLatestDaemonLog } from './api-BcWf5v4i.mjs';
+import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-BMa6cyw9.mjs';
 import { z } from 'zod';
 import fs, { writeFile as writeFile$1, rename, unlink as unlink$1 } from 'fs/promises';
 import os, { homedir } from 'os';
@@ -31,6 +31,7 @@ import { createInterface } from 'node:readline';
 import { createServer } from 'http';
 import { promisify } from 'util';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
+import 'node:events';
 
 async function openBrowser(url) {
   try {
@@ -2644,6 +2645,14 @@ async function recoverTrackedSessionsFromLocalRegistry({
   return { recoveredCount, removedStaleCount };
 }
 
+const DEFAULT_SESSION_WEBHOOK_TIMEOUT_MS = 45e3;
+function resolveSessionWebhookTimeoutMs() {
+  const parsed = Number.parseInt(process.env.HAPPY_DAEMON_SESSION_WEBHOOK_TIMEOUT || "", 10);
+  if (Number.isFinite(parsed) && parsed > 0) {
+    return parsed;
+  }
+  return DEFAULT_SESSION_WEBHOOK_TIMEOUT_MS;
+}
 const initialMachineMetadata = {
   host: os.hostname(),
   platform: os.platform(),
@@ -2673,6 +2682,7 @@ async function getProfileEnvironmentVariablesForAgent(profileId, agentType) {
   }
 }
 async function startDaemon() {
+  const sessionWebhookTimeoutMs = resolveSessionWebhookTimeoutMs();
   const shutdownCoordinator = createShutdownCoordinator(async () => {
     logger.debug("[DAEMON RUN] Startup malfunctioned, forcing exit with code 1");
     await new Promise((resolve) => setTimeout(resolve, 100));
@@ -2915,7 +2925,7 @@ async function startDaemon() {
                   type: spawnError.type,
                   errorMessage: spawnError.errorMessage
                 });
-              }, 15e3);
+              }, sessionWebhookTimeoutMs);
               pidToAwaiter.set(tmuxResult.pid, (result) => {
                 clearTimeout(timeout);
                 resolve(result);
@@ -3002,7 +3012,7 @@ async function startDaemon() {
                 type: spawnError.type,
                 errorMessage: spawnError.errorMessage
               });
-            }, 15e3);
+            }, sessionWebhookTimeoutMs);
             pidToAwaiter.set(happyProcess.pid, (result) => {
               clearTimeout(timeout);
               resolve(result);
@@ -3077,17 +3087,19 @@ async function startDaemon() {
       onHappySessionWebhook,
       port: HAPPY_CLOUD_DAEMON_PORT
     });
-    const recoveryResult = await recoverTrackedSessionsFromLocalRegistry({
-      trackedSessionPids: pidToTrackedSession.keys(),
-      trackSession: (pid, trackedSession) => {
-        pidToTrackedSession.set(pid, trackedSession);
+    const runSessionRegistryRecovery = async (label) => {
+      const recoveryResult = await recoverTrackedSessionsFromLocalRegistry({
+        trackedSessionPids: pidToTrackedSession.keys(),
+        trackSession: (pid, trackedSession) => {
+          pidToTrackedSession.set(pid, trackedSession);
+        }
+      });
+      if (recoveryResult.recoveredCount > 0 || recoveryResult.removedStaleCount > 0) {
+        logger.debug(
+          `[DAEMON RUN] Session registry recovery ${label} completed: recovered=${recoveryResult.recoveredCount}, removedStale=${recoveryResult.removedStaleCount}`
+        );
       }
-    });
-    if (recoveryResult.recoveredCount > 0 || recoveryResult.removedStaleCount > 0) {
-      logger.debug(
-        `[DAEMON RUN] Session registry recovery completed: recovered=${recoveryResult.recoveredCount}, removedStale=${recoveryResult.removedStaleCount}`
-      );
-    }
+    };
     const fileState = {
       pid: process.pid,
       httpPort: controlPort,
@@ -3117,6 +3129,9 @@ async function startDaemon() {
       requestShutdown: () => requestShutdown("happy-app")
     });
     apiMachine.connect();
+    void runSessionRegistryRecovery("startup").catch((error) => {
+      logger.debug("[DAEMON RUN] Session registry startup recovery failed", error);
+    });
     const heartbeatIntervalMs = parseInt(process.env.HAPPY_DAEMON_HEARTBEAT_INTERVAL || "60000");
     let heartbeatRunning = false;
     const restartOnStaleVersionAndHeartbeat = setInterval(async () => {
@@ -3128,17 +3143,7 @@ async function startDaemon() {
         logger.debug(`[DAEMON RUN] Health check started at ${(/* @__PURE__ */ new Date()).toLocaleString()}`);
       }
       try {
-        const recoveryResult2 = await recoverTrackedSessionsFromLocalRegistry({
-          trackedSessionPids: pidToTrackedSession.keys(),
-          trackSession: (pid, trackedSession) => {
-            pidToTrackedSession.set(pid, trackedSession);
-          }
-        });
-        if (recoveryResult2.recoveredCount > 0 || recoveryResult2.removedStaleCount > 0) {
-          logger.debug(
-            `[DAEMON RUN] Session registry recovery tick completed: recovered=${recoveryResult2.recoveredCount}, removedStale=${recoveryResult2.removedStaleCount}`
-          );
-        }
+        await runSessionRegistryRecovery("tick");
         await runDaemonHealthCheck({
           trackedSessionPids: pidToTrackedSession.keys(),
           removeTrackedSession: (pid) => {
@@ -7317,12 +7322,57 @@ function registerCodexAgent() {
   agentRegistry.register("codex", (opts) => createCodexBackend(opts).backend);
 }
 
+function mapToClaudeMode(mode) {
+  const codexToClaudeMap = {
+    "yolo": "bypassPermissions",
+    "safe-yolo": "default",
+    "read-only": "default"
+  };
+  return codexToClaudeMap[mode] ?? mode;
+}
+
+function ensureExperimentalAcp(args) {
+  if (args.includes("--experimental-acp")) {
+    return args;
+  }
+  return ["--experimental-acp", ...args];
+}
 function defaultClaudeArgs() {
-  return ["--experimental-acp"];
+  return ensureExperimentalAcp([]);
+}
+function appendStringFlag(args, flag, value) {
+  if (value && value.trim().length > 0) {
+    args.push(flag, value);
+  }
+}
+function appendListFlag(args, flag, values) {
+  if (values && values.length > 0) {
+    args.push(flag, values.join(","));
+  }
+}
+function resolveClaudeAcpArgs(options) {
+  if (options.args) {
+    return ensureExperimentalAcp([...options.args]);
+  }
+  const args = ensureExperimentalAcp([...options.baseArgs ?? []]);
+  appendStringFlag(args, "--system-prompt", options.customSystemPrompt);
+  appendStringFlag(args, "--append-system-prompt", options.appendSystemPrompt);
+  appendStringFlag(args, "--model", options.model);
+  appendStringFlag(args, "--fallback-model", options.fallbackModel);
+  appendListFlag(args, "--allowedTools", options.allowedTools);
+  appendListFlag(args, "--disallowedTools", options.disallowedTools);
+  appendStringFlag(args, "--settings", options.settingsPath);
+  if (options.permissionMode) {
+    args.push("--permission-mode", mapToClaudeMode(options.permissionMode));
+  }
+  return args;
 }
 function createClaudeBackend(options) {
   const command = options.command ?? process.env.HAPPY_CLAUDE_ACP_COMMAND ?? "claude";
-  const args = options.args ?? defaultClaudeArgs();
+  const args = resolveClaudeAcpArgs({
+    ...options,
+    baseArgs: options.baseArgs ?? defaultClaudeArgs()
+  });
   const backendOptions = {
     agentName: "claude",
     cwd: options.cwd,
@@ -7334,6 +7384,7 @@ function createClaudeBackend(options) {
     },
     mcpServers: options.mcpServers,
     permissionHandler: options.permissionHandler,
+    selectionHandler: options.selectionHandler,
     transportHandler: claudeTransport
   };
   return {
@@ -7384,8 +7435,15 @@ function initializeAgents() {
 
 class InMemoryRuntimeEventBuffer {
   events = [];
+  maxEvents;
+  constructor(maxEvents = 64) {
+    this.maxEvents = Math.max(1, maxEvents);
+  }
   push(event) {
     this.events.push(event);
+    while (this.events.length > this.maxEvents) {
+      this.events.shift();
+    }
   }
   drain() {
     return this.events.splice(0, this.events.length);
@@ -7400,17 +7458,20 @@ class RuntimeShell {
     return this.registry.has(provider);
   }
   async launch(opts) {
-    if (!this.registry.has(opts.provider)) {
+    if (!opts.createBackend && !this.registry.has(opts.provider)) {
       throw new Error(`Runtime provider "${opts.provider}" is not registered`);
     }
-    const backend = this.registry.create(opts.provider, {
+    const backendFactory = opts.createBackend ?? ((factoryOpts) => this.registry.create(opts.provider, factoryOpts));
+    const backend = backendFactory({
       cwd: opts.cwd,
       env: opts.env
     });
     const handlers = /* @__PURE__ */ new Set();
     const eventBuffer = new InMemoryRuntimeEventBuffer();
     const fanout = (message) => {
-      eventBuffer.push(message);
+      if (handlers.size === 0) {
+        eventBuffer.push(message);
+      }
       for (const handler of handlers) {
         handler(message);
       }
@@ -7452,6 +7513,69 @@ function createDefaultRuntimeShell() {
   return new RuntimeShell();
 }
 
+const KNOWN_CANONICAL_TOOL_NAMES_V2 = [
+  "Bash",
+  "Read",
+  "Write",
+  "Edit",
+  "MultiEdit",
+  "Delete",
+  "Patch",
+  "Diff",
+  "Glob",
+  "Grep",
+  "LS",
+  "CodeSearch",
+  "WebFetch",
+  "WebSearch",
+  "TodoWrite",
+  "TodoRead",
+  "Task",
+  "Reasoning",
+  "EnterPlanMode",
+  "ExitPlanMode",
+  "AskUserQuestion",
+  "AcpHistoryImport",
+  "WorkspaceIndexingPermission",
+  "SubAgentRun",
+  "AgentTeamCreate",
+  "AgentTeamDelete",
+  "AgentTeamSendMessage"
+];
+const CANONICAL_TOOL_NAME_LOOKUP = new Map(
+  KNOWN_CANONICAL_TOOL_NAMES_V2.map((name) => [name.toLowerCase(), name])
+);
+const RAW_TO_CANONICAL_TOOL_NAME_LOOKUP = {
+  bash: "Bash",
+  shell: "Bash",
+  execute: "Bash",
+  claudebash: "Bash",
+  codexbash: "Bash",
+  geminibash: "Bash",
+  claudepatch: "Patch",
+  codexpatch: "Patch",
+  geminipatch: "Patch"
+};
+function resolveCanonicalToolNameV2(rawToolName) {
+  const normalized = typeof rawToolName === "string" ? rawToolName.trim() : "";
+  if (!normalized) {
+    return "Bash";
+  }
+  if (normalized.startsWith("mcp__")) {
+    return normalized;
+  }
+  const lower = normalized.toLowerCase();
+  const known = CANONICAL_TOOL_NAME_LOOKUP.get(lower);
+  if (known) {
+    return known;
+  }
+  const mapped = RAW_TO_CANONICAL_TOOL_NAME_LOOKUP[lower];
+  if (mapped) {
+    return mapped;
+  }
+  return normalized;
+}
+
 const DAEMON_STARTUP_TIMEOUT_MS = 3e4;
 const DAEMON_STARTUP_POLL_INTERVAL_MS = 250;
 async function waitForDaemonReady(timeoutMs = DAEMON_STARTUP_TIMEOUT_MS, pollIntervalMs = DAEMON_STARTUP_POLL_INTERVAL_MS) {
@@ -7493,6 +7617,34 @@ var launch = /*#__PURE__*/Object.freeze({
     launchRuntimeProvider: launchRuntimeProvider
 });
 
+const unifiedProviderExecutors = {
+  claude: async (opts) => {
+    const { runClaude } = await import('./runClaude-cQ-UT0Ke.mjs');
+    await runClaude(opts.credentials, opts.claudeOptions ?? {});
+  },
+  codex: async (opts) => {
+    const { runCodex } = await import('./runCodex-AnJUPIhX.mjs');
+    await runCodex({
+      credentials: opts.credentials,
+      startedBy: opts.startedBy,
+      startingMode: opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local"),
+      codexArgs: opts.codexArgs ?? []
+    });
+  },
+  gemini: async (opts) => {
+    const { runGemini } = await import('./runGemini-BGo_0mzA.mjs');
+    await runGemini({
+      credentials: opts.credentials,
+      startedBy: opts.startedBy
+    });
+  },
+  cursor: async (opts) => {
+    await launchRuntimeProvider({
+      provider: "cursor",
+      initialPrompt: opts.initialPrompt
+    });
+  }
+};
 async function ensureUnifiedRuntimePrerequisites(credentials) {
   if (credentials) {
     await ensureUnifiedDaemonStarted();
@@ -7521,32 +7673,9 @@ async function ensureUnifiedDaemonStarted() {
 }
 async function executeUnifiedProvider(opts) {
   const credentials = await ensureUnifiedRuntimePrerequisites(opts.credentials);
-  if (opts.provider === "claude") {
-    const { runClaude } = await import('./runClaude-B_fTMxc4.mjs');
-    await runClaude(credentials, opts.claudeOptions ?? {});
-    return;
-  }
-  if (opts.provider === "codex") {
-    const { runCodex } = await import('./runCodex-CUgOiIEz.mjs');
-    await runCodex({
-      credentials,
-      startedBy: opts.startedBy,
-      startingMode: opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local"),
-      codexArgs: opts.codexArgs ?? []
-    });
-    return;
-  }
-  if (opts.provider === "gemini") {
-    const { runGemini } = await import('./runGemini-2_FEtJYa.mjs');
-    await runGemini({
-      credentials,
-      startedBy: opts.startedBy
-    });
-    return;
-  }
-  await launchRuntimeProvider({
-    provider: "cursor",
-    initialPrompt: opts.initialPrompt
+  await unifiedProviderExecutors[opts.provider]({
+    ...opts,
+    credentials
   });
 }
 
@@ -7579,7 +7708,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-ComOeFLY.mjs');
+      const { renderRuntimeProviders } = await import('./command-nOI80Mnm.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -7757,8 +7886,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-BxP6Jw1f.mjs');
-        const { ApiClient: ApiClient2 } = await import('./api-BjxmW-0W.mjs').then(function (n) { return n.q; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-BMa6cyw9.mjs');
+        const { ApiClient: ApiClient2 } = await import('./api-BcWf5v4i.mjs').then(function (n) { return n.q; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();
@@ -8174,4 +8303,4 @@ ${chalk.bold("Examples:")}
   }
 }
 
-export { ExitCodeError as E, GEMINI_MODEL_ENV as G, createGeminiBackend as a, stopCaffeinate as b, createDefaultRuntimeShell as c, projectPath as d, createCodexBackend as e, formatDisplayMessage as f, getInitialGeminiModel as g, getProjectPath as h, initialMachineMetadata as i, claudeLocal as j, isBun as k, trimIdent as l, claudeCheckSession as m, getEnvironmentInfo as n, startCaffeinate as o, publishSessionRegistration as p, readGeminiLocalConfig as r, saveGeminiModelToConfig as s, truncateDisplayMessage as t, validateCodexAcpSpawn as v };
+export { ExitCodeError as E, GEMINI_MODEL_ENV as G, RuntimeShell as R, createGeminiBackend as a, stopCaffeinate as b, createDefaultRuntimeShell as c, createCodexBackend as d, projectPath as e, formatDisplayMessage as f, getInitialGeminiModel as g, resolveCanonicalToolNameV2 as h, initialMachineMetadata as i, getProjectPath as j, claudeLocal as k, trimIdent as l, createClaudeBackend as m, isBun as n, claudeCheckSession as o, publishSessionRegistration as p, mapToClaudeMode as q, readGeminiLocalConfig as r, saveGeminiModelToConfig as s, truncateDisplayMessage as t, getEnvironmentInfo as u, validateCodexAcpSpawn as v, startCaffeinate as w };