@rickgetz/codex 0.132.0-rick.1 → 0.133.0-rick.1

package/bin/codex.js

@@ -13,12 +13,12 @@ const __dirname = path.dirname(__filename);
 const require = createRequire(import.meta.url);
 
 const PLATFORM_PACKAGE_SUFFIX_BY_TARGET = {
-  "x86_64-unknown-linux-musl": "codex-linux-x64",
-  "aarch64-unknown-linux-musl": "codex-linux-arm64",
-  "x86_64-apple-darwin": "codex-darwin-x64",
-  "aarch64-apple-darwin": "codex-darwin-arm64",
-  "x86_64-pc-windows-msvc": "codex-win32-x64",
-  "aarch64-pc-windows-msvc": "codex-win32-arm64",
+  "x86_64-unknown-linux-musl": "linux-x64",
+  "aarch64-unknown-linux-musl": "linux-arm64",
+  "x86_64-apple-darwin": "darwin-x64",
+  "aarch64-apple-darwin": "darwin-arm64",
+  "x86_64-pc-windows-msvc": "win32-x64",
+  "aarch64-pc-windows-msvc": "win32-arm64",
 };
 const rootPackageJson = JSON.parse(
   readFileSync(path.join(__dirname, "..", "package.json"), "utf8"),
@@ -28,9 +28,9 @@ const rootPackageName = rootPackageJson.name || "@rickgetz/codex";
 function packageAliasName(basePackageName, suffix) {
   if (basePackageName.startsWith("@")) {
     const [scope, packageName] = basePackageName.split("/", 2);
-    return `${scope}/${packageName}-${suffix.replace(/^codex-/, "")}`;
+    return `${scope}/${packageName}-${suffix}`;
   }
-  return `${basePackageName}-${suffix.replace(/^codex-/, "")}`;
+  return `${basePackageName}-${suffix}`;
 }
 
 const { platform, arch } = process;
@@ -90,33 +90,43 @@ const platformPackage = packageAliasName(rootPackageName, platformPackageSuffix)
 
 const codexBinaryName = process.platform === "win32" ? "codex.exe" : "codex";
 const localVendorRoot = path.join(__dirname, "..", "vendor");
-const localBinaryPath = path.join(
-  localVendorRoot,
-  targetTriple,
-  "codex",
-  codexBinaryName,
-);
+const packageBinaryPath = (vendorRoot) =>
+  path.join(vendorRoot, targetTriple, "bin", codexBinaryName);
+const legacyBinaryPath = (vendorRoot) =>
+  path.join(vendorRoot, targetTriple, "codex", codexBinaryName);
+
+function resolveNativePackage(vendorRoot) {
+  const packageRoot = path.join(vendorRoot, targetTriple);
+  const binaryPath = packageBinaryPath(vendorRoot);
+  if (existsSync(binaryPath)) {
+    return {
+      binaryPath,
+      pathDir: path.join(packageRoot, "codex-path"),
+    };
+  }
+
+  const legacyPath = legacyBinaryPath(vendorRoot);
+  if (existsSync(legacyPath)) {
+    return {
+      binaryPath: legacyPath,
+      pathDir: path.join(packageRoot, "path"),
+    };
+  }
 
-let vendorRoot;
+  return null;
+}
+
+let nativePackage;
 try {
   const packageJsonPath = require.resolve(`${platformPackage}/package.json`);
-  vendorRoot = path.join(path.dirname(packageJsonPath), "vendor");
+  nativePackage = resolveNativePackage(
+    path.join(path.dirname(packageJsonPath), "vendor"),
+  );
 } catch {
-  if (existsSync(localBinaryPath)) {
-    vendorRoot = localVendorRoot;
-  } else {
-    const packageManager = detectPackageManager();
-    const updateCommand =
-      packageManager === "bun"
-        ? `bun install -g ${rootPackageName}@latest`
-        : `npm install -g ${rootPackageName}@latest`;
-    throw new Error(
-      `Missing optional dependency ${platformPackage}. Reinstall Codex: ${updateCommand}`,
-    );
-  }
+  nativePackage = resolveNativePackage(localVendorRoot);
 }
 
-if (!vendorRoot) {
+if (!nativePackage) {
   const packageManager = detectPackageManager();
   const updateCommand =
     packageManager === "bun"
@@ -127,8 +137,7 @@ if (!vendorRoot) {
   );
 }
 
-const archRoot = path.join(vendorRoot, targetTriple);
-const binaryPath = path.join(archRoot, "codex", codexBinaryName);
+const { binaryPath, pathDir } = nativePackage;
 
 // 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
@@ -172,7 +181,6 @@ function detectPackageManager() {
 }
 
 const additionalDirs = [];
-const pathDir = path.join(archRoot, "path");
 if (existsSync(pathDir)) {
   additionalDirs.push(pathDir);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rickgetz/codex",
-  "version": "0.132.0-rick.1",
+  "version": "0.133.0-rick.1",
   "license": "Apache-2.0",
   "bin": {
     "codex-rick": "bin/codex.js"
@@ -19,6 +19,6 @@
   },
   "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319",
   "optionalDependencies": {
-    "@rickgetz/codex-darwin-arm64": "npm:@rickgetz/codex@0.132.0-rick.1-darwin-arm64"
+    "@rickgetz/codex-darwin-arm64": "npm:@rickgetz/codex@0.133.0-rick.1-darwin-arm64"
   }
 }