@agentclientprotocol/codex-acp 2.1.2-preview.4 → 2.1.2-preview.6

package/dist/index.js

@@ -3691,6 +3691,503 @@ var require_main = __commonJS({
   }
 });
 
+// node_modules/isexe/windows.js
+var require_windows = __commonJS({
+  "node_modules/isexe/windows.js"(exports, module) {
+    module.exports = isexe;
+    isexe.sync = sync;
+    var fs8 = __require("fs");
+    function checkPathExt(path8, options) {
+      var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
+      if (!pathext) {
+        return true;
+      }
+      pathext = pathext.split(";");
+      if (pathext.indexOf("") !== -1) {
+        return true;
+      }
+      for (var i = 0; i < pathext.length; i++) {
+        var p = pathext[i].toLowerCase();
+        if (p && path8.substr(-p.length).toLowerCase() === p) {
+          return true;
+        }
+      }
+      return false;
+    }
+    function checkStat(stat, path8, options) {
+      if (!stat.isSymbolicLink() && !stat.isFile()) {
+        return false;
+      }
+      return checkPathExt(path8, options);
+    }
+    function isexe(path8, options, cb) {
+      fs8.stat(path8, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path8, options));
+      });
+    }
+    function sync(path8, options) {
+      return checkStat(fs8.statSync(path8), path8, options);
+    }
+  }
+});
+
+// node_modules/isexe/mode.js
+var require_mode = __commonJS({
+  "node_modules/isexe/mode.js"(exports, module) {
+    module.exports = isexe;
+    isexe.sync = sync;
+    var fs8 = __require("fs");
+    function isexe(path8, options, cb) {
+      fs8.stat(path8, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, options));
+      });
+    }
+    function sync(path8, options) {
+      return checkStat(fs8.statSync(path8), options);
+    }
+    function checkStat(stat, options) {
+      return stat.isFile() && checkMode(stat, options);
+    }
+    function checkMode(stat, options) {
+      var mod = stat.mode;
+      var uid = stat.uid;
+      var gid = stat.gid;
+      var myUid = options.uid !== void 0 ? options.uid : process.getuid && process.getuid();
+      var myGid = options.gid !== void 0 ? options.gid : process.getgid && process.getgid();
+      var u = parseInt("100", 8);
+      var g = parseInt("010", 8);
+      var o = parseInt("001", 8);
+      var ug = u | g;
+      var ret = mod & o || mod & g && gid === myGid || mod & u && uid === myUid || mod & ug && myUid === 0;
+      return ret;
+    }
+  }
+});
+
+// node_modules/isexe/index.js
+var require_isexe = __commonJS({
+  "node_modules/isexe/index.js"(exports, module) {
+    var fs8 = __require("fs");
+    var core;
+    if (process.platform === "win32" || global.TESTING_WINDOWS) {
+      core = require_windows();
+    } else {
+      core = require_mode();
+    }
+    module.exports = isexe;
+    isexe.sync = sync;
+    function isexe(path8, options, cb) {
+      if (typeof options === "function") {
+        cb = options;
+        options = {};
+      }
+      if (!cb) {
+        if (typeof Promise !== "function") {
+          throw new TypeError("callback not provided");
+        }
+        return new Promise(function(resolve, reject) {
+          isexe(path8, options || {}, function(er, is) {
+            if (er) {
+              reject(er);
+            } else {
+              resolve(is);
+            }
+          });
+        });
+      }
+      core(path8, options || {}, function(er, is) {
+        if (er) {
+          if (er.code === "EACCES" || options && options.ignoreErrors) {
+            er = null;
+            is = false;
+          }
+        }
+        cb(er, is);
+      });
+    }
+    function sync(path8, options) {
+      try {
+        return core.sync(path8, options || {});
+      } catch (er) {
+        if (options && options.ignoreErrors || er.code === "EACCES") {
+          return false;
+        } else {
+          throw er;
+        }
+      }
+    }
+  }
+});
+
+// node_modules/which/which.js
+var require_which = __commonJS({
+  "node_modules/which/which.js"(exports, module) {
+    var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
+    var path8 = __require("path");
+    var COLON = isWindows ? ";" : ":";
+    var isexe = require_isexe();
+    var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
+    var getPathInfo = (cmd, opt) => {
+      const colon = opt.colon || COLON;
+      const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? [""] : [
+        // windows always checks the cwd first
+        ...isWindows ? [process.cwd()] : [],
+        ...(opt.path || process.env.PATH || /* istanbul ignore next: very unusual */
+        "").split(colon)
+      ];
+      const pathExtExe = isWindows ? opt.pathExt || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM" : "";
+      const pathExt = isWindows ? pathExtExe.split(colon) : [""];
+      if (isWindows) {
+        if (cmd.indexOf(".") !== -1 && pathExt[0] !== "")
+          pathExt.unshift("");
+      }
+      return {
+        pathEnv,
+        pathExt,
+        pathExtExe
+      };
+    };
+    var which = (cmd, opt, cb) => {
+      if (typeof opt === "function") {
+        cb = opt;
+        opt = {};
+      }
+      if (!opt)
+        opt = {};
+      const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
+      const found = [];
+      const step = (i) => new Promise((resolve, reject) => {
+        if (i === pathEnv.length)
+          return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
+        const ppRaw = pathEnv[i];
+        const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
+        const pCmd = path8.join(pathPart, cmd);
+        const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
+        resolve(subStep(p, i, 0));
+      });
+      const subStep = (p, i, ii) => new Promise((resolve, reject) => {
+        if (ii === pathExt.length)
+          return resolve(step(i + 1));
+        const ext = pathExt[ii];
+        isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
+          if (!er && is) {
+            if (opt.all)
+              found.push(p + ext);
+            else
+              return resolve(p + ext);
+          }
+          return resolve(subStep(p, i, ii + 1));
+        });
+      });
+      return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
+    };
+    var whichSync = (cmd, opt) => {
+      opt = opt || {};
+      const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
+      const found = [];
+      for (let i = 0; i < pathEnv.length; i++) {
+        const ppRaw = pathEnv[i];
+        const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
+        const pCmd = path8.join(pathPart, cmd);
+        const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
+        for (let j = 0; j < pathExt.length; j++) {
+          const cur = p + pathExt[j];
+          try {
+            const is = isexe.sync(cur, { pathExt: pathExtExe });
+            if (is) {
+              if (opt.all)
+                found.push(cur);
+              else
+                return cur;
+            }
+          } catch (ex) {
+          }
+        }
+      }
+      if (opt.all && found.length)
+        return found;
+      if (opt.nothrow)
+        return null;
+      throw getNotFoundError(cmd);
+    };
+    module.exports = which;
+    which.sync = whichSync;
+  }
+});
+
+// node_modules/path-key/index.js
+var require_path_key = __commonJS({
+  "node_modules/path-key/index.js"(exports, module) {
+    "use strict";
+    var pathKey = (options = {}) => {
+      const environment = options.env || process.env;
+      const platform2 = options.platform || process.platform;
+      if (platform2 !== "win32") {
+        return "PATH";
+      }
+      return Object.keys(environment).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
+    };
+    module.exports = pathKey;
+    module.exports.default = pathKey;
+  }
+});
+
+// node_modules/cross-spawn/lib/util/resolveCommand.js
+var require_resolveCommand = __commonJS({
+  "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module) {
+    "use strict";
+    var path8 = __require("path");
+    var which = require_which();
+    var getPathKey = require_path_key();
+    function resolveCommandAttempt(parsed, withoutPathExt) {
+      const env = parsed.options.env || process.env;
+      const cwd = process.cwd();
+      const hasCustomCwd = parsed.options.cwd != null;
+      const shouldSwitchCwd = hasCustomCwd && process.chdir !== void 0 && !process.chdir.disabled;
+      if (shouldSwitchCwd) {
+        try {
+          process.chdir(parsed.options.cwd);
+        } catch (err) {
+        }
+      }
+      let resolved;
+      try {
+        resolved = which.sync(parsed.command, {
+          path: env[getPathKey({ env })],
+          pathExt: withoutPathExt ? path8.delimiter : void 0
+        });
+      } catch (e) {
+      } finally {
+        if (shouldSwitchCwd) {
+          process.chdir(cwd);
+        }
+      }
+      if (resolved) {
+        resolved = path8.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+      }
+      return resolved;
+    }
+    function resolveCommand(parsed) {
+      return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+    }
+    module.exports = resolveCommand;
+  }
+});
+
+// node_modules/cross-spawn/lib/util/escape.js
+var require_escape = __commonJS({
+  "node_modules/cross-spawn/lib/util/escape.js"(exports, module) {
+    "use strict";
+    var metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
+    function escapeCommand(arg) {
+      arg = arg.replace(metaCharsRegExp, "^$1");
+      return arg;
+    }
+    function escapeArgument2(arg, doubleEscapeMetaChars) {
+      arg = `${arg}`;
+      arg = arg.replace(/(?=(\\+?)?)\1"/g, '$1$1\\"');
+      arg = arg.replace(/(?=(\\+?)?)\1$/, "$1$1");
+      arg = `"${arg}"`;
+      arg = arg.replace(metaCharsRegExp, "^$1");
+      if (doubleEscapeMetaChars) {
+        arg = arg.replace(metaCharsRegExp, "^$1");
+      }
+      return arg;
+    }
+    module.exports.command = escapeCommand;
+    module.exports.argument = escapeArgument2;
+  }
+});
+
+// node_modules/shebang-regex/index.js
+var require_shebang_regex = __commonJS({
+  "node_modules/shebang-regex/index.js"(exports, module) {
+    "use strict";
+    module.exports = /^#!(.*)/;
+  }
+});
+
+// node_modules/shebang-command/index.js
+var require_shebang_command = __commonJS({
+  "node_modules/shebang-command/index.js"(exports, module) {
+    "use strict";
+    var shebangRegex = require_shebang_regex();
+    module.exports = (string4 = "") => {
+      const match = string4.match(shebangRegex);
+      if (!match) {
+        return null;
+      }
+      const [path8, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path8.split("/").pop();
+      if (binary === "env") {
+        return argument;
+      }
+      return argument ? `${binary} ${argument}` : binary;
+    };
+  }
+});
+
+// node_modules/cross-spawn/lib/util/readShebang.js
+var require_readShebang = __commonJS({
+  "node_modules/cross-spawn/lib/util/readShebang.js"(exports, module) {
+    "use strict";
+    var fs8 = __require("fs");
+    var shebangCommand = require_shebang_command();
+    function readShebang(command) {
+      const size = 150;
+      const buffer = Buffer.alloc(size);
+      let fd;
+      try {
+        fd = fs8.openSync(command, "r");
+        fs8.readSync(fd, buffer, 0, size, 0);
+        fs8.closeSync(fd);
+      } catch (e) {
+      }
+      return shebangCommand(buffer.toString());
+    }
+    module.exports = readShebang;
+  }
+});
+
+// node_modules/cross-spawn/lib/parse.js
+var require_parse = __commonJS({
+  "node_modules/cross-spawn/lib/parse.js"(exports, module) {
+    "use strict";
+    var path8 = __require("path");
+    var resolveCommand = require_resolveCommand();
+    var escape = require_escape();
+    var readShebang = require_readShebang();
+    var isWin = process.platform === "win32";
+    var isExecutableRegExp = /\.(?:com|exe)$/i;
+    var isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+    function detectShebang(parsed) {
+      parsed.file = resolveCommand(parsed);
+      const shebang = parsed.file && readShebang(parsed.file);
+      if (shebang) {
+        parsed.args.unshift(parsed.file);
+        parsed.command = shebang;
+        return resolveCommand(parsed);
+      }
+      return parsed.file;
+    }
+    function parseNonShell(parsed) {
+      if (!isWin) {
+        return parsed;
+      }
+      const commandFile = detectShebang(parsed);
+      const needsShell = !isExecutableRegExp.test(commandFile);
+      if (parsed.options.forceShell || needsShell) {
+        const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
+        parsed.command = path8.normalize(parsed.command);
+        parsed.command = escape.command(parsed.command);
+        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
+        const shellCommand = [parsed.command].concat(parsed.args).join(" ");
+        parsed.args = ["/d", "/s", "/c", `"${shellCommand}"`];
+        parsed.command = process.env.comspec || "cmd.exe";
+        parsed.options.windowsVerbatimArguments = true;
+      }
+      return parsed;
+    }
+    function parse3(command, args, options) {
+      if (args && !Array.isArray(args)) {
+        options = args;
+        args = null;
+      }
+      args = args ? args.slice(0) : [];
+      options = Object.assign({}, options);
+      const parsed = {
+        command,
+        args,
+        options,
+        file: void 0,
+        original: {
+          command,
+          args
+        }
+      };
+      return options.shell ? parsed : parseNonShell(parsed);
+    }
+    module.exports = parse3;
+  }
+});
+
+// node_modules/cross-spawn/lib/enoent.js
+var require_enoent = __commonJS({
+  "node_modules/cross-spawn/lib/enoent.js"(exports, module) {
+    "use strict";
+    var isWin = process.platform === "win32";
+    function notFoundError(original, syscall) {
+      return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
+        code: "ENOENT",
+        errno: "ENOENT",
+        syscall: `${syscall} ${original.command}`,
+        path: original.command,
+        spawnargs: original.args
+      });
+    }
+    function hookChildProcess(cp, parsed) {
+      if (!isWin) {
+        return;
+      }
+      const originalEmit = cp.emit;
+      cp.emit = function(name, arg1) {
+        if (name === "exit") {
+          const err = verifyENOENT(arg1, parsed);
+          if (err) {
+            return originalEmit.call(cp, "error", err);
+          }
+        }
+        return originalEmit.apply(cp, arguments);
+      };
+    }
+    function verifyENOENT(status, parsed) {
+      if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, "spawn");
+      }
+      return null;
+    }
+    function verifyENOENTSync(status, parsed) {
+      if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, "spawnSync");
+      }
+      return null;
+    }
+    module.exports = {
+      hookChildProcess,
+      verifyENOENT,
+      verifyENOENTSync,
+      notFoundError
+    };
+  }
+});
+
+// node_modules/cross-spawn/index.js
+var require_cross_spawn = __commonJS({
+  "node_modules/cross-spawn/index.js"(exports, module) {
+    "use strict";
+    var cp = __require("child_process");
+    var parse3 = require_parse();
+    var enoent = require_enoent();
+    function spawn3(command, args, options) {
+      const parsed = parse3(command, args, options);
+      const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
+      enoent.hookChildProcess(spawned, parsed);
+      return spawned;
+    }
+    function spawnSync(command, args, options) {
+      const parsed = parse3(command, args, options);
+      const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
+      result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
+      return result;
+    }
+    module.exports = spawn3;
+    module.exports.spawn = spawn3;
+    module.exports.sync = spawnSync;
+    module.exports._parse = parse3;
+    module.exports._enoent = enoent;
+  }
+});
+
 // node_modules/@agentclientprotocol/sdk/dist/schema/index.js
 var AGENT_METHODS = {
   initialize: "initialize",
@@ -27126,6 +27623,7 @@ var legacyClientNotificationMethods = /* @__PURE__ */ new Set([
 
 // src/CodexJsonRpcConnection.ts
 var rpc = __toESM(require_main(), 1);
+var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 import { spawn } from "node:child_process";
 import { createRequire } from "node:module";
 
@@ -27339,14 +27837,15 @@ async function settledWithin(promise2, ms) {
 }
 
 // src/CodexJsonRpcConnection.ts
-function startCodexConnection(codexPath, env) {
+var require2 = createRequire(import.meta.url);
+function startCodexConnection(codexPath, env, appServerStartupArgs = ["app-server"]) {
   const spawnEnv = env ?? process.env;
   let codex;
   if (codexPath) {
-    codex = process.platform === "win32" ? spawn(`"${codexPath}" app-server`, { shell: true, env: spawnEnv }) : spawn(codexPath, ["app-server"], { env: spawnEnv });
+    codex = process.platform === "win32" ? (0, import_cross_spawn.default)(codexPath, appServerStartupArgs, { env: spawnEnv }) : spawn(codexPath, appServerStartupArgs, { env: spawnEnv });
   } else {
-    const bundledCodexPath = createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");
-    codex = spawn(process.execPath, [bundledCodexPath, "app-server"], { env: spawnEnv });
+    const bundledCodexPath = require2.resolve("@openai/codex/bin/codex.js");
+    codex = spawn(process.execPath, [bundledCodexPath, ...appServerStartupArgs], { env: spawnEnv });
   }
   attachLogs(codex);
   const reader = createJSONRPCReader(codex.stdout);
@@ -27444,6 +27943,7 @@ var AIR_EXTENSION_CAPABILITIES_KEY = "capabilities";
 var AIR_DIFF_PATCH_KEY = "diffPatch";
 var AIR_SESSION_FAILURE_KEY = "sessionFailure";
 var AIR_AGENT_FILE_CHANGE_REPORT_KEY = "agentFileChangeReport";
+var AIR_CUSTOM_INSTRUCTIONS_KEY = "customInstructions";
 var AIR_NATIVE_SUBAGENT_SESSIONS_KEY = "nativeSubagentSessions";
 var AIR_ASYNC_TASKS_KEY = "asyncTasks";
 var AIR_RECOMMENDED_CONFIG_VALUE_KEY = "recommendedValue";
@@ -27458,6 +27958,7 @@ var AIR_PERMISSION_KEY = "permission";
 var AIR_CONTEXT_COMPACTION_KEY = "contextCompaction";
 var AIR_RAW_INPUT_RENDERING_KEY = "rawInputRendering";
 var AIR_PLAN_CONTENT_DELTA_KEY = "planContentDelta";
+var AIR_CODEX_HOOKS_KEY = "codexHooks";
 var AIR_CONTENT_DELTA_KEY = "contentDelta";
 var AIR_SUBAGENT_KEY = "subagent";
 var AIR_CUSTOM_ANSWER_KEY = "customAnswer";
@@ -27496,6 +27997,13 @@ function clientSupportsAirCapability(capabilities, capability) {
   const supported = air[AIR_EXTENSION_CAPABILITIES_KEY];
   return typeof version2 === "number" && Number.isInteger(version2) && version2 >= AIR_EXTENSION_VERSION && Array.isArray(supported) && supported.includes(capability);
 }
+function airCustomInstructions(meta3) {
+  const root = asRecord(meta3);
+  const jetbrains = asRecord(root[JETBRAINS_META_KEY]);
+  const air = asRecord(jetbrains[AIR_META_KEY]);
+  const instructions = air[AIR_CUSTOM_INSTRUCTIONS_KEY];
+  return typeof instructions === "string" ? instructions : void 0;
+}
 function asRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
@@ -33533,7 +34041,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.1.2-preview.4",
+  version: "2.1.2-preview.6",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -33587,6 +34095,7 @@ var package_default = {
   license: "Apache-2.0",
   type: "module",
   devDependencies: {
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "^26.1.0",
     ajv: "^8.20.0",
     esbuild: "^0.28.2",
@@ -33598,6 +34107,7 @@ var package_default = {
   dependencies: {
     "@agentclientprotocol/sdk": "^1.5.0",
     "@openai/codex": "^0.160.1",
+    "cross-spawn": "^7.0.6",
     diff: "^9.0.0",
     open: "^11.0.1",
     "vscode-jsonrpc": "^9.0.1",
@@ -34440,12 +34950,14 @@ var CodexAcpClient = class {
   }
   async newSession(request) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
+    const developerInstructions = airCustomInstructions(request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
     const sessionConfig = await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers);
     const response = await this.codexClient.threadStart({
       config: sessionConfig.config,
       modelProvider: this.getModelProvider(),
-      cwd: request.cwd
+      cwd: request.cwd,
+      ...developerInstructions !== void 0 && { developerInstructions }
     });
     const codexModels = await this.fetchAvailableModels();
     if (codexModels.length === 0) {
@@ -35782,6 +36294,12 @@ var CodexAppServerClient = class {
   async configRead(params) {
     return await this.sendRequest({ method: "config/read", params });
   }
+  async hooksList(params) {
+    return await this.sendRequest({ method: "hooks/list", params });
+  }
+  async configBatchWrite(params) {
+    return await this.sendRequest({ method: "config/batchWrite", params });
+  }
   async accountRead(params) {
     return await this.sendRequest({ method: "account/read", params });
   }
@@ -37614,6 +38132,33 @@ function clientSupportsSubagents(capabilities) {
   return clientSupportsAirCapability(capabilities, AIR_NATIVE_SUBAGENT_SESSIONS_KEY);
 }
 
+// src/CodexHookTrust.ts
+var CODEX_HOOKS_LIST_METHOD = "_codex/hooks/list";
+var CODEX_HOOKS_TRUST_METHOD = "_codex/hooks/trust";
+async function listCodexHooks(client, cwd) {
+  const [entry] = (await client.hooksList({ cwds: [cwd] })).data;
+  if (entry === void 0) throw new Error("Codex could not list hooks for the requested directory");
+  return { ...entry, hooks: entry.hooks.filter((hook) => hook.source === "sessionFlags") };
+}
+async function trustCodexHooks(client, cwd, requested) {
+  const isListed = (hooks, request) => hooks.find((hook) => hook.key === request.key && hook.currentHash === request.currentHash);
+  const current = (await listCodexHooks(client, cwd)).hooks;
+  const edits = requested.map((request) => {
+    const hook = isListed(current, request);
+    if (hook === void 0) throw new Error("A Codex hook changed before trust was recorded");
+    return hook;
+  }).filter((hook) => hook.trustStatus !== "trusted").map((hook) => ({
+    keyPath: `hooks.state.${JSON.stringify(hook.key)}.trusted_hash`,
+    value: hook.currentHash,
+    mergeStrategy: "replace"
+  }));
+  if (edits.length > 0) {
+    await client.configBatchWrite({ edits, reloadUserConfig: true });
+  }
+  const verified = (await listCodexHooks(client, cwd)).hooks;
+  return requested.every((request) => isListed(verified, request)?.trustStatus === "trusted");
+}
+
 // src/CodexAcpServer.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 
@@ -38342,11 +38887,13 @@ var CodexAcpServer = class {
                 AIR_SESSION_FAILURE_KEY,
                 AIR_DIFF_PATCH_KEY,
                 AIR_AGENT_FILE_CHANGE_REPORT_KEY,
+                AIR_CUSTOM_INSTRUCTIONS_KEY,
                 AIR_NATIVE_SUBAGENT_SESSIONS_KEY,
                 AIR_ASYNC_TASKS_KEY,
                 AIR_RECOMMENDED_CONFIG_VALUE_KEY,
                 AIR_RAW_INPUT_RENDERING_KEY,
-                AIR_PLAN_CONTENT_DELTA_KEY
+                AIR_PLAN_CONTENT_DELTA_KEY,
+                AIR_CODEX_HOOKS_KEY
               ]
             }
           }
@@ -38354,6 +38901,14 @@ var CodexAcpServer = class {
       }
     };
   }
+  async listHooks(cwd) {
+    if (this.providerUpdate !== null) await this.providerUpdate;
+    return await this.runWithProcessCheck(() => listCodexHooks(this.codexAcpClient.appServerClient, cwd));
+  }
+  async trustHooks(cwd, hooks) {
+    if (this.providerUpdate !== null) await this.providerUpdate;
+    return { trusted: await this.runWithProcessCheck(() => trustCodexHooks(this.codexAcpClient.appServerClient, cwd, hooks)) };
+  }
   async extMethod(method, params) {
     const methodRequest = { method, params };
     if (!isExtMethodRequest(methodRequest)) {
@@ -39149,7 +39704,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
     await exited;
     clearTimeout(forceKill);
     state.stderr = "";
-    state.connection = startCodexConnection(state.codexPath);
+    state.connection = startCodexConnection(state.codexPath, void 0, state.appServerStartupArgs);
     this.captureStderr();
     this.observeCodexProcess();
     return new CodexAcpClient(
@@ -41125,6 +41680,20 @@ function spawnCodexCli(codexPath, args) {
   return spawn2(process.execPath, [bundledCodexPath, ...args], options);
 }
 
+// src/CodexHookConfig.ts
+function prepareCodexHookConfig(config2) {
+  if (config2?.["hooks"] === void 0) return { sessionConfig: config2, appServerStartupArgs: ["app-server"] };
+  const { hooks, ...sessionConfig } = config2;
+  return { sessionConfig, appServerStartupArgs: ["app-server", "-c", `hooks=${toToml(hooks)}`] };
+}
+function toToml(value) {
+  if (Array.isArray(value)) return `[${value.map(toToml).join(", ")}]`;
+  if (value !== null && typeof value === "object") {
+    return `{ ${Object.entries(value).map(([key, item]) => `${JSON.stringify(key)} = ${toToml(item)}`).join(", ")} }`;
+  }
+  return JSON.stringify(value);
+}
+
 // src/index.ts
 var emptyExtensionParamsParser = external_exports.preprocess(
   (params) => params ?? {},
@@ -41153,6 +41722,11 @@ var asyncTaskStopParamsParser = external_exports.object({
   sessionId: external_exports.string().trim().min(1),
   asyncTaskId: external_exports.string().trim().min(1)
 }).passthrough();
+var hooksListParamsParser = external_exports.object({ cwd: external_exports.string().trim().min(1) });
+var hooksTrustParamsParser = external_exports.object({
+  cwd: external_exports.string().trim().min(1),
+  hooks: external_exports.array(external_exports.object({ key: external_exports.string().min(1), currentHash: external_exports.string().min(1) })).min(1)
+});
 if (process.argv.includes("--version")) {
   console.log(`${package_default.name} ${package_default.version}`);
   process.exit(0);
@@ -41178,6 +41752,7 @@ function startAcpServer() {
   const authRequestString = process.env["DEFAULT_AUTH_REQUEST"];
   const modelProvider = process.env["MODEL_PROVIDER"];
   const config2 = configString ? JSON.parse(configString) : void 0;
+  const hookConfig = prepareCodexHookConfig(config2);
   const parsedAuthRequest = authRequestString ? JSON.parse(authRequestString) : void 0;
   const defaultAuthRequest = parsedAuthRequest && isCodexAuthRequest(parsedAuthRequest) ? parsedAuthRequest : void 0;
   logger.log("Startup", {
@@ -41190,9 +41765,10 @@ function startAcpServer() {
     defaultAuthRequest: defaultAuthRequest ?? null
   });
   const codexProcessState = {
-    connection: startCodexConnection(codexPath),
+    connection: startCodexConnection(codexPath, void 0, hookConfig.appServerStartupArgs),
     codexPath,
-    config: config2,
+    config: hookConfig.sessionConfig,
+    appServerStartupArgs: hookConfig.appServerStartupArgs,
     modelProvider,
     stderr: ""
   };
@@ -41208,7 +41784,7 @@ function startAcpServer() {
   const acpJsonStream = createJsonStream(process.stdin, process.stdout);
   function createAgent(connection) {
     const appServerClient = new CodexAppServerClient(codexProcessState.connection.connection);
-    const codexClient = new CodexAcpClient(appServerClient, config2, modelProvider);
+    const codexClient = new CodexAcpClient(appServerClient, hookConfig.sessionConfig, modelProvider);
     return new CodexAcpServer(
       connection,
       codexClient,
@@ -41233,5 +41809,5 @@ function startAcpServer() {
         codexAcpServer = null;
       }
     });
-  }).onRequest(methods.agent.initialize, (ctx) => getAgent().initialize(ctx.params)).onRequest(methods.agent.session.new, (ctx) => getAgent().newSession(ctx.params)).onRequest(methods.agent.session.load, (ctx) => getAgent().loadSession(ctx.params)).onRequest(methods.agent.session.fork, (ctx) => getAgent().forkSession(ctx.params)).onRequest(methods.agent.session.list, (ctx) => getAgent().listSessions(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => getAgent().deleteSession(ctx.params)).onRequest(methods.agent.session.resume, (ctx) => getAgent().resumeSession(ctx.params)).onRequest(methods.agent.session.close, (ctx) => getAgent().closeSession(ctx.params)).onRequest(methods.agent.session.setMode, (ctx) => getAgent().setSessionMode(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => getAgent().setSessionConfigOption(ctx.params)).onRequest(methods.agent.authenticate, (ctx) => getAgent().authenticate(ctx.params, ctx.requestId)).onRequest(methods.agent.logout, (ctx) => getAgent().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => getAgent().prompt(ctx.params, ctx.signal)).onNotification(methods.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest("authentication/status", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/status", ctx.params)).onRequest("authentication/logout", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/logout", ctx.params)).onRequest(LEGACY_SET_SESSION_MODEL_METHOD, legacySetSessionModelParamsParser, (ctx) => getAgent().extMethod(LEGACY_SET_SESSION_MODEL_METHOD, ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent().extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(ASYNC_TASK_STOP_METHOD, asyncTaskStopParamsParser, (ctx) => getAgent().extMethod(ASYNC_TASK_STOP_METHOD, ctx.params)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent().extMethod(GOAL_CONTROL_METHOD, ctx.params)).connect(acpJsonStream);
+  }).onRequest(methods.agent.initialize, (ctx) => getAgent().initialize(ctx.params)).onRequest(methods.agent.session.new, (ctx) => getAgent().newSession(ctx.params)).onRequest(methods.agent.session.load, (ctx) => getAgent().loadSession(ctx.params)).onRequest(methods.agent.session.fork, (ctx) => getAgent().forkSession(ctx.params)).onRequest(methods.agent.session.list, (ctx) => getAgent().listSessions(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => getAgent().deleteSession(ctx.params)).onRequest(methods.agent.session.resume, (ctx) => getAgent().resumeSession(ctx.params)).onRequest(methods.agent.session.close, (ctx) => getAgent().closeSession(ctx.params)).onRequest(methods.agent.session.setMode, (ctx) => getAgent().setSessionMode(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => getAgent().setSessionConfigOption(ctx.params)).onRequest(methods.agent.authenticate, (ctx) => getAgent().authenticate(ctx.params, ctx.requestId)).onRequest(methods.agent.logout, (ctx) => getAgent().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => getAgent().prompt(ctx.params, ctx.signal)).onNotification(methods.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest("authentication/status", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/status", ctx.params)).onRequest("authentication/logout", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/logout", ctx.params)).onRequest(LEGACY_SET_SESSION_MODEL_METHOD, legacySetSessionModelParamsParser, (ctx) => getAgent().extMethod(LEGACY_SET_SESSION_MODEL_METHOD, ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent().extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(ASYNC_TASK_STOP_METHOD, asyncTaskStopParamsParser, (ctx) => getAgent().extMethod(ASYNC_TASK_STOP_METHOD, ctx.params)).onRequest(CODEX_HOOKS_LIST_METHOD, hooksListParamsParser, (ctx) => getAgent().listHooks(ctx.params.cwd)).onRequest(CODEX_HOOKS_TRUST_METHOD, hooksTrustParamsParser, (ctx) => getAgent().trustHooks(ctx.params.cwd, ctx.params.hooks)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent().extMethod(GOAL_CONTROL_METHOD, ctx.params)).connect(acpJsonStream);
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1.2-preview.4",
+  "version": "2.1.2-preview.6",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -57,6 +57,7 @@
   "license": "Apache-2.0",
   "type": "module",
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "^26.1.0",
     "ajv": "^8.20.0",
     "esbuild": "^0.28.2",
@@ -68,6 +69,7 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.5.0",
     "@openai/codex": "^0.160.1",
+    "cross-spawn": "^7.0.6",
     "diff": "^9.0.0",
     "open": "^11.0.1",
     "vscode-jsonrpc": "^9.0.1",