happy-imou-cloud 2.0.4 → 2.0.5

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

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-CyJG1mr6.cjs');
-var persistence = require('./persistence-BeFVx6kI.cjs');
+var api = require('./api-DaqnNHfl.cjs');
+var persistence = require('./persistence-D6Y0604_.cjs');
 var z = require('zod');
 var fs$1 = require('fs/promises');
 var os$1 = require('os');
@@ -70,7 +70,7 @@ async function openBrowser(url) {
   }
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-1zlH6s7a.cjs', document.baseURI).href)));
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Dc92gnxM.cjs', document.baseURI).href)));
 const QRCode = require$1("qrcode-terminal/vendor/QRCode");
 const QRErrorCorrectLevel = require$1("qrcode-terminal/vendor/QRCode/QRErrorCorrectLevel");
 const pendingTempFiles = /* @__PURE__ */ new Set();
@@ -693,7 +693,7 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-1zlH6s7a.cjs', document.baseURI).href))));
+const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Dc92gnxM.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;
@@ -5064,15 +5064,17 @@ async function withRetry(operation, options) {
       return await operation();
     } catch (error) {
       lastError = normalizeAcpError(error);
-      if (attempt < options.maxAttempts) {
-        const delayMs = Math.min(
-          options.baseDelayMs * Math.pow(2, attempt - 1),
-          options.maxDelayMs
-        );
-        api.logger.debug(`[AcpBackend] ${options.operationName} failed (attempt ${attempt}/${options.maxAttempts}): ${lastError.message}. Retrying in ${delayMs}ms...`);
-        options.onRetry?.(attempt, lastError);
-        await api.delay(delayMs);
+      const retryable = options.shouldRetry?.(lastError) ?? true;
+      if (!retryable || attempt >= options.maxAttempts) {
+        throw lastError;
       }
+      const delayMs = Math.min(
+        options.baseDelayMs * Math.pow(2, attempt - 1),
+        options.maxDelayMs
+      );
+      api.logger.debug(`[AcpBackend] ${options.operationName} failed (attempt ${attempt}/${options.maxAttempts}): ${lastError.message}. Retrying in ${delayMs}ms...`);
+      options.onRetry?.(attempt, lastError);
+      await api.delay(delayMs);
     }
   }
   throw lastError;
@@ -5125,6 +5127,77 @@ function enrichAcpError(error, stderrExcerpt) {
   }
   return normalized;
 }
