happy-imou-cloud 2.1.4 → 2.1.5

package/bin/happy-cloud.mjs

@@ -1,39 +1,39 @@
 #!/usr/bin/env node
-
-import { execFileSync } from 'child_process';
-import { fileURLToPath } from 'url';
-import { join, dirname } from 'path';
-import { ensureAcpSdkCompat } from '../scripts/ensureAcpSdkCompat.mjs';
-
-// Check if we're already running with the flags
-const hasNoWarnings = process.execArgv.includes('--no-warnings');
-const hasNoDeprecation = process.execArgv.includes('--no-deprecation');
-
-if (!hasNoWarnings || !hasNoDeprecation) {
-  // Get path to the actual CLI entrypoint
-  const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
-  const entrypoint = join(projectRoot, 'dist', 'index.mjs');
-
-  ensureAcpSdkCompat();
-  
-  // Execute the actual CLI directly with the correct flags
-  try {
-    execFileSync(process.execPath, [
-      '--no-warnings',
-      '--no-deprecation',
-      entrypoint,
-      ...process.argv.slice(2)
-    ], {
-      stdio: 'inherit',
-      env: process.env
-    });
-  } catch (error) {
-    // execFileSync throws if the process exits with non-zero
-    process.exit(error.status || 1);
-  }
-} else {
-  // We're running Node with the flags we wanted, import the CLI entrypoint
-  // module to avoid creating a new process.
-  ensureAcpSdkCompat();
-  import("../dist/index.mjs");
-}
+
+import { execFileSync } from 'child_process';
+import { fileURLToPath } from 'url';
+import { join, dirname } from 'path';
+import { ensureAcpSdkCompat } from '../scripts/ensureAcpSdkCompat.mjs';
+
+// Check if we're already running with the flags
+const hasNoWarnings = process.execArgv.includes('--no-warnings');
+const hasNoDeprecation = process.execArgv.includes('--no-deprecation');
+
+if (!hasNoWarnings || !hasNoDeprecation) {
+  // Get path to the actual CLI entrypoint
+  const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+  const entrypoint = join(projectRoot, 'dist', 'index.mjs');
+
+  ensureAcpSdkCompat();
+  
+  // Execute the actual CLI directly with the correct flags
+  try {
+    execFileSync(process.execPath, [
+      '--no-warnings',
+      '--no-deprecation',
+      entrypoint,
+      ...process.argv.slice(2)
+    ], {
+      stdio: 'inherit',
+      env: process.env
+    });
+  } catch (error) {
+    // execFileSync throws if the process exits with non-zero
+    process.exit(error.status || 1);
+  }
+} else {
+  // We're running Node with the flags we wanted, import the CLI entrypoint
+  // module to avoid creating a new process.
+  ensureAcpSdkCompat();
+  import("../dist/index.mjs");
+}

package/dist/{BaseReasoningProcessor-lTsZVuAU.mjs → BaseReasoningProcessor-CTWoJTb8.mjs}

@@ -1,6 +1,6 @@
-import { p as publishSessionRegistration } from './index-D72RMo5Z.mjs';
-import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-l8X03rs-.mjs';
-import { c as createSessionMetadata } from './registerKillSessionHandler-DAVhkb-l.mjs';
+import { p as publishSessionRegistration } from './index-CQEVJsPp.mjs';
+import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-RxQ4bfJm.mjs';
+import { c as createSessionMetadata } from './registerKillSessionHandler-BuzsaxI2.mjs';
 import { EventEmitter } from 'node:events';
 import { randomUUID } from 'node:crypto';
 

