happy-imou-cloud 2.0.2 → 2.0.4

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

@@ -1,10 +1,10 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-D2Njw9Im.cjs');
-var persistence = require('./persistence-D_2GkJAO.cjs');
+var api = require('./api-CyJG1mr6.cjs');
+var persistence = require('./persistence-BeFVx6kI.cjs');
 var z = require('zod');
-var fs$2 = require('fs/promises');
+var fs$1 = require('fs/promises');
 var os$1 = require('os');
 var tmp = require('tmp');
 var node_crypto = require('node:crypto');
@@ -14,18 +14,18 @@ var qrcode = require('qrcode-terminal');
 var promises = require('node:fs/promises');
 var node_module = require('node:module');
 var os = require('node:os');
-var path = require('node:path');
+var node_path = require('node:path');
 var open = require('open');
 var React = require('react');
 var ink = require('ink');
 var child_process = require('child_process');
-var path$1 = require('path');
+var path = require('path');
 var url = require('url');
-var fs$1 = require('fs');
+var fs = require('fs');
 var node_child_process = require('node:child_process');
 var psList = require('ps-list');
 var spawn = require('cross-spawn');
-var fs = require('node:fs');
+var node_fs = require('node:fs');
 var fastify = require('fastify');
 var fastifyTypeProviderZod = require('fastify-type-provider-zod');
 var node_readline = require('node:readline');
@@ -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-Bg-YziG2.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-1zlH6s7a.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();
@@ -164,7 +164,7 @@ async function openWindowsQrCode(value) {
       "</body>",
       "</html>"
     ].join("");
