chatroom-cli 1.91.4 → 1.91.6

package/dist/index.js

@@ -29834,7 +29834,7 @@ var init_model_variant = __esm(() => {
 });
 
 // src/daemon/infrastructure/local/harness/services/codex-sdk/codex-sdk-package.ts
-import { existsSync as existsSync2, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync4, realpathSync, statSync } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
 import { dirname as dirname3, join as join8 } from "node:path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL as pathToFileURL2 } from "node:url";
@@ -29902,45 +29902,69 @@ function resolvePlatformPackageName2(targetTriple) {
   }
   return pkg;
 }
+function isRegularFile(filePath) {
+  try {
+    return statSync(filePath).isFile();
+  } catch {
+    return false;
+  }
+}
+function addPlatformPackageJsonCandidate(candidates, candidate) {
+  if (candidate && existsSync2(candidate) && !candidates.includes(candidate)) {
+    candidates.push(candidate);
+  }
+}
+function resolvePlatformPackageJsonCandidates(platformPkg, chatroomCliRoot, codexPackageJson, chatroomRequire, codexRequire) {
+  const candidates = [];
+  const codexPackageDir = realpathSync(dirname3(codexPackageJson));
+  const platformPkgBaseName = platformPkg.includes("/") ? platformPkg.slice(platformPkg.indexOf("/") + 1) : platformPkg;
+  try {
+    addPlatformPackageJsonCandidate(candidates, codexRequire.resolve(`${platformPkg}/package.json`));
+  } catch {}
+  try {
+    addPlatformPackageJsonCandidate(candidates, chatroomRequire.resolve(`${platformPkg}/package.json`, { paths: [chatroomCliRoot] }));
+  } catch {}
+  addPlatformPackageJsonCandidate(candidates, join8(codexPackageDir, "..", platformPkgBaseName, "package.json"));
+  addPlatformPackageJsonCandidate(candidates, join8(codexPackageDir, "node_modules", platformPkg, "package.json"));
+  return candidates;
+}
+function resolveNativeCodexBinary(vendorRoot, targetTriple, codexBinaryName) {
+  const packageRoot = join8(vendorRoot, targetTriple);
+  const packageBinaryPath = join8(packageRoot, "bin", codexBinaryName);
+  if (isRegularFile(packageBinaryPath) && isRegularFile(join8(packageRoot, "codex-package.json"))) {
+    return packageBinaryPath;
+  }
+  const legacyBinaryPath = join8(packageRoot, "codex", codexBinaryName);
+  if (isRegularFile(legacyBinaryPath)) {
+    return legacyBinaryPath;
+  }
+  return;
+}
 function resolveCodexExecutablePath(moduleRef = import.meta.url) {
-  if (cachedExecutablePath2)
-    return cachedExecutablePath2;
   const chatroomCliRoot = resolveChatroomCliRoot2(moduleRef);
   const require3 = createRequire4(join8(chatroomCliRoot, "package.json"));
-  let codexPackageDir;
+  let codexPackageJson;
   try {
-    codexPackageDir = dirname3(require3.resolve(`${CODEX_NPM_NAME}/package.json`, { paths: [chatroomCliRoot] }));
+    codexPackageJson = require3.resolve(`${CODEX_NPM_NAME}/package.json`, {
+      paths: [chatroomCliRoot]
+    });
   } catch {
     throw new CodexSdkPackageError(`${CODEX_NPM_NAME} is not installed. Ensure chatroom-cli was installed with optional dependencies. ${REINSTALL_HINT2}`);
   }
   const targetTriple = resolveTargetTriple();
   const platformPkg = resolvePlatformPackageName2(targetTriple);
   const codexBinaryName = process.platform === "win32" ? "codex.exe" : "codex";
-  let platformPkgDir;
-  try {
-    const platformPackageJson = [codexPackageDir, chatroomCliRoot].map((resolveFrom) => {
-      try {
-        return require3.resolve(`${platformPkg}/package.json`, { paths: [resolveFrom] });
-      } catch {
-        return;
-      }
-    }).find((resolved) => resolved !== undefined);
-    if (!platformPackageJson) {
-      throw new Error(`Unable to resolve ${platformPkg}`);
-    }
-    platformPkgDir = dirname3(platformPackageJson);
-  } catch {
+  const codexRequire = createRequire4(codexPackageJson);
+  const platformPackageJsonCandidates = resolvePlatformPackageJsonCandidates(platformPkg, chatroomCliRoot, codexPackageJson, require3, codexRequire);
+  if (platformPackageJsonCandidates.length === 0) {
     throw new CodexSdkPackageError(`Native Codex CLI package ${platformPkg} is not installed. Ensure ${CODEX_NPM_NAME} is installed with optional dependencies. ${REINSTALL_HINT2}`);
   }
-  const packageBinaryPath = join8(platformPkgDir, "vendor", targetTriple, "bin", codexBinaryName);
-  const legacyBinaryPath = join8(platformPkgDir, "vendor", targetTriple, "codex", codexBinaryName);
-  if (existsSync2(packageBinaryPath)) {
-    cachedExecutablePath2 = packageBinaryPath;
-    return cachedExecutablePath2;
-  }
-  if (existsSync2(legacyBinaryPath)) {
-    cachedExecutablePath2 = legacyBinaryPath;
-    return cachedExecutablePath2;
+  for (const platformPackageJson of platformPackageJsonCandidates) {
+    const vendorRoot = join8(dirname3(platformPackageJson), "vendor");
+    const binaryPath = resolveNativeCodexBinary(vendorRoot, targetTriple, codexBinaryName);
+    if (binaryPath) {
+      return binaryPath;
+    }
   }
   throw new CodexSdkPackageError(`Unable to locate Codex CLI binaries for ${targetTriple}. Ensure ${CODEX_NPM_NAME} is installed with optional dependencies. ${REINSTALL_HINT2}`);
 }
@@ -29985,7 +30009,7 @@ function formatCodexSdkLoadError(err) {
   }
   return formatCodexSdkError(err);
 }
-var REINSTALL_HINT2 = "Reinstall chatroom-cli: npm install -g chatroom-cli@latest", CODEX_NPM_NAME = "@openai/codex", PLATFORM_PACKAGE_BY_TARGET, CodexSdkPackageError, cachedExecutablePath2;
+var REINSTALL_HINT2 = "Reinstall chatroom-cli: npm install -g chatroom-cli@latest", CODEX_NPM_NAME = "@openai/codex", PLATFORM_PACKAGE_BY_TARGET, CodexSdkPackageError;
 var init_codex_sdk_package = __esm(() => {
   PLATFORM_PACKAGE_BY_TARGET = {
     "x86_64-unknown-linux-musl": "@openai/codex-linux-x64",
@@ -117804,4 +117828,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=E74FDA2AD007D39564756E2164756E21
+//# debugId=BFC81C63628747E364756E2164756E21