happy-imou-cloud 2.0.3 → 2.0.5

package/dist/{index-CriPm_z9.mjs → index-C5wR2qKT.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-DpQIC-DJ.mjs';
-import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-CqgPgbzN.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-DoHt-HyL.mjs';
+import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-QqeBvUxX.mjs';
 import { z } from 'zod';
 import fs from 'fs/promises';
 import os, { homedir } from 'os';
@@ -4505,6 +4505,107 @@ function parseArgsFromContent(content) {
   }
   return {};
 }
+function appendToolOutput(existing, next) {
+  if (!existing || existing.length === 0) {
+    return next;
+  }
+  if (next === existing || existing.endsWith(next)) {
+    return existing;
+  }
+  if (next.startsWith(existing)) {
+    return next;
+  }
+  return `${existing}${next}`;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function hasMeaningfulContent(value) {
+  if (value === null || value === void 0) {
+    return false;
+  }
+  if (typeof value === "string") {
+    return value.length > 0;
+  }
+  if (Array.isArray(value)) {
+    return value.length > 0;
+  }
+  if (isRecord(value)) {
+    return Object.keys(value).length > 0;
+  }
+  return true;
+}
+function looksLikeToolMetadata(record) {
+  const metadataKeys = [
+    "command",
+    "cmd",
+    "script",
+    "argv",
+    "cwd",
+    "workingDirectory",
+    "description",
+    "title",
+    "parsed_cmd"
+  ];
+  if (metadataKeys.some((key) => key in record)) {
+    return true;
+  }
+  const nestedKeys = ["input", "toolCall", "arguments", "content"];
+  for (const key of nestedKeys) {
+    const nested = record[key];
+    if (isRecord(nested) && looksLikeToolMetadata(nested)) {
+      return true;
+    }
+  }
+  return false;
+}
+function extractToolOutputChunk(content) {
+  if (typeof content === "string") {
+    return content.length > 0 ? content : null;
+  }
+  if (Array.isArray(content)) {
+    const parts = content.map((item) => extractToolOutputChunk(item)).filter((item) => Boolean(item));
+    return parts.length > 0 ? parts.join("") : null;
+  }
+  if (!isRecord(content)) {
+    return null;
+  }
+  const outputKeys = ["stdout", "stderr", "output", "text", "message", "data", "error", "reason"];
+  const hasOutputKey = outputKeys.some((key) => key in content);
+  if (!hasOutputKey && looksLikeToolMetadata(content)) {
+    return null;
+  }
+  for (const key of outputKeys) {
+    if (!(key in content)) {
+      continue;
+    }
+    const value = content[key];
+    const formatted2 = typeof value === "string" ? value : formatDisplayMessage(value);
+    if (formatted2.length > 0) {
+      return formatted2;
+    }
+  }
+  const formatted = formatDisplayMessage(content);
+  return formatted.length > 0 ? formatted : null;
+}
+function mergeStreamedOutputWithResult(content, streamedOutput) {
+  if (!streamedOutput || streamedOutput.length === 0) {
+    return content;
+  }
+  if (!hasMeaningfulContent(content)) {
+    return streamedOutput;
+  }
+  if (isRecord(content)) {
+    const hasStructuredOutput = ["stdout", "stderr", "output", "text", "message", "data"].some((key) => key in content);
+    if (!hasStructuredOutput) {
+      return {
+        ...content,
+        stdout: streamedOutput
+      };
+    }
+  }
+  return content;
+}
 function extractErrorDetail(content) {
   if (!content) return void 0;
   if (typeof content === "string") {
@@ -4652,11 +4753,13 @@ function completeToolCall(toolCallId, toolKind, content, ctx) {
     clearTimeout(timeout);
     ctx.toolCallTimeouts.delete(toolCallId);
   }
+  const streamedOutput = ctx.toolCallOutputs.get(toolCallId);
+  ctx.toolCallOutputs.delete(toolCallId);
   logger.debug(`[AcpBackend] \u2705 Tool call COMPLETED: ${toolCallId} (${toolKindStr}) - Duration: ${duration}. Active tool calls: ${ctx.activeToolCalls.size}`);
   ctx.emit({
     type: "tool-result",
     toolName: toolKindStr,
-    result: content,
+    result: mergeStreamedOutputWithResult(content, streamedOutput),
     callId: toolCallId
   });
   if (ctx.activeToolCalls.size === 0) {
@@ -4698,6 +4801,8 @@ function failToolCall(toolCallId, status, toolKind, content, ctx) {
   }
   const durationStr = formatDuration(startTime);
   logger.debug(`[AcpBackend] \u274C Tool call ${status.toUpperCase()}: ${toolCallId} (${toolKindStr}) - Duration: ${durationStr}. Active tool calls: ${ctx.activeToolCalls.size}`);
+  const streamedOutput = ctx.toolCallOutputs.get(toolCallId);
+  ctx.toolCallOutputs.delete(toolCallId);
   const errorDetail = extractErrorDetail(content);
   if (errorDetail) {
     logger.debug(`[AcpBackend] \u274C Tool call error details: ${errorDetail.substring(0, 500)}`);
@@ -4707,7 +4812,11 @@ function failToolCall(toolCallId, status, toolKind, content, ctx) {
   ctx.emit({
     type: "tool-result",
     toolName: toolKindStr,
-    result: errorDetail ? { error: errorDetail, status } : { error: `Tool call ${status}`, status },
+    result: streamedOutput ? {
+      stdout: streamedOutput,
+      error: errorDetail || `Tool call ${status}`,
+      status
+    } : errorDetail ? { error: errorDetail, status } : { error: `Tool call ${status}`, status },
     callId: toolCallId
   });
   if (ctx.activeToolCalls.size === 0) {
@@ -4723,8 +4832,13 @@ function handleToolCallUpdate(update, ctx) {
     logger.debug("[AcpBackend] Tool call update without toolCallId:", update);
     return { handled: false };
   }
-  const toolKind = update.kind || "unknown";
+  const toolKind = update.kind || ctx.toolCallIdToNameMap.get(toolCallId) || "unknown";
   let toolCallCountSincePrompt = ctx.toolCallCountSincePrompt;
+  const outputChunk = extractToolOutputChunk(update.content);
+  if (outputChunk) {
+    const nextOutput = appendToolOutput(ctx.toolCallOutputs.get(toolCallId), outputChunk);
+    ctx.toolCallOutputs.set(toolCallId, nextOutput);
+  }
   if (status === "in_progress" || status === "pending") {
     if (!ctx.activeToolCalls.has(toolCallId)) {
       toolCallCountSincePrompt++;
@@ -4928,15 +5042,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
-        );
-        logger.debug(`[AcpBackend] ${options.operationName} failed (attempt ${attempt}/${options.maxAttempts}): ${lastError.message}. Retrying in ${delayMs}ms...`);
-        options.onRetry?.(attempt, lastError);
-        await 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
+      );
+      logger.debug(`[AcpBackend] ${options.operationName} failed (attempt ${attempt}/${options.maxAttempts}): ${lastError.message}. Retrying in ${delayMs}ms...`);
+      options.onRetry?.(attempt, lastError);
+      await delay(delayMs);
     }
   }
   throw lastError;
@@ -4973,6 +5089,11 @@ function normalizeAcpError(error) {
   }
   return normalized;
 }
+function createAcpAbortError(message) {
+  const error = new Error(message);
+  error.name = "AbortError";
+  return error;
+}
 function enrichAcpError(error, stderrExcerpt) {
   const normalized = normalizeAcpError(error);
   if (!stderrExcerpt.trim()) {
@@ -4984,6 +5105,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;
@@ -4999,6 +5191,8 @@ class AcpBackend {
   toolCallTimeouts = /* @__PURE__ */ new Map();
   /** Track tool call start times for performance monitoring */
   toolCallStartTimes = /* @__PURE__ */ new Map();
+  /** Track streamed tool output between ACP updates and final completion */
+  toolCallOutputs = /* @__PURE__ */ new Map();
   /** Pending permission requests that need response */
   pendingPermissions = /* @__PURE__ */ new Map();
   /** Map from permission request ID to real tool call ID for tracking */
@@ -5009,6 +5203,14 @@ class AcpBackend {
   toolCallCountSincePrompt = 0;
   /** Timeout for emitting 'idle' status after last message chunk */
   idleTimeout = null;
+  /** Promise resolver for waitForResponseComplete */
+  idleResolver = null;
+  /** Promise rejecter for waitForResponseComplete */
+  idleRejecter = null;
+  /** Completion signal captured before waitForResponseComplete is attached */
+  responseCompletionOutcome = null;
+  /** Whether the current prompt is still waiting for completion */
+  waitingForResponse = false;
   /** Transport handler for agent-specific behavior */
   transport;
   /** Keep a short rolling stderr buffer so startup failures can surface the real cause. */
@@ -5026,6 +5228,44 @@ class AcpBackend {
   getRecentStderrExcerpt() {
     return this.recentStderrLines.slice(-6).join("\n");
   }
+  clearIdleTimeoutState() {
+    if (this.idleTimeout) {
+      clearTimeout(this.idleTimeout);
+      this.idleTimeout = null;
+    }
+  }
+  clearToolCallTracking() {
+    this.activeToolCalls.clear();
+    for (const timeout of this.toolCallTimeouts.values()) {
+      clearTimeout(timeout);
+    }
+    this.toolCallTimeouts.clear();
+    this.toolCallStartTimes.clear();
+    this.toolCallIdToNameMap.clear();
+    this.toolCallOutputs.clear();
+    this.toolCallCountSincePrompt = 0;
+  }
+  resetResponseTrackingForNewPrompt() {
+    this.responseCompletionOutcome = null;
+    this.clearIdleTimeoutState();
+    this.clearToolCallTracking();
+  }
+  settleResponseWaiter(outcome) {
+    const hasActiveWaiter = Boolean(this.idleResolver || this.idleRejecter);
+    if (!this.waitingForResponse && !hasActiveWaiter) {
+      return;
+    }
+    if (!hasActiveWaiter) {
+      this.waitingForResponse = false;
+      this.responseCompletionOutcome = outcome;
+      return;
+    }
+    if (outcome.kind === "resolved") {
+      this.idleResolver?.();
+      return;
+    }
+    this.idleRejecter?.(outcome.error);
+  }
   onMessage(handler) {
     this.listeners.push(handler);
   }
@@ -5100,10 +5340,15 @@ class AcpBackend {
       });
       this.process.on("error", (err) => {
         logger.debug(`[AcpBackend] Process error:`, err);
+        this.settleResponseWaiter({ kind: "rejected", error: err });
         this.emit({ type: "status", status: "error", detail: err.message });
       });
       this.process.on("exit", (code, signal) => {
         if (!this.disposed && code !== 0 && code !== null) {
+          this.settleResponseWaiter({
+            kind: "rejected",
+            error: new Error(`ACP process exited with code ${code}${signal ? ` (${signal})` : ""}`)
+          });
           logger.debug(`[AcpBackend] Process exited with code ${code}, signal ${signal}`);
           this.emit({ type: "status", status: "stopped", detail: `Exit code: ${code}` });
         }
@@ -5331,20 +5576,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) {
@@ -5356,7 +5608,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)
         }
       );
       logger.debug(`[AcpBackend] Initialize completed`);
@@ -5375,20 +5628,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) {
@@ -5400,7 +5660,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;
@@ -5434,6 +5695,7 @@ class AcpBackend {
       toolCallStartTimes: this.toolCallStartTimes,
       toolCallTimeouts: this.toolCallTimeouts,
       toolCallIdToNameMap: this.toolCallIdToNameMap,
+      toolCallOutputs: this.toolCallOutputs,
       idleTimeout: this.idleTimeout,
       toolCallCountSincePrompt: this.toolCallCountSincePrompt,
       emit: (msg) => this.emit(msg),
@@ -5510,20 +5772,24 @@ class AcpBackend {
         this.emitUsageTelemetry(update, "acp-usage-update");
         continue;
       }
+      if (sessionUpdateType === "task_complete") {
+        this.emitUsageTelemetry(update.usage, "acp-session-usage");
+        ctx.clearIdleTimeout();
+        logger.debug("[AcpBackend] task_complete received, emitting idle status");
+        this.emitIdleStatus();
+        continue;
+      }
       const handledLegacy = handleLegacyMessageChunk(update, ctx).handled;
       const handledPlan = handlePlanUpdate(update, ctx).handled;
       const handledThinking = handleThinkingUpdate(update, ctx).handled;
       const handledUsage = this.emitUsageTelemetry(update.usage, "acp-session-usage");
       const updateTypeStr = sessionUpdateType;
-      const handledTypes = ["agent_message_chunk", "tool_call_update", "agent_thought_chunk", "tool_call", "usage_update"];
+      const handledTypes = ["agent_message_chunk", "tool_call_update", "agent_thought_chunk", "tool_call", "usage_update", "task_complete"];
       if (updateTypeStr && !handledTypes.includes(updateTypeStr) && !handledLegacy && !handledPlan && !handledThinking && !handledUsage) {
         logger.debug(`[AcpBackend] Unhandled session update type: ${updateTypeStr}`, JSON.stringify(update, null, 2));
       }
     }
   }
-  // Promise resolver for waitForIdle - set when waiting for response to complete
-  idleResolver = null;
-  waitingForResponse = false;
   async sendPrompt(sessionId, prompt) {
     this.toolCallCountSincePrompt = 0;
     if (this.disposed) {
@@ -5532,6 +5798,7 @@ class AcpBackend {
     if (!this.connection || !this.acpSessionId) {
       throw new Error("Session not started");
     }
+    this.resetResponseTrackingForNewPrompt();
     this.emit({ type: "status", status: "running" });
     this.waitingForResponse = true;
     try {
@@ -5550,7 +5817,6 @@ class AcpBackend {
       logger.debug("[AcpBackend] Prompt request sent to ACP connection");
     } catch (error) {
       logger.debug("[AcpBackend] Error sending prompt:", error);
-      this.waitingForResponse = false;
       let errorDetail;
       if (error instanceof Error) {
         errorDetail = error.message;
@@ -5564,6 +5830,10 @@ class AcpBackend {
         status: "error",
         detail: errorDetail
       });
+      this.settleResponseWaiter({
+        kind: "rejected",
+        error: error instanceof Error ? error : normalizeAcpError(error)
+      });
       throw error;
     }
   }
@@ -5572,21 +5842,38 @@ class AcpBackend {
    * Call this after sendPrompt to wait for Gemini to finish responding
    */
   async waitForResponseComplete(timeoutMs = 12e4) {
+    const pendingOutcome = this.responseCompletionOutcome;
+    if (pendingOutcome) {
+      this.responseCompletionOutcome = null;
+      if (pendingOutcome.kind === "rejected") {
+        throw pendingOutcome.error;
+      }
+      return;
+    }
     if (!this.waitingForResponse) {
       return;
     }
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
         this.idleResolver = null;
+        this.idleRejecter = null;
         this.waitingForResponse = false;
         reject(new Error("Timeout waiting for response to complete"));
       }, timeoutMs);
       this.idleResolver = () => {
         clearTimeout(timeout);
         this.idleResolver = null;
+        this.idleRejecter = null;
         this.waitingForResponse = false;
         resolve();
       };
+      this.idleRejecter = (error) => {
+        clearTimeout(timeout);
+        this.idleResolver = null;
+        this.idleRejecter = null;
+        this.waitingForResponse = false;
+        reject(error);
+      };
     });
   }
   /**
@@ -5594,18 +5881,19 @@ class AcpBackend {
    */
   emitIdleStatus() {
     this.emit({ type: "status", status: "idle" });
-    if (this.idleResolver) {
-      logger.debug("[AcpBackend] Resolving idle waiter");
-      this.idleResolver();
-    }
+    this.settleResponseWaiter({ kind: "resolved" });
   }
   async cancel(sessionId) {
+    const cancelError = createAcpAbortError("Cancelled by user");
+    this.clearIdleTimeoutState();
+    this.clearToolCallTracking();
+    this.settleResponseWaiter({ kind: "rejected", error: cancelError });
+    this.emit({ type: "status", status: "stopped", detail: "Cancelled by user" });
     if (!this.connection || !this.acpSessionId) {
       return;
     }
     try {
       await this.connection.cancel({ sessionId: this.acpSessionId });
-      this.emit({ type: "status", status: "stopped", detail: "Cancelled by user" });
     } catch (error) {
       logger.debug("[AcpBackend] Error cancelling:", error);
     }
@@ -5633,6 +5921,10 @@ class AcpBackend {
     if (this.disposed) return;
     logger.debug("[AcpBackend] Disposing backend");
     this.disposed = true;
+    this.settleResponseWaiter({
+      kind: "rejected",
+      error: createAcpAbortError("ACP backend disposed")
+    });
     if (this.connection && this.acpSessionId) {
       try {
         await Promise.race([
@@ -5661,19 +5953,11 @@ class AcpBackend {
       });
       this.process = null;
     }
-    if (this.idleTimeout) {
-      clearTimeout(this.idleTimeout);
-      this.idleTimeout = null;
-    }
+    this.clearIdleTimeoutState();
     this.listeners = [];
     this.connection = null;
     this.acpSessionId = null;
-    this.activeToolCalls.clear();
-    for (const timeout of this.toolCallTimeouts.values()) {
-      clearTimeout(timeout);
-    }
-    this.toolCallTimeouts.clear();
-    this.toolCallStartTimes.clear();
+    this.clearToolCallTracking();
     this.pendingPermissions.clear();
   }
 }
@@ -5908,6 +6192,7 @@ function registerGeminiAgent() {
   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];
@@ -5962,6 +6247,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;
 }
@@ -6027,7 +6316,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 = {}) {
@@ -6314,12 +6603,12 @@ async function ensureUnifiedDaemonStarted() {
 async function executeUnifiedProvider(opts) {
   const credentials = await ensureUnifiedRuntimePrerequisites(opts.credentials);
   if (opts.provider === "claude") {
-    const { runClaude } = await import('./runClaude-D6Pdkevn.mjs');
+    const { runClaude } = await import('./runClaude-CZ8gxaJL.mjs');
     await runClaude(credentials, opts.claudeOptions ?? {});
     return;
   }
   if (opts.provider === "codex") {
-    const { runCodex } = await import('./runCodex-CsfUU1Wb.mjs');
+    const { runCodex } = await import('./runCodex-DT7g4MPm.mjs');
     await runCodex({
       credentials,
       startedBy: opts.startedBy,
@@ -6329,7 +6618,7 @@ async function executeUnifiedProvider(opts) {
     return;
   }
   if (opts.provider === "gemini") {
-    const { runGemini } = await import('./runGemini-CrH3dQ0Y.mjs');
+    const { runGemini } = await import('./runGemini-CmY5386l.mjs');
     await runGemini({
       credentials,
       startedBy: opts.startedBy
@@ -6371,7 +6660,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-DRqrBuHM.mjs');
+      const { renderRuntimeProviders } = await import('./command-Dl9SrMnv.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -6549,8 +6838,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-CqgPgbzN.mjs');
-        const { ApiClient: ApiClient2 } = await import('./api-DpQIC-DJ.mjs').then(function (n) { return n.q; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-QqeBvUxX.mjs');
+        const { ApiClient: ApiClient2 } = await import('./api-DoHt-HyL.mjs').then(function (n) { return n.q; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();