@mmmbuto/codex-vl 0.138.0-alpha.4 → 0.138.0-alpha.6

package/bin/codex.js

@@ -87,14 +87,18 @@ function findCodexExecutable() {
     vendorRoot = path.join(__dirname, "..", "vendor");
   }
 
-  const codexExecutable = path.join(
-    vendorRoot,
-    targetTriple,
-    "bin",
-    process.platform === "win32" ? "codex.exe" : "codex",
-  );
-  if (existsSync(codexExecutable)) {
-    return codexExecutable;
+  const exeName = process.platform === "win32" ? "codex.exe" : "codex";
+  // Upstream 0.138 launcher expects vendor/<triple>/bin/<exe>; the fork CI
+  // payloads ship vendor/<triple>/codex/<exe> (pre-0.138 layout). Accept
+  // both so a launcher/payload layout drift can never brick the install.
+  const candidates = [
+    path.join(vendorRoot, targetTriple, "bin", exeName),
+    path.join(vendorRoot, targetTriple, "codex", exeName),
+  ];
+  for (const codexExecutable of candidates) {
+    if (existsSync(codexExecutable)) {
+      return codexExecutable;
+    }
   }
 
   const packageManager = detectPackageManager();
@@ -306,20 +310,24 @@ if (skipNativeExec) {
   process.exit(0);
 }
 
-const env = { ...process.env, PATH: updatedPath };
-if (platform === "android") {
-  env.CODEX_SELF_EXE = binaryPath;
-  env.LD_LIBRARY_PATH = sanitizeAndroidLdLibraryPath(path.dirname(binaryPath));
-}
 const packageManagerEnvVar =
   detectPackageManager() === "bun"
     ? "CODEX_MANAGED_BY_BUN"
     : "CODEX_MANAGED_BY_NPM";
+// Single env: the fork launcher needs (PATH update, Android self-exe and
+// LD_LIBRARY_PATH) merged with upstream's managed-package markers — the
+// 0.138.0-alpha.3 merge briefly kept both declarations and broke the
+// launcher with a duplicate `const env`.
 const env = {
   ...process.env,
+  PATH: updatedPath,
   [packageManagerEnvVar]: "1",
   CODEX_MANAGED_PACKAGE_ROOT: realpathSync(path.join(__dirname, "..")),
 };
+if (platform === "android") {
+  env.CODEX_SELF_EXE = binaryPath;
+  env.LD_LIBRARY_PATH = sanitizeAndroidLdLibraryPath(path.dirname(binaryPath));
+}
 
 const child = spawn(binaryPath, process.argv.slice(2), {
   stdio: "inherit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmmbuto/codex-vl",
-  "version": "0.138.0-alpha.4",
+  "version": "0.138.0-alpha.6",
   "license": "Apache-2.0",
   "bin": {
     "codex-vl": "bin/codex.js",
@@ -25,4 +25,4 @@
     "@mmmbuto/codex-vl-linux-arm64": "npm:@mmmbuto/codex-vl@0.138.0-alpha.4-linux-arm64",
     "@mmmbuto/codex-vl-android-arm64": "npm:@mmmbuto/codex-vl@0.138.0-alpha.4-android-arm64"
   }
-}
+}