happy-imou-cloud 2.0.7 → 2.0.9

package/bin/happy-cloud.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { execFileSync } from 'child_process';
 import { fileURLToPath } from 'url';

package/dist/{api-Dwkm7s_E.cjs → api-CUTdFiFP.cjs}

@@ -19,7 +19,7 @@ var path = require('path');
 var expoServerSdk = require('expo-server-sdk');
 
 var name = "happy-imou-cloud";
-var version = "2.0.7";
+var version = "2.0.9";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -62,7 +62,7 @@ var scripts = {
 	"// ==== TypeScript & Build ====": "",
 	"why do we need to build before running tests / dev?": "We need the binary to be built so we run daemon commands which directly run the binary - we don't want them to go out of sync or have custom spawn logic depending how we started happy",
 	typecheck: "tsc --noEmit",
-	build: "shx rm -rf dist && npx tsc --noEmit && pkgroll",
+	build: "node ./scripts/build.mjs",
 	"// ==== Testing ====": "",
 	test: "yarn build && vitest run",
 	"test:integration": "yarn build && vitest run --config vitest.integration.config.ts",
@@ -118,7 +118,6 @@ var dependencies = {
 	"expo-server-sdk": "^3.15.0",
 	fastify: "^5.6.2",
 	"fastify-type-provider-zod": "4.0.2",
-	"happy-protocol": "0.1.0",
 	"http-proxy": "^1.18.1",
 	"http-proxy-middleware": "^3.0.5",
 	ink: "^6.5.1",
@@ -433,7 +432,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-hbhwAYIV.cjs'); });
+      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-CxvL0cwp.cjs'); });
       const state = await readDaemonState();
       if (!state) {
         return logs;

package/dist/{api-dwwHBzLc.mjs → api-CnvyGas2.mjs}

@@ -17,7 +17,7 @@ import { resolve, join as join$1 } from 'path';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.0.7";
+var version = "2.0.9";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -60,7 +60,7 @@ var scripts = {
 	"// ==== TypeScript & Build ====": "",
 	"why do we need to build before running tests / dev?": "We need the binary to be built so we run daemon commands which directly run the binary - we don't want them to go out of sync or have custom spawn logic depending how we started happy",
 	typecheck: "tsc --noEmit",
-	build: "shx rm -rf dist && npx tsc --noEmit && pkgroll",
+	build: "node ./scripts/build.mjs",
 	"// ==== Testing ====": "",
 	test: "yarn build && vitest run",
 	"test:integration": "yarn build && vitest run --config vitest.integration.config.ts",
@@ -116,7 +116,6 @@ var dependencies = {
 	"expo-server-sdk": "^3.15.0",
 	fastify: "^5.6.2",
 	"fastify-type-provider-zod": "4.0.2",
-	"happy-protocol": "0.1.0",
 	"http-proxy": "^1.18.1",
 	"http-proxy-middleware": "^3.0.5",
 	ink: "^6.5.1",
@@ -431,7 +430,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await import('./persistence-Dg-rxY2a.mjs');
+      const { readDaemonState } = await import('./persistence-BPV3AmJL.mjs');
       const state = await readDaemonState();
       if (!state) {
         return logs;

package/dist/{command-Cfq3Uc0S.mjs → command-BGA3qCKR.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-HyqLXzw-.mjs';
+import { c as createDefaultRuntimeShell } from './index-BpZL4RcT.mjs';
 import 'chalk';
-import './api-dwwHBzLc.mjs';
+import './api-CnvyGas2.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';
@@ -17,7 +17,7 @@ import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'expo-server-sdk';
-import './persistence-Dg-rxY2a.mjs';
+import './persistence-BPV3AmJL.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';

package/dist/{command-DiAVIsxX.cjs → command-DLAJZsKX.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-CfqxEoyl.cjs');
+var index = require('./index-D4OdFq68.cjs');
 require('chalk');
-require('./api-Dwkm7s_E.cjs');
+require('./api-CUTdFiFP.cjs');
 require('axios');
 require('fs');
 require('node:fs');
@@ -19,7 +19,7 @@ require('fs/promises');
 require('crypto');
 require('path');
 require('expo-server-sdk');
-require('./persistence-hbhwAYIV.cjs');
+require('./persistence-CxvL0cwp.cjs');
 require('node:fs/promises');
 require('os');
 require('tmp');

package/dist/{index-HyqLXzw-.mjs → index-BpZL4RcT.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-dwwHBzLc.mjs';
-import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-Dg-rxY2a.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-CnvyGas2.mjs';
+import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-BPV3AmJL.mjs';
 import { z } from 'zod';
 import fs from 'fs/promises';
 import os, { homedir } from 'os';
@@ -1108,6 +1108,21 @@ function getEnvironmentInfo() {
     terminal: process.env.TERM
   };
 }
+function resolveDaemonSpawnDiagnostics(projectRoot, fileExists = existsSync) {
+  const wrapperCandidates = [
+    join(projectRoot, "bin", "happy-cloud.mjs"),
+    join(projectRoot, "bin", "happy.mjs")
+  ];
+  const cliEntrypoint = join(projectRoot, "dist", "index.mjs");
+  const wrapperPath = wrapperCandidates.find((candidate) => fileExists(candidate)) ?? wrapperCandidates[0];
+  return {
+    projectRoot,
+    wrapperPath,
+    cliEntrypoint,
+    wrapperExists: fileExists(wrapperPath),
+    cliEntrypointExists: fileExists(cliEntrypoint)
+  };
+}
 function getLogFiles(logDir) {
   if (!existsSync(logDir)) {
     return [];
@@ -1134,14 +1149,12 @@ async function runDoctorCommand(filter) {
     console.log(`Node.js Version: ${chalk.green(process.version)}`);
     console.log("");
     console.log(chalk.bold("\u{1F527} Daemon Spawn Diagnostics"));
-    const projectRoot = projectPath();
-    const wrapperPath = join(projectRoot, "bin", "happy.mjs");
-    const cliEntrypoint = join(projectRoot, "dist", "index.mjs");
-    console.log(`Project Root: ${chalk.blue(projectRoot)}`);
-    console.log(`Wrapper Script: ${chalk.blue(wrapperPath)}`);
-    console.log(`CLI Entrypoint: ${chalk.blue(cliEntrypoint)}`);
-    console.log(`Wrapper Exists: ${existsSync(wrapperPath) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
-    console.log(`CLI Exists: ${existsSync(cliEntrypoint) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
+    const diagnostics = resolveDaemonSpawnDiagnostics(projectPath());
+    console.log(`Project Root: ${chalk.blue(diagnostics.projectRoot)}`);
+    console.log(`Wrapper Script: ${chalk.blue(diagnostics.wrapperPath)}`);
+    console.log(`CLI Entrypoint: ${chalk.blue(diagnostics.cliEntrypoint)}`);
+    console.log(`Wrapper Exists: ${diagnostics.wrapperExists ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
+    console.log(`CLI Exists: ${diagnostics.cliEntrypointExists ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
     console.log("");
     console.log(chalk.bold("\u2699\uFE0F  Configuration"));
     console.log(`Happy Home: ${chalk.blue(configuration.happyCloudHomeDir)}`);
@@ -4191,6 +4204,9 @@ class DefaultTransport {
   getInitTimeout() {
     return DEFAULT_TIMEOUTS.init;
   }
+  getInitDelayMs() {
+    return 0;
+  }
   /**
    * Default: pass through all lines that are valid JSON objects/arrays
    */
@@ -4251,11 +4267,16 @@ class DefaultTransport {
   determineToolName(toolName, _toolCallId, _input, _context) {
     return toolName;
   }
+  getPostPromptNoUpdatesTimeoutMs() {
+    return 3e4;
+  }
 }
 
 const GEMINI_TIMEOUTS = {
   /** Gemini CLI can be slow on first start (downloading models, etc.) */
   init: 12e4,
+  /** Gemini ACP can swallow an initialize request sent too early after spawn */
+  initDelay: 2500,
   /** Standard tool call timeout */
   toolCall: 12e4,
   /** Investigation tools (codebase_investigator) can run for a long time */
@@ -4290,6 +4311,9 @@ class GeminiTransport {
   getInitTimeout() {
     return GEMINI_TIMEOUTS.init;
   }
+  getInitDelayMs() {
+    return GEMINI_TIMEOUTS.initDelay;
+  }
   /**
    * Filter Gemini CLI debug output from stdout.
    *
@@ -5026,6 +5050,10 @@ ${line}` : line;
         controller.error(error);
       } finally {
         reader.releaseLock();
+        try {
+          params.onDone?.();
+        } catch {
+        }
         if (!controllerErrored) {
           controller.close();
         }
@@ -5088,7 +5116,7 @@ async function killProcessTree(proc, options) {
   if (!pid) {
     return;
   }
-  const graceMs = Math.max(1, options?.graceMs);
+  const graceMs = Math.max(1, options?.graceMs ?? 1e3);
   const descendants = await resolveDescendantPids(pid).catch(() => []);
   const allPids = [...descendants, pid];
   for (const targetPid of allPids) {
@@ -5113,6 +5141,29 @@ const RETRY_CONFIG = {
   /** Maximum delay between retries in ms */
   maxDelayMs: 5e3
 };
+const DEFAULT_POST_PROMPT_NO_UPDATES_TIMEOUT_MS = 3e4;
+function readPositiveIntegerEnv(name) {
+  const raw = typeof process.env[name] === "string" ? process.env[name].trim() : "";
+  if (!raw) {
+    return null;
+  }
+  const value = Number(raw);
+  if (!Number.isFinite(value) || !Number.isInteger(value) || value <= 0) {
+    return null;
+  }
+  return value;
+}
+function resolvePostPromptNoUpdatesTimeoutMs(transport) {
+  const transportValue = transport.getPostPromptNoUpdatesTimeoutMs?.();
+  if (typeof transportValue === "number" && Number.isFinite(transportValue) && transportValue > 0) {
+    return Math.trunc(transportValue);
+  }
+  const envValue = readPositiveIntegerEnv("HAPPY_ACP_POST_PROMPT_NO_UPDATES_TIMEOUT_MS") ?? readPositiveIntegerEnv("HAPPIER_ACP_POST_PROMPT_NO_UPDATES_TIMEOUT_MS");
+  if (envValue != null) {
+    return envValue;
+  }
+  return DEFAULT_POST_PROMPT_NO_UPDATES_TIMEOUT_MS;
+}
 function getSessionUpdates(params) {
   const notification = params;
   const updates = Array.isArray(notification.updates) ? notification.updates.filter((update) => Boolean(update && typeof update === "object")) : [];
@@ -5288,6 +5339,17 @@ function normalizeAcpError(error) {
   }
   return normalized;
 }
+function getStatusErrorDetail(message) {
+  if (message.type !== "status" || message.status !== "error") {
+    return null;
+  }
+  const detail = typeof message.detail === "string" ? message.detail.trim() : "";
+  return detail || "Unknown ACP transport error";
+}
+function looksLikeDroppedStdoutError(text) {
+  const lower = text.toLowerCase();
+  return lower.startsWith("error") || lower.includes("error:") || lower.includes("exception") || lower.includes("traceback") || lower.includes("invalid request") || lower.includes("invalid_request") || lower.includes("unauthorized") || lower.includes("forbidden") || lower.includes("permission denied") || /\b(4\d\d|5\d\d)\b/.test(lower) && (lower.includes("http") || lower.includes("status") || lower.includes("request"));
+}
 function createAcpAbortError(message) {
   const error = new Error(message);
   error.name = "AbortError";
@@ -5410,6 +5472,12 @@ class AcpBackend {
   responseCompletionOutcome = null;
   /** Whether the current prompt is still waiting for completion */
   waitingForResponse = false;
+  /** First fatal prompt-level error observed for the current turn */
+  responseCompletionError = null;
+  /** Fallback completion when prompt returns but the agent emits no session updates */
+  postPromptCompletionIdleTimeout = null;
+  /** Whether at least one session/update arrived after the current prompt */
+  sawSessionUpdateSincePrompt = false;
   /** Transport handler for agent-specific behavior */
   transport;
   /** Keep a short rolling stderr buffer so startup failures can surface the real cause. */
@@ -5433,6 +5501,12 @@ class AcpBackend {
       this.idleTimeout = null;
     }
   }
+  clearPostPromptCompletionIdleTimeout() {
+    if (this.postPromptCompletionIdleTimeout) {
+      clearTimeout(this.postPromptCompletionIdleTimeout);
+      this.postPromptCompletionIdleTimeout = null;
+    }
+  }
   clearToolCallTracking() {
     this.activeToolCalls.clear();
     for (const timeout of this.toolCallTimeouts.values()) {
@@ -5446,9 +5520,26 @@ class AcpBackend {
   }
   resetResponseTrackingForNewPrompt() {
     this.responseCompletionOutcome = null;
+    this.responseCompletionError = null;
+    this.sawSessionUpdateSincePrompt = false;
     this.clearIdleTimeoutState();
+    this.clearPostPromptCompletionIdleTimeout();
     this.clearToolCallTracking();
   }
+  failPendingResponseWait(error) {
+    if (this.responseCompletionError) {
+      return;
+    }
+    this.responseCompletionError = error;
+    this.responseCompletionOutcome = null;
+    this.waitingForResponse = false;
+    this.clearPostPromptCompletionIdleTimeout();
+    if (this.idleRejecter) {
+      this.idleRejecter(error);
+    }
+    this.idleResolver = null;
+    this.idleRejecter = null;
+  }
   settleResponseWaiter(outcome) {
     const hasActiveWaiter = Boolean(this.idleResolver || this.idleRejecter);
     if (!this.waitingForResponse && !hasActiveWaiter) {
@@ -5484,6 +5575,38 @@ class AcpBackend {
       }
     }
   }
+  handleDroppedStdoutLine(entry) {
+    if (entry.reason !== "transport_filter_null" || !this.waitingForResponse || this.responseCompletionError) {
+      return;
+    }
+    const raw = entry.line.trim();
+    if (!raw) {
+      return;
+    }
+    const context = {
+      activeToolCalls: this.activeToolCalls,
+      hasActiveInvestigation: this.transport.isInvestigationTool ? Array.from(this.activeToolCalls).some((id) => this.transport.isInvestigationTool(id)) : false
+    };
+    const transportResult = this.transport.handleStderr?.(entry.line, context);
+    const transportMessage = transportResult?.message ?? null;
+    if (transportMessage) {
+      this.emit(transportMessage);
+      const errorDetail = getStatusErrorDetail(transportMessage);
+      if (errorDetail) {
+        this.failPendingResponseWait(new Error(errorDetail));
+      }
+      return;
+    }
+    if (!looksLikeDroppedStdoutError(raw)) {
+      return;
+    }
+    this.emit({
+      type: "status",
+      status: "error",
+      detail: raw
+    });
+    this.failPendingResponseWait(new Error(raw));
+  }
   async startSession(initialPrompt) {
     if (this.disposed) {
       throw new Error("Backend has been disposed");
@@ -5523,20 +5646,27 @@ class AcpBackend {
           const result = this.transport.handleStderr(text, context);
           if (result.message) {
             this.emit(result.message);
+            const errorDetail = getStatusErrorDetail(result.message);
+            if (errorDetail && this.waitingForResponse) {
+              this.failPendingResponseWait(new Error(errorDetail));
+            }
           }
         }
       });
       this.process.on("error", (err) => {
         logger.debug(`[AcpBackend] Process error:`, err);
-        this.settleResponseWaiter({ kind: "rejected", error: err });
+        if (this.waitingForResponse) {
+          this.failPendingResponseWait(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})` : ""}`)
-          });
+          if (this.waitingForResponse) {
+            this.failPendingResponseWait(
+              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}` });
         }
@@ -5553,14 +5683,17 @@ class AcpBackend {
         transport: this.transport,
         onDroppedLine: (entry) => {
           droppedStdoutLines.push(entry);
+          this.handleDroppedStdoutLine(entry);
+        },
+        onDone: () => {
+          if (droppedStdoutLines.length > 0) {
+            logger.debug(
+              `[AcpBackend] Filtered out ${droppedStdoutLines.length} stdout lines from ${this.transport.agentName}`,
+              droppedStdoutLines.slice(0, 5)
+            );
+          }
         }
       });
-      if (droppedStdoutLines.length > 0) {
-        logger.debug(
-          `[AcpBackend] Filtered out ${droppedStdoutLines.length} stdout lines from ${this.transport.agentName}`,
-          droppedStdoutLines.slice(0, 5)
-        );
-      }
       const stream = ndJsonStream(writable, filteredReadable);
       const client = {
         sessionUpdate: async (params) => {
@@ -5722,6 +5855,11 @@ class AcpBackend {
         }
       };
       const initTimeout = this.transport.getInitTimeout();
+      const initDelayMs = this.transport.getInitDelayMs?.() ?? 0;
+      if (initDelayMs > 0) {
+        logger.debug(`[AcpBackend] Waiting ${initDelayMs}ms before initialize (${this.transport.agentName})...`);
+        await delay(initDelayMs);
+      }
       logger.debug(`[AcpBackend] Initializing connection (timeout: ${initTimeout}ms)...`);
       await withRetry(
         async () => {
@@ -5827,6 +5965,16 @@ class AcpBackend {
       return { sessionId };
     } catch (error) {
       const enrichedError = enrichAcpError(error, this.getRecentStderrExcerpt());
+      if (this.process) {
+        try {
+          await killProcessTree(this.process, { graceMs: 250 });
+        } catch {
+        } finally {
+          this.process = null;
+        }
+      }
+      this.connection = null;
+      this.acpSessionId = null;
       logger.debug("[AcpBackend] Error starting session:", enrichedError);
       this.emit({
         type: "status",
@@ -5887,6 +6035,8 @@ class AcpBackend {
       logger.debug("[AcpBackend] Received session update without update field:", params);
       return;
     }
+    this.sawSessionUpdateSincePrompt = true;
+    this.clearPostPromptCompletionIdleTimeout();
     for (const update of updates) {
       const sessionUpdateType = update.sessionUpdate;
       if (sessionUpdateType !== "agent_message_chunk") {
@@ -5966,6 +6116,29 @@ class AcpBackend {
       logger.debug(`[AcpBackend] Prompt request:`, JSON.stringify(promptRequest, null, 2));
       await this.connection.prompt(promptRequest);
       logger.debug("[AcpBackend] Prompt request sent to ACP connection");
+      if (this.waitingForResponse && this.activeToolCalls.size === 0 && this.sawSessionUpdateSincePrompt === false) {
+        const noUpdatesTimeoutMs = resolvePostPromptNoUpdatesTimeoutMs(this.transport);
+        this.postPromptCompletionIdleTimeout = setTimeout(() => {
+          this.postPromptCompletionIdleTimeout = null;
+          if (this.responseCompletionError || !this.waitingForResponse) {
+            return;
+          }
+          if (this.sawSessionUpdateSincePrompt || this.activeToolCalls.size > 0) {
+            return;
+          }
+          const exitCode = this.process?.exitCode;
+          if (typeof exitCode === "number" && Number.isFinite(exitCode) && exitCode !== 0) {
+            this.failPendingResponseWait(new Error(`Exit code: ${exitCode}`));
+            return;
+          }
+          const signalCode = this.process?.signalCode;
+          if (typeof signalCode === "string" && signalCode.trim().length > 0) {
+            this.failPendingResponseWait(new Error(`Signal: ${signalCode}`));
+            return;
+          }
+          this.emitIdleStatus();
+        }, Math.max(100, noUpdatesTimeoutMs));
+      }
     } catch (error) {
       logger.debug("[AcpBackend] Error sending prompt:", error);
       let errorDetail;
@@ -5981,10 +6154,7 @@ class AcpBackend {
         status: "error",
         detail: errorDetail
       });
-      this.settleResponseWaiter({
-        kind: "rejected",
-        error: error instanceof Error ? error : normalizeAcpError(error)
-      });
+      this.failPendingResponseWait(error instanceof Error ? error : normalizeAcpError(error));
       throw error;
     }
   }
@@ -5993,6 +6163,9 @@ class AcpBackend {
    * Call this after sendPrompt to wait for Gemini to finish responding
    */
   async waitForResponseComplete(timeoutMs = 12e4) {
+    if (this.responseCompletionError) {
+      throw this.responseCompletionError;
+    }
     const pendingOutcome = this.responseCompletionOutcome;
     if (pendingOutcome) {
       this.responseCompletionOutcome = null;
@@ -6031,12 +6204,14 @@ class AcpBackend {
    * Helper to emit idle status and resolve any waiting promises
    */
   emitIdleStatus() {
+    this.clearPostPromptCompletionIdleTimeout();
     this.emit({ type: "status", status: "idle" });
     this.settleResponseWaiter({ kind: "resolved" });
   }
   async cancel(sessionId) {
     const cancelError = createAcpAbortError("Cancelled by user");
     this.clearIdleTimeoutState();
+    this.clearPostPromptCompletionIdleTimeout();
     this.clearToolCallTracking();
     this.settleResponseWaiter({ kind: "rejected", error: cancelError });
     this.emit({ type: "status", status: "stopped", detail: "Cancelled by user" });
@@ -6097,6 +6272,7 @@ class AcpBackend {
       }
     }
     this.clearIdleTimeoutState();
+    this.clearPostPromptCompletionIdleTimeout();
     this.listeners = [];
     this.connection = null;
     this.acpSessionId = null;
@@ -6745,12 +6921,12 @@ async function ensureUnifiedDaemonStarted() {
 async function executeUnifiedProvider(opts) {
   const credentials = await ensureUnifiedRuntimePrerequisites(opts.credentials);
   if (opts.provider === "claude") {
-    const { runClaude } = await import('./runClaude-OxYbt3ZQ.mjs');
+    const { runClaude } = await import('./runClaude-8inO7C5p.mjs');
     await runClaude(credentials, opts.claudeOptions ?? {});
     return;
   }
   if (opts.provider === "codex") {
-    const { runCodex } = await import('./runCodex-ByVTEbSY.mjs');
+    const { runCodex } = await import('./runCodex-BQ-fN5E6.mjs');
     await runCodex({
       credentials,
       startedBy: opts.startedBy,
@@ -6760,7 +6936,7 @@ async function executeUnifiedProvider(opts) {
     return;
   }
   if (opts.provider === "gemini") {
-    const { runGemini } = await import('./runGemini-BRO6A2jm.mjs');
+    const { runGemini } = await import('./runGemini-BE0FizuV.mjs');
     await runGemini({
       credentials,
       startedBy: opts.startedBy
@@ -6802,7 +6978,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-Cfq3Uc0S.mjs');
+      const { renderRuntimeProviders } = await import('./command-BGA3qCKR.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -6980,8 +7156,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-Dg-rxY2a.mjs');
-        const { ApiClient: ApiClient2 } = await import('./api-dwwHBzLc.mjs').then(function (n) { return n.q; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-BPV3AmJL.mjs');
+        const { ApiClient: ApiClient2 } = await import('./api-CnvyGas2.mjs').then(function (n) { return n.q; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();