mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
6bcccb0ee6
## Why Codex package installs include helper binaries in `codex-path`, such as the bundled `rg`. Package-layout launches should add that directory before user commands run, but standalone launches were missing it while npm launches only worked because `codex.js` had its own legacy `PATH` rewrite. That made npm and standalone package behavior diverge. Shell snapshot restoration can also reset `PATH` after runtime setup. Any package-owned `PATH` prepend has to be recorded as an explicit runtime override so shells, unified exec, and user-shell commands keep access to `codex-path` after a snapshot is sourced. ## Repro Before this change, a curl-installed package could contain `rg` under `codex-path` but still fail to put it on `PATH`: ```shell mkdir /tmp/test-codex-curl curl -fsSL https://chatgpt.com/codex/install.sh \ | CODEX_HOME=/tmp/test-codex-curl CODEX_NON_INTERACTIVE=1 sh /tmp/test-codex-curl/packages/standalone/current/bin/codex exec \ --skip-git-repo-check 'print `which -a rg`' find /tmp/test-codex-curl -name rg ``` The `which -a rg` output omitted the packaged helper even though `find` showed it under `/tmp/test-codex-curl/packages/standalone/releases/.../codex-path/rg`. The npm install path behaved differently only because `codex-cli/bin/codex.js` had legacy `PATH` rewriting: ```shell mkdir /tmp/test-codex-npm cd /tmp/test-codex-npm npm install @openai/codex ./node_modules/.bin/codex exec --skip-git-repo-check 'print `which -a rg`' ``` That printed the npm package's `vendor/<target>/codex-path/rg` first. This PR moves that behavior into Rust-side package launch setup so curl/standalone and npm/bun launches agree without JS rewriting `PATH`. ## What Changed - `codex-rs/arg0` now uses `InstallContext::current().package_layout.path_dir` to prepend the package helper directory before any threads are created. - Package helper `PATH` setup is independent from the temporary arg0 alias setup, so `codex-path` is still added even if CODEX_HOME tempdir, lock, or symlink setup fails. - `codex-rs/install-context` detects the canonical package layout we ship: `bin/`, `codex-resources/`, and `codex-path/` next to `codex-package.json`. - Shell, local unified exec, and user-shell runtimes now record package `codex-path` prepends in `explicit_env_overrides`, matching the existing zsh-fork behavior so shell snapshots cannot restore over the package helper path. - Remote unified exec requests do not receive the local app-server package path overlay. - `codex-cli/bin/codex.js` no longer computes or overrides `PATH`; it only locates the native binary in the canonical package layout and passes npm/bun management metadata. - Added regression tests for `PATH` ordering, package layout detection, and shell snapshot preservation of package path prepends. ## Verification - `node --check codex-cli/bin/codex.js` - `just test -p codex-install-context -p codex-arg0` - `just test -p codex-core user_shell_snapshot_preserves_package_path_prepend` - `just test -p codex-core tools::runtimes::tests` - `just bazel-lock-update` - `just bazel-lock-check` - `just fix -p codex-install-context -p codex-arg0 -p codex-core`
205 lines
5.7 KiB
JavaScript
Executable File
205 lines
5.7 KiB
JavaScript
Executable File
#!/usr/bin/env node
|
|
// Unified entry point for the Codex CLI.
|
|
|
|
import { spawn } from "node:child_process";
|
|
import { existsSync, realpathSync } from "fs";
|
|
import { createRequire } from "node:module";
|
|
import path from "path";
|
|
import { fileURLToPath } from "url";
|
|
|
|
// __dirname equivalent in ESM
|
|
const __filename = fileURLToPath(import.meta.url);
|
|
const __dirname = path.dirname(__filename);
|
|
const require = createRequire(import.meta.url);
|
|
|
|
const PLATFORM_PACKAGE_BY_TARGET = {
|
|
"x86_64-unknown-linux-musl": "@openai/codex-linux-x64",
|
|
"aarch64-unknown-linux-musl": "@openai/codex-linux-arm64",
|
|
"x86_64-apple-darwin": "@openai/codex-darwin-x64",
|
|
"aarch64-apple-darwin": "@openai/codex-darwin-arm64",
|
|
"x86_64-pc-windows-msvc": "@openai/codex-win32-x64",
|
|
"aarch64-pc-windows-msvc": "@openai/codex-win32-arm64",
|
|
};
|
|
|
|
const { platform, arch } = process;
|
|
|
|
let targetTriple = null;
|
|
switch (platform) {
|
|
case "linux":
|
|
case "android":
|
|
switch (arch) {
|
|
case "x64":
|
|
targetTriple = "x86_64-unknown-linux-musl";
|
|
break;
|
|
case "arm64":
|
|
targetTriple = "aarch64-unknown-linux-musl";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
case "darwin":
|
|
switch (arch) {
|
|
case "x64":
|
|
targetTriple = "x86_64-apple-darwin";
|
|
break;
|
|
case "arm64":
|
|
targetTriple = "aarch64-apple-darwin";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
case "win32":
|
|
switch (arch) {
|
|
case "x64":
|
|
targetTriple = "x86_64-pc-windows-msvc";
|
|
break;
|
|
case "arm64":
|
|
targetTriple = "aarch64-pc-windows-msvc";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (!targetTriple) {
|
|
throw new Error(`Unsupported platform: ${platform} (${arch})`);
|
|
}
|
|
|
|
const platformPackage = PLATFORM_PACKAGE_BY_TARGET[targetTriple];
|
|
if (!platformPackage) {
|
|
throw new Error(`Unsupported target triple: ${targetTriple}`);
|
|
}
|
|
|
|
function findCodexExecutable() {
|
|
let vendorRoot;
|
|
try {
|
|
const packageJsonPath = require.resolve(`${platformPackage}/package.json`);
|
|
vendorRoot = path.join(path.dirname(packageJsonPath), "vendor");
|
|
} catch {
|
|
vendorRoot = path.join(__dirname, "..", "vendor");
|
|
}
|
|
|
|
const codexExecutable = path.join(
|
|
vendorRoot,
|
|
targetTriple,
|
|
"bin",
|
|
process.platform === "win32" ? "codex.exe" : "codex",
|
|
);
|
|
if (existsSync(codexExecutable)) {
|
|
return codexExecutable;
|
|
}
|
|
|
|
const packageManager = detectPackageManager();
|
|
const updateCommand =
|
|
packageManager === "bun"
|
|
? "bun install -g @openai/codex@latest"
|
|
: "npm install -g @openai/codex@latest";
|
|
throw new Error(
|
|
`Missing optional dependency ${platformPackage}. Reinstall Codex: ${updateCommand}`,
|
|
);
|
|
}
|
|
|
|
const binaryPath = findCodexExecutable();
|
|
|
|
// Use an asynchronous spawn instead of spawnSync so that Node is able to
|
|
// respond to signals (e.g. Ctrl-C / SIGINT) while the native binary is
|
|
// executing. This allows us to forward those signals to the child process
|
|
// and guarantees that when either the child terminates or the parent
|
|
// receives a fatal signal, both processes exit in a predictable manner.
|
|
|
|
/**
|
|
* Use heuristics to detect the package manager that was used to install Codex
|
|
* in order to give the user a hint about how to update it.
|
|
*/
|
|
function detectPackageManager() {
|
|
const userAgent = process.env.npm_config_user_agent || "";
|
|
if (/\bbun\//.test(userAgent)) {
|
|
return "bun";
|
|
}
|
|
|
|
const execPath = process.env.npm_execpath || "";
|
|
if (execPath.includes("bun")) {
|
|
return "bun";
|
|
}
|
|
|
|
if (
|
|
__dirname.includes(".bun/install/global") ||
|
|
__dirname.includes(".bun\\install\\global")
|
|
) {
|
|
return "bun";
|
|
}
|
|
|
|
return userAgent ? "npm" : null;
|
|
}
|
|
|
|
const packageManagerEnvVar =
|
|
detectPackageManager() === "bun"
|
|
? "CODEX_MANAGED_BY_BUN"
|
|
: "CODEX_MANAGED_BY_NPM";
|
|
const env = {
|
|
...process.env,
|
|
[packageManagerEnvVar]: "1",
|
|
CODEX_MANAGED_PACKAGE_ROOT: realpathSync(path.join(__dirname, "..")),
|
|
};
|
|
|
|
const child = spawn(binaryPath, process.argv.slice(2), {
|
|
stdio: "inherit",
|
|
env,
|
|
});
|
|
|
|
child.on("error", (err) => {
|
|
// Typically triggered when the binary is missing or not executable.
|
|
// Re-throwing here will terminate the parent with a non-zero exit code
|
|
// while still printing a helpful stack trace.
|
|
// eslint-disable-next-line no-console
|
|
console.error(err);
|
|
process.exit(1);
|
|
});
|
|
|
|
// Forward common termination signals to the child so that it shuts down
|
|
// gracefully. In the handler we temporarily disable the default behavior of
|
|
// exiting immediately; once the child has been signaled we simply wait for
|
|
// its exit event which will in turn terminate the parent (see below).
|
|
const forwardSignal = (signal) => {
|
|
if (child.killed) {
|
|
return;
|
|
}
|
|
try {
|
|
child.kill(signal);
|
|
} catch {
|
|
/* ignore */
|
|
}
|
|
};
|
|
|
|
["SIGINT", "SIGTERM", "SIGHUP"].forEach((sig) => {
|
|
process.on(sig, () => forwardSignal(sig));
|
|
});
|
|
|
|
// When the child exits, mirror its termination reason in the parent so that
|
|
// shell scripts and other tooling observe the correct exit status.
|
|
// Wrap the lifetime of the child process in a Promise so that we can await
|
|
// its termination in a structured way. The Promise resolves with an object
|
|
// describing how the child exited: either via exit code or due to a signal.
|
|
const childResult = await new Promise((resolve) => {
|
|
child.on("exit", (code, signal) => {
|
|
if (signal) {
|
|
resolve({ type: "signal", signal });
|
|
} else {
|
|
resolve({ type: "code", exitCode: code ?? 1 });
|
|
}
|
|
});
|
|
});
|
|
|
|
if (childResult.type === "signal") {
|
|
// Re-emit the same signal so that the parent terminates with the expected
|
|
// semantics (this also sets the correct exit code of 128 + n).
|
|
process.kill(process.pid, childResult.signal);
|
|
} else {
|
|
process.exit(childResult.exitCode);
|
|
}
|