+class AcpProcessStartupError extends Error {
+  constructor(message, exitCode, signal) {
+    super(message);
+    this.exitCode = exitCode;
+    this.signal = signal;
+    this.name = "AcpProcessStartupError";
+  }
+}
+function createProcessStartupError(agentName, operationName, code, signal) {
+  if (code !== null) {
+    return new AcpProcessStartupError(
+      `${agentName} exited with code ${code} during ${operationName}`,
+      code,
+      signal
+    );
+  }
+  if (signal) {
+    return new AcpProcessStartupError(
+      `${agentName} exited due to signal ${signal} during ${operationName}`,
+      code,
+      signal
+    );
+  }
+  return new AcpProcessStartupError(
+    `${agentName} exited unexpectedly during ${operationName}`,
+    code,
+    signal
+  );
+}
+async function raceWithProcessExit(childProcess, operation, options) {
+  if (childProcess.exitCode !== null) {
+    throw createProcessStartupError(
+      options.agentName,
+      options.operationName,
+      childProcess.exitCode,
+      childProcess.signalCode ?? null
+    );
+  }
+  return await new Promise((resolve, reject) => {
+    let settled = false;
+    const cleanup = () => {
+      childProcess.off("error", handleError);
+      childProcess.off("exit", handleExit);
+    };
+    const settleResolve = (value) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanup();
+      resolve(value);
+    };
+    const settleReject = (error) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanup();
+      reject(normalizeAcpError(error));
+    };
+    const handleError = (error) => {
+      settleReject(error);
+    };
+    const handleExit = (code, signal) => {
+      settleReject(createProcessStartupError(options.agentName, options.operationName, code, signal));
+    };
+    childProcess.once("error", handleError);
+    childProcess.once("exit", handleExit);
+    operation.then(settleResolve, settleReject);
+  });
+}
 class AcpBackend {
   constructor(options) {
     this.options = options;
@@ -5525,20 +5598,27 @@ class AcpBackend {
         async () => {
           let timeoutHandle = null;
           try {
-            const result = await Promise.race([
-              this.connection.initialize(initRequest).then((res) => {
-                if (timeoutHandle) {
-                  clearTimeout(timeoutHandle);
-                  timeoutHandle = null;
-                }
-                return res;
-              }),
-              new Promise((_, reject) => {
-                timeoutHandle = setTimeout(() => {
-                  reject(new Error(`Initialize timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
-                }, initTimeout);
-              })
-            ]);
+            const result = await raceWithProcessExit(
+              this.process,
+              Promise.race([
+                this.connection.initialize(initRequest).then((res) => {
+                  if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                    timeoutHandle = null;
+                  }
+                  return res;
+                }),
+                new Promise((_, reject) => {
+                  timeoutHandle = setTimeout(() => {
+                    reject(new Error(`Initialize timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
+                  }, initTimeout);
+                })
+              ]),
+              {
+                agentName: this.transport.agentName,
+                operationName: "initialize"
+              }
+            );
             return result;
           } finally {
             if (timeoutHandle) {
@@ -5550,7 +5630,8 @@ class AcpBackend {
           operationName: "Initialize",
           maxAttempts: RETRY_CONFIG.maxAttempts,
           baseDelayMs: RETRY_CONFIG.baseDelayMs,
-          maxDelayMs: RETRY_CONFIG.maxDelayMs
+          maxDelayMs: RETRY_CONFIG.maxDelayMs,
+          shouldRetry: (error) => !(error instanceof AcpProcessStartupError)
         }
       );
       api.logger.debug(`[AcpBackend] Initialize completed`);
@@ -5569,20 +5650,27 @@ class AcpBackend {
         async () => {
           let timeoutHandle = null;
           try {
-            const result = await Promise.race([
-              this.connection.newSession(newSessionRequest).then((res) => {
-                if (timeoutHandle) {
-                  clearTimeout(timeoutHandle);
-                  timeoutHandle = null;
-                }
-                return res;
-              }),
-              new Promise((_, reject) => {
-                timeoutHandle = setTimeout(() => {
-                  reject(new Error(`New session timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
-                }, initTimeout);
-              })
-            ]);
+            const result = await raceWithProcessExit(
+              this.process,
+              Promise.race([
+                this.connection.newSession(newSessionRequest).then((res) => {
+                  if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                    timeoutHandle = null;
+                  }
+                  return res;
+                }),
+                new Promise((_, reject) => {
+                  timeoutHandle = setTimeout(() => {
+                    reject(new Error(`New session timeout after ${initTimeout}ms - ${this.transport.agentName} did not respond`));
+                  }, initTimeout);
+                })
+              ]),
+              {
+                agentName: this.transport.agentName,
+                operationName: "new session"
+              }
+            );
             return result;
           } finally {
             if (timeoutHandle) {
@@ -5594,7 +5682,8 @@ class AcpBackend {
           operationName: "NewSession",
           maxAttempts: RETRY_CONFIG.maxAttempts,
           baseDelayMs: RETRY_CONFIG.baseDelayMs,
-          maxDelayMs: RETRY_CONFIG.maxDelayMs
+          maxDelayMs: RETRY_CONFIG.maxDelayMs,
+          shouldRetry: (error) => !(error instanceof AcpProcessStartupError)
         }
       );
       this.acpSessionId = sessionResponse.sessionId;
@@ -6125,6 +6214,7 @@ function registerGeminiAgent() {
   api.logger.debug("[Gemini] Registered with agent registry");
 }
 
+const DEFAULT_CODEX_ACP_NPX_PACKAGE = "@zed-industries/codex-acp@0.9.5";
 function readFirstEnv(...names) {
   for (const name of names) {
     const raw = process.env[name];
@@ -6179,6 +6269,10 @@ function readCodexAcpNpxMode() {
   }
   return "auto";
 }
+function readCodexAcpNpxPackage() {
+  const configured = readFirstEnv("HAPPY_CODEX_ACP_PACKAGE", "HAPPIER_CODEX_ACP_PACKAGE");
+  return configured || DEFAULT_CODEX_ACP_NPX_PACKAGE;
+}
 function isBinOnPath(baseName) {
   return resolveCommandOnPath(baseName) !== null;
 }
@@ -6244,7 +6338,7 @@ function resolveCodexAcpSpawn(options = {}) {
   }
   return {
     command: resolveNpxCommand(),
-    args: ["--prefer-offline", "-y", "@zed-industries/codex-acp", ...directArgs]
+    args: ["--prefer-offline", "-y", readCodexAcpNpxPackage(), ...directArgs]
   };
 }
 function validateCodexAcpSpawn(options = {}) {
@@ -6531,12 +6625,12 @@ async function ensureUnifiedDaemonStarted() {
 async function executeUnifiedProvider(opts) {
   const credentials = await ensureUnifiedRuntimePrerequisites(opts.credentials);
   if (opts.provider === "claude") {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-Dz-PCSvb.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-gHKFB1UG.cjs'); });
     await runClaude(credentials, opts.claudeOptions ?? {});
     return;
   }
   if (opts.provider === "codex") {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BtZplK1R.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CdjzG1N7.cjs'); });
     await runCodex({
       credentials,
       startedBy: opts.startedBy,
@@ -6546,7 +6640,7 @@ async function executeUnifiedProvider(opts) {
     return;
   }
   if (opts.provider === "gemini") {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DUyH311Z.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DxjvRmOc.cjs'); });
     await runGemini({
       credentials,
       startedBy: opts.startedBy
@@ -6588,7 +6682,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-CPlJKXDn.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-D9-hmqVq.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -6766,8 +6860,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-BeFVx6kI.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-CyJG1mr6.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-D6Y0604_.cjs'); });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-DaqnNHfl.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
 require('chalk');
-require('./api-CyJG1mr6.cjs');
-require('./persistence-BeFVx6kI.cjs');
+require('./api-DaqnNHfl.cjs');
+require('./persistence-D6Y0604_.cjs');
 require('zod');
-require('./index-1zlH6s7a.cjs');
+require('./index-Dc92gnxM.cjs');
 require('node:child_process');
 require('node:fs');
 require('@agentclientprotocol/sdk');

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import 'chalk';
-import './api-CIHTNilH.mjs';
-import './persistence-sLEqV8vk.mjs';
+import './api-DoHt-HyL.mjs';
+import './persistence-QqeBvUxX.mjs';
 import 'zod';
-import './index-vNYxNqVZ.mjs';
+import './index-C5wR2qKT.mjs';
 import 'node:child_process';
 import 'node:fs';
 import '@agentclientprotocol/sdk';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var api = require('./api-CyJG1mr6.cjs');
+var api = require('./api-DaqnNHfl.cjs');
 var types = require('./types-DVk3crez.cjs');
 require('axios');
 require('chalk');

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-CIHTNilH.mjs';
+export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-DoHt-HyL.mjs';
 export { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import 'axios';
 import 'chalk';

package/dist/{persistence-BeFVx6kI.cjs → persistence-D6Y0604_.cjs}

@@ -3,7 +3,7 @@
 var promises = require('node:fs/promises');
 var node_fs = require('node:fs');
 var node_path = require('node:path');
-var api = require('./api-CyJG1mr6.cjs');
+var api = require('./api-DaqnNHfl.cjs');
 var z = require('zod');
 require('axios');
 require('chalk');

package/dist/{persistence-sLEqV8vk.mjs → persistence-QqeBvUxX.mjs}

@@ -1,7 +1,7 @@
 import { readFile, unlink, mkdir, open, stat, writeFile, rename } from 'node:fs/promises';
 import { existsSync, unlinkSync, writeFileSync, readdirSync, readFileSync, constants } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { c as configuration, l as logger, e as encodeBase64 } from './api-CIHTNilH.mjs';
+import { c as configuration, l as logger, e as encodeBase64 } from './api-DoHt-HyL.mjs';
 import * as z from 'zod';
 import 'axios';
 import 'chalk';

package/dist/{registerKillSessionHandler-CCxqGFjZ.cjs → registerKillSessionHandler-C6yXr8ky.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-1zlH6s7a.cjs');
-var api = require('./api-CyJG1mr6.cjs');
+var index = require('./index-Dc92gnxM.cjs');
+var api = require('./api-DaqnNHfl.cjs');
 var crypto = require('crypto');
 require('axios');
 require('node:events');

package/dist/{registerKillSessionHandler-uVHqIC4h.mjs → registerKillSessionHandler-CC9zGBPE.mjs}

@@ -1,5 +1,5 @@
-import { f as formatDisplayMessage } from './index-vNYxNqVZ.mjs';
-import { l as logger } from './api-CIHTNilH.mjs';
+import { f as formatDisplayMessage } from './index-C5wR2qKT.mjs';
+import { l as logger } from './api-DoHt-HyL.mjs';
 import { createHash } from 'crypto';
 import 'axios';
 import 'node:events';

package/dist/{runClaude-Dl9nIRIg.mjs → runClaude-CZ8gxaJL.mjs}

@@ -1,13 +1,13 @@
 import os, { homedir } from 'node:os';
 import { randomUUID } from 'node:crypto';
-import { l as logger, d as backoff, f as delay, g as AsyncLock, c as configuration, b as connectionState, A as ApiClient, p as packageJson, i as isAuthenticationRequiredError, s as startOfflineReconnection } from './api-CIHTNilH.mjs';
-import { e as getProjectPath, h as claudeLocal, E as ExitCodeError, j as isBun, k as trimIdent, l as claudeCheckSession, p as projectPath, m as getEnvironmentInfo, i as initialMachineMetadata, b as stopCaffeinate, n as notifyDaemonSessionStarted, o as startCaffeinate } from './index-vNYxNqVZ.mjs';
+import { l as logger, d as backoff, f as delay, g as AsyncLock, c as configuration, b as connectionState, A as ApiClient, p as packageJson, i as isAuthenticationRequiredError, s as startOfflineReconnection } from './api-DoHt-HyL.mjs';
+import { e as getProjectPath, h as claudeLocal, E as ExitCodeError, j as isBun, k as trimIdent, l as claudeCheckSession, p as projectPath, m as getEnvironmentInfo, i as initialMachineMetadata, b as stopCaffeinate, n as notifyDaemonSessionStarted, o as startCaffeinate } from './index-C5wR2qKT.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import { dirname, basename, join, resolve } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { stat, watch, access } from 'fs/promises';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { a as MessageBuffer, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler } from './registerKillSessionHandler-uVHqIC4h.mjs';
+import { a as MessageBuffer, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler } from './registerKillSessionHandler-CC9zGBPE.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { execSync, spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
@@ -20,7 +20,7 @@ import 'tweetnacl';
 import 'expo-server-sdk';
 import 'chalk';
 import { isDeepStrictEqual } from 'node:util';
-import { readSettings } from './persistence-sLEqV8vk.mjs';
+import { readSettings } from './persistence-QqeBvUxX.mjs';
 import { createServer } from 'node:http';
 import 'fs';
 import 'zod';

package/dist/{runClaude-Dz-PCSvb.cjs → runClaude-gHKFB1UG.cjs}

@@ -2,14 +2,14 @@
 
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var api = require('./api-CyJG1mr6.cjs');
-var index = require('./index-1zlH6s7a.cjs');
+var api = require('./api-DaqnNHfl.cjs');
+var index = require('./index-Dc92gnxM.cjs');
 var types = require('./types-DVk3crez.cjs');
 var node_path = require('node:path');
 var promises = require('node:fs/promises');
 var fs = require('fs/promises');
 var ink = require('ink');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CCxqGFjZ.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-C6yXr8ky.cjs');
 var React = require('react');
 var node_child_process = require('node:child_process');
 var node_readline = require('node:readline');
@@ -22,7 +22,7 @@ require('tweetnacl');
 require('expo-server-sdk');
 require('chalk');
 var node_util = require('node:util');
-var persistence = require('./persistence-BeFVx6kI.cjs');
+var persistence = require('./persistence-D6Y0604_.cjs');
 var node_http = require('node:http');
 require('fs');
 require('zod');
@@ -937,7 +937,7 @@ class AbortError extends Error {
   }
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('runClaude-Dz-PCSvb.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('runClaude-gHKFB1UG.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {

package/dist/{runCodex-BtZplK1R.cjs → runCodex-CdjzG1N7.cjs}

@@ -1,13 +1,14 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-CyJG1mr6.cjs');
-var persistence = require('./persistence-BeFVx6kI.cjs');
-var index = require('./index-1zlH6s7a.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DEEfNi5Y.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CCxqGFjZ.cjs');
+var api = require('./api-DaqnNHfl.cjs');
+var persistence = require('./persistence-D6Y0604_.cjs');
+var index = require('./index-Dc92gnxM.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DPVZIJ4n.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-C6yXr8ky.cjs');
 var React = require('react');
 var ink = require('ink');
+var happyProtocol = require('happy-protocol');
 require('axios');
 require('chalk');
 require('fs');
@@ -952,21 +953,28 @@ async function codexRemoteLauncher(session) {
         }
         case "tool-call": {
           const toolArgs = msg.args ? index.truncateDisplayMessage(msg.args, 100) : "";
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(
             `Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}` : ""}`,
             "tool"
           );
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: msg.toolName,
+            name: canonicalToolName,
             callId: msg.callId,
-            input: msg.args,
+            input: happyProtocol.attachToolHappierMetaV2(msg.args, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: msg.toolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           return;
         }
         case "tool-result": {
-          const isError = msg.result && typeof msg.result === "object" && "error" in msg.result;
+          const isError = happyProtocol.inferToolResultError(msg.result);
           const resultText = index.truncateDisplayMessage(msg.result, 200) || (isError ? "Unknown error" : "");
           messageBuffer.addMessage(
             `${isError ? "Error:" : "Result:"} ${resultText}`.trim(),
@@ -975,7 +983,13 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.callId,
-            output: msg.result,
+            output: happyProtocol.attachToolHappierMetaV2(msg.result, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: msg.toolName,
+              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2(msg.toolName)
+            }),
             id: node_crypto.randomUUID(),
             isError
           });
@@ -998,7 +1012,7 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "terminal-output",
             data: terminalOutput,
-            callId: node_crypto.randomUUID()
+            callId: msg.callId ?? node_crypto.randomUUID()
           });
           return;
         }
@@ -1016,11 +1030,19 @@ async function codexRemoteLauncher(session) {
         case "exec-approval-request": {
           const { call_id, type, ...inputs } = msg;
           messageBuffer.addMessage(`Exec approval requested: ${call_id}`, "tool");
+          const rawToolName = "CodexBash";
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: "CodexBash",
+            name: canonicalToolName,
             callId: call_id,
-            input: inputs,
+            input: happyProtocol.attachToolHappierMetaV2(inputs, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           return;
@@ -1029,14 +1051,22 @@ async function codexRemoteLauncher(session) {
           const changeCount = Object.keys(msg.changes || {}).length;
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
           messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
+          const rawToolName = "CodexPatch";
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: "CodexPatch",
+            name: canonicalToolName,
             callId: msg.call_id,
-            input: {
+            input: happyProtocol.attachToolHappierMetaV2({
               auto_approved: msg.auto_approved,
               changes: msg.changes
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           return;
@@ -1050,11 +1080,17 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.call_id,
-            output: {
+            output: happyProtocol.attachToolHappierMetaV2({
               stdout: msg.stdout,
               stderr: msg.stderr,
               success: msg.success
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: "CodexPatch",
+              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2("CodexPatch")
+            }),
             id: node_crypto.randomUUID(),
             isError: !msg.success
           });