apexrest 1.2.0 → 1.3.0

package/dist/codex-compat/plugins/apexrest-apex/runtime/{chunk-WK5GP4ES.mjs → chunk-P3CVQAZW.mjs}

@@ -1,13 +1,20 @@
 import { createRequire as __createRequire } from 'node:module'; const require = __createRequire(import.meta.url);
 import {
   VERSION
-} from "./chunk-S24BD6PY.mjs";
+} from "./chunk-RBJJNQ5O.mjs";
 import {
-  Client,
-  StdioClientTransport,
   ToolchainService,
+  canonicalHome,
   managedHome,
+  renameWithRetry,
   requireTrust,
+  resourceRoot,
+  runCommand,
+  runtimeState
+} from "./chunk-N4C2SKCN.mjs";
+import {
+  Client,
+  ReadBuffer,
   require_applicator,
   require_codegen,
   require_compile,
@@ -24,24 +31,521 @@ import {
   require_validate,
   require_validation,
   require_validation_error,
-  resourceRoot,
-  runProcess,
-  runtimeState
-} from "./chunk-3MDDJFXN.mjs";
+  serializeMessage
+} from "./chunk-JYN3YHP3.mjs";
 import {
   Fault,
   __commonJS,
+  __require,
   __toESM,
   atomicWrite,
   canonical,
   contained,
+  containedChild,
   exists,
   hash,
   inventory,
   readJson,
   withLock,
   writeJson
-} from "./chunk-2Z3BZF66.mjs";
+} from "./chunk-WPS3CSQJ.mjs";
+
+// node_modules/isexe/windows.js
+var require_windows = __commonJS({
+  "node_modules/isexe/windows.js"(exports, module) {
+    module.exports = isexe;
+    isexe.sync = sync;
+    var fs = __require("fs");
+    function checkPathExt(path5, 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 && path5.substr(-p.length).toLowerCase() === p) {
+          return true;
+        }
+      }
+      return false;
+    }
+    function checkStat(stat, path5, options) {
+      if (!stat.isSymbolicLink() && !stat.isFile()) {
+        return false;
+      }
+      return checkPathExt(path5, options);
+    }
+    function isexe(path5, options, cb) {
+      fs.stat(path5, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path5, options));
+      });
+    }
+    function sync(path5, options) {
+      return checkStat(fs.statSync(path5), path5, options);
+    }
+  }
+});
+
+// node_modules/isexe/mode.js
+var require_mode = __commonJS({
+  "node_modules/isexe/mode.js"(exports, module) {
+    module.exports = isexe;
+    isexe.sync = sync;
+    var fs = __require("fs");
+    function isexe(path5, options, cb) {
+      fs.stat(path5, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, options));
+      });
+    }
+    function sync(path5, options) {
+      return checkStat(fs.statSync(path5), 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 fs = __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(path5, 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(path5, options || {}, function(er, is) {
+            if (er) {
+              reject(er);
+            } else {
+              resolve(is);
+            }
+          });
+        });
+      }
+      core(path5, options || {}, function(er, is) {
+        if (er) {
+          if (er.code === "EACCES" || options && options.ignoreErrors) {
+            er = null;
+            is = false;
+          }
+        }
+        cb(er, is);
+      });
+    }
+    function sync(path5, options) {
+      try {
+        return core.sync(path5, 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 path5 = __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 = path5.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 = path5.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 platform = options.platform || process.platform;
+      if (platform !== "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 path5 = __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 ? path5.delimiter : void 0
+        });
+      } catch (e) {
+      } finally {
+        if (shouldSwitchCwd) {
+          process.chdir(cwd);
+        }
+      }
+      if (resolved) {
+        resolved = path5.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 escapeArgument(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 = escapeArgument;
+  }
+});
+
+// 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 = (string = "") => {
+      const match = string.match(shebangRegex);
+      if (!match) {
+        return null;
+      }
+      const [path5, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path5.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 fs = __require("fs");
+    var shebangCommand = require_shebang_command();
+    function readShebang(command) {
+      const size = 150;
+      const buffer = Buffer.alloc(size);
+      let fd;
+      try {
+        fd = fs.openSync(command, "r");
+        fs.readSync(fd, buffer, 0, size, 0);
+        fs.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 path5 = __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 = path5.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 parse(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 = parse;
+  }
+});
+
+// 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(cp2, parsed) {
+      if (!isWin) {
+        return;
+      }
+      const originalEmit = cp2.emit;
+      cp2.emit = function(name, arg1) {
+        if (name === "exit") {
+          const err = verifyENOENT(arg1, parsed);
+          if (err) {
+            return originalEmit.call(cp2, "error", err);
+          }
+        }
+        return originalEmit.apply(cp2, 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 cp2 = __require("child_process");
+    var parse = require_parse();
+    var enoent = require_enoent();
+    function spawn2(command, args, options) {
+      const parsed = parse(command, args, options);
+      const spawned = cp2.spawn(parsed.command, parsed.args, parsed.options);
+      enoent.hookChildProcess(spawned, parsed);
+      return spawned;
+    }
+    function spawnSync(command, args, options) {
+      const parsed = parse(command, args, options);
+      const result = cp2.spawnSync(parsed.command, parsed.args, parsed.options);
+      result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
+      return result;
+    }
+    module.exports = spawn2;
+    module.exports.spawn = spawn2;
+    module.exports.sync = spawnSync;
+    module.exports._parse = parse;
+    module.exports._enoent = enoent;
+  }
+});
 
 // node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js
 var require_dynamicAnchor = __commonJS({
@@ -872,9 +1376,182 @@ import path4 from "node:path";
 import { homedir } from "node:os";
 import { readFile as readFile2, rm as rm2 } from "node:fs/promises";
 
-// packages/installer/src/native.ts
-import path3 from "node:path";
-import { cp, mkdir, readFile, rename, rm, chmod, realpath as realpath2 } from "node:fs/promises";
+// node_modules/@modelcontextprotocol/sdk/dist/esm/client/stdio.js
+var import_cross_spawn = __toESM(require_cross_spawn(), 1);
+import process2 from "node:process";
+import { PassThrough } from "node:stream";
+var DEFAULT_INHERITED_ENV_VARS = process2.platform === "win32" ? [
+  "APPDATA",
+  "HOMEDRIVE",
+  "HOMEPATH",
+  "LOCALAPPDATA",
+  "PATH",
+  "PROCESSOR_ARCHITECTURE",
+  "SYSTEMDRIVE",
+  "SYSTEMROOT",
+  "TEMP",
+  "USERNAME",
+  "USERPROFILE",
+  "PROGRAMFILES"
+] : (
+  /* list inspired by the default env inheritance of sudo */
+  ["HOME", "LOGNAME", "PATH", "SHELL", "TERM", "USER"]
+);
+function getDefaultEnvironment() {
+  const env = {};
+  for (const key of DEFAULT_INHERITED_ENV_VARS) {
+    const value = process2.env[key];
+    if (value === void 0) {
+      continue;
+    }
+    if (value.startsWith("()")) {
+      continue;
+    }
+    env[key] = value;
+  }
+  return env;
+}
+var StdioClientTransport = class {
+  constructor(server) {
+    this._stderrStream = null;
+    this._serverParams = server;
+    this._readBuffer = new ReadBuffer({ maxBufferSize: server.maxBufferSize });
+    if (server.stderr === "pipe" || server.stderr === "overlapped") {
+      this._stderrStream = new PassThrough();
+    }
+  }
+  /**
+   * Starts the server process and prepares to communicate with it.
+   */
+  async start() {
+    if (this._process) {
+      throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
+    }
+    return new Promise((resolve, reject) => {
+      this._process = (0, import_cross_spawn.default)(this._serverParams.command, this._serverParams.args ?? [], {
+        // merge default env with server env because mcp server needs some env vars
+        env: {
+          ...getDefaultEnvironment(),
+          ...this._serverParams.env
+        },
+        stdio: ["pipe", "pipe", this._serverParams.stderr ?? "inherit"],
+        shell: false,
+        windowsHide: process2.platform === "win32",
+        cwd: this._serverParams.cwd
+      });
+      this._process.on("error", (error) => {
+        reject(error);
+        this.onerror?.(error);
+      });
+      this._process.on("spawn", () => {
+        resolve();
+      });
+      this._process.on("close", (_code) => {
+        this._process = void 0;
+        this.onclose?.();
+      });
+      this._process.stdin?.on("error", (error) => {
+        this.onerror?.(error);
+      });
+      this._process.stdout?.on("data", (chunk) => {
+        try {
+          this._readBuffer.append(chunk);
+          this.processReadBuffer();
+        } catch (error) {
+          this.onerror?.(error);
+          this.close().catch(() => {
+          });
+        }
+      });
+      this._process.stdout?.on("error", (error) => {
+        this.onerror?.(error);
+      });
+      if (this._stderrStream && this._process.stderr) {
+        this._process.stderr.pipe(this._stderrStream);
+      }
+    });
+  }
+  /**
+   * The stderr stream of the child process, if `StdioServerParameters.stderr` was set to "pipe" or "overlapped".
+   *
+   * If stderr piping was requested, a PassThrough stream is returned _immediately_, allowing callers to
+   * attach listeners before the start method is invoked. This prevents loss of any early
+   * error output emitted by the child process.
+   */
+  get stderr() {
+    if (this._stderrStream) {
+      return this._stderrStream;
+    }
+    return this._process?.stderr ?? null;
+  }
+  /**
+   * The child process pid spawned by this transport.
+   *
+   * This is only available after the transport has been started.
+   */
+  get pid() {
+    return this._process?.pid ?? null;
+  }
+  processReadBuffer() {
+    while (true) {
+      try {
+        const message = this._readBuffer.readMessage();
+        if (message === null) {
+          break;
+        }
+        this.onmessage?.(message);
+      } catch (error) {
+        this.onerror?.(error);
+      }
+    }
+  }
+  async close() {
+    if (this._process) {
+      const processToClose = this._process;
+      this._process = void 0;
+      const closePromise = new Promise((resolve) => {
+        processToClose.once("close", () => {
+          resolve();
+        });
+      });
+      try {
+        processToClose.stdin?.end();
+      } catch {
+      }
+      await Promise.race([closePromise, new Promise((resolve) => setTimeout(resolve, 2e3).unref())]);
+      if (processToClose.exitCode === null) {
+        try {
+          processToClose.kill("SIGTERM");
+        } catch {
+        }
+        await Promise.race([closePromise, new Promise((resolve) => setTimeout(resolve, 2e3).unref())]);
+      }
+      if (processToClose.exitCode === null) {
+        try {
+          processToClose.kill("SIGKILL");
+        } catch {
+        }
+      }
+    }
+    this._readBuffer.clear();
+  }
+  send(message) {
+    return new Promise((resolve) => {
+      if (!this._process?.stdin) {
+        throw new Error("Not connected");
+      }
+      const json = serializeMessage(message);
+      if (this._process.stdin.write(json)) {
+        resolve();
+      } else {
+        this._process.stdin.once("drain", resolve);
+      }
+    });
+  }
+};
+
+// packages/installer/src/registration.ts
+import path2 from "node:path";
 
 // packages/installer/src/package-source.ts
 var import__ = __toESM(require__(), 1);
@@ -952,9 +1629,8 @@ async function validateNative(source) {
 }
 
 // packages/installer/src/registration.ts
-import path2 from "node:path";
 async function checkCodex(codexHome, codex = "codex") {
-  const result = await runProcess({
+  const result = await runCommand({
     executable: codex,
     args: ["--version"],
     cwd: process.cwd(),
@@ -969,15 +1645,19 @@ async function checkCodex(codexHome, codex = "codex") {
       "dependency_missing"
     );
 }
+function codexRun(codexHome, cwd, codex = "codex") {
+  return (args, timeoutMs = 6e4) => runCommand({
+    executable: codex,
+    args,
+    cwd,
+    env: { ...process.env, CODEX_HOME: codexHome },
+    timeoutMs
+  });
+}
 function codexInvoke(codexHome, cwd, codex = "codex") {
+  const run = codexRun(codexHome, cwd, codex);
   return async (args) => {
-    const result = await runProcess({
-      executable: codex,
-      args,
-      cwd,
-      env: { ...process.env, CODEX_HOME: codexHome },
-      timeoutMs: 6e4
-    });
+    const result = await run(args);
     if (result.timedOut || result.cancelled || result.truncated || result.code === null)
       throw new Fault(
         "CODEX_REGISTRATION_UNKNOWN",
@@ -1052,6 +1732,8 @@ async function inspectRegistration(markets, home, codexHome, destination) {
 }
 
 // packages/installer/src/native.ts
+import path3 from "node:path";
+import { cp, mkdir, readFile, rm, chmod } from "node:fs/promises";
 async function installNative(r) {
   const source = await resolveNativePlugin(r.source);
   const payload = Object.fromEntries(
@@ -1063,22 +1745,27 @@ async function installNative(r) {
   payload[".agents/plugins/marketplace.json"] = hash(JSON.stringify(nativeMarketplace, null, 2) + "\n");
   const copyDigest = hash(canonical(payload));
   const sourceMcpFile = await exists(path3.join(source, "plugin.json")) ? "mcp.json" : ".mcp.json";
+  const mcpKey = "plugins/apexrest-apex/" + sourceMcpFile;
+  const expectedFiles = canonical({ ...payload, [mcpKey]: void 0 });
   const sourceMcp = await readJson(path3.join(source, sourceMcpFile));
   const sourceServer = sourceMcp.mcpServers.apexrest;
   if (!sourceServer) throw new Fault("INVALID_PACKAGE", "Native package has no apexrest MCP server.", 2);
   sourceServer.command = "node";
   sourceServer.args = ["runtime/mcp.mjs"];
   delete sourceServer.env;
-  payload["plugins/apexrest-apex/" + sourceMcpFile] = hash(JSON.stringify(sourceMcp, null, 2) + "\n");
+  payload[mcpKey] = hash(JSON.stringify(sourceMcp, null, 2) + "\n");
   const digest = hash(canonical(payload));
   if (!r.dryRun) {
     await mkdir(r.home, { recursive: true, mode: 448 });
     await mkdir(r.codexHome, { recursive: true, mode: 448 });
   }
-  const home = await exists(r.home) ? await realpath2(r.home) : path3.resolve(r.home);
-  const codexHome = await exists(r.codexHome) ? await realpath2(r.codexHome) : path3.resolve(r.codexHome);
+  const home = await canonicalHome(r.home);
+  const codexHome = await canonicalHome(r.codexHome);
   const node = r.node ?? process.execPath;
   const destination = path3.join(home, "native", hash(canonical({ sourceDigest: digest, node, home })));
+  const root = path3.join(destination, "plugins/apexrest-apex");
+  const cli = path3.join(root, "runtime/apexrest.mjs");
+  const launchers = launcherScripts(home, node, cli);
   const invoke = codexInvoke(codexHome, await exists(home) ? home : process.cwd(), r.codex);
   if (!await exists(codexHome)) await checkCodex(codexHome, r.codex);
   const inspect = async () => inspectRegistration(
@@ -1087,7 +1774,7 @@ async function installNative(r) {
     codexHome,
     destination
   );
-  const registration = await inspect();
+  let registration = await inspect();
   if (r.expectedRegistration && r.expectedRegistration !== registration.fingerprint)
     throw new Fault(
       "MARKETPLACE_CHANGED",
@@ -1112,6 +1799,12 @@ async function installNative(r) {
     const stamp = Date.now();
     const configBackup = path3.join(home, "config-before-install-" + stamp + ".toml");
     if (await exists(config)) await cp(config, configBackup);
+    const repaired = await exists(destination) && !await reusable(destination, expectedFiles, mcpKey);
+    if (repaired) {
+      const broken = `${destination}.broken-${stamp}`;
+      await renameWithRetry(destination, broken);
+      await rm(broken, { recursive: true, force: true });
+    }
     if (!await exists(destination)) {
       const staging = destination + ".staging";
       await rm(staging, { recursive: true, force: true });
@@ -1121,9 +1814,8 @@ async function installNative(r) {
       await writeJson(path3.join(staging, ".agents/plugins/marketplace.json"), nativeMarketplace);
       if (hash(canonical(await inventory(staging))) !== copyDigest)
         throw new Fault("PACKAGE_COPY_INVALID", "Native package copy changed.", 5);
-      await rename(staging, destination);
+      await renameWithRetry(staging, destination);
     }
-    const root = path3.join(destination, "plugins/apexrest-apex");
     const portable = await exists(path3.join(root, "plugin.json"));
     const mcpPath = path3.join(root, portable ? "mcp.json" : ".mcp.json");
     const mcp = JSON.parse(await readFile(mcpPath, "utf8"));
@@ -1133,6 +1825,7 @@ async function installNative(r) {
     server.args = [path3.join(root, "runtime/mcp.mjs")];
     server.env = { APEXREST_HOME: home };
     await writeJson(mcpPath, mcp);
+    if (repaired && registration.previousRoot === destination) registration = await inspect();
     const current = await inspect();
     if (current.fingerprint !== registration.fingerprint)
       throw new Fault(
@@ -1225,28 +1918,10 @@ async function installNative(r) {
       actions: ["CODEX_RELOAD_REQUIRED", "NATIVE_HOST_VERIFICATION_REQUIRED"]
     };
     await writeJson(path3.join(home, "installation.json"), state);
-    const cli = path3.join(root, "runtime/apexrest.mjs");
-    const quote = (value) => "'" + value.replaceAll("'", `'"'"'`) + "'";
     await mkdir(path3.join(home, "bin"), { recursive: true });
-    if (process.platform === "win32") {
-      const ps = (value) => "'" + value.replaceAll("'", "''") + "'";
-      await atomicWrite(
-        path3.join(home, "bin/apexrest.ps1"),
-        `$env:APEXREST_HOME=${ps(home)}
-& ${ps(node)} ${ps(cli)} @args
-exit $LASTEXITCODE
-`
-      );
-    } else {
-      const launcher = path3.join(home, "bin/apexrest");
-      await atomicWrite(
-        launcher,
-        `#!/bin/sh
-export APEXREST_HOME=${quote(home)}
-exec ${quote(node)} ${quote(cli)} "$@"
-`
-      );
-      await chmod(launcher, 448);
+    for (const [name, contents] of Object.entries(launchers)) {
+      await atomicWrite(path3.join(home, "bin", name), contents);
+      if (name === "apexrest") await chmod(path3.join(home, "bin", name), 448);
     }
     await writeJson(transition, { status: "completed", ...record });
     return state;
@@ -1255,11 +1930,59 @@ exec ${quote(node)} ${quote(cli)} "$@"
 async function installationState(home) {
   return readJson(path3.join(home, "installation.json"));
 }
+async function reusable(destination, expectedFiles, mcpKey) {
+  try {
+    const files = await inventory(destination);
+    if (!files[mcpKey]) return false;
+    return canonical({ ...files, [mcpKey]: void 0 }) === expectedFiles;
+  } catch {
+    return false;
+  }
+}
+var cmdUnsafe = /[%!"\x00-\x1f]/;
+function launcherScripts(home, node, cli, platform = process.platform) {
+  if (platform !== "win32") {
+    const quote = (value) => "'" + value.replaceAll("'", `'"'"'`) + "'";
+    return {
+      apexrest: `#!/bin/sh
+export APEXREST_HOME=${quote(home)}
+exec ${quote(node)} ${quote(cli)} "$@"
+`
+    };
+  }
+  if ([home, node, cli].some((value) => cmdUnsafe.test(value)))
+    throw new Fault(
+      "UNSAFE_LAUNCHER_PATH",
+      'The managed home, Node.js or plugin path contains characters a Windows launcher cannot represent safely (% ! " or control characters). Choose another home directory.',
+      2,
+      "blocked"
+    );
+  const ps = (value) => "'" + value.replaceAll("'", "''") + "'";
+  return {
+    // Restore the caller's APEXREST_HOME: a dot-sourced or in-session call must not leak it.
+    "apexrest.ps1": `$apexrestPreviousHome = $env:APEXREST_HOME
+$env:APEXREST_HOME = ${ps(home)}
+try {
+  & ${ps(node)} ${ps(cli)} @args
+  $apexrestExitCode = $LASTEXITCODE
+} finally {
+  $env:APEXREST_HOME = $apexrestPreviousHome
+}
+exit $apexrestExitCode
+`,
+    "apexrest.cmd": `@echo off\r
+setlocal\r
+set "APEXREST_HOME=${home}"\r
+"${node}" "${cli}" %*\r
+exit /b %ERRORLEVEL%\r
+`
+  };
+}
 
 // packages/installer/src/setup.ts
 async function setup(input) {
   const text = (key) => input[key];
-  const home = path4.resolve(
+  const home = await canonicalHome(
     text("home") ?? (input.scope === "project" ? path4.join(text("project") ?? process.cwd(), ".apexrest/managed") : managedHome())
   );
   if (input.scope === "project") {
@@ -1279,9 +2002,10 @@ async function setup(input) {
       "Requested version does not match the supplied immutable package.",
       2
     );
-  const codexHome = path4.resolve(
+  const codexHome = await canonicalHome(
     text("codexHome") ?? process.env.CODEX_HOME ?? path4.join(homedir(), ".codex")
   );
+  const codex = text("codex");
   const request = {
     home,
     ...text("cacheDir") ? { cacheDir: text("cacheDir") } : {},
@@ -1298,6 +2022,7 @@ async function setup(input) {
     source,
     home,
     codexHome,
+    ...codex ? { codex } : {},
     dryRun: true,
     node: existingRuntime.node ?? process.execPath
   });
@@ -1321,6 +2046,7 @@ async function setup(input) {
     source,
     home,
     codexHome,
+    ...codex ? { codex } : {},
     node: runtime.node ?? process.execPath,
     expectedRegistration: nativePlan.registration.fingerprint
   });
@@ -1359,63 +2085,57 @@ async function setup(input) {
   await writeJson(path4.join(home, "setup-result.json"), result);
   return result;
 }
-async function uninstallNative(home, keepRuntime) {
-  const state = await installationState(home);
-  const markets = await runProcess({
-    executable: "codex",
-    args: ["plugin", "marketplace", "list", "--json"],
-    cwd: home,
-    env: { ...process.env, CODEX_HOME: state.codexHome },
-    timeoutMs: 3e4
-  });
-  const owned = markets.code === 0 && JSON.parse(markets.stdout).marketplaces.some(
-    (m) => m.name === "apexrest" && m.root === state.destination
-  );
-  if (!owned)
+var ownedDestination = (home, destination) => {
+  if (typeof destination !== "string" || !path4.isAbsolute(destination) || path4.dirname(destination) !== path4.join(home, "native") || !/^[a-f0-9]{64}$/.test(path4.basename(destination)))
     throw new Fault(
       "MARKETPLACE_OWNERSHIP_CONFLICT",
-      "Current marketplace no longer belongs to this installation; nothing was removed.",
-      5
+      "The installation record does not name a managed native payload under this home; nothing was removed.",
+      5,
+      "conflict"
     );
-  const result = await runProcess({
-    executable: "codex",
-    args: ["plugin", "remove", "apexrest-apex@apexrest"],
-    cwd: home,
-    env: { ...process.env, CODEX_HOME: state.codexHome },
-    timeoutMs: 3e4
-  });
-  if (result.code !== 0) throw new Fault("UNINSTALL_FAILED", result.stderr, 3);
-  const removal = await runProcess({
-    executable: "codex",
-    args: ["plugin", "marketplace", "remove", "apexrest"],
-    cwd: home,
-    env: { ...process.env, CODEX_HOME: state.codexHome },
-    timeoutMs: 3e4
-  });
-  if (removal.code !== 0) throw new Fault("MARKETPLACE_REMOVE_FAILED", removal.stderr, 3);
-  const listing = await runProcess({
-    executable: "codex",
-    args: ["plugin", "list", "--json"],
-    cwd: home,
-    env: { ...process.env, CODEX_HOME: state.codexHome },
-    timeoutMs: 3e4
-  });
-  if (listing.code !== 0 || listing.stdout.includes("apexrest-apex@apexrest"))
-    throw new Fault("UNINSTALL_UNCONFIRMED", "Codex still lists this plugin.", 3);
-  const destination = await contained(home, state.destination);
-  if (!keepRuntime) await rm2(destination, { recursive: true, force: true });
-  await writeJson(path4.join(home, "uninstalled.json"), {
-    at: (/* @__PURE__ */ new Date()).toISOString(),
-    keepRuntime,
-    sharedRuntimePreserved: true
+  return destination;
+};
+async function uninstallNative(homeInput, keepRuntime, options = {}) {
+  const home = await canonicalHome(homeInput);
+  return withLock(path4.join(home, "install.lock"), async () => {
+    const state = await installationState(home);
+    if (typeof state.codexHome !== "string" || !path4.isAbsolute(state.codexHome))
+      throw new Fault("INSTALLATION_RECORD_INVALID", "The installation record has no Codex profile.", 5);
+    const codexHome = state.codexHome;
+    const destination = ownedDestination(home, state.destination);
+    const run = codexRun(codexHome, home, options.codex);
+    const markets = await listMarketplaces(codexInvoke(codexHome, home, options.codex));
+    if (!markets.some((m) => m.name === "apexrest" && m.root === destination))
+      throw new Fault(
+        "MARKETPLACE_OWNERSHIP_CONFLICT",
+        "Current marketplace no longer belongs to this installation; nothing was removed.",
+        5
+      );
+    const result = await run(["plugin", "remove", "apexrest-apex@apexrest"], 3e4);
+    if (result.code !== 0) throw new Fault("UNINSTALL_FAILED", result.stderr, 3);
+    const removal = await run(["plugin", "marketplace", "remove", "apexrest"], 3e4);
+    if (removal.code !== 0) throw new Fault("MARKETPLACE_REMOVE_FAILED", removal.stderr, 3);
+    const listing = await run(["plugin", "list", "--json"], 3e4);
+    if (listing.code !== 0 || listing.stdout.includes("apexrest-apex@apexrest"))
+      throw new Fault("UNINSTALL_UNCONFIRMED", "Codex still lists this plugin.", 3);
+    if (!keepRuntime && await exists(destination))
+      await rm2(await containedChild(path4.join(home, "native"), destination), {
+        recursive: true,
+        force: true
+      });
+    await writeJson(path4.join(home, "uninstalled.json"), {
+      at: (/* @__PURE__ */ new Date()).toISOString(),
+      keepRuntime,
+      sharedRuntimePreserved: true
+    });
+    return {
+      status: "uninstalled",
+      projectsPreserved: true,
+      backupsPreserved: true,
+      credentialsPreserved: true,
+      sharedRuntimePreserved: true
+    };
   });
-  return {
-    status: "uninstalled",
-    projectsPreserved: true,
-    backupsPreserved: true,
-    credentialsPreserved: true,
-    sharedRuntimePreserved: true
-  };
 }
 export {
   setup,