-    const filePath = path.join(os.tmpdir(), `happy-auth-qrcode-${node_crypto.randomUUID()}.html`);
+    const filePath = node_path.join(os.tmpdir(), `happy-auth-qrcode-${node_crypto.randomUUID()}.html`);
     await promises.writeFile(filePath, html, "utf8");
     const opened = await openBrowser(filePath);
     if (opened) {
@@ -693,18 +693,18 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Bg-YziG2.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-1zlH6s7a.cjs', document.baseURI).href))));
 function projectPath() {
-  const path = path$1.resolve(__dirname$1, "..");
-  return path;
+  const path$1 = path.resolve(__dirname$1, "..");
+  return path$1;
 }
 
 function getDaemonPid() {
   try {
-    if (!fs.existsSync(api.configuration.daemonStateFile)) {
+    if (!node_fs.existsSync(api.configuration.daemonStateFile)) {
       return null;
     }
-    const state = JSON.parse(fs.readFileSync(api.configuration.daemonStateFile, "utf-8"));
+    const state = JSON.parse(node_fs.readFileSync(api.configuration.daemonStateFile, "utf-8"));
     return typeof state.pid === "number" ? state.pid : null;
   } catch {
     return null;
@@ -1030,8 +1030,8 @@ async function isDaemonRunningCurrentlyInstalledHappyVersion() {
     return false;
   }
   try {
-    const packageJsonPath = path$1.join(projectPath(), "package.json");
-    const packageJson = JSON.parse(fs$1.readFileSync(packageJsonPath, "utf-8"));
+    const packageJsonPath = path.join(projectPath(), "package.json");
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
     const currentCliVersion = packageJson.version;
     api.logger.debug(`[DAEMON CONTROL] Current CLI version: ${currentCliVersion}, Daemon started with version: ${state.startedWithCliVersion}`);
     if (currentCliVersion !== state.startedWithCliVersion) {
@@ -1131,14 +1131,14 @@ function getEnvironmentInfo() {
   };
 }
 function getLogFiles(logDir) {
-  if (!fs.existsSync(logDir)) {
+  if (!node_fs.existsSync(logDir)) {
     return [];
   }
   try {
-    return fs.readdirSync(logDir).filter((file) => file.endsWith(".log")).map((file) => {
-      const path$1 = path.join(logDir, file);
-      const stats = fs.statSync(path$1);
-      return { file, path: path$1, modified: stats.mtime };
+    return node_fs.readdirSync(logDir).filter((file) => file.endsWith(".log")).map((file) => {
+      const path = node_path.join(logDir, file);
+      const stats = node_fs.statSync(path);
+      return { file, path, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
   } catch {
     return [];
@@ -1157,13 +1157,13 @@ async function runDoctorCommand(filter) {
     console.log("");
     console.log(chalk.bold("\u{1F527} Daemon Spawn Diagnostics"));
     const projectRoot = projectPath();
-    const wrapperPath = path.join(projectRoot, "bin", "happy.mjs");
-    const cliEntrypoint = path.join(projectRoot, "dist", "index.mjs");
+    const wrapperPath = node_path.join(projectRoot, "bin", "happy.mjs");
+    const cliEntrypoint = node_path.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: ${fs.existsSync(wrapperPath) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
-    console.log(`CLI Exists: ${fs.existsSync(cliEntrypoint) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
+    console.log(`Wrapper Exists: ${node_fs.existsSync(wrapperPath) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
+    console.log(`CLI Exists: ${node_fs.existsSync(cliEntrypoint) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
     console.log("");
     console.log(chalk.bold("\u2699\uFE0F  Configuration"));
     console.log(`Happy Home: ${chalk.blue(api.configuration.happyCloudHomeDir)}`);
@@ -1329,7 +1329,7 @@ const isBun = () => getRuntime() === "bun";
 
 function spawnHappyCLI(args, options = {}) {
   const projectRoot = projectPath();
-  const entrypoint = path.join(projectRoot, "dist", "index.mjs");
+  const entrypoint = node_path.join(projectRoot, "dist", "index.mjs");
   let directory;
   if ("cwd" in options) {
     directory = options.cwd;
@@ -1344,7 +1344,7 @@ function spawnHappyCLI(args, options = {}) {
     entrypoint,
     ...args
   ];
-  if (!fs.existsSync(entrypoint)) {
+  if (!node_fs.existsSync(entrypoint)) {
     const errorMessage = `Entrypoint ${entrypoint} does not exist`;
     api.logger.debug(`[SPAWN HAPPY CLOUD CLI] ${errorMessage}`);
     throw new Error(errorMessage);
@@ -2404,7 +2404,7 @@ async function startDaemon() {
       const { directory, sessionId, machineId: machineId2, approvedNewDirectoryCreation = true } = options;
       let directoryCreated = false;
       try {
-        await fs$2.access(directory);
+        await fs$1.access(directory);
         api.logger.debug(`[DAEMON RUN] Directory exists: ${directory}`);
       } catch (error) {
         api.logger.debug(`[DAEMON RUN] Directory doesn't exist, creating: ${directory}`);
@@ -2416,7 +2416,7 @@ async function startDaemon() {
           };
         }
         try {
-          await fs$2.mkdir(directory, { recursive: true });
+          await fs$1.mkdir(directory, { recursive: true });
           api.logger.debug(`[DAEMON RUN] Successfully created directory: ${directory}`);
           directoryCreated = true;
         } catch (mkdirError) {
@@ -2445,7 +2445,7 @@ async function startDaemon() {
         if (options.token) {
           if (options.agent === "codex") {
             const codexHomeDir = tmp__namespace.dirSync();
-            fs$2.writeFile(path$1.join(codexHomeDir.name, "auth.json"), options.token);
+            fs$1.writeFile(path.join(codexHomeDir.name, "auth.json"), options.token);
             authEnv.CODEX_HOME = codexHomeDir.name;
           } else {
             authEnv.CLAUDE_CODE_OAUTH_TOKEN = options.token;
@@ -2511,7 +2511,7 @@ async function startDaemon() {
           const sessionDesc = tmuxSessionName || "current/most recent session";
           api.logger.debug(`[DAEMON RUN] Attempting to spawn session in tmux: ${sessionDesc}`);
           const tmux = getTmuxUtilities(tmuxSessionName);
-          const cliPath = path$1.join(projectPath(), "dist", "index.mjs");
+          const cliPath = path.join(projectPath(), "dist", "index.mjs");
           const agent = resolveDaemonSpawnAgent(options.agent);
           const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${buildDaemonSpawnArgs(agent).join(" ")}`;
           const windowName = `happy-${Date.now()}-${agent}`;
@@ -2757,7 +2757,7 @@ async function startDaemon() {
           pidToTrackedSession.delete(pid);
         }
       }
-      const projectVersion = JSON.parse(fs$1.readFileSync(path$1.join(projectPath(), "package.json"), "utf-8")).version;
+      const projectVersion = JSON.parse(fs.readFileSync(path.join(projectPath(), "package.json"), "utf-8")).version;
       if (projectVersion !== api.configuration.currentCliVersion) {
         api.logger.debug("[DAEMON RUN] Daemon is outdated, triggering self-restart with latest version, clearing heartbeat interval");
         clearInterval(restartOnStaleVersionAndHeartbeat);
@@ -2850,7 +2850,7 @@ const PLIST_LABEL$1 = "com.happy-cloud.daemon";
 const PLIST_FILE$1 = `/Library/LaunchDaemons/${PLIST_LABEL$1}.plist`;
 async function install$1() {
   try {
-    if (fs$1.existsSync(PLIST_FILE$1)) {
+    if (fs.existsSync(PLIST_FILE$1)) {
       api.logger.info("Daemon plist already exists. Uninstalling first...");
       child_process.execSync(`launchctl unload ${PLIST_FILE$1}`, { stdio: "inherit" });
     }
@@ -2894,8 +2894,8 @@ async function install$1() {
             </dict>
             </plist>
         `);
-    fs$1.writeFileSync(PLIST_FILE$1, plistContent);
-    fs$1.chmodSync(PLIST_FILE$1, 420);
+    fs.writeFileSync(PLIST_FILE$1, plistContent);
+    fs.chmodSync(PLIST_FILE$1, 420);
     api.logger.info(`Created daemon plist at ${PLIST_FILE$1}`);
     child_process.execSync(`launchctl load ${PLIST_FILE$1}`, { stdio: "inherit" });
     api.logger.info("Daemon installed and started successfully");
@@ -2921,7 +2921,7 @@ const PLIST_LABEL = "com.happy-cli.daemon";
 const PLIST_FILE = `/Library/LaunchDaemons/${PLIST_LABEL}.plist`;
 async function uninstall$1() {
   try {
-    if (!fs$1.existsSync(PLIST_FILE)) {
+    if (!fs.existsSync(PLIST_FILE)) {
       api.logger.info("Daemon plist not found. Nothing to uninstall.");
       return;
     }
@@ -2931,7 +2931,7 @@ async function uninstall$1() {
     } catch (error) {
       api.logger.info("Failed to unload daemon (it might not be running)");
     }
-    fs$1.unlinkSync(PLIST_FILE);
+    fs.unlinkSync(PLIST_FILE);
     api.logger.info(`Removed daemon plist from ${PLIST_FILE}`);
     api.logger.info("Daemon uninstalled successfully");
   } catch (error) {
@@ -3071,8 +3071,8 @@ async function handleAuthLogout(args = []) {
         console.log(chalk.gray("Stopped daemon"));
       } catch {
       }
-      if (fs.existsSync(happyDir)) {
-        fs.rmSync(happyDir, { recursive: true, force: true });
+      if (node_fs.existsSync(happyDir)) {
+        node_fs.rmSync(happyDir, { recursive: true, force: true });
       }
       console.log(chalk.green("\u2713 Successfully logged out"));
       console.log(chalk.gray('  Run "hicloud auth login" to authenticate again'));
@@ -3745,10 +3745,10 @@ async function handleConnectStatus() {
 }
 function updateLocalGeminiCredentials(tokens) {
   try {
-    const geminiDir = path$1.join(os$1.homedir(), ".gemini");
-    const credentialsPath = path$1.join(geminiDir, "oauth_creds.json");
-    if (!fs$1.existsSync(geminiDir)) {
-      fs$1.mkdirSync(geminiDir, { recursive: true });
+    const geminiDir = path.join(os$1.homedir(), ".gemini");
+    const credentialsPath = path.join(geminiDir, "oauth_creds.json");
+    if (!fs.existsSync(geminiDir)) {
+      fs.mkdirSync(geminiDir, { recursive: true });
     }
     const credentials = {
       access_token: tokens.access_token,
@@ -3758,7 +3758,7 @@ function updateLocalGeminiCredentials(tokens) {
       ...tokens.id_token && { id_token: tokens.id_token },
       ...tokens.expires_in && { expires_in: tokens.expires_in }
     };
-    fs$1.writeFileSync(credentialsPath, JSON.stringify(credentials, null, 2), "utf-8");
+    fs.writeFileSync(credentialsPath, JSON.stringify(credentials, null, 2), "utf-8");
     console.log(chalk.gray(`  Updated local credentials: ${credentialsPath}`));
   } catch (error) {
     console.log(chalk.yellow(`  \u26A0\uFE0F Could not update local credentials: ${error}`));
@@ -3766,22 +3766,22 @@ function updateLocalGeminiCredentials(tokens) {
 }
 
 function getProjectPath(workingDirectory, claudeConfigDirOverride) {
-  const projectId = path.resolve(workingDirectory).replace(/[^a-zA-Z0-9-]/g, "-");
+  const projectId = node_path.resolve(workingDirectory).replace(/[^a-zA-Z0-9-]/g, "-");
   const claudeConfigDirRaw = process.env.CLAUDE_CONFIG_DIR ?? "";
   const claudeConfigDirTrimmed = claudeConfigDirRaw.trim();
-  const claudeConfigDir = claudeConfigDirTrimmed ? claudeConfigDirTrimmed : path.join(os.homedir(), ".claude");
-  return path.join(claudeConfigDir, "projects", projectId);
+  const claudeConfigDir = claudeConfigDirTrimmed ? claudeConfigDirTrimmed : node_path.join(os.homedir(), ".claude");
+  return node_path.join(claudeConfigDir, "projects", projectId);
 }
 
-function claudeCheckSession(sessionId, path$1, transcriptPath) {
-  const projectDir = getProjectPath(path$1);
-  const sessionFile = transcriptPath ?? path.join(projectDir, `${sessionId}.jsonl`);
-  const sessionExists = fs.existsSync(sessionFile);
+function claudeCheckSession(sessionId, path, transcriptPath) {
+  const projectDir = getProjectPath(path);
+  const sessionFile = transcriptPath ?? node_path.join(projectDir, `${sessionId}.jsonl`);
+  const sessionExists = node_fs.existsSync(sessionFile);
   if (!sessionExists) {
     api.logger.debug(`[claudeCheckSession] Path ${sessionFile} does not exist`);
     return false;
   }
-  const sessionData = fs.readFileSync(sessionFile, "utf-8").split("\n");
+  const sessionData = node_fs.readFileSync(sessionFile, "utf-8").split("\n");
   const hasGoodMessage = !!sessionData.find((v, index) => {
     if (!v.trim()) return false;
     try {
@@ -3802,7 +3802,7 @@ function claudeFindLastSession(workingDirectory) {
   try {
     const projectDir = getProjectPath(workingDirectory);
     const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    const files = fs.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).map((f) => {
+    const files = node_fs.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).map((f) => {
       const sessionId = f.replace(".jsonl", "");
       if (!uuidPattern.test(sessionId)) {
         return null;
@@ -3811,7 +3811,7 @@ function claudeFindLastSession(workingDirectory) {
         return {
           name: f,
           sessionId,
-          mtime: fs.statSync(path.join(projectDir, f)).mtime.getTime()
+          mtime: node_fs.statSync(node_path.join(projectDir, f)).mtime.getTime()
         };
       }
       return null;
@@ -3831,10 +3831,10 @@ class ExitCodeError extends Error {
     this.exitCode = exitCode;
   }
 }
-const claudeCliPath = path.resolve(path.join(projectPath(), "scripts", "claude_local_launcher.cjs"));
+const claudeCliPath = node_path.resolve(node_path.join(projectPath(), "scripts", "claude_local_launcher.cjs"));
 async function claudeLocal(opts) {
   const projectDir = getProjectPath(opts.path);
-  fs.mkdirSync(projectDir, { recursive: true });
+  node_fs.mkdirSync(projectDir, { recursive: true });
   const hasContinueFlag = opts.claudeArgs?.includes("--continue");
   const hasResumeFlag = opts.claudeArgs?.includes("--resume");
   const hasUserSessionControl = hasContinueFlag || hasResumeFlag;
@@ -3953,7 +3953,7 @@ async function claudeLocal(opts) {
         args.push("--settings", opts.hookSettingsPath);
         api.logger.debug(`[ClaudeLocal] Using hook settings: ${opts.hookSettingsPath}`);
       }
-      if (!claudeCliPath || !fs.existsSync(claudeCliPath)) {
+      if (!claudeCliPath || !node_fs.existsSync(claudeCliPath)) {
         throw new Error("Claude local launcher not found. Please ensure HAPPY_PROJECT_ROOT is set correctly for development.");
       }
       const env = {
@@ -4527,6 +4527,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") {
@@ -4674,11 +4775,13 @@ function completeToolCall(toolCallId, toolKind, content, ctx) {
     clearTimeout(timeout);
     ctx.toolCallTimeouts.delete(toolCallId);
   }
+  const streamedOutput = ctx.toolCallOutputs.get(toolCallId);
+  ctx.toolCallOutputs.delete(toolCallId);
   api.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) {
@@ -4720,6 +4823,8 @@ function failToolCall(toolCallId, status, toolKind, content, ctx) {
   }
   const durationStr = formatDuration(startTime);
   api.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) {
     api.logger.debug(`[AcpBackend] \u274C Tool call error details: ${errorDetail.substring(0, 500)}`);
@@ -4729,7 +4834,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) {
@@ -4745,8 +4854,13 @@ function handleToolCallUpdate(update, ctx) {
     api.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++;
@@ -4995,6 +5109,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()) {
@@ -5021,6 +5140,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 */
@@ -5031,6 +5152,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. */
@@ -5048,6 +5177,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);
   }
@@ -5122,10 +5289,15 @@ class AcpBackend {
       });
       this.process.on("error", (err) => {
         api.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})` : ""}`)
+          });
           api.logger.debug(`[AcpBackend] Process exited with code ${code}, signal ${signal}`);
           this.emit({ type: "status", status: "stopped", detail: `Exit code: ${code}` });
         }
@@ -5456,6 +5628,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),
@@ -5532,20 +5705,24 @@ class AcpBackend {
         this.emitUsageTelemetry(update, "acp-usage-update");
         continue;
       }
+      if (sessionUpdateType === "task_complete") {
+        this.emitUsageTelemetry(update.usage, "acp-session-usage");
+        ctx.clearIdleTimeout();
+        api.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) {
         api.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) {
@@ -5554,6 +5731,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 {
@@ -5572,7 +5750,6 @@ class AcpBackend {
       api.logger.debug("[AcpBackend] Prompt request sent to ACP connection");
     } catch (error) {
       api.logger.debug("[AcpBackend] Error sending prompt:", error);
-      this.waitingForResponse = false;
       let errorDetail;
       if (error instanceof Error) {
         errorDetail = error.message;
@@ -5586,6 +5763,10 @@ class AcpBackend {
         status: "error",
         detail: errorDetail
       });
+      this.settleResponseWaiter({
+        kind: "rejected",
+        error: error instanceof Error ? error : normalizeAcpError(error)
+      });
       throw error;
     }
   }
@@ -5594,21 +5775,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);
+      };
     });
   }
   /**
@@ -5616,18 +5814,19 @@ class AcpBackend {
    */
   emitIdleStatus() {
     this.emit({ type: "status", status: "idle" });
-    if (this.idleResolver) {
-      api.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) {
       api.logger.debug("[AcpBackend] Error cancelling:", error);
     }
@@ -5655,6 +5854,10 @@ class AcpBackend {
     if (this.disposed) return;
     api.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([
@@ -5683,19 +5886,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();
   }
 }
@@ -5711,17 +5906,17 @@ function readGeminiLocalConfig() {
   let googleCloudProject = null;
   let googleCloudProjectEmail = null;
   const possiblePaths = [
-    path$1.join(os$1.homedir(), ".gemini", "oauth_creds.json"),
+    path.join(os$1.homedir(), ".gemini", "oauth_creds.json"),
     // Main OAuth credentials file
-    path$1.join(os$1.homedir(), ".gemini", "config.json"),
-    path$1.join(os$1.homedir(), ".config", "gemini", "config.json"),
-    path$1.join(os$1.homedir(), ".gemini", "auth.json"),
-    path$1.join(os$1.homedir(), ".config", "gemini", "auth.json")
+    path.join(os$1.homedir(), ".gemini", "config.json"),
+    path.join(os$1.homedir(), ".config", "gemini", "config.json"),
+    path.join(os$1.homedir(), ".gemini", "auth.json"),
+    path.join(os$1.homedir(), ".config", "gemini", "auth.json")
   ];
   for (const configPath of possiblePaths) {
-    if (fs$1.existsSync(configPath)) {
+    if (fs.existsSync(configPath)) {
       try {
-        const config = JSON.parse(fs$1.readFileSync(configPath, "utf-8"));
+        const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
         if (!token) {
           const foundToken = config.access_token || config.token || config.apiKey || config.GEMINI_API_KEY;
           if (foundToken && typeof foundToken === "string") {
@@ -5793,22 +5988,22 @@ function determineGeminiModel(explicitModel, localConfig) {
 }
 function saveGeminiModelToConfig(model) {
   try {
-    const configDir = path$1.join(os$1.homedir(), ".gemini");
-    const configPath = path$1.join(configDir, "config.json");
-    if (!fs$1.existsSync(configDir)) {
-      fs$1.mkdirSync(configDir, { recursive: true });
+    const configDir = path.join(os$1.homedir(), ".gemini");
+    const configPath = path.join(configDir, "config.json");
+    if (!fs.existsSync(configDir)) {
+      fs.mkdirSync(configDir, { recursive: true });
     }
     let config = {};
-    if (fs$1.existsSync(configPath)) {
+    if (fs.existsSync(configPath)) {
       try {
-        config = JSON.parse(fs$1.readFileSync(configPath, "utf-8"));
+        config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
       } catch (error) {
         api.logger.debug(`[Gemini] Failed to read existing config, creating new one`);
         config = {};
       }
     }
     config.model = model;
-    fs$1.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
     api.logger.debug(`[Gemini] Saved model "${model}" to ${configPath}`);
   } catch (error) {
     api.logger.debug(`[Gemini] Failed to save model to config:`, error);
@@ -5816,15 +6011,15 @@ function saveGeminiModelToConfig(model) {
 }
 function saveGoogleCloudProjectToConfig(projectId, email) {
   try {
-    const configDir = path$1.join(os$1.homedir(), ".gemini");
-    const configPath = path$1.join(configDir, "config.json");
-    if (!fs$1.existsSync(configDir)) {
-      fs$1.mkdirSync(configDir, { recursive: true });
+    const configDir = path.join(os$1.homedir(), ".gemini");
+    const configPath = path.join(configDir, "config.json");
+    if (!fs.existsSync(configDir)) {
+      fs.mkdirSync(configDir, { recursive: true });
     }
     let config = {};
-    if (fs$1.existsSync(configPath)) {
+    if (fs.existsSync(configPath)) {
       try {
-        config = JSON.parse(fs$1.readFileSync(configPath, "utf-8"));
+        config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
       } catch {
         config = {};
       }
@@ -5833,7 +6028,7 @@ function saveGoogleCloudProjectToConfig(projectId, email) {
     if (email) {
       config.googleCloudProjectEmail = email;
     }
-    fs$1.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
     api.logger.debug(`[Gemini] Saved Google Cloud Project "${projectId}"${email ? ` for ${email}` : ""} to ${configPath}`);
   } catch (error) {
     api.logger.debug(`[Gemini] Failed to save Google Cloud Project to config:`, error);
@@ -5940,11 +6135,11 @@ function readFirstEnv(...names) {
   return "";
 }
 function normalizeCommandPath(command) {
-  if (path.isAbsolute(command)) {
+  if (node_path.isAbsolute(command)) {
     return command;
   }
-  const resolved = path.resolve(process.cwd(), command);
-  return fs.existsSync(resolved) ? resolved : command;
+  const resolved = node_path.resolve(process.cwd(), command);
+  return node_fs.existsSync(resolved) ? resolved : command;
 }
 function resolveCommandOnPath(command) {
   const pathValue = typeof process.env.PATH === "string" ? process.env.PATH : "";
@@ -5952,13 +6147,13 @@ function resolveCommandOnPath(command) {
     return null;
   }
   const extensions = process.platform === "win32" ? (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD").split(";").map((value) => value.trim().toLowerCase()).filter(Boolean) : [""];
-  for (const dir of pathValue.split(path.delimiter)) {
+  for (const dir of pathValue.split(node_path.delimiter)) {
     const trimmedDir = dir.trim();
     if (!trimmedDir) {
       continue;
     }
-    const directCandidate = path.join(trimmedDir, command);
-    if (fs.existsSync(directCandidate)) {
+    const directCandidate = node_path.join(trimmedDir, command);
+    if (node_fs.existsSync(directCandidate)) {
       return directCandidate;
     }
     if (process.platform !== "win32") {
@@ -5969,8 +6164,8 @@ function resolveCommandOnPath(command) {
       continue;
     }
     for (const extension of extensions) {
-      const candidate = path.join(trimmedDir, `${command}${extension.toLowerCase()}`);
-      if (fs.existsSync(candidate)) {
+      const candidate = node_path.join(trimmedDir, `${command}${extension.toLowerCase()}`);
+      if (node_fs.existsSync(candidate)) {
         return candidate;
       }
     }
@@ -6065,8 +6260,8 @@ function validateCodexAcpSpawn(options = {}) {
   const normalizedCommand = spawn.command.trim();
   const commandLower = normalizedCommand.toLowerCase();
   const npxMode = readCodexAcpNpxMode();
-  if (path.isAbsolute(normalizedCommand)) {
-    if (!fs.existsSync(normalizedCommand)) {
+  if (node_path.isAbsolute(normalizedCommand)) {
+    if (!node_fs.existsSync(normalizedCommand)) {
       return {
         ok: false,
         errorMessage: `Codex ACP is enabled, but the resolved command does not exist: ${normalizedCommand}`
@@ -6336,12 +6531,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-B-GNEkKg.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-Dz-PCSvb.cjs'); });
     await runClaude(credentials, opts.claudeOptions ?? {});
     return;
   }
   if (opts.provider === "codex") {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CPHyGwj9.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BtZplK1R.cjs'); });
     await runCodex({
       credentials,
       startedBy: opts.startedBy,
@@ -6351,7 +6546,7 @@ async function executeUnifiedProvider(opts) {
     return;
   }
   if (opts.provider === "gemini") {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DaDz1bzQ.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DUyH311Z.cjs'); });
     await runGemini({
       credentials,
       startedBy: opts.startedBy
@@ -6393,7 +6588,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-CVldr51S.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-CPlJKXDn.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -6571,8 +6766,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-D_2GkJAO.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-D2Njw9Im.cjs'); }).then(function (n) { return n.api; });
+        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; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();
@@ -6735,7 +6930,7 @@ function shouldRunMainClaudeFlow(opts) {
         if (latest) {
           console.error(`Latest daemon log: ${latest.path}`);
           try {
-            const logContent = fs.readFileSync(latest.path, "utf-8");
+            const logContent = node_fs.readFileSync(latest.path, "utf-8");
             if (logContent.includes("EADDRINUSE")) {
               console.error("Daemon control port is already in use. Retry after stopping the stale daemon or run `hicloud doctor clean`.");
             }