package/dist/{BaseReasoningProcessor-DgdsExMH.cjs → BaseReasoningProcessor-DsunYoSL.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-D1BP-fEm.cjs');
-var api = require('./api-B6ESNpGB.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-71xCO8e_.cjs');
+var index = require('./index-C06zeR85.cjs');
+var api = require('./api-DOn5w7Lv.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BRC1HO05.cjs');
 var node_events = require('node:events');
 var node_crypto = require('node:crypto');
 

package/dist/{ProviderSelectionHandler-Bavm9TDG.cjs → ProviderSelectionHandler-BxcgZ5df.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var api = require('./api-B6ESNpGB.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-71xCO8e_.cjs');
+var api = require('./api-DOn5w7Lv.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BRC1HO05.cjs');
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{ProviderSelectionHandler-CGTnB7ba.mjs → ProviderSelectionHandler-LiWZjziD.mjs}

@@ -1,5 +1,5 @@
-import { l as logger } from './api-l8X03rs-.mjs';
-import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-DAVhkb-l.mjs';
+import { l as logger } from './api-RxQ4bfJm.mjs';
+import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-BuzsaxI2.mjs';
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{api-B6ESNpGB.cjs → api-DOn5w7Lv.cjs}

@@ -18,7 +18,7 @@ var node_child_process = require('node:child_process');
 var expoServerSdk = require('expo-server-sdk');
 
 var name = "happy-imou-cloud";
-var version = "2.1.4";
+var version = "2.1.5";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -433,7 +433,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-EDmI-c8T.cjs'); });
+      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-DuakVvfB.cjs'); });
       const state = await readDaemonState();
       if (!state) {
         return logs;

package/dist/{api-l8X03rs-.mjs → api-RxQ4bfJm.mjs}

@@ -16,7 +16,7 @@ import { spawn } from 'node:child_process';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.1.4";
+var version = "2.1.5";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -431,7 +431,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await import('./persistence-CyFjFOlN.mjs');
+      const { readDaemonState } = await import('./persistence-Bf5FdmEK.mjs');
       const state = await readDaemonState();
       if (!state) {
         return logs;

package/dist/{command-BVCkEMtp.mjs → command-BZ8G4IiN.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-D72RMo5Z.mjs';
+import { c as createDefaultRuntimeShell } from './index-CQEVJsPp.mjs';
 import 'chalk';
-import './api-l8X03rs-.mjs';
+import './api-RxQ4bfJm.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';
@@ -16,7 +16,7 @@ import 'crypto';
 import 'path';
 import 'node:child_process';
 import 'expo-server-sdk';
-import './persistence-CyFjFOlN.mjs';
+import './persistence-Bf5FdmEK.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';

package/dist/{command-DPLKOzMr.cjs → command-C3XGNSfh.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-D1BP-fEm.cjs');
+var index = require('./index-C06zeR85.cjs');
 require('chalk');
-require('./api-B6ESNpGB.cjs');
+require('./api-DOn5w7Lv.cjs');
 require('axios');
 require('fs');
 require('node:fs');
@@ -18,7 +18,7 @@ require('crypto');
 require('path');
 require('node:child_process');
 require('expo-server-sdk');
-require('./persistence-EDmI-c8T.cjs');
+require('./persistence-DuakVvfB.cjs');
 require('node:fs/promises');
 require('os');
 require('tmp');

package/dist/{index-D1BP-fEm.cjs → index-C06zeR85.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-B6ESNpGB.cjs');
-var persistence = require('./persistence-EDmI-c8T.cjs');
+var api = require('./api-DOn5w7Lv.cjs');
+var persistence = require('./persistence-DuakVvfB.cjs');
 var z = require('zod');
 var fs$2 = require('fs/promises');
 var os$1 = require('os');
@@ -72,7 +72,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-D1BP-fEm.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-C06zeR85.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();
@@ -695,7 +695,7 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-D1BP-fEm.cjs', document.baseURI).href))));
+const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-C06zeR85.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$2, "..");
   return path;
@@ -8265,7 +8265,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('index-D1BP-fEm.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('index-C06zeR85.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -9516,11 +9516,11 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-DjnTGJGC.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-C8Lx-Xij.cjs'); });
     await runClaude(opts.credentials, opts.claudeOptions ?? {});
   },
   codex: async (opts) => {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BHq7Rnq7.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-rYroXLgt.cjs'); });
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -9529,7 +9529,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-hkZeOnA_.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-Bjw2PSMh.cjs'); });
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -9605,7 +9605,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-DPLKOzMr.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-C3XGNSfh.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -9783,8 +9783,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-EDmI-c8T.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-B6ESNpGB.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-DuakVvfB.cjs'); });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-DOn5w7Lv.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/{index-D72RMo5Z.mjs → index-CQEVJsPp.mjs}

@@ -1,6 +1,6 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
-import { l as logger, e as encodeBase64, c as configuration, k as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, m as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, n as encodeBase64Url, h as delay, o as buildClientHeaders, q as decodeBase64, r as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, t as HeadTailPreviewBuffer, u as getLatestDaemonLog } from './api-l8X03rs-.mjs';
-import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-CyFjFOlN.mjs';
+import { l as logger, e as encodeBase64, c as configuration, k as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, m as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, n as encodeBase64Url, h as delay, o as buildClientHeaders, q as decodeBase64, r as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, t as HeadTailPreviewBuffer, u as getLatestDaemonLog } from './api-RxQ4bfJm.mjs';
+import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-Bf5FdmEK.mjs';
 import { z } from 'zod';
 import fs, { writeFile as writeFile$1, rename, unlink as unlink$1 } from 'fs/promises';
 import os, { homedir } from 'os';
@@ -9494,11 +9494,11 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await import('./runClaude-BRhQLKjh.mjs');
+    const { runClaude } = await import('./runClaude-Cg8x5JOI.mjs');
     await runClaude(opts.credentials, opts.claudeOptions ?? {});
   },
   codex: async (opts) => {
-    const { runCodex } = await import('./runCodex-DUs_jBE-.mjs');
+    const { runCodex } = await import('./runCodex-e4wK1OuI.mjs');
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -9507,7 +9507,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await import('./runGemini-pmvBZ6qU.mjs');
+    const { runGemini } = await import('./runGemini-Cd1FWJJ_.mjs');
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -9583,7 +9583,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-BVCkEMtp.mjs');
+      const { renderRuntimeProviders } = await import('./command-BZ8G4IiN.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -9761,8 +9761,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-CyFjFOlN.mjs');
-        const { ApiClient: ApiClient2 } = await import('./api-l8X03rs-.mjs').then(function (n) { return n.v; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-Bf5FdmEK.mjs');
+        const { ApiClient: ApiClient2 } = await import('./api-RxQ4bfJm.mjs').then(function (n) { return n.v; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
 require('chalk');
-require('./api-B6ESNpGB.cjs');
-require('./persistence-EDmI-c8T.cjs');
+require('./api-DOn5w7Lv.cjs');
+require('./persistence-DuakVvfB.cjs');
 require('zod');
-require('./index-D1BP-fEm.cjs');
+require('./index-C06zeR85.cjs');
 require('node:child_process');
 require('node:fs');
 require('cross-spawn');

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import 'chalk';
-import './api-l8X03rs-.mjs';
-import './persistence-CyFjFOlN.mjs';
+import './api-RxQ4bfJm.mjs';
+import './persistence-Bf5FdmEK.mjs';
 import 'zod';
-import './index-D72RMo5Z.mjs';
+import './index-CQEVJsPp.mjs';
 import 'node:child_process';
 import 'node:fs';
 import 'cross-spawn';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var api = require('./api-B6ESNpGB.cjs');
+var api = require('./api-DOn5w7Lv.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-l8X03rs-.mjs';
+export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-RxQ4bfJm.mjs';
 export { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import 'axios';
 import 'chalk';

package/dist/{persistence-CyFjFOlN.mjs → persistence-Bf5FdmEK.mjs}

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

package/dist/{persistence-EDmI-c8T.cjs → persistence-DuakVvfB.cjs}

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

package/dist/{registerKillSessionHandler-71xCO8e_.cjs → registerKillSessionHandler-BRC1HO05.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
-var index = require('./index-D1BP-fEm.cjs');
-var persistence = require('./persistence-EDmI-c8T.cjs');
+var index = require('./index-C06zeR85.cjs');
+var persistence = require('./persistence-DuakVvfB.cjs');
 var os = require('node:os');
 var path = require('node:path');
-var api = require('./api-B6ESNpGB.cjs');
+var api = require('./api-DOn5w7Lv.cjs');
 var node_crypto = require('node:crypto');
 var crypto = require('crypto');
 require('axios');
@@ -116,6 +116,62 @@ function attachToolHappierMetaV2(value, meta) {
   };
 }
 
+const DISPLAY_FRIENDLY_TOOL_FIELDS = ["stdout", "stderr", "output", "text", "message", "detail", "reason", "data"];
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function stripInternalToolMeta(value) {
+  if (!isRecord(value)) {
+    return value;
+  }
+  const {
+    _happier: _ignoredHappier,
+    _happy: _ignoredHappy,
+    ...rest
+  } = value;
+  return rest;
+}
+function extractNestedTextContent(value) {
+  if (typeof value === "string") {
+    return value.trim().length > 0 ? value : null;
+  }
+  if (Array.isArray(value)) {
+    const parts = value.map((item) => extractNestedTextContent(item)).filter((item) => typeof item === "string" && item.length > 0);
+    return parts.length > 0 ? parts.join("\n") : null;
+  }
+  if (!isRecord(value)) {
+    return null;
+  }
+  if (typeof value.text === "string" && value.text.trim().length > 0) {
+    return value.text;
+  }
+  if ("content" in value) {
+    return extractNestedTextContent(value.content);
+  }
+  return null;
+}
+function normalizeCodexToolInput(value) {
+  return stripInternalToolMeta(value);
+}
+function normalizeCodexToolOutput(value) {
+  const sanitized = stripInternalToolMeta(value);
+  if (!isRecord(sanitized)) {
+    return sanitized;
+  }
+  const hasDisplayFriendlyField = DISPLAY_FRIENDLY_TOOL_FIELDS.some((field) => field in sanitized);
+  if (hasDisplayFriendlyField || !("content" in sanitized)) {
+    return sanitized;
+  }
+  const flattenedText = extractNestedTextContent(sanitized.content);
+  if (!flattenedText) {
+    return sanitized;
+  }
+  const { content: _content, ...rest } = sanitized;
+  return {
+    ...rest,
+    text: flattenedText
+  };
+}
 function getDefaultExecToolName(provider) {
   switch (provider) {
     case "claude":
@@ -146,6 +202,14 @@ function attachToolMeta(provider, rawToolName, value) {
     canonicalToolName
   });
 }
+function prepareToolInput(provider, rawToolName, value) {
+  const enriched = attachToolMeta(provider, rawToolName, value);
+  return provider === "codex" ? normalizeCodexToolInput(enriched) : enriched;
+}
+function prepareToolOutput(provider, rawToolName, value) {
+  const enriched = attachToolMeta(provider, rawToolName, value);
+  return provider === "codex" ? normalizeCodexToolOutput(enriched) : enriched;
+}
 function forwardAgentMessageToProviderSession(msg, options) {
   const createId = options.createId ?? node_crypto.randomUUID;
   const toolResultType = options.toolResultType ?? "tool-result";
@@ -155,7 +219,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: index.resolveCanonicalToolNameV2(msg.toolName),
         callId: msg.callId,
-        input: attachToolMeta(options.provider, msg.toolName, msg.args),
+        input: prepareToolInput(options.provider, msg.toolName, msg.args),
         id: createId()
       });
       return true;
@@ -164,7 +228,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
       options.send({
         type: toolResultType,
         callId: msg.callId,
-        output: attachToolMeta(options.provider, msg.toolName, msg.result),
+        output: prepareToolOutput(options.provider, msg.toolName, msg.result),
         id: createId(),
         isError: inferToolResultError(msg.result)
       });
@@ -206,7 +270,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: index.resolveCanonicalToolNameV2(rawToolName),
         callId: call_id,
-        input: attachToolMeta(options.provider, rawToolName, inputs),
+        input: prepareToolInput(options.provider, rawToolName, inputs),
         id: createId()
       });
       return true;
@@ -217,7 +281,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: index.resolveCanonicalToolNameV2(rawToolName),
         callId: msg.call_id,
-        input: attachToolMeta(options.provider, rawToolName, {
+        input: prepareToolInput(options.provider, rawToolName, {
           auto_approved: msg.auto_approved,
           changes: msg.changes
         }),
@@ -230,7 +294,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
       options.send({
         type: toolResultType,
         callId: msg.call_id,
-        output: attachToolMeta(options.provider, rawToolName, {
+        output: prepareToolOutput(options.provider, rawToolName, {
           stdout: msg.stdout,
           stderr: msg.stderr,
           success: msg.success