@llmnesia/mcp 0.1.0 → 0.1.1

package/dist/cli.js

@@ -1,14 +1,520 @@
 #!/usr/bin/env node
+import { createRequire as __llmnesiaCreateRequire } from "node:module";
+const require = __llmnesiaCreateRequire(import.meta.url);
 import {
   Corpus,
   SearchIndex,
   VERSION,
+  __commonJS,
+  __require,
+  __toESM,
   deleteIndexDb,
   drainInbox,
   ingestFile,
   openSearchIndex,
   resolveCorpusDir
-} from "./chunk-OBJD6H4A.js";
+} from "./chunk-4CBIA42T.js";
+
+// ../node_modules/isexe/windows.js
+var require_windows = __commonJS({
+  "../node_modules/isexe/windows.js"(exports, module) {
+    "use strict";
+    module.exports = isexe;
+    isexe.sync = sync;
+    var fs = __require("fs");
+    function checkPathExt(path, 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 && path.substr(-p.length).toLowerCase() === p) {
+          return true;
+        }
+      }
+      return false;
+    }
+    function checkStat(stat6, path, options) {
+      if (!stat6.isSymbolicLink() && !stat6.isFile()) {
+        return false;
+      }
+      return checkPathExt(path, options);
+    }
+    function isexe(path, options, cb) {
+      fs.stat(path, function(er, stat6) {
+        cb(er, er ? false : checkStat(stat6, path, options));
+      });
+    }
+    function sync(path, options) {
+      return checkStat(fs.statSync(path), path, options);
+    }
+  }
+});
+
+// ../node_modules/isexe/mode.js
+var require_mode = __commonJS({
+  "../node_modules/isexe/mode.js"(exports, module) {
+    "use strict";
+    module.exports = isexe;
+    isexe.sync = sync;
+    var fs = __require("fs");
+    function isexe(path, options, cb) {
+      fs.stat(path, function(er, stat6) {
+        cb(er, er ? false : checkStat(stat6, options));
+      });
+    }
+    function sync(path, options) {
+      return checkStat(fs.statSync(path), options);
+    }
+    function checkStat(stat6, options) {
+      return stat6.isFile() && checkMode(stat6, options);
+    }
+    function checkMode(stat6, options) {
+      var mod = stat6.mode;
+      var uid = stat6.uid;
+      var gid = stat6.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) {
+    "use strict";
+    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(path, 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(resolve4, reject) {
+          isexe(path, options || {}, function(er, is) {
+            if (er) {
+              reject(er);
+            } else {
+              resolve4(is);
+            }
+          });
+        });
+      }
+      core(path, options || {}, function(er, is) {
+        if (er) {
+          if (er.code === "EACCES" || options && options.ignoreErrors) {
+            er = null;
+            is = false;
+          }
+        }
+        cb(er, is);
+      });
+    }
+    function sync(path, options) {
+      try {
+        return core.sync(path, 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) {
+    "use strict";
+    var isWindows2 = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
+    var path = __require("path");
+    var COLON = isWindows2 ? ";" : ":";
+    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(/\//) || isWindows2 && cmd.match(/\\/) ? [""] : [
+        // windows always checks the cwd first
+        ...isWindows2 ? [process.cwd()] : [],
+        ...(opt.path || process.env.PATH || /* istanbul ignore next: very unusual */
+        "").split(colon)
+      ];
+      const pathExtExe = isWindows2 ? opt.pathExt || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM" : "";
+      const pathExt = isWindows2 ? pathExtExe.split(colon) : [""];
+      if (isWindows2) {
+        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((resolve4, reject) => {
+        if (i === pathEnv.length)
+          return opt.all && found.length ? resolve4(found) : reject(getNotFoundError(cmd));
+        const ppRaw = pathEnv[i];
+        const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
+        const pCmd = path.join(pathPart, cmd);
+        const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
+        resolve4(subStep(p, i, 0));
+      });
+      const subStep = (p, i, ii) => new Promise((resolve4, reject) => {
+        if (ii === pathExt.length)
+          return resolve4(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 resolve4(p + ext);
+          }
+          return resolve4(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 = path.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 platform4 = options.platform || process.platform;
+      if (platform4 !== "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 path = __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 ? path.delimiter : void 0
+        });
+      } catch (e) {
+      } finally {
+        if (shouldSwitchCwd) {
+          process.chdir(cwd);
+        }
+      }
+      if (resolved) {
+        resolved = path.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 [path, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path.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 path = __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 = path.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 spawn(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 = spawn;
+    module.exports.spawn = spawn;
+    module.exports.sync = spawnSync;
+    module.exports._parse = parse;
+    module.exports._enoent = enoent;
+  }
+});
 
 // src/cli.ts
 import { createInterface } from "readline/promises";
@@ -1984,27 +2490,129 @@ async function watchInbox(corpus, onDrain) {
 }
 
 // src/clientRegistration.ts
+var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 import { execFile as execFile2 } from "child_process";
-import { readFile as readFile2, stat as stat5, writeFile as writeFile2 } from "fs/promises";
+import { access, readFile as readFile2, stat as stat5, writeFile as writeFile2 } from "fs/promises";
 import { homedir as homedir2, platform as platform2 } from "os";
 import { dirname as dirname4, join as join4 } from "path";
 import { promisify as promisify2 } from "util";
 var execFileAsync2 = promisify2(execFile2);
 var SERVER_NAME = "llmnesia";
+async function commandOnPath(name) {
+  try {
+    const { stdout } = await execFileAsync2(process.platform === "win32" ? "where" : "which", [name]);
+    return stdout.split(/\r?\n/).map((line) => line.trim()).find(Boolean) ?? null;
+  } catch {
+    return null;
+  }
+}
+async function runExecutable(executable, args) {
+  return new Promise((resolve4, reject) => {
+    const child = (0, import_cross_spawn.default)(executable, args, { stdio: ["ignore", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.setEncoding("utf8");
+    child.stderr?.setEncoding("utf8");
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk;
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk;
+    });
+    child.once("error", reject);
+    child.once("close", (code, signal) => {
+      if (code === 0) {
+        resolve4({ stdout, stderr });
+        return;
+      }
+      reject(
+        Object.assign(new Error(`Command failed with ${signal ? `signal ${signal}` : `exit code ${code ?? "unknown"}`}`), {
+          code,
+          signal,
+          stdout,
+          stderr
+        })
+      );
+    });
+  });
+}
+async function runPathCli(name, args) {
+  const executable = await commandOnPath(name);
+  if (!executable) {
+    throw new Error(`\`${name}\` was not found on PATH`);
+  }
+  return runExecutable(executable, args);
+}
+async function resolveCodexExecutable() {
+  const onPath = await commandOnPath("codex");
+  if (onPath) {
+    return onPath;
+  }
+  if (process.platform === "darwin") {
+    const candidates = [
+      "/Applications/ChatGPT.app/Contents/Resources/codex",
+      "/Applications/Codex.app/Contents/Resources/codex",
+      join4(homedir2(), "Applications", "ChatGPT.app", "Contents", "Resources", "codex"),
+      join4(homedir2(), "Applications", "Codex.app", "Contents", "Resources", "codex")
+    ];
+    for (const candidate of candidates) {
+      try {
+        await access(candidate);
+        return candidate;
+      } catch {
+      }
+    }
+  }
+  return null;
+}
 var realClaudeCli = {
   detect: async () => {
+    return await commandOnPath("claude") !== null;
+  },
+  add: async (name, serve) => {
+    await runPathCli("claude", ["mcp", "add", name, "--", serve.command, ...serve.args]);
+  },
+  remove: async (name) => {
+    await runPathCli("claude", ["mcp", "remove", name]);
+  }
+};
+async function runCodex(args) {
+  const executable = await resolveCodexExecutable();
+  if (!executable) {
+    throw new Error("`codex` was not found on PATH or in a supported desktop app location");
+  }
+  return runExecutable(executable, args);
+}
+function parseCodexRegistration(raw) {
+  const value = JSON.parse(raw);
+  const transport = value.transport && typeof value.transport === "object" ? value.transport : value;
+  const command = transport.command;
+  const rawArgs = transport.args;
+  if (typeof command !== "string" || !Array.isArray(rawArgs) || !rawArgs.every((arg) => typeof arg === "string")) {
+    return { serve: null };
+  }
+  return { serve: { command, args: rawArgs } };
+}
+var realCodexCli = {
+  detect: async () => await resolveCodexExecutable() !== null,
+  get: async (name) => {
     try {
-      await execFileAsync2(process.platform === "win32" ? "where" : "which", ["claude"]);
-      return true;
-    } catch {
-      return false;
+      const { stdout } = await runCodex(["mcp", "get", name, "--json"]);
+      return parseCodexRegistration(stdout);
+    } catch (err) {
+      const output = err && typeof err === "object" ? `${"stdout" in err ? String(err.stdout) : ""}
+${"stderr" in err ? String(err.stderr) : ""}` : errorMessage(err);
+      if (/No MCP server named/i.test(output)) {
+        return null;
+      }
+      throw err;
     }
   },
   add: async (name, serve) => {
-    await execFileAsync2("claude", ["mcp", "add", name, "--", serve.command, ...serve.args]);
+    await runCodex(["mcp", "add", name, "--", serve.command, ...serve.args]);
   },
   remove: async (name) => {
-    await execFileAsync2("claude", ["mcp", "remove", name]);
+    await runCodex(["mcp", "remove", name]);
   }
 };
 function paths(home2, osPlatform2) {
@@ -2068,6 +2676,78 @@ async function registerClaudeCode(serve, cli) {
     };
   }
 }
+function sameServeCommand(left, right) {
+  return left.command === right.command && JSON.stringify(left.args) === JSON.stringify(right.args);
+}
+async function registerCodex(serve, cli, configPath, confirm) {
+  if (!await cli.detect()) {
+    if (!await clientDirExists(configPath)) {
+      return {
+        client: "Codex",
+        action: "skipped",
+        detail: `Not installed (no Codex CLI and no ${dirname4(configPath)}).`
+      };
+    }
+    return {
+      client: "Codex",
+      action: "printed",
+      detail: `Codex's CLI was not found. Add this to ${configPath}:
+${codexBlock(serve)}Then fully quit and reopen Codex.`
+    };
+  }
+  let existing;
+  try {
+    existing = await cli.get(SERVER_NAME);
+  } catch (err) {
+    return { client: "Codex", action: "error", detail: `Could not inspect Codex MCP settings: ${errorMessage(err)}` };
+  }
+  if (existing?.serve && sameServeCommand(existing.serve, serve)) {
+    return { client: "Codex", action: "skipped", detail: "Already registered." };
+  }
+  if (existing && !existing.serve) {
+    return {
+      client: "Codex",
+      action: "error",
+      detail: `A non-stdio or unrecognised "${SERVER_NAME}" entry already exists. It was left unchanged.`
+    };
+  }
+  const verb = existing ? "replace its existing LLMnesia MCP registration" : "register the LLMnesia MCP server";
+  const ok = await confirm(
+    `Codex: ${verb}?
+codex mcp add ${SERVER_NAME} -- ${serve.command} ${serve.args.join(" ")}`
+  );
+  if (!ok) {
+    return { client: "Codex", action: "declined", detail: "Skipped by user." };
+  }
+  if (existing) {
+    try {
+      await cli.remove(SERVER_NAME);
+    } catch (err) {
+      return { client: "Codex", action: "error", detail: `Could not remove the old registration: ${errorMessage(err)}` };
+    }
+  }
+  try {
+    await cli.add(SERVER_NAME, serve);
+  } catch (err) {
+    if (existing?.serve) {
+      try {
+        await cli.add(SERVER_NAME, existing.serve);
+      } catch (restoreErr) {
+        return {
+          client: "Codex",
+          action: "error",
+          detail: `Registration failed (${errorMessage(err)}) and restoring the previous entry also failed (${errorMessage(restoreErr)}).`
+        };
+      }
+    }
+    return { client: "Codex", action: "error", detail: `codex mcp add failed: ${errorMessage(err)}` };
+  }
+  return {
+    client: "Codex",
+    action: "registered",
+    detail: `Ran: codex mcp add ${SERVER_NAME} -- ${serve.command} ${serve.args.join(" ")}`
+  };
+}
 async function registerJsonClient(clientLabel, configPath, serve, confirm, now) {
   if (!await clientDirExists(configPath)) {
     return {
@@ -2127,12 +2807,7 @@ async function registerClients(options) {
     results.push(await registerJsonClient("Claude Desktop", claudeDesktop, options.serve, options.confirm, now));
   }
   results.push(await registerJsonClient("Cursor", cursor, options.serve, options.confirm, now));
-  results.push({
-    client: "Codex",
-    action: "printed",
-    detail: `Add this to ${codex} yourself (TOML is fragile to auto-edit):
-${codexBlock(options.serve)}`
-  });
+  results.push(await registerCodex(options.serve, options.codexCli ?? realCodexCli, codex, options.confirm));
   results.push({
     client: "Other MCP clients (Windsurf, Zed, LM Studio, ...)",
     action: "printed",
@@ -2157,6 +2832,21 @@ async function unregisterClaudeCode(cli) {
     };
   }
 }
+async function unregisterCodex(cli) {
+  if (!await cli.detect()) {
+    return { client: "Codex", action: "skipped", detail: "`codex` not found; no automatic registration to remove." };
+  }
+  try {
+    const existing = await cli.get(SERVER_NAME);
+    if (!existing) {
+      return { client: "Codex", action: "skipped", detail: "Not registered." };
+    }
+    await cli.remove(SERVER_NAME);
+    return { client: "Codex", action: "registered", detail: `Ran: codex mcp remove ${SERVER_NAME}` };
+  } catch (err) {
+    return { client: "Codex", action: "error", detail: `codex mcp remove failed: ${errorMessage(err)}` };
+  }
+}
 async function unregisterJsonClient(clientLabel, configPath, now) {
   let data;
   let existed;
@@ -2190,10 +2880,11 @@ async function unregisterClients(options = {}) {
     results.push(await unregisterJsonClient("Claude Desktop", claudeDesktop, now));
   }
   results.push(await unregisterJsonClient("Cursor", cursor, now));
+  results.push(await unregisterCodex(options.codexCli ?? realCodexCli));
   results.push({
-    client: "Codex / other MCP clients",
+    client: "Other MCP clients",
     action: "skipped",
-    detail: "These were only ever printed as copy-paste blocks, never auto-edited \u2014 remove the block yourself if you added it."
+    detail: "These were only shown as copy-paste blocks, never auto-edited \u2014 remove the block yourself if you added it."
   });
   return results;
 }
@@ -2468,7 +3159,7 @@ function checkCodex(home2) {
   return {
     name: "Codex",
     status: "missing",
-    detail: `Codex is installed but not configured. llmnesia-mcp install prints the TOML block to add to ${configPath}.`
+    detail: `Codex is installed but not configured. Run: llmnesia-mcp install (it uses Codex's CLI when available).`
   };
 }
 async function runDoctor(options = {}) {