happy-imou-cloud 2.0.4 → 2.0.6

package/dist/{index-1zlH6s7a.cjs → index-Buq7nurH.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-CyJG1mr6.cjs');
-var persistence = require('./persistence-BeFVx6kI.cjs');
+var api = require('./api-DccDghmF.cjs');
+var persistence = require('./persistence-BrTyBuT7.cjs');
 var z = require('zod');
 var fs$1 = require('fs/promises');
 var os$1 = require('os');
@@ -70,7 +70,7 @@ async function openBrowser(url) {
   }
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-1zlH6s7a.cjs', document.baseURI).href)));
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Buq7nurH.cjs', document.baseURI).href)));
 const QRCode = require$1("qrcode-terminal/vendor/QRCode");
 const QRErrorCorrectLevel = require$1("qrcode-terminal/vendor/QRCode/QRErrorCorrectLevel");
 const pendingTempFiles = /* @__PURE__ */ new Set();
@@ -693,7 +693,7 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-1zlH6s7a.cjs', document.baseURI).href))));
+const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Buq7nurH.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;
@@ -4928,6 +4928,205 @@ function handleThinkingUpdate(update, ctx) {
   return { handled: true };
 }
 
+function buildAcpSpawnSpec(params) {
+  return {
+    command: params.command,
+    args: (params.args ?? []).map((arg) => String(arg)),
+    options: {
+      cwd: params.cwd,
+      env: params.env,
+      stdio: ["pipe", "pipe", "pipe"],
+      windowsHide: process.platform === "win32"
+    }
+  };
+}
+
+function createAcpFilteredStdoutReadable(params) {
+  const maxMultilineBytes = typeof params.maxMultilineBytes === "number" && Number.isFinite(params.maxMultilineBytes) && params.maxMultilineBytes > 0 ? Math.trunc(params.maxMultilineBytes) : 1e6;
+  const decoder = new TextDecoder();
+  const encoder = new TextEncoder();
+  return new ReadableStream({
+    async start(controller) {
+      const reader = params.readable.getReader();
+      let buffer = "";
+      let multiline = null;
+      let controllerErrored = false;
+      const drop = (reason, line) => {
+        params.onDroppedLine?.({ reason, line });
+      };
+      const enqueueLine = (line) => {
+        if (!line.trim()) {
+          return;
+        }
+        const filtered = params.transport.filterStdoutLine?.(line);
+        if (filtered === void 0) {
+          controller.enqueue(encoder.encode(line + "\n"));
+          return;
+        }
+        if (filtered === null) {
+          drop("transport_filter_null", line);
+          return;
+        }
+        controller.enqueue(encoder.encode(filtered + "\n"));
+      };
+      const tryFlushMultiline = (candidate) => {
+        const trimmed = candidate.trim();
+        if (!trimmed) {
+          return false;
+        }
+        if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+          return false;
+        }
+        try {
+          const parsed = JSON.parse(trimmed);
+          if (typeof parsed !== "object" || parsed === null) {
+            return false;
+          }
+          enqueueLine(JSON.stringify(parsed));
+          return true;
+        } catch {
+          return false;
+        }
+      };
+      try {
+        while (true) {
+          const { value, done } = await reader.read();
+          if (done) {
+            break;
+          }
+          if (!value) {
+            continue;
+          }
+          buffer += decoder.decode(value, { stream: true });
+          const lines = buffer.split("\n");
+          buffer = lines.pop() || "";
+          for (const line of lines) {
+            if (multiline) {
+              const nextBuf = multiline.buf.length > 0 ? `${multiline.buf}
+${line}` : line;
+              const nextBytes = multiline.bytes + line.length + 1;
+              if (nextBytes > maxMultilineBytes) {
+                drop("multiline_overflow", multiline.buf);
+                multiline = null;
+                enqueueLine(line);
+                continue;
+              }
+              multiline = { buf: nextBuf, bytes: nextBytes };
+              if (tryFlushMultiline(multiline.buf)) {
+                multiline = null;
+              }
+              continue;
+            }
+            const trimmed = line.trim();
+            if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+              try {
+                const parsed = JSON.parse(trimmed);
+                if (typeof parsed === "object" && parsed !== null) {
+                  enqueueLine(line);
+                  continue;
+                }
+              } catch {
+                multiline = { buf: line, bytes: line.length };
+                continue;
+              }
+            }
+            enqueueLine(line);
+          }
+        }
+        if (multiline) {
+          if (!tryFlushMultiline(multiline.buf)) {
+            drop("multiline_incomplete", multiline.buf);
+          }
+          multiline = null;
+        }
+        const trailing = buffer.trim();
+        if (trailing) {
+          drop("multiline_incomplete", buffer);
+        }
+      } catch (error) {
+        controllerErrored = true;
+        controller.error(error);
+      } finally {
+        reader.releaseLock();
+        if (!controllerErrored) {
+          controller.close();
+        }
+      }
+    }
+  });
+}
+
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveDescendantPids(rootPid) {
+  const processes = await psList();
+  const childrenByParent = /* @__PURE__ */ new Map();
+  for (const proc of processes) {
+    if (typeof proc.pid !== "number" || typeof proc.ppid !== "number") {
+      continue;
+    }
+    const children = childrenByParent.get(proc.ppid) ?? [];
+    children.push(proc.pid);
+    childrenByParent.set(proc.ppid, children);
+  }
+  const descendants = [];
+  const seen = /* @__PURE__ */ new Set();
+  const visit = (pid) => {
+    for (const childPid of childrenByParent.get(pid) ?? []) {
+      if (seen.has(childPid)) {
+        continue;
+      }
+      seen.add(childPid);
+      visit(childPid);
+      descendants.push(childPid);
+    }
+  };
+  visit(rootPid);
+  return descendants;
+}
+function bestEffortKillPid(pid, signal) {
+  try {
+    process.kill(pid, signal);
+  } catch {
+  }
+}
+async function waitForAllGone(pids, timeoutMs) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (pids.every((pid) => !isAlive(pid))) {
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 25));
+  }
+}
+async function killProcessTree(proc, options) {
+  const pid = proc.pid;
+  if (!pid) {
+    return;
+  }
+  const graceMs = Math.max(1, options?.graceMs);
+  const descendants = await resolveDescendantPids(pid).catch(() => []);
+  const allPids = [...descendants, pid];
+  for (const targetPid of allPids) {
+    bestEffortKillPid(targetPid, "SIGTERM");
+  }
+  await waitForAllGone(allPids, graceMs);
+  const remaining = allPids.filter((targetPid) => isAlive(targetPid));
+  if (remaining.length === 0) {
+    return;
+  }
+  for (const targetPid of remaining) {
+    bestEffortKillPid(targetPid, "SIGKILL");
+  }
+  await waitForAllGone(remaining, Math.min(250, graceMs));
+}
+
 const RETRY_CONFIG = {
   /** Maximum number of retry attempts for init/newSession */
   maxAttempts: 3,
@@ -5064,15 +5263,17 @@ async function withRetry(operation, options) {
       return await operation();
     } catch (error) {
       lastError = normalizeAcpError(error);
-      if (attempt < options.maxAttempts) {
-        const delayMs = Math.min(
-          options.baseDelayMs * Math.pow(2, attempt - 1),
-          options.maxDelayMs
-        );
-        api.logger.debug(`[AcpBackend] ${options.operationName} failed (attempt ${attempt}/${options.maxAttempts}): ${lastError.message}. Retrying in ${delayMs}ms...`);
-        options.onRetry?.(attempt, lastError);
-        await api.delay(delayMs);
+      const retryable = options.shouldRetry?.(lastError) ?? true;
+      if (!retryable || attempt >= options.maxAttempts) {
+        throw lastError;
       }
+      const delayMs = Math.min(
+        options.baseDelayMs * Math.pow(2, attempt - 1),
+        options.maxDelayMs
+      );
+      api.logger.debug(`[AcpBackend] ${options.operationName} failed (attempt ${attempt}/${options.maxAttempts}): ${lastError.message}. Retrying in ${delayMs}ms...`);
+      options.onRetry?.(attempt, lastError);
+      await api.delay(delayMs);
     }
   }
   throw lastError;
@@ -5125,6 +5326,77 @@ function enrichAcpError(error, stderrExcerpt) {
   }
   return normalized;
 }
