@bluehansl/claudex 0.142.5 → 0.144.1

package/README.md

@@ -21,7 +21,7 @@ curl -fsSL https://chatgpt.com/codex/install.sh | sh
 
 Run the following on Windows to install Codex CLI:
 
-```
+```shell
 powershell -ExecutionPolicy ByPass -c "irm https://chatgpt.com/codex/install.ps1 | iex"
 ```
 

package/bin/claudex.js

@@ -11,6 +11,7 @@ import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const require = createRequire(import.meta.url);
+const codexPackageRoot = realpathSync(path.join(__dirname, ".."));
 
 const PLATFORM_PACKAGE_BY_TARGET = {
   "x86_64-unknown-linux-musl": "@bluehansl/claudex-linux-x64",
@@ -121,6 +122,8 @@ if (!nativePackage) {
   const updateCommand =
     packageManager === "bun"
       ? "bun install -g @bluehansl/claudex@latest"
+      : packageManager === "pnpm"
+        ? "pnpm add -g @bluehansl/claudex@latest"
       : "npm install -g @bluehansl/claudex@latest";
   throw new Error(
     `Missing optional dependency ${platformPackage}. Reinstall Claudex: ${updateCommand}`,
@@ -145,11 +148,47 @@ function getUpdatedPath(newDirs) {
   return updatedPath;
 }
 
+function isPnpmOwnedCodexInstall(nodeModulesDir) {
+  if (!existsSync(path.join(nodeModulesDir, ".modules.yaml"))) {
+    return false;
+  }
+
+  try {
+    return (
+      realpathSync(path.join(nodeModulesDir, "@bluehansl", "claudex")) ===
+      codexPackageRoot
+    );
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Use heuristics to detect the package manager that was used to install Claudex
  * in order to give the user a hint about how to update it.
  */
 function detectPackageManager() {
+  // pnpm's owning node_modules directory can be several parents above the
+  // package in isolated global layouts. Search ancestors of both the canonical
+  // package root and lexical entrypoint because pnpm may link either path.
+  const entrypointDir = path.dirname(path.resolve(process.argv[1]));
+  for (const startDir of new Set([codexPackageRoot, entrypointDir])) {
+    const filesystemRoot = path.parse(startDir).root;
+    for (
+      let currentDir = startDir;
+      currentDir !== filesystemRoot;
+      currentDir = path.dirname(currentDir)
+    ) {
+      if (isPnpmOwnedCodexInstall(path.join(currentDir, "node_modules"))) {
+        return "pnpm";
+      }
+    }
+
+    if (isPnpmOwnedCodexInstall(path.join(filesystemRoot, "node_modules"))) {
+      return "pnpm";
+    }
+  }
+
   const userAgent = process.env.npm_config_user_agent || "";
   if (/\bbun\//.test(userAgent)) {
     return "bun";
@@ -170,10 +209,13 @@ function detectPackageManager() {
   return userAgent ? "npm" : null;
 }
 
+const packageManager = detectPackageManager();
 const packageManagerEnvVar =
-  detectPackageManager() === "bun"
+  packageManager === "bun"
     ? "CODEX_MANAGED_BY_BUN"
-    : "CODEX_MANAGED_BY_NPM";
+    : packageManager === "pnpm"
+      ? "CODEX_MANAGED_BY_PNPM"
+      : "CODEX_MANAGED_BY_NPM";
 const additionalDirs = [];
 if (existsSync(pathDir)) {
   additionalDirs.push(pathDir);
@@ -182,9 +224,12 @@ const updatedPath = getUpdatedPath(additionalDirs);
 const env = {
   ...process.env,
   PATH: updatedPath,
-  [packageManagerEnvVar]: "1",
-  CODEX_MANAGED_PACKAGE_ROOT: realpathSync(path.join(__dirname, "..")),
+  CODEX_MANAGED_PACKAGE_ROOT: codexPackageRoot,
 };
+delete env.CODEX_MANAGED_BY_NPM;
+delete env.CODEX_MANAGED_BY_BUN;
+delete env.CODEX_MANAGED_BY_PNPM;
+env[packageManagerEnvVar] = "1";
 
 const child = spawn(binaryPath, process.argv.slice(2), {
   stdio: "inherit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bluehansl/claudex",
-  "version": "0.142.5",
+  "version": "0.144.1",
   "description": "Claudex CLI is a customized Codex CLI that runs locally on your computer.",
   "license": "Apache-2.0",
   "bin": {
@@ -20,6 +20,6 @@
   },
   "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319",
   "optionalDependencies": {
-    "@bluehansl/claudex-darwin-arm64": "npm:@bluehansl/claudex@0.142.5-darwin-arm64"
+    "@bluehansl/claudex-darwin-arm64": "npm:@bluehansl/claudex@0.144.1-darwin-arm64"
   }
 }