happy-imou-cloud 2.0.0 → 2.0.2

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

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-D7OK-mML.cjs');
-var persistence = require('./persistence-DHgf1CTG.cjs');
+var api = require('./api-D2Njw9Im.cjs');
+var persistence = require('./persistence-D_2GkJAO.cjs');
 var z = require('zod');
 var fs$2 = require('fs/promises');
 var os$1 = require('os');
@@ -70,7 +70,7 @@ async function openBrowser(url) {
   }
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B_wlQBy2.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-Bg-YziG2.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();
@@ -241,6 +241,64 @@ const AuthSelector = ({ onSelect, onCancel }) => {
   })), /* @__PURE__ */ React.createElement(ink.Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(ink.Text, { dimColor: true }, "Use arrows or 1-2 to select, Enter to confirm")));
 };
 
+async function ensureSigningCredentials(credentials, opts = {}) {
+  if (credentials.signing) {
+    return credentials;
+  }
+  try {
+    const response = await axios.post(`${api.configuration.serverUrl}/v1/auth/refresh`, {}, {
+      headers: api.buildAuthenticatedHeaders({
+        credentials,
+        method: "POST",
+        url: `${api.configuration.serverUrl}/v1/auth/refresh`,
+        body: {},
+        headers: {
+          "Content-Type": "application/json"
+        },
+        signRequest: false
+      })
+    });
+    if (!response.data?.success || !response.data?.token || !response.data?.signing) {
+      api.logger.debug("[AUTH] Signing bootstrap returned incomplete payload", response.data);
+      throw new api.SigningBootstrapRequiredError(api.SIGNING_BOOTSTRAP_REQUIRED_MESSAGE);
+    }
+    const upgradedCredentials = {
+      ...credentials,
+      token: response.data.token,
+      signing: response.data.signing
+    };
+    if (upgradedCredentials.encryption.type === "legacy") {
+      await persistence.writeCredentialsLegacy({
+        secret: upgradedCredentials.encryption.secret,
+        token: upgradedCredentials.token,
+        signing: upgradedCredentials.signing
+      });
+    } else {
+      await persistence.writeCredentialsDataKey({
+        publicKey: upgradedCredentials.encryption.publicKey,
+        machineKey: upgradedCredentials.encryption.machineKey,
+        token: upgradedCredentials.token,
+        signing: upgradedCredentials.signing
+      });
+    }
+    api.logger.debug("[AUTH] Signing credentials bootstrapped successfully");
+    return upgradedCredentials;
+  } catch (error) {
+    if (axios.isAxiosError(error) && error.response?.status === 401) {
+      api.logger.debug("[AUTH] Signing bootstrap rejected with 401");
+      throw new api.SigningBootstrapRequiredError(api.SIGNING_BOOTSTRAP_REQUIRED_MESSAGE);
+    }
+    if (error instanceof api.SigningBootstrapRequiredError) {
+      throw error;
+    }
+    api.logger.debug("[AUTH] Failed to bootstrap signing credentials", error);
+    if (opts.failFast) {
+      throw new api.SigningBootstrapRequiredError(api.SIGNING_BOOTSTRAP_REQUIRED_MESSAGE);
+    }
+    return credentials;
+  }
+}
+
 function isNonInteractive() {
   return !process.stdin.isTTY || !process.stdout.isTTY;
 }
@@ -542,7 +600,7 @@ async function authAndSetupMachineIfNeeded() {
   } else {
     api.logger.debug("[AUTH] Using existing credentials");
   }