+class AcpProcessStartupError extends Error {
+  constructor(message, exitCode, signal) {
+    super(message);
+    this.exitCode = exitCode;
+    this.signal = signal;
+    this.name = "AcpProcessStartupError";
+  }
+}
+function createProcessStartupError(agentName, operationName, code, signal) {
+  if (code !== null) {
+    return new AcpProcessStartupError(
+      `${agentName} exited with code ${code} during ${operationName}`,
+      code,
+      signal
+    );
+  }
+  if (signal) {
+    return new AcpProcessStartupError(
+      `${agentName} exited due to signal ${signal} during ${operationName}`,
+      code,
+      signal
+    );
+  }
+  return new AcpProcessStartupError(
+    `${agentName} exited unexpectedly during ${operationName}`,
+    code,
+    signal
+  );
+}
+async function raceWithProcessExit(childProcess, operation, options) {
+  if (childProcess.exitCode !== null) {
+    throw createProcessStartupError(
+      options.agentName,
+      options.operationName,
+      childProcess.exitCode,
+      childProcess.signalCode ?? null
+    );
+  }
+  return await new Promise((resolve, reject) => {
+    let settled = false;
+    const cleanup = () => {
+      childProcess.off("error", handleError);
+      childProcess.off("exit", handleExit);
+    };
+    const settleResolve = (value) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanup();
+      resolve(value);
+    };
+    const settleReject = (error) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanup();
+      reject(normalizeAcpError(error));
+    };
+    const handleError = (error) => {
+      settleReject(error);
+    };
+    const handleExit = (code, signal) => {
+      settleReject(createProcessStartupError(options.agentName, options.operationName, code, signal));
+    };
+    childProcess.once("error", handleError);
+    childProcess.once("exit", handleExit);
+    operation.then(settleResolve, settleReject);
+  });
+}
 class AcpBackend {
   constructor(options) {
     this.options = options;
@@ -5243,24 +5515,13 @@ class AcpBackend {
     try {
       api.logger.debug(`[AcpBackend] Starting session: ${sessionId}`);
       this.recentStderrLines = [];
-      const args = this.options.args || [];
-      if (process.platform === "win32") {
-        const fullCommand = [this.options.command, ...args].join(" ");
-        this.process = node_child_process.spawn("cmd.exe", ["/c", fullCommand], {
-          cwd: this.options.cwd,
-          env: { ...process.env, ...this.options.env },
-          stdio: ["pipe", "pipe", "pipe"],
-          windowsHide: true
-        });
-      } else {
-        this.process = node_child_process.spawn(this.options.command, args, {
-          cwd: this.options.cwd,
-          env: { ...process.env, ...this.options.env },
-          // Use 'pipe' for all stdio to capture output without printing to console
-          // stdout and stderr will be handled by our event listeners
-          stdio: ["pipe", "pipe", "pipe"]
-        });
-      }
+      const spawnSpec = buildAcpSpawnSpec({
+        command: this.options.command,
+        args: this.options.args ?? [],
+        cwd: this.options.cwd,
+        env: { ...process.env, ...this.options.env }
+      });
+      this.process = spawn(spawnSpec.command, spawnSpec.args, spawnSpec.options);
       if (this.process.stderr) {
       }
       if (!this.process.stdin || !this.process.stdout || !this.process.stderr) {
@@ -5308,57 +5569,20 @@ class AcpBackend {
       );
       const writable = streams.writable;
       const readable = streams.readable;
-      const transport = this.transport;
-      const filteredReadable = new ReadableStream({
-        async start(controller) {
-          const reader = readable.getReader();
-          const decoder = new TextDecoder();
-          const encoder = new TextEncoder();
-          let buffer = "";
-          let filteredCount = 0;
-          try {
-            while (true) {
-              const { done, value } = await reader.read();
-              if (done) {
-                if (buffer.trim()) {
-                  const filtered = transport.filterStdoutLine?.(buffer);
-                  if (filtered === void 0) {
-                    controller.enqueue(encoder.encode(buffer));
-                  } else if (filtered !== null) {
-                    controller.enqueue(encoder.encode(filtered));
-                  } else {
-                    filteredCount++;
-                  }
-                }
-                if (filteredCount > 0) {
-                  api.logger.debug(`[AcpBackend] Filtered out ${filteredCount} non-JSON lines from ${transport.agentName} stdout`);
-                }
-                controller.close();
-                break;
-              }
-              buffer += decoder.decode(value, { stream: true });
-              const lines = buffer.split("\n");
-              buffer = lines.pop() || "";
-              for (const line of lines) {
-                if (!line.trim()) continue;
-                const filtered = transport.filterStdoutLine?.(line);
-                if (filtered === void 0) {
-                  controller.enqueue(encoder.encode(line + "\n"));
-                } else if (filtered !== null) {
-                  controller.enqueue(encoder.encode(filtered + "\n"));
-                } else {
-                  filteredCount++;
-                }
-              }
-            }
-          } catch (error) {
-            api.logger.debug(`[AcpBackend] Error filtering stdout stream:`, error);
-            controller.error(error);
-          } finally {
-            reader.releaseLock();
-          }
+      const droppedStdoutLines = [];
+      const filteredReadable = createAcpFilteredStdoutReadable({
+        readable,
+        transport: this.transport,
+        onDroppedLine: (entry) => {
+          droppedStdoutLines.push(entry);
         }
       });
+      if (droppedStdoutLines.length > 0) {
+        api.logger.debug(
+          `[AcpBackend] Filtered out ${droppedStdoutLines.length} stdout lines from ${this.transport.agentName}`,
+          droppedStdoutLines.slice(0, 5)
+        );
+      }
       const stream = sdk.ndJsonStream(writable, filteredReadable);
       const client = {
         sessionUpdate: async (params) => {
@@ -5525,20 +5749,27 @@ class AcpBackend {
         async () => {
           let timeoutHandle = null;
           try {
-            const result = await Promise.race([
-              this.connection.initialize(initRequest).then((res) => {
-                if (timeoutHandle) {
-                  clearTimeout(timeoutHandle);
-                  timeoutHandle = null;
-                }
-                return res;
-              }),
-              new Promise((_, reject) => {
-                timeoutHandle = setTimeout(() => {
-                  reject(new Error(`Initialize timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
-                }, initTimeout);
-              })
-            ]);
+            const result = await raceWithProcessExit(
+              this.process,
+              Promise.race([
+                this.connection.initialize(initRequest).then((res) => {
+                  if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                    timeoutHandle = null;
+                  }
+                  return res;
+                }),
+                new Promise((_, reject) => {
+                  timeoutHandle = setTimeout(() => {
+                    reject(new Error(`Initialize timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
+                  }, initTimeout);
+                })
+              ]),
+              {
+                agentName: this.transport.agentName,
+                operationName: "initialize"
+              }
+            );
             return result;
           } finally {
             if (timeoutHandle) {
@@ -5550,7 +5781,8 @@ class AcpBackend {
           operationName: "Initialize",
           maxAttempts: RETRY_CONFIG.maxAttempts,
           baseDelayMs: RETRY_CONFIG.baseDelayMs,
-          maxDelayMs: RETRY_CONFIG.maxDelayMs
+          maxDelayMs: RETRY_CONFIG.maxDelayMs,
+          shouldRetry: (error) => !(error instanceof AcpProcessStartupError)
         }
       );
       api.logger.debug(`[AcpBackend] Initialize completed`);
@@ -5569,20 +5801,27 @@ class AcpBackend {
         async () => {
           let timeoutHandle = null;
           try {
-            const result = await Promise.race([
-              this.connection.newSession(newSessionRequest).then((res) => {
-                if (timeoutHandle) {
-                  clearTimeout(timeoutHandle);
-                  timeoutHandle = null;
-                }
-                return res;
-              }),
-              new Promise((_, reject) => {
-                timeoutHandle = setTimeout(() => {
-                  reject(new Error(`New session timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
-                }, initTimeout);
-              })
-            ]);
+            const result = await raceWithProcessExit(
+              this.process,
+              Promise.race([
+                this.connection.newSession(newSessionRequest).then((res) => {
+                  if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                    timeoutHandle = null;
+                  }
+                  return res;
+                }),
+                new Promise((_, reject) => {
+                  timeoutHandle = setTimeout(() => {
+                    reject(new Error(`New session timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
+                  }, initTimeout);
+                })
+              ]),
+              {
+                agentName: this.transport.agentName,
+                operationName: "new session"
+              }
+            );
             return result;
           } finally {
             if (timeoutHandle) {
@@ -5594,7 +5833,8 @@ class AcpBackend {
           operationName: "NewSession",
           maxAttempts: RETRY_CONFIG.maxAttempts,
           baseDelayMs: RETRY_CONFIG.baseDelayMs,
-          maxDelayMs: RETRY_CONFIG.maxDelayMs
+          maxDelayMs: RETRY_CONFIG.maxDelayMs,
+          shouldRetry: (error) => !(error instanceof AcpProcessStartupError)
         }
       );
       this.acpSessionId = sessionResponse.sessionId;
@@ -5870,21 +6110,13 @@ class AcpBackend {
       }
     }
     if (this.process) {
-      this.process.kill("SIGTERM");
-      await new Promise((resolve) => {
-        const timeout = setTimeout(() => {
-          if (this.process) {
-            api.logger.debug("[AcpBackend] Force killing process");
-            this.process.kill("SIGKILL");
-          }
-          resolve();
-        }, 1e3);
-        this.process?.once("exit", () => {
-          clearTimeout(timeout);
-          resolve();
-        });
-      });
-      this.process = null;
+      try {
+        await killProcessTree(this.process, { graceMs: 1e3 });
+      } catch (error) {
+        api.logger.debug("[AcpBackend] Failed to kill ACP process tree:", error);
+      } finally {
+        this.process = null;
+      }
     }
     this.clearIdleTimeoutState();
     this.listeners = [];
@@ -6125,6 +6357,7 @@ function registerGeminiAgent() {
   api.logger.debug("[Gemini] Registered with agent registry");
 }
 
+const DEFAULT_CODEX_ACP_NPX_PACKAGE = "@zed-industries/codex-acp@0.9.5";
 function readFirstEnv(...names) {
   for (const name of names) {
     const raw = process.env[name];
@@ -6179,6 +6412,10 @@ function readCodexAcpNpxMode() {
   }
   return "auto";
 }
+function readCodexAcpNpxPackage() {
+  const configured = readFirstEnv("HAPPY_CODEX_ACP_PACKAGE", "HAPPIER_CODEX_ACP_PACKAGE");
+  return configured || DEFAULT_CODEX_ACP_NPX_PACKAGE;
+}
 function isBinOnPath(baseName) {
   return resolveCommandOnPath(baseName) !== null;
 }
@@ -6244,7 +6481,7 @@ function resolveCodexAcpSpawn(options = {}) {
   }
   return {
     command: resolveNpxCommand(),
-    args: ["--prefer-offline", "-y", "@zed-industries/codex-acp", ...directArgs]
+    args: ["--prefer-offline", "-y", readCodexAcpNpxPackage(), ...directArgs]
   };
 }
 function validateCodexAcpSpawn(options = {}) {
@@ -6531,12 +6768,12 @@ async function ensureUnifiedDaemonStarted() {
 async function executeUnifiedProvider(opts) {
   const credentials = await ensureUnifiedRuntimePrerequisites(opts.credentials);
   if (opts.provider === "claude") {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-Dz-PCSvb.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-COy1pLhn.cjs'); });
     await runClaude(credentials, opts.claudeOptions ?? {});
     return;
   }
   if (opts.provider === "codex") {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BtZplK1R.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BRMOT2dJ.cjs'); });
     await runCodex({
       credentials,
       startedBy: opts.startedBy,
@@ -6546,7 +6783,7 @@ async function executeUnifiedProvider(opts) {
     return;
   }
   if (opts.provider === "gemini") {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DUyH311Z.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BVPmTGxQ.cjs'); });
     await runGemini({
       credentials,
       startedBy: opts.startedBy
@@ -6588,7 +6825,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-CPlJKXDn.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-C2v0VkPq.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -6766,8 +7003,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-BeFVx6kI.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-CyJG1mr6.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-BrTyBuT7.cjs'); });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-DccDghmF.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();