@sellable/install 0.1.216 → 0.1.218

package/bin/sellable-install.mjs

@@ -13,6 +13,7 @@ import {
 import { homedir } from "node:os";
 import { dirname, join, relative } from "node:path";
 import { stdout as output } from "node:process";
+import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import {
   REQUIRED_SELLABLE_MCP_TOOLS,
@@ -22,6 +23,7 @@ import {
 const DEFAULT_API_URL = "https://app.sellable.dev";
 const DEFAULT_SERVER_PACKAGE =
   process.env.SELLABLE_MCP_PACKAGE || "@sellable/mcp@latest";
+const CODEX_INSTALL_URL = "https://chatgpt.com/codex/install";
 
 function getInstallVersion() {
   try {
@@ -175,6 +177,8 @@ Options:
   --hosted-url <url>        Hosted MCP URL for --server hosted.
   --verbose                 Print every file write and shell command.
   --dry-run                 Print actions without writing or running host commands.
+  --install-codex-cli       Install Codex CLI without prompting if it is missing or blocked.
+  --no-install-codex-cli    Do not prompt to install Codex CLI; install Desktop config only when possible.
   --verify-only             Verify installed host config where possible.
   --json                    Print machine-readable verification JSON.
   --artifact <path>         Write verification JSON to a file.
@@ -247,6 +251,7 @@ function parseArgs(argv) {
     json: false,
     artifactPath: process.env.SELLABLE_VERIFY_ARTIFACT || "",
     verbose: false,
+    codexCliInstall: codexCliInstallPreference(),
   };
 
   for (let i = 0; i < argv.length; i += 1) {
@@ -280,6 +285,10 @@ function parseArgs(argv) {
       opts.hostedUrl = next();
     } else if (arg === "--dry-run") {
       opts.dryRun = true;
+    } else if (arg === "--install-codex-cli") {
+      opts.codexCliInstall = "install";
+    } else if (arg === "--no-install-codex-cli") {
+      opts.codexCliInstall = "skip";
     } else if (arg === "--verify-only") {
       opts.verifyOnly = true;
     } else if (arg === "--json") {
@@ -303,6 +312,14 @@ function parseArgs(argv) {
   return opts;
 }
 
+function codexCliInstallPreference() {
+  const raw = process.env.SELLABLE_INSTALL_CODEX_CLI || "";
+  const value = raw.trim().toLowerCase();
+  if (["1", "true", "yes", "y", "install"].includes(value)) return "install";
+  if (["0", "false", "no", "n", "skip"].includes(value)) return "skip";
+  return "ask";
+}
+
 function redact(value) {
   if (!value) return "";
   if (value.length <= 10) return "[redacted]";
@@ -360,6 +377,175 @@ function commandExistsDetails(command, platform = process.platform) {
   };
 }
 
+function summarizeSpawnFailure(result) {
+  const errorMessage = result.error?.message || "";
+  const stderr = (result.stderr || "").trim();
+  const stdout = (result.stdout || "").trim();
+  return (
+    errorMessage ||
+    stderr ||
+    stdout ||
+    (Number.isInteger(result.status) ? `exit ${result.status}` : "unknown failure")
+  );
+}
+
+function codexCliStatus(opts = {}) {
+  const details = commandExistsDetails("codex");
+  if (!details.exists) {
+    return {
+      exists: false,
+      usable: false,
+      reason: "Codex CLI not found on PATH",
+      details,
+    };
+  }
+  if (opts.dryRun) {
+    return {
+      exists: true,
+      usable: true,
+      reason: "dry-run",
+      details,
+    };
+  }
+
+  const result = spawnSync("codex", ["mcp", "--help"], {
+    encoding: "utf8",
+    stdio: "pipe",
+    timeout: 10000,
+  });
+  if (result.status === 0) {
+    return {
+      exists: true,
+      usable: true,
+      reason: "Codex CLI responded to `codex mcp --help`",
+      details,
+    };
+  }
+
+  return {
+    exists: true,
+    usable: false,
+    reason: `Codex CLI found but not usable: ${summarizeSpawnFailure(result)}`,
+    details,
+  };
+}
+
+function codexDesktopLikelyInstalled(status = null) {
+  if (process.env.SELLABLE_INSTALL_ASSUME_CODEX_DESKTOP === "1") return true;
+  const home = codexHome();
+  const probes = [
+    status?.details?.stdout || "",
+    process.env.PATH || "",
+  ].join("\n");
+
+  if (/WindowsApps[\\/]+codex\.exe/i.test(probes)) return true;
+  if (existsSync(join(home, "config.toml"))) return true;
+  if (existsSync(join(home, "plugins", ".plugin-appserver"))) return true;
+  if (existsSync(join(home, "plugins", "cache"))) return true;
+  if (process.platform === "darwin" && existsSync("/Applications/Codex.app")) {
+    return true;
+  }
+  return false;
+}
+
+function isNonInteractiveInstall() {
+  return (
+    process.env.CI === "true" ||
+    process.env.SELLABLE_NON_INTERACTIVE === "1" ||
+    process.env.SELLABLE_NON_INTERACTIVE === "true" ||
+    process.env.SELLABLE_NON_INTERACTIVE === "yes"
+  );
+}
+
+async function askYesNo(question, defaultAnswer = false) {
+  if (!process.stdin.isTTY || !output.isTTY || isNonInteractiveInstall()) {
+    return null;
+  }
+  const suffix = defaultAnswer ? " [Y/n] " : " [y/N] ";
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+  try {
+    const answer = (await rl.question(`${question}${suffix}`)).trim().toLowerCase();
+    if (!answer) return defaultAnswer;
+    return ["y", "yes"].includes(answer);
+  } finally {
+    rl.close();
+  }
+}
+
+function codexInstallCommand(platform = process.platform) {
+  const override = process.env.SELLABLE_CODEX_INSTALL_COMMAND;
+  if (override) {
+    return isWindowsPlatform(platform)
+      ? ["cmd.exe", ["/d", "/s", "/c", override]]
+      : ["sh", ["-c", override]];
+  }
+  if (isWindowsPlatform(platform)) {
+    return [
+      "powershell.exe",
+      [
+        "-NoProfile",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-Command",
+        `$env:CODEX_NON_INTERACTIVE='1'; irm ${CODEX_INSTALL_URL}.ps1 | iex`,
+      ],
+    ];
+  }
+  return [
+    "sh",
+    ["-c", `curl -fsSL ${CODEX_INSTALL_URL}.sh | CODEX_NON_INTERACTIVE=1 sh`],
+  ];
+}
+
+function codexManualInstallCommand(platform = process.platform) {
+  return isWindowsPlatform(platform)
+    ? `$env:CODEX_NON_INTERACTIVE=1; irm ${CODEX_INSTALL_URL}.ps1 | iex`
+    : `curl -fsSL ${CODEX_INSTALL_URL}.sh | sh`;
+}
+
+async function maybeInstallCodexCli(status, opts) {
+  if (opts.dryRun) return false;
+  if (opts.codexCliInstall === "skip") {
+    logWarn(`${status.reason}. Skipping Codex CLI install by request.`);
+    return false;
+  }
+
+  let shouldInstall = opts.codexCliInstall === "install";
+  if (!shouldInstall) {
+    const answer = await askYesNo(
+      `${status.reason}. Install the Codex CLI now?`,
+      false
+    );
+    if (answer === null) {
+      logWarn(
+        `${status.reason}. Non-interactive shell; skipping Codex CLI install. Re-run with --install-codex-cli to install it.`
+      );
+      return false;
+    }
+    shouldInstall = answer;
+  }
+
+  if (!shouldInstall) {
+    logWarn(`${status.reason}. Continuing with Codex Desktop plugin setup only.`);
+    return false;
+  }
+
+  const [command, args] = codexInstallCommand();
+  logStep("Installing Codex CLI using the official Codex installer...");
+  try {
+    run(command, args, opts);
+    return true;
+  } catch (err) {
+    logWarn(
+      `Codex CLI install failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return false;
+  }
+}
+
 function shellQuote(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`;
 }
@@ -2455,6 +2641,27 @@ function writeAuth(opts) {
   return { written: true, reused: false };
 }
 
+function resolveWindowsNpmCommand() {
+  const explicit =
+    process.env.SELLABLE_INSTALL_NPM_CMD_COMMAND ||
+    process.env.SELLABLE_INSTALL_NPM_COMMAND;
+  if (explicit) return explicit;
+
+  const nodeBin = process.env.SELLABLE_INSTALL_NODE_BIN || "";
+  for (const name of ["npm.cmd", "npm"]) {
+    const candidate = nodeBin ? join(nodeBin, name) : "";
+    if (candidate && existsSync(candidate)) return candidate;
+  }
+
+  if (isWindowsPlatform()) {
+    const details = commandExistsDetails("npm.cmd");
+    const first = details.stdout.split(/\r?\n/).find((line) => line.trim());
+    if (details.exists && first) return first.trim();
+  }
+
+  return packageManagerCommand("win32");
+}
+
 function installSelfShim(opts) {
   const installDir =
     process.env.SELLABLE_INSTALL_DIR || join(homedir(), ".local", "bin");
@@ -2475,12 +2682,11 @@ exec ${shellQuote(npmCommand)} exec --yes --package ${shellQuote(INSTALL_PACKAGE
     isWindowsPlatform() || process.env.SELLABLE_INSTALL_WRITE_CMD_SHIM === "1";
   if (shouldWriteCmdShim) {
     const cmdPath = `${binPath}.cmd`;
-    const npmCmdCommand =
-      process.env.SELLABLE_INSTALL_NPM_CMD_COMMAND ||
-      process.env.SELLABLE_INSTALL_NPM_COMMAND ||
-      packageManagerCommand("win32");
+    const npmCmdCommand = resolveWindowsNpmCommand();
     const cmdPathPrefix = nodeBin ? `set "PATH=${nodeBin};%PATH%"\r\n` : "";
-    const cmdShim = `@echo off\r\n${cmdPathPrefix}"${npmCmdCommand}" exec --yes --package ${INSTALL_PACKAGE_SPEC} -- sellable %*\r\n`;
+    const cmdShim =
+      `@echo off\r\n${cmdPathPrefix}` +
+      `call "${npmCmdCommand}" exec --yes --package ${INSTALL_PACKAGE_SPEC} -- sellable %*\r\n`;
     writeFile(cmdPath, cmdShim, opts, 0o755);
   }
 }
@@ -2820,32 +3026,70 @@ function patchClaudeAlwaysLoad(opts) {
   }
 }
 
-function installCodex(opts) {
-  if (!opts.dryRun && !commandExists("codex")) {
+function registerCodexCliMcp(opts) {
+  try {
+    if (opts.server !== "hosted") {
+      run("codex", ["mcp", "remove", "sellable"], {
+        ...opts,
+        dryRun: opts.dryRun,
+        allowFail: true,
+      });
+    }
+    run("codex", codexMcpAddArgs(opts), opts);
+    return true;
+  } catch (err) {
+    logWarn(
+      `Codex CLI MCP registration skipped: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return false;
+  }
+}
+
+async function installCodex(opts) {
+  let cliStatus = codexCliStatus(opts);
+  let desktopLikely = codexDesktopLikelyInstalled(cliStatus);
+  let attemptedCliInstall = false;
+
+  if (!opts.dryRun && !cliStatus.usable) {
+    attemptedCliInstall = await maybeInstallCodexCli(cliStatus, opts);
+    if (attemptedCliInstall) {
+      cliStatus = codexCliStatus(opts);
+      desktopLikely = codexDesktopLikelyInstalled(cliStatus) || desktopLikely;
+      if (!cliStatus.usable) {
+        logWarn(
+          `${cliStatus.reason}. Continuing with Codex Desktop plugin setup where possible.`
+        );
+      }
+    }
+  }
+
+  const shouldInstallDesktop =
+    opts.host === "codex" ||
+    cliStatus.usable ||
+    desktopLikely ||
+    attemptedCliInstall;
+  if (!shouldInstallDesktop) {
     const message =
-      "Codex CLI not found. Install/login to Codex, then rerun: sellable --host codex";
+      "Codex CLI not found and Codex Desktop was not detected. Install/login to Codex, then rerun: sellable --host codex";
     if (opts.host === "all") {
       logWarn(`Skipping Codex: ${message}`);
       return { installed: false };
     }
     throw new Error(message);
   }
+
   if (!opts.dryRun) {
     mkdirSync(codexHome(), { recursive: true, mode: 0o700 });
   }
-  if (opts.server === "hosted") {
-    run("codex", codexMcpAddArgs(opts), opts);
-    const info = installCodexDesktopPlugin(opts);
-    return { installed: true, ...info };
+
+  const cliRegistered = cliStatus.usable ? registerCodexCliMcp(opts) : false;
+  if (!cliRegistered && !opts.dryRun) {
+    logWarn(
+      "Codex CLI MCP registration did not run; writing Codex Desktop plugin and config directly."
+    );
   }
-  run("codex", ["mcp", "remove", "sellable"], {
-    ...opts,
-    dryRun: opts.dryRun,
-    allowFail: true,
-  });
-  run("codex", codexMcpAddArgs(opts), opts);
   const info = installCodexDesktopPlugin(opts);
-  return { installed: true, ...info };
+  return { installed: true, cliRegistered, ...info };
 }
 
 function requiredCheck(ok, label) {
@@ -2996,11 +3240,11 @@ async function verify(opts) {
     );
   }
   if (opts.host === "codex" || opts.host === "all") {
-    const hasCodexCli = commandExists("codex");
+    const codexStatus = codexCliStatus(opts);
     checks.push(
       warningCheck(
-        hasCodexCli,
-        hasCodexCli ? "Codex CLI present" : "Codex CLI missing"
+        codexStatus.usable,
+        codexStatus.usable ? "Codex CLI usable" : codexStatus.reason
       )
     );
     const pluginPath = join(
@@ -3358,8 +3602,8 @@ function printNextSteps(installedHosts, authReused) {
     console.log("");
     printInstallAgentBox(
       "Install Codex",
-      "npm install -g @openai/codex",
-      "https://github.com/openai/codex"
+      codexManualInstallCommand(),
+      "https://developers.openai.com/codex/quickstart"
     );
     console.log("");
     console.log("");
@@ -3805,7 +4049,7 @@ async function main() {
         }
       }
       if (opts.host === "codex" || opts.host === "all") {
-        const result = installCodex(opts);
+        const result = await installCodex(opts);
         if (result.installed) {
           installedHosts.push("Codex");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sellable/install",
-  "version": "0.1.216",
+  "version": "0.1.218",
   "type": "module",
   "description": "One-command installer for Sellable MCP in Claude Code and Codex",
   "bin": {