-  credentials = await ensureSigningCredentials(credentials);
+  credentials = await ensureSigningCredentials(credentials, { failFast: newAuth });
   const currentSettings = await persistence.readSettings();
   const settings = newAuth || !currentSettings.machineId ? await persistence.updateSettings(async (s) => ({
     ...s,
@@ -551,53 +609,6 @@ async function authAndSetupMachineIfNeeded() {
   api.logger.debug(`[AUTH] Machine ID: ${settings.machineId}`);
   return { credentials, machineId: settings.machineId };
 }
-async function ensureSigningCredentials(credentials) {
-  if (credentials.signing) {
-    return credentials;
-  }
-  try {
-    const response = await axios.post(`${api.configuration.serverUrl}/v1/auth/refresh`, {}, {
-      headers: api.buildAuthenticatedHeaders({
-        credentials,
-        method: "POST",
-        url: `${api.configuration.serverUrl}/v1/auth/refresh`,
-        body: {},
-        headers: {
-          "Content-Type": "application/json"
-        },
-        signRequest: false
-      })
-    });
-    if (!response.data?.success || !response.data?.token || !response.data?.signing) {
-      api.logger.debug("[AUTH] Signing bootstrap returned incomplete payload");
-      return credentials;
-    }
-    const upgradedCredentials = {
-      ...credentials,
-      token: response.data.token,
-      signing: response.data.signing
-    };
-    if (upgradedCredentials.encryption.type === "legacy") {
-      await persistence.writeCredentialsLegacy({
-        secret: upgradedCredentials.encryption.secret,
-        token: upgradedCredentials.token,
-        signing: upgradedCredentials.signing
-      });
-    } else {
-      await persistence.writeCredentialsDataKey({
-        publicKey: upgradedCredentials.encryption.publicKey,
-        machineKey: upgradedCredentials.encryption.machineKey,
-        token: upgradedCredentials.token,
-        signing: upgradedCredentials.signing
-      });
-    }
-    api.logger.debug("[AUTH] Signing credentials bootstrapped successfully");
-    return upgradedCredentials;
-  } catch (error) {
-    api.logger.debug("[AUTH] Failed to bootstrap signing credentials", error);
-    return credentials;
-  }
-}
 
 let caffeinateProcess = null;
 function startCaffeinate() {
@@ -682,7 +693,7 @@ 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-B_wlQBy2.cjs', document.baseURI).href))));
+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))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -980,6 +991,32 @@ async function checkIfDaemonRunningAndCleanupStaleState() {
     return false;
   }
 }
+async function isDaemonControlServerResponsive(timeoutMs = 1e3) {
+  const state = await persistence.readDaemonState();
+  if (!state?.httpPort) {
+    api.logger.debug("[DAEMON CONTROL] No daemon state or control port found for readiness check");
+    return false;
+  }
+  try {
+    process.kill(state.pid, 0);
+  } catch {
+    api.logger.debug("[DAEMON CONTROL] Daemon PID not running during readiness check, cleaning up state");
+    await cleanupDaemonState();
+    return false;
+  }
+  try {
+    const response = await fetch(`http://127.0.0.1:${state.httpPort}/list`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({}),
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    return response.ok;
+  } catch (error) {
+    api.logger.debug("[DAEMON CONTROL] Daemon control server not ready yet", error);
+    return false;
+  }
+}
 async function isDaemonRunningCurrentlyInstalledHappyVersion() {
   api.logger.debug("[DAEMON CONTROL] Checking if daemon is running same version");
   const runningDaemon = await checkIfDaemonRunningAndCleanupStaleState();
@@ -997,7 +1034,10 @@ async function isDaemonRunningCurrentlyInstalledHappyVersion() {
     const packageJson = JSON.parse(fs$1.readFileSync(packageJsonPath, "utf-8"));
     const currentCliVersion = packageJson.version;
     api.logger.debug(`[DAEMON CONTROL] Current CLI version: ${currentCliVersion}, Daemon started with version: ${state.startedWithCliVersion}`);
-    return currentCliVersion === state.startedWithCliVersion;
+    if (currentCliVersion !== state.startedWithCliVersion) {
+      return false;
+    }
+    return await isDaemonControlServerResponsive();
   } catch (error) {
     api.logger.debug("[DAEMON CONTROL] Error checking daemon version", error);
     return false;
@@ -1214,7 +1254,7 @@ ${typeLabels[type] || type}:`));
     }
     if (filter === "all" && allProcesses.length > 1) {
       console.log(chalk.bold("\n\u{1F4A1} Process Management"));
-      console.log(chalk.gray("To clean up runaway processes: happy doctor clean"));
+      console.log(chalk.gray("To clean up runaway processes: hicloud doctor clean"));
     }
   } catch (error) {
     console.log(chalk.red("\u274C Error checking daemon status"));
@@ -1396,7 +1436,8 @@ function startDaemonControlServer({
       schema: {
         body: z.z.object({
           directory: z.z.string(),
-          sessionId: z.z.string().optional()
+          sessionId: z.z.string().optional(),
+          agent: z.z.enum(["claude", "codex", "gemini"]).optional()
         }),
         response: {
           200: z.z.object({
@@ -1417,9 +1458,9 @@ function startDaemonControlServer({
         }
       }
     }, async (request, reply) => {
-      const { directory, sessionId } = request.body;
-      api.logger.debug(`[CONTROL SERVER] Spawn session request: dir=${directory}, sessionId=${sessionId || "new"}`);
-      const result = await spawnSession({ directory, sessionId });
+      const { directory, sessionId, agent } = request.body;
+      api.logger.debug(`[CONTROL SERVER] Spawn session request: dir=${directory}, sessionId=${sessionId || "new"}, agent=${agent || "claude"}`);
+      const result = await spawnSession({ directory, sessionId, agent });
       switch (result.type) {
         case "success":
           if (!result.sessionId) {
@@ -2934,13 +2975,13 @@ async function handleAuthCommand(args) {
 }
 function showAuthHelp() {
   console.log(`
-${chalk.bold("happy-cloud auth")} - Authentication management
+${chalk.bold("hicloud auth")} - Authentication management
 
 ${chalk.bold("Usage:")}
-  happy-cloud auth login [--force]    Authenticate with Happy
-  happy-cloud auth logout [--yes]     Remove authentication and machine data
-  happy-cloud auth status             Show authentication status
-  happy-cloud auth help               Show this help message
+  hicloud auth login [--force]    Authenticate with Happy
+  hicloud auth logout [--yes]     Remove authentication and machine data
+  hicloud auth status             Show authentication status
+  hicloud auth help               Show this help message
 
 ${chalk.bold("Options:")}
   --force    Clear credentials, machine ID, and stop daemon before re-auth
@@ -2980,7 +3021,7 @@ async function handleAuthLogin(args) {
       console.log(chalk.green("\u2713 Already authenticated"));
       console.log(chalk.gray(`  Machine ID: ${settings.machineId}`));
       console.log(chalk.gray(`  Host: ${os.hostname()}`));
-      console.log(chalk.gray(`  Use 'happy-cloud auth login --force' to re-authenticate`));
+      console.log(chalk.gray(`  Use 'hicloud auth login --force' to re-authenticate`));
       return;
     } else if (existingCreds && !settings?.machineId) {
       console.log(chalk.yellow("\u26A0\uFE0F  Credentials exist but machine ID is missing"));
@@ -3011,7 +3052,7 @@ async function handleAuthLogout(args = []) {
   let confirmed = skipConfirm;
   if (!confirmed) {
     if (isNonInteractive) {
-      throw new Error('Non-interactive terminal detected. Use "happy-cloud auth logout --yes" to confirm.');
+      throw new Error('Non-interactive terminal detected. Use "hicloud auth logout --yes" to confirm.');
     }
     const rl = node_readline.createInterface({
       input: process.stdin,
@@ -3034,7 +3075,7 @@ async function handleAuthLogout(args = []) {
         fs.rmSync(happyDir, { recursive: true, force: true });
       }
       console.log(chalk.green("\u2713 Successfully logged out"));
-      console.log(chalk.gray('  Run "happy-cloud auth login" to authenticate again'));
+      console.log(chalk.gray('  Run "hicloud auth login" to authenticate again'));
     } catch (error) {
       throw new Error(`Failed to logout: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
@@ -3048,20 +3089,20 @@ async function handleAuthStatus() {
   console.log(chalk.bold("\nAuthentication Status\n"));
   if (!credentials) {
     console.log(chalk.red("\u2717 Not authenticated"));
-    console.log(chalk.gray('  Run "happy-cloud auth login" to authenticate'));
+    console.log(chalk.gray('  Run "hicloud auth login" to authenticate'));
     return;
   }
   console.log(chalk.green("\u2713 Authenticated"));
   const tokenPreview = credentials.token.substring(0, 30) + "...";
   console.log(chalk.gray(`  Token: ${tokenPreview}`));
-  console.log(chalk.gray(`  Request signing: ${credentials.signing ? "ready" : "legacy credentials (will auto-upgrade on use)"}`));
+  console.log(chalk.gray(`  Request signing: ${describeSigningStatus(credentials)}`));
   if (settings?.machineId) {
     console.log(chalk.green("\u2713 Machine registered"));
     console.log(chalk.gray(`  Machine ID: ${settings.machineId}`));
     console.log(chalk.gray(`  Host: ${os.hostname()}`));
   } else {
     console.log(chalk.yellow("\u26A0\uFE0F  Machine not registered"));
-    console.log(chalk.gray('  Run "happy-cloud auth login --force" to fix this'));
+    console.log(chalk.gray('  Run "hicloud auth login --force" to fix this'));
   }
   console.log(chalk.gray(`
   Data directory: ${api.configuration.happyCloudHomeDir}`));
@@ -3076,6 +3117,12 @@ async function handleAuthStatus() {
     console.log(chalk.gray("\u2717 Daemon not running"));
   }
 }
+function describeSigningStatus(credentials) {
+  if (credentials.signing) {
+    return "ready";
+  }
+  return "not initialized (server write requests may still fail until signing bootstrap succeeds)";
+}
 
 const CLIENT_ID$2 = "app_EMoamEEZ73f0CkXaXp7hrann";
 const AUTH_BASE_URL = "https://auth.openai.com";
@@ -3592,14 +3639,14 @@ async function handleConnectCommand(args) {
 }
 function showConnectHelp() {
   console.log(`
-${chalk.bold("happy-cloud connect")} - Connect AI vendor API keys to Happy cloud
+${chalk.bold("hicloud connect")} - Connect AI vendor API keys to Happy cloud
 
 ${chalk.bold("Usage:")}
-  happy-cloud connect codex        Store your Codex API key in Happy cloud
-  happy-cloud connect claude       Store your Anthropic API key in Happy cloud
-  happy-cloud connect gemini       Store your Gemini API key in Happy cloud
-  happy-cloud connect status       Show connection status for all vendors
-  happy-cloud connect help         Show this help message
+  hicloud connect codex        Store your Codex API key in Happy cloud
+  hicloud connect claude       Store your Anthropic API key in Happy cloud
+  hicloud connect gemini       Store your Gemini API key in Happy cloud
+  hicloud connect status       Show connection status for all vendors
+  hicloud connect help         Show this help message
 
 ${chalk.bold("Description:")}
   The connect command allows you to securely store your AI vendor API keys
@@ -3607,13 +3654,13 @@ ${chalk.bold("Description:")}
   without exposing your API keys locally.
 
 ${chalk.bold("Examples:")}
-  happy-cloud connect codex
-  happy-cloud connect claude
-  happy-cloud connect gemini
-  happy-cloud connect status
+  hicloud connect codex
+  hicloud connect claude
+  hicloud connect gemini
+  hicloud connect status
 
 ${chalk.bold("Notes:")}
-  \u2022 You must be authenticated with Happy first (run 'happy-cloud auth login')
+  \u2022 You must be authenticated with Happy first (run 'hicloud auth login')
   \u2022 API keys are encrypted and stored securely in Happy cloud
   \u2022 You can manage your stored keys at https://happycloudcode.imou.com
 `);
@@ -3625,7 +3672,7 @@ async function handleConnectVendor(vendor, displayName) {
   const credentials = await persistence.readCredentials();
   if (!credentials) {
     console.log(chalk.yellow("\u26A0\uFE0F  Not authenticated with Happy"));
-    console.log(chalk.gray('  Please run "happy-cloud auth login" first'));
+    console.log(chalk.gray('  Please run "hicloud auth login" first'));
     process.exit(1);
   }
   const api$1 = await api.ApiClient.create(credentials);
@@ -3657,7 +3704,7 @@ async function handleConnectStatus() {
   const credentials = await persistence.readCredentials();
   if (!credentials) {
     console.log(chalk.yellow("\u26A0\uFE0F  Not authenticated with Happy"));
-    console.log(chalk.gray('  Please run "happy-cloud auth login" first'));
+    console.log(chalk.gray('  Please run "hicloud auth login" first'));
     process.exit(1);
   }
   const api$1 = await api.ApiClient.create(credentials);
@@ -3692,8 +3739,8 @@ async function handleConnectStatus() {
     }
   }
   console.log("");
-  console.log(chalk.gray("To connect a vendor, run: happy-cloud connect <vendor>"));
-  console.log(chalk.gray("Example: happy-cloud connect gemini"));
+  console.log(chalk.gray("To connect a vendor, run: hicloud connect <vendor>"));
+  console.log(chalk.gray("Example: hicloud connect gemini"));
   console.log("");
 }
 function updateLocalGeminiCredentials(tokens) {
@@ -3718,19 +3765,17 @@ function updateLocalGeminiCredentials(tokens) {
   }
 }
 
-function getProjectPath(workingDirectory) {
-  let resolved = path.resolve(workingDirectory);
-  if (process.platform === "win32" && path.isAbsolute(resolved)) {
-    resolved = resolved.replace(/^[A-Z]:/i, "");
-  }
-  const projectId = resolved.replace(/[\\\/\.: _]/g, "-");
-  const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), ".claude");
+function getProjectPath(workingDirectory, claudeConfigDirOverride) {
+  const projectId = 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);
 }
 
-function claudeCheckSession(sessionId, path$1) {
+function claudeCheckSession(sessionId, path$1, transcriptPath) {
   const projectDir = getProjectPath(path$1);
-  const sessionFile = path.join(projectDir, `${sessionId}.jsonl`);
+  const sessionFile = transcriptPath ?? path.join(projectDir, `${sessionId}.jsonl`);
   const sessionExists = fs.existsSync(sessionFile);
   if (!sessionExists) {
     api.logger.debug(`[claudeCheckSession] Path ${sessionFile} does not exist`);
@@ -4078,6 +4123,77 @@ class AgentRegistry {
 }
 const agentRegistry = new AgentRegistry();
 
+const PREFERRED_MESSAGE_FIELDS = ["stderr", "error", "message", "detail", "stdout", "text", "reason"];
+function safeSerializeDisplayValue(value) {
+  const seen = /* @__PURE__ */ new WeakSet();
+  try {
+    const serialized = JSON.stringify(value, (_key, currentValue) => {
+      if (typeof currentValue === "bigint") {
+        return currentValue.toString();
+      }
+      if (currentValue instanceof Error) {
+        return {
+          name: currentValue.name,
+          message: currentValue.message,
+          stack: currentValue.stack
+        };
+      }
+      if (typeof currentValue === "object" && currentValue !== null) {
+        if (seen.has(currentValue)) {
+          return "[Circular]";
+        }
+        seen.add(currentValue);
+      }
+      return currentValue;
+    });
+    return serialized ?? String(value);
+  } catch {
+    return String(value);
+  }
+}
+function formatDisplayMessage(value, seen = /* @__PURE__ */ new WeakSet()) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (value instanceof Error) {
+    return value.message || String(value);
+  }
+  if (value === null || value === void 0) {
+    return "";
+  }
+  if (typeof Buffer !== "undefined" && Buffer.isBuffer(value)) {
+    return value.toString("utf8");
+  }
+  if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
+    return String(value);
+  }
+  if (typeof value === "object") {
+    if (seen.has(value)) {
+      return "[Circular]";
+    }
+    seen.add(value);
+    const record = value;
+    for (const field of PREFERRED_MESSAGE_FIELDS) {
+      if (!(field in record)) {
+        continue;
+      }
+      const formattedField = formatDisplayMessage(record[field], seen).trim();
+      if (formattedField.length > 0) {
+        return formattedField;
+      }
+    }
+    return safeSerializeDisplayValue(value);
+  }
+  return String(value);
+}
+function truncateDisplayMessage(value, maxLength) {
+  const formatted = formatDisplayMessage(value);
+  if (formatted.length <= maxLength) {
+    return formatted;
+  }
+  return `${formatted.substring(0, maxLength)}...`;
+}
+
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */
   init: 6e4,
@@ -4372,7 +4488,7 @@ class CodexTransport extends DefaultTransport {
     return 800;
   }
 }
-const codexTransport = new CodexTransport();
+new CodexTransport();
 
 class ClaudeTransport extends DefaultTransport {
   constructor() {
@@ -4706,6 +4822,70 @@ const RETRY_CONFIG = {
   /** Maximum delay between retries in ms */
   maxDelayMs: 5e3
 };
+function getSessionUpdates(params) {
+  const notification = params;
+  const updates = Array.isArray(notification.updates) ? notification.updates.filter((update) => Boolean(update && typeof update === "object")) : [];
+  if (updates.length > 0) {
+    return updates;
+  }
+  if (notification.update && typeof notification.update === "object") {
+    return [notification.update];
+  }
+  return [];
+}
+function asNonNegativeFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
+}
+function extractUsageTokens(record) {
+  const used = asNonNegativeFiniteNumber(record.used);
+  const size = asNonNegativeFiniteNumber(record.size);
+  if (used != null || size != null) {
+    const tokens2 = {
+      total: used ?? 0
+    };
+    if (used != null) tokens2.used = used;
+    if (size != null) tokens2.size = size;
+    return tokens2;
+  }
+  const input = asNonNegativeFiniteNumber(record.input_tokens) ?? asNonNegativeFiniteNumber(record.inputTokens) ?? asNonNegativeFiniteNumber(record.prompt_tokens) ?? asNonNegativeFiniteNumber(record.promptTokens);
+  const output = asNonNegativeFiniteNumber(record.output_tokens) ?? asNonNegativeFiniteNumber(record.outputTokens) ?? asNonNegativeFiniteNumber(record.completion_tokens) ?? asNonNegativeFiniteNumber(record.completionTokens);
+  const cacheRead = asNonNegativeFiniteNumber(record.cache_read_input_tokens) ?? asNonNegativeFiniteNumber(record.cacheReadInputTokens) ?? asNonNegativeFiniteNumber(record.cache_read_tokens) ?? asNonNegativeFiniteNumber(record.cacheReadTokens) ?? asNonNegativeFiniteNumber(record.cached_read_tokens) ?? asNonNegativeFiniteNumber(record.cachedReadTokens);
+  const cacheCreation = asNonNegativeFiniteNumber(record.cache_creation_input_tokens) ?? asNonNegativeFiniteNumber(record.cacheCreationInputTokens) ?? asNonNegativeFiniteNumber(record.cache_creation_tokens) ?? asNonNegativeFiniteNumber(record.cacheCreationTokens) ?? asNonNegativeFiniteNumber(record.cached_write_tokens) ?? asNonNegativeFiniteNumber(record.cachedWriteTokens);
+  const thought = asNonNegativeFiniteNumber(record.thought_tokens) ?? asNonNegativeFiniteNumber(record.thoughtTokens);
+  const totalFromPayload = asNonNegativeFiniteNumber(record.total_tokens) ?? asNonNegativeFiniteNumber(record.totalTokens);
+  const anyPresent = totalFromPayload != null || input != null || output != null || cacheRead != null || cacheCreation != null || thought != null;
+  if (!anyPresent) {
+    return null;
+  }
+  const total = totalFromPayload ?? (input ?? 0) + (output ?? 0) + (cacheRead ?? 0) + (cacheCreation ?? 0) + (thought ?? 0);
+  const tokens = { total };
+  if (input != null) tokens.input = input;
+  if (output != null) tokens.output = output;
+  if (cacheRead != null) tokens.cache_read = cacheRead;
+  if (cacheCreation != null) tokens.cache_creation = cacheCreation;
+  if (thought != null) tokens.thought = thought;
+  return tokens;
+}
+function isApprovalOption(option) {
+  if (option.optionId === "proceed_once" || option.optionId === "proceed_always" || option.optionId === "cancel") {
+    return true;
+  }
+  const searchable = `${option.name ?? ""} ${option.label ?? ""}`.toLowerCase();
+  return searchable.includes("once") || searchable.includes("always") || searchable.includes("cancel");
+}
+function isSelectionPermissionRequest(params) {
+  if (Array.isArray(params.codex_command) && params.codex_command.length > 0) {
+    return false;
+  }
+  if (params.requestedSchema?.properties?.optionId) {
+    return true;
+  }
+  const options = Array.isArray(params.options) ? params.options : [];
+  if (options.length === 0) {
+    return false;
+  }
+  return !options.every((option) => isApprovalOption(option));
+}
 function nodeToWebStreams(stdin, stdout) {
   const writable = new WritableStream({
     write(chunk) {
@@ -4769,7 +4949,7 @@ async function withRetry(operation, options) {
     try {
       return await operation();
     } catch (error) {
-      lastError = error instanceof Error ? error : new Error(String(error));
+      lastError = normalizeAcpError(error);
       if (attempt < options.maxAttempts) {
         const delayMs = Math.min(
           options.baseDelayMs * Math.pow(2, attempt - 1),
@@ -4783,6 +4963,49 @@ async function withRetry(operation, options) {
   }
   throw lastError;
 }
+function formatAcpErrorMessage(error) {
+  if (error instanceof Error && error.message && error.message !== "[object Object]") {
+    return error.message;
+  }
+  if (typeof error === "object" && error !== null) {
+    const record = error;
+    const message = formatDisplayMessage(error).trim();
+    const code = record.code;
+    const status = record.status;
+    const prefix = [
+      code !== void 0 && code !== null ? `[code=${String(code)}]` : "",
+      status !== void 0 && status !== null ? `[status=${String(status)}]` : ""
+    ].filter(Boolean).join(" ");
+    if (message.length > 0) {
+      return prefix ? `${prefix} ${message}` : message;
+    }
+  }
+  const fallback = formatDisplayMessage(error).trim();
+  return fallback || "Unknown ACP error";
+}
+function normalizeAcpError(error) {
+  if (error instanceof Error && error.message && error.message !== "[object Object]") {
+    return error;
+  }
+  const normalized = new Error(formatAcpErrorMessage(error));
+  normalized.name = error instanceof Error ? error.name : "Error";
+  if (error && typeof error === "object") {
+    const { message: _message, ...rest } = error;
+    Object.assign(normalized, rest);
+  }
+  return normalized;
+}
+function enrichAcpError(error, stderrExcerpt) {
+  const normalized = normalizeAcpError(error);
+  if (!stderrExcerpt.trim()) {
+    return normalized;
+  }
+  const existingStderr = normalized.stderr;
+  if (typeof existingStderr !== "string" || existingStderr.trim().length === 0) {
+    Object.assign(normalized, { stderr: stderrExcerpt });
+  }
+  return normalized;
+}
 class AcpBackend {
   constructor(options) {
     this.options = options;
@@ -4810,6 +5033,21 @@ class AcpBackend {
   idleTimeout = null;
   /** Transport handler for agent-specific behavior */
   transport;
+  /** Keep a short rolling stderr buffer so startup failures can surface the real cause. */
+  recentStderrLines = [];
+  recordRecentStderr(text) {
+    const normalized = text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    if (normalized.length === 0) {
+      return;
+    }
+    this.recentStderrLines.push(...normalized);
+    if (this.recentStderrLines.length > 12) {
+      this.recentStderrLines = this.recentStderrLines.slice(-12);
+    }
+  }
+  getRecentStderrExcerpt() {
+    return this.recentStderrLines.slice(-6).join("\n");
+  }
   onMessage(handler) {
     this.listeners.push(handler);
   }
@@ -4837,6 +5075,7 @@ class AcpBackend {
     this.emit({ type: "status", status: "starting" });
     try {
       api.logger.debug(`[AcpBackend] Starting session: ${sessionId}`);
+      this.recentStderrLines = [];
       const args = this.options.args || [];
       if (process.platform === "win32") {
         const fullCommand = [this.options.command, ...args].join(" ");
@@ -4863,6 +5102,7 @@ class AcpBackend {
       this.process.stderr.on("data", (data) => {
         const text = data.toString();
         if (!text.trim()) return;
+        this.recordRecentStderr(text);
         const hasActiveInvestigation = this.transport.isInvestigationTool ? Array.from(this.activeToolCalls).some((id) => this.transport.isInvestigationTool(id)) : false;
         const context = {
           activeToolCalls: this.activeToolCalls,
@@ -4973,6 +5213,7 @@ class AcpBackend {
           }
           this.toolCallCountSincePrompt++;
           const options = extendedParams.options || [];
+          const isSelectionRequest = isSelectionPermissionRequest(extendedParams);
           api.logger.debug(`[AcpBackend] Permission request: tool=${toolName}, toolCallId=${toolCallId}, input=`, JSON.stringify(input));
           api.logger.debug(`[AcpBackend] Permission request params structure:`, JSON.stringify({
             hasToolCall: !!toolCall,
@@ -4981,6 +5222,42 @@ class AcpBackend {
             paramsKind: extendedParams.kind,
             paramsKeys: Object.keys(params)
           }, null, 2));
+          if (isSelectionRequest) {
+            const selectionOptions = options.reduce((acc, option) => {
+              if (!option.optionId) {
+                return acc;
+              }
+              const displayOption = option;
+              acc.push({
+                optionId: option.optionId,
+                label: displayOption.label || option.name || option.optionId,
+                description: displayOption.description || option.name || option.optionId
+              });
+              return acc;
+            }, []);
+            if (selectionOptions.length === 0) {
+              api.logger.debug("[AcpBackend] Selection request has no valid options, cancelling");
+              return { outcome: { outcome: "selected", optionId: "cancel" } };
+            }
+            if (!this.options.selectionHandler) {
+              api.logger.debug("[AcpBackend] No selection handler configured, cancelling selection request");
+              return { outcome: { outcome: "selected", optionId: "cancel" } };
+            }
+            try {
+              const selectionMessage = typeof extendedParams.message === "string" && extendedParams.message.trim().length > 0 ? extendedParams.message : formatDisplayMessage(input).trim() || toolName;
+              const requestId = extendedParams.codex_event_id || extendedParams.codex_elicitation || toolCallId;
+              const response = await this.options.selectionHandler.handleSelection({
+                id: requestId,
+                message: selectionMessage,
+                options: selectionOptions,
+                defaultOptionId: extendedParams.requestedSchema?.properties?.optionId?.default
+              });
+              return { outcome: { outcome: "selected", optionId: response.optionId } };
+            } catch (error) {
+              api.logger.debug("[AcpBackend] Error in selection handler:", error);
+              return { outcome: { outcome: "selected", optionId: "cancel" } };
+            }
+          }
           this.emit({
             type: "permission-request",
             id: permissionId,
@@ -5154,18 +5431,19 @@ class AcpBackend {
       if (initialPrompt) {
         this.sendPrompt(sessionId, initialPrompt).catch((error) => {
           api.logger.debug("[AcpBackend] Error sending initial prompt:", error);
-          this.emit({ type: "status", status: "error", detail: String(error) });
+          this.emit({ type: "status", status: "error", detail: formatAcpErrorMessage(error) });
         });
       }
       return { sessionId };
     } catch (error) {
-      api.logger.debug("[AcpBackend] Error starting session:", error);
+      const enrichedError = enrichAcpError(error, this.getRecentStderrExcerpt());
+      api.logger.debug("[AcpBackend] Error starting session:", enrichedError);
       this.emit({
         type: "status",
         status: "error",
-        detail: error instanceof Error ? error.message : String(error)
+        detail: formatAcpErrorMessage(enrichedError)
       });
-      throw error;
+      throw enrichedError;
     }
   }
   /**
@@ -5196,51 +5474,73 @@ class AcpBackend {
       }
     };
   }
+  emitUsageTelemetry(payload, source) {
+    if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+      return false;
+    }
+    const tokens = extractUsageTokens(payload);
+    if (!tokens) {
+      return false;
+    }
+    this.emit({
+      type: "token-count",
+      key: source,
+      tokens,
+      source
+    });
+    return true;
+  }
   handleSessionUpdate(params) {
-    const notification = params;
-    const update = notification.update;
-    if (!update) {
+    const updates = getSessionUpdates(params);
+    if (updates.length === 0) {
       api.logger.debug("[AcpBackend] Received session update without update field:", params);
       return;
     }
-    const sessionUpdateType = update.sessionUpdate;
-    if (sessionUpdateType !== "agent_message_chunk") {
-      api.logger.debug(`[AcpBackend] Received session update: ${sessionUpdateType}`, JSON.stringify({
-        sessionUpdate: sessionUpdateType,
-        toolCallId: update.toolCallId,
-        status: update.status,
-        kind: update.kind,
-        hasContent: !!update.content,
-        hasLocations: !!update.locations
-      }, null, 2));
-    }
-    const ctx = this.createHandlerContext();
-    if (sessionUpdateType === "agent_message_chunk") {
-      handleAgentMessageChunk(update, ctx);
-      return;
-    }
-    if (sessionUpdateType === "tool_call_update") {
-      const result = handleToolCallUpdate(update, ctx);
-      if (result.toolCallCountSincePrompt !== void 0) {
-        this.toolCallCountSincePrompt = result.toolCallCountSincePrompt;
+    for (const update of updates) {
+      const sessionUpdateType = update.sessionUpdate;
+      if (sessionUpdateType !== "agent_message_chunk") {
+        api.logger.debug(`[AcpBackend] Received session update: ${sessionUpdateType}`, JSON.stringify({
+          sessionUpdate: sessionUpdateType,
+          toolCallId: update.toolCallId,
+          status: update.status,
+          kind: update.kind,
+          hasContent: !!update.content,
+          hasLocations: !!update.locations
+        }, null, 2));
+      }
+      const ctx = this.createHandlerContext();
+      if (sessionUpdateType === "agent_message_chunk") {
+        handleAgentMessageChunk(update, ctx);
+        continue;
+      }
+      if (sessionUpdateType === "tool_call_update") {
+        const result = handleToolCallUpdate(update, ctx);
+        if (result.toolCallCountSincePrompt !== void 0) {
+          this.toolCallCountSincePrompt = result.toolCallCountSincePrompt;
+        }
+        continue;
+      }
+      if (sessionUpdateType === "agent_thought_chunk") {
+        handleAgentThoughtChunk(update, ctx);
+        continue;
+      }
+      if (sessionUpdateType === "tool_call") {
+        handleToolCall(update, ctx);
+        continue;
+      }
+      if (sessionUpdateType === "usage_update") {
+        this.emitUsageTelemetry(update, "acp-usage-update");
+        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"];
+      if (updateTypeStr && !handledTypes.includes(updateTypeStr) && !handledLegacy && !handledPlan && !handledThinking && !handledUsage) {
+        api.logger.debug(`[AcpBackend] Unhandled session update type: ${updateTypeStr}`, JSON.stringify(update, null, 2));
       }
-      return;
-    }
-    if (sessionUpdateType === "agent_thought_chunk") {
-      handleAgentThoughtChunk(update, ctx);
-      return;
-    }
-    if (sessionUpdateType === "tool_call") {
-      handleToolCall(update, ctx);
-      return;
-    }
-    handleLegacyMessageChunk(update, ctx);
-    handlePlanUpdate(update, ctx);
-    handleThinkingUpdate(update, ctx);
-    const updateTypeStr = sessionUpdateType;
-    const handledTypes = ["agent_message_chunk", "tool_call_update", "agent_thought_chunk", "tool_call"];
-    if (updateTypeStr && !handledTypes.includes(updateTypeStr) && !update.messageChunk && !update.plan && !update.thinking) {
-      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
@@ -5277,17 +5577,9 @@ class AcpBackend {
       if (error instanceof Error) {
         errorDetail = error.message;
       } else if (typeof error === "object" && error !== null) {
-        const errObj = error;
-        const fallbackMessage = (typeof errObj.message === "string" ? errObj.message : void 0) || String(error);
-        if (errObj.code !== void 0) {
-          errorDetail = JSON.stringify({ code: errObj.code, message: fallbackMessage });
-        } else if (typeof errObj.message === "string") {
-          errorDetail = errObj.message;
-        } else {
-          errorDetail = String(error);
-        }
+        errorDetail = formatAcpErrorMessage(error);
       } else {
-        errorDetail = String(error);
+        errorDetail = formatAcpErrorMessage(error);
       }
       this.emit({
         type: "status",
@@ -5638,59 +5930,213 @@ function registerGeminiAgent() {
   api.logger.debug("[Gemini] Registered with agent registry");
 }
 
-function firstExistingPath(candidates) {
-  for (const candidate of candidates) {
-    try {
+function readFirstEnv(...names) {
+  for (const name of names) {
+    const raw = process.env[name];
+    if (typeof raw === "string" && raw.trim()) {
+      return raw.trim();
+    }
+  }
+  return "";
+}
+function normalizeCommandPath(command) {
+  if (path.isAbsolute(command)) {
+    return command;
+  }
+  const resolved = path.resolve(process.cwd(), command);
+  return fs.existsSync(resolved) ? resolved : command;
+}
+function resolveCommandOnPath(command) {
+  const pathValue = typeof process.env.PATH === "string" ? process.env.PATH : "";
+  if (!pathValue) {
+    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)) {
+    const trimmedDir = dir.trim();
+    if (!trimmedDir) {
+      continue;
+    }
+    const directCandidate = path.join(trimmedDir, command);
+    if (fs.existsSync(directCandidate)) {
+      return directCandidate;
+    }
+    if (process.platform !== "win32") {
+      continue;
+    }
+    const hasExtension = /\.[^\\/]+$/.test(command);
+    if (hasExtension) {
+      continue;
+    }
+    for (const extension of extensions) {
+      const candidate = path.join(trimmedDir, `${command}${extension.toLowerCase()}`);
       if (fs.existsSync(candidate)) {
         return candidate;
       }
-    } catch {
     }
   }
   return null;
 }
-function resolveCodexExecutable() {
-  if (process.platform === "win32") {
-    const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
-    const npmGlobalBin = path.join(appData, "npm");
-    const resolved = firstExistingPath([
-      path.join(npmGlobalBin, "codex.cmd"),
-      path.join(npmGlobalBin, "codex.ps1"),
-      path.join(npmGlobalBin, "codex")
-    ]);
-    if (resolved) {
-      return resolved;
-    }
+function readCodexAcpNpxMode() {
+  const raw = readFirstEnv("HAPPY_CODEX_ACP_NPX_MODE", "HAPPIER_CODEX_ACP_NPX_MODE").toLowerCase();
+  if (raw === "auto" || raw === "never" || raw === "force") {
+    return raw;
   }
-  return "codex";
+  return "auto";
+}
+function isBinOnPath(baseName) {
+  return resolveCommandOnPath(baseName) !== null;
 }
-function shouldUseShellForCodex(executable) {
-  return process.platform === "win32" && /\.(cmd|bat|ps1)$/i.test(executable);
+function readCodexAcpConfigOverrides() {
+  const raw = readFirstEnv("HAPPY_CODEX_ACP_CONFIG_OVERRIDES", "HAPPIER_CODEX_ACP_CONFIG_OVERRIDES");
+  return raw.split("\n").map((line) => line.trim()).filter(Boolean);
+}
+function buildCodexAcpConfigArgs(options) {
+  const args = [...options.baseArgs ?? []];
+  const overrides = [...readCodexAcpConfigOverrides()];
+  if (options.model) {
+    overrides.push(`model=${JSON.stringify(options.model)}`);
+  }
+  if (options.approvalPolicy) {
+    overrides.push(`approval_policy=${JSON.stringify(options.approvalPolicy)}`);
+  }
+  if (options.sandbox) {
+    overrides.push(`sandbox_mode=${JSON.stringify(options.sandbox)}`);
+  }
+  for (const override of overrides) {
+    args.push("-c", override);
+  }
+  return args;
+}
+function resolveNpxCommand() {
+  return resolveCommandOnPath(process.platform === "win32" ? "npx.cmd" : "npx") ?? resolveCommandOnPath("npx") ?? (process.platform === "win32" ? "npx.cmd" : "npx");
+}
+function resolveCodexAcpSpawn(options = {}) {
+  if (options.args) {
+    const command = normalizeCommandPath(options.command || readFirstEnv("HAPPY_CODEX_ACP_BIN", "HAPPY_CODEX_ACP_COMMAND", "HAPPIER_CODEX_ACP_BIN") || "codex-acp");
+    return {
+      command,
+      args: [...options.args]
+    };
+  }
+  const directArgs = buildCodexAcpConfigArgs(options);
+  if (options.command) {
+    return {
+      command: normalizeCommandPath(options.command),
+      args: directArgs
+    };
+  }
+  const envOverride = readFirstEnv("HAPPY_CODEX_ACP_BIN", "HAPPY_CODEX_ACP_COMMAND", "HAPPIER_CODEX_ACP_BIN");
+  if (envOverride) {
+    return {
+      command: normalizeCommandPath(envOverride),
+      args: directArgs
+    };
+  }
+  const npxMode = readCodexAcpNpxMode();
+  const codexAcpOnPath = resolveCommandOnPath(process.platform === "win32" ? "codex-acp.cmd" : "codex-acp") ?? resolveCommandOnPath("codex-acp");
+  if (npxMode !== "force" && codexAcpOnPath) {
+    return {
+      command: codexAcpOnPath,
+      args: directArgs
+    };
+  }
+  if (npxMode === "never") {
+    return {
+      command: process.platform === "win32" ? "codex-acp.cmd" : "codex-acp",
+      args: directArgs
+    };
+  }
+  return {
+    command: resolveNpxCommand(),
+    args: ["--prefer-offline", "-y", "@zed-industries/codex-acp", ...directArgs]
+  };
+}
+function validateCodexAcpSpawn(options = {}) {
+  let spawn;
+  try {
+    spawn = resolveCodexAcpSpawn(options);
+  } catch (error) {
+    return {
+      ok: false,
+      errorMessage: error instanceof Error ? error.message : "Codex ACP is enabled, but the command could not be resolved."
+    };
+  }
+  const normalizedCommand = spawn.command.trim();
+  const commandLower = normalizedCommand.toLowerCase();
+  const npxMode = readCodexAcpNpxMode();
+  if (path.isAbsolute(normalizedCommand)) {
+    if (!fs.existsSync(normalizedCommand)) {
+      return {
+        ok: false,
+        errorMessage: `Codex ACP is enabled, but the resolved command does not exist: ${normalizedCommand}`
+      };
+    }
+    return { ok: true, spawn };
+  }
+  if (commandLower.endsWith("npx") || commandLower.endsWith("npx.cmd")) {
+    if (isBinOnPath("npx") || isBinOnPath("npx.cmd")) {
+      return { ok: true, spawn };
+    }
+    return {
+      ok: false,
+      errorMessage: "Codex ACP is enabled, but codex-acp is not installed and npx is not available. Install codex-acp, install Node.js/npm so npx is available, or set HAPPY_CODEX_ACP_BIN to a working codex-acp executable."
+    };
+  }
+  if (commandLower === "codex-acp" || commandLower === "codex-acp.cmd") {
+    if (isBinOnPath("codex-acp") || isBinOnPath("codex-acp.cmd")) {
+      return { ok: true, spawn };
+    }
+    return {
+      ok: false,
+      errorMessage: npxMode === "never" ? "Codex ACP is enabled, but codex-acp is not installed and npx fallback is disabled. Install codex-acp, add it to PATH, or set HAPPY_CODEX_ACP_BIN to the executable." : "Codex ACP is enabled, but codex-acp could not be resolved on PATH. Install codex-acp, add it to PATH, or set HAPPY_CODEX_ACP_BIN to the executable."
+    };
+  }
+  return { ok: true, spawn };
 }
 
-function defaultCodexArgs() {
-  return ["mcp-server"];
+class CodexAcpTransport extends CodexTransport {
+  constructor(initTimeoutMs) {
+    super();
+    this.initTimeoutMs = initTimeoutMs;
+  }
+  getInitTimeout() {
+    return this.initTimeoutMs;
+  }
+}
+function resolveCodexTransport(command) {
+  if (/npx(?:\.cmd)?$/i.test(command)) {
+    return new CodexAcpTransport(18e4);
+  }
+  return new CodexAcpTransport(6e4);
 }
 function createCodexBackend(options) {
-  const command = options.command ?? process.env.HAPPY_CODEX_ACP_COMMAND ?? resolveCodexExecutable();
-  const args = options.args ?? defaultCodexArgs();
+  const spawn = resolveCodexAcpSpawn({
+    command: options.command,
+    args: options.args,
+    baseArgs: options.baseArgs,
+    model: options.model,
+    sandbox: options.sandbox,
+    approvalPolicy: options.approvalPolicy
+  });
   const backendOptions = {
     agentName: "codex",
     cwd: options.cwd,
-    command,
-    args,
+    command: spawn.command,
+    args: spawn.args,
     env: {
       ...options.env,
       NODE_ENV: "production"
     },
     mcpServers: options.mcpServers,
     permissionHandler: options.permissionHandler,
-    transportHandler: codexTransport
+    selectionHandler: options.selectionHandler,
+    transportHandler: resolveCodexTransport(spawn.command)
   };
   return {
     backend: new AcpBackend(backendOptions),
-    command,
-    args
+    command: spawn.command,
+    args: spawn.args
   };
 }
 function registerCodexAgent() {
@@ -5876,17 +6322,26 @@ async function ensureUnifiedDaemonStarted() {
     env: process.env
   });
   daemonProcess.unref();
-  await new Promise((resolve) => setTimeout(resolve, 200));
+  for (let i = 0; i < 100; i++) {
+    if (await isDaemonRunningCurrentlyInstalledHappyVersion()) {
+      return;
+    }
+    if (await isDaemonControlServerResponsive(500)) {
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  throw new Error("Failed to start Happy background service.");
 }
 async function executeUnifiedProvider(opts) {
   const credentials = await ensureUnifiedRuntimePrerequisites(opts.credentials);
   if (opts.provider === "claude") {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-CwAitpX-.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-B-GNEkKg.cjs'); });
     await runClaude(credentials, opts.claudeOptions ?? {});
     return;
   }
   if (opts.provider === "codex") {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Cm0VTqw_.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CPHyGwj9.cjs'); });
     await runCodex({
       credentials,
       startedBy: opts.startedBy,
@@ -5896,7 +6351,7 @@ async function executeUnifiedProvider(opts) {
     return;
   }
   if (opts.provider === "gemini") {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-CLWjwDYS.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DaDz1bzQ.cjs'); });
     await runGemini({
       credentials,
       startedBy: opts.startedBy
@@ -5909,6 +6364,10 @@ async function executeUnifiedProvider(opts) {
   });
 }
 
+function shouldRunMainClaudeFlow(opts) {
+  return !opts.showHelp && !opts.showVersion;
+}
+
 (async () => {
   const args = process.argv.slice(2);
   const isRemoteMode = args.includes("--happy-starting-mode") && args.includes("remote");
@@ -5917,7 +6376,7 @@ async function executeUnifiedProvider(opts) {
     Object.defineProperty(process.stderr, "isTTY", { value: false });
   }
   if (!args.includes("--version")) {
-    api.logger.debug("Starting happy-cloud CLI with args: ", process.argv);
+    api.logger.debug("Starting hicloud CLI with args: ", process.argv);
   }
   const subcommand = args[0];
   if (!args.includes("--version")) ;
@@ -5934,7 +6393,7 @@ async function executeUnifiedProvider(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-G85giEAF.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-CVldr51S.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -5960,8 +6419,8 @@ async function executeUnifiedProvider(opts) {
       }
       return;
     }
-    console.log("Usage: happy-cloud runtime providers");
-    console.log("       happy-cloud runtime launch <claude|codex|gemini|cursor> [prompt]");
+    console.log("Usage: hicloud runtime providers");
+    console.log("       hicloud runtime launch <claude|codex|gemini|cursor> [prompt]");
     return;
   } else if (subcommand === "auth") {
     try {
@@ -6112,8 +6571,8 @@ async function executeUnifiedProvider(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-DHgf1CTG.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-D7OK-mML.cjs'); }).then(function (n) { return n.api; });
+        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; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();
@@ -6159,7 +6618,7 @@ async function executeUnifiedProvider(opts) {
           console.log("No Google Cloud Project configured.");
           console.log("");
           console.log('If you see "Authentication required" error, you may need to set a project:');
-          console.log("  happy-cloud gemini project set <your-project-id>");
+          console.log("  hicloud gemini project set <your-project-id>");
           console.log("");
           console.log("This is required for Google Workspace accounts.");
           console.log("Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca");
@@ -6171,7 +6630,7 @@ async function executeUnifiedProvider(opts) {
       }
     }
     if (geminiSubcommand === "project" && !args[2]) {
-      console.log("Usage: happy-cloud gemini project <command>");
+      console.log("Usage: hicloud gemini project <command>");
       console.log("");
       console.log("Commands:");
       console.log("  set <project-id>   Set Google Cloud Project ID");
@@ -6203,7 +6662,7 @@ async function executeUnifiedProvider(opts) {
     }
     return;
   } else if (subcommand === "logout") {
-    console.log(chalk.yellow('Note: "happy-cloud logout" is deprecated. Use "happy-cloud auth logout" instead.\n'));
+    console.log(chalk.yellow('Note: "hicloud logout" is deprecated. Use "hicloud auth logout" instead.\n'));
     try {
       await handleAuthCommand(["logout"]);
     } catch (error) {
@@ -6262,7 +6721,7 @@ async function executeUnifiedProvider(opts) {
       child.unref();
       let started = false;
       for (let i = 0; i < 100; i++) {
-        if (await checkIfDaemonRunningAndCleanupStaleState()) {
+        if (await checkIfDaemonRunningAndCleanupStaleState() && await isDaemonControlServerResponsive(500)) {
           started = true;
           break;
         }
@@ -6319,20 +6778,20 @@ async function executeUnifiedProvider(opts) {
       }
     } else {
       console.log(`
-${chalk.bold("happy-cloud daemon")} - Daemon management
+${chalk.bold("hicloud daemon")} - Daemon management
 
 ${chalk.bold("Usage:")}
-  happy-cloud daemon start              Start the daemon (detached)
-  happy-cloud daemon stop               Stop the daemon (sessions stay alive)
-  happy-cloud daemon status             Show daemon status
-  happy-cloud daemon list               List active sessions
+  hicloud daemon start              Start the daemon (detached)
+  hicloud daemon stop               Stop the daemon (sessions stay alive)
+  hicloud daemon status             Show daemon status
+  hicloud daemon list               List active sessions
 
   If you want to kill all happy related processes run
-  ${chalk.cyan("happy-cloud doctor clean")}
+  ${chalk.cyan("hicloud doctor clean")}
 
 ${chalk.bold("Note:")} The daemon runs in the background and manages Claude sessions.
 
-${chalk.bold("To clean up runaway processes:")} Use ${chalk.cyan("happy-cloud doctor clean")}
+${chalk.bold("To clean up runaway processes:")} Use ${chalk.cyan("hicloud doctor clean")}
 `);
     }
     return;
@@ -6407,33 +6866,33 @@ ${chalk.bold("To clean up runaway processes:")} Use ${chalk.cyan("happy-cloud do
 ${chalk.bold(BRAND_CONFIG.name)} - AI \u7F16\u7A0B\u52A9\u624B
 
 ${chalk.bold("Usage:")}
-  happy-cloud [options]         Start Claude with mobile control
-  happy-cloud auth              Manage authentication
-  happy-cloud codex             Start Codex mode
-  happy-cloud gemini            Start Gemini mode (ACP)
-  happy-cloud cursor            Start Cursor mode (experimental ACP)
-  happy-cloud connect           Connect AI vendor API keys
-  happy-cloud notify            Send push notification
-  happy-cloud daemon            Manage background service that allows
+  hicloud [options]         Start Claude with mobile control
+  hicloud auth              Manage authentication
+  hicloud codex             Start Codex mode
+  hicloud gemini            Start Gemini mode (ACP)
+  hicloud cursor            Start Cursor mode (experimental ACP)
+  hicloud connect           Connect AI vendor API keys
+  hicloud notify            Send push notification
+  hicloud daemon            Manage background service that allows
                             to spawn new sessions away from your computer
-  happy-cloud doctor            System diagnostics & troubleshooting
+  hicloud doctor            System diagnostics & troubleshooting
 
 ${chalk.bold("Examples:")}
-  happy-cloud                    Start session
-  happy-cloud --yolo             Start with bypassing permissions
-                            happy-cloud sugar for --dangerously-skip-permissions
-  happy-cloud --chrome           Enable Chrome browser access for this session
-  happy-cloud --no-chrome        Disable Chrome even if default is on
-  happy-cloud --js-runtime bun   Use bun instead of node to spawn Claude Code
-  happy-cloud --claude-env ANTHROPIC_BASE_URL=http://127.0.0.1:3456
+  hicloud                    Start session
+  hicloud --yolo             Start with bypassing permissions
+                            hicloud sugar for --dangerously-skip-permissions
+  hicloud --chrome           Enable Chrome browser access for this session
+  hicloud --no-chrome        Disable Chrome even if default is on
+  hicloud --js-runtime bun   Use bun instead of node to spawn Claude Code
+  hicloud --claude-env ANTHROPIC_BASE_URL=http://127.0.0.1:3456
                            Use a custom API endpoint (e.g., claude-code-router)
-  happy-cloud auth login --force Authenticate
-  happy-cloud doctor             Run diagnostics
+  hicloud auth login --force Authenticate
+  hicloud doctor             Run diagnostics
 
 ${chalk.bold(`${BRAND_CONFIG.name} supports ALL Claude options!`)}
-  Use any claude flag with happy-cloud as you would with claude. Our favorite:
+  Use any claude flag with hicloud as you would with claude. Our favorite:
 
-  happy-cloud --resume
+  hicloud --resume
 
 ${chalk.gray("\u2500".repeat(60))}
 ${chalk.bold.cyan("Claude Code Options (from `claude --help`):")}
@@ -6448,8 +6907,9 @@ ${chalk.bold.cyan("Claude Code Options (from `claude --help`):")}
     }
     if (showVersion) {
       console.log(getVersionString());
+      return;
     }
-    if (!showHelp && !showVersion) {
+    if (shouldRunMainClaudeFlow({ showHelp, showVersion })) {
       printBanner();
     }
     try {
@@ -6485,31 +6945,31 @@ async function handleNotifyCommand(args) {
   }
   if (showHelp) {
     console.log(`
-${chalk.bold("happy-cloud notify")} - Send notification
+${chalk.bold("hicloud notify")} - Send notification
 
 ${chalk.bold("Usage:")}
-  happy-cloud notify -p <message> [-t <title>]    Send notification with custom message and optional title
-  happy-cloud notify -h, --help                   Show this help
+  hicloud notify -p <message> [-t <title>]    Send notification with custom message and optional title
+  hicloud notify -h, --help                   Show this help
 
 ${chalk.bold("Options:")}
   -p <message>    Notification message (required)
   -t <title>      Notification title (optional, defaults to "Happy")
 
 ${chalk.bold("Examples:")}
-  happy-cloud notify -p "Deployment complete!"
-  happy-cloud notify -p "System update complete" -t "Server Status"
-  happy-cloud notify -t "Alert" -p "Database connection restored"
+  hicloud notify -p "Deployment complete!"
+  hicloud notify -p "System update complete" -t "Server Status"
+  hicloud notify -t "Alert" -p "Database connection restored"
 `);
     return;
   }
   if (!message) {
     console.error(chalk.red('Error: Message is required. Use -p "your message" to specify the notification text.'));
-    console.log(chalk.gray('Run "happy-cloud notify --help" for usage information.'));
+    console.log(chalk.gray('Run "hicloud notify --help" for usage information.'));
     process.exit(1);
   }
   let credentials = await persistence.readCredentials();
   if (!credentials) {
-    console.error(chalk.red('Error: Not authenticated. Please run "happy-cloud auth login" first.'));
+    console.error(chalk.red('Error: Not authenticated. Please run "hicloud auth login" first.'));
     process.exit(1);
   }
   console.log(chalk.blue("\u{1F4F1} Sending push notification..."));
@@ -6539,8 +6999,10 @@ exports.ExitCodeError = ExitCodeError;
 exports.GEMINI_MODEL_ENV = GEMINI_MODEL_ENV;
 exports.claudeCheckSession = claudeCheckSession;
 exports.claudeLocal = claudeLocal;
+exports.createCodexBackend = createCodexBackend;
 exports.createDefaultRuntimeShell = createDefaultRuntimeShell;
 exports.createGeminiBackend = createGeminiBackend;
+exports.formatDisplayMessage = formatDisplayMessage;
 exports.getEnvironmentInfo = getEnvironmentInfo;
 exports.getInitialGeminiModel = getInitialGeminiModel;
 exports.getProjectPath = getProjectPath;
@@ -6549,9 +7011,9 @@ exports.isBun = isBun;
 exports.notifyDaemonSessionStarted = notifyDaemonSessionStarted;
 exports.projectPath = projectPath;
 exports.readGeminiLocalConfig = readGeminiLocalConfig;
-exports.resolveCodexExecutable = resolveCodexExecutable;
 exports.saveGeminiModelToConfig = saveGeminiModelToConfig;
-exports.shouldUseShellForCodex = shouldUseShellForCodex;
 exports.startCaffeinate = startCaffeinate;
 exports.stopCaffeinate = stopCaffeinate;
 exports.trimIdent = trimIdent;
+exports.truncateDisplayMessage = truncateDisplayMessage;
+exports.validateCodexAcpSpawn = validateCodexAcpSpawn;