chatroom-cli 1.91.5 → 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, statSync } 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";
@@ -29909,6 +29909,25 @@ function isRegularFile(filePath) {
     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);
@@ -29922,8 +29941,6 @@ function resolveNativeCodexBinary(vendorRoot, targetTriple, codexBinaryName) {
   return;
 }
 function resolveCodexExecutablePath(moduleRef = import.meta.url) {
-  if (cachedExecutablePath2)
-    return cachedExecutablePath2;
   const chatroomCliRoot = resolveChatroomCliRoot2(moduleRef);
   const require3 = createRequire4(join8(chatroomCliRoot, "package.json"));
   let codexPackageJson;
@@ -29938,18 +29955,7 @@ function resolveCodexExecutablePath(moduleRef = import.meta.url) {
   const platformPkg = resolvePlatformPackageName2(targetTriple);
   const codexBinaryName = process.platform === "win32" ? "codex.exe" : "codex";
   const codexRequire = createRequire4(codexPackageJson);
-  const platformPackageJsonCandidates = [];
-  try {
-    platformPackageJsonCandidates.push(codexRequire.resolve(`${platformPkg}/package.json`));
-  } catch {}
-  try {
-    const fromCliRoot = require3.resolve(`${platformPkg}/package.json`, {
-      paths: [chatroomCliRoot]
-    });
-    if (!platformPackageJsonCandidates.includes(fromCliRoot)) {
-      platformPackageJsonCandidates.push(fromCliRoot);
-    }
-  } catch {}
+  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}`);
   }
@@ -29957,8 +29963,7 @@ function resolveCodexExecutablePath(moduleRef = import.meta.url) {
     const vendorRoot = join8(dirname3(platformPackageJson), "vendor");
     const binaryPath = resolveNativeCodexBinary(vendorRoot, targetTriple, codexBinaryName);
     if (binaryPath) {
-      cachedExecutablePath2 = binaryPath;
-      return cachedExecutablePath2;
+      return binaryPath;
     }
   }
   throw new CodexSdkPackageError(`Unable to locate Codex CLI binaries for ${targetTriple}. Ensure ${CODEX_NPM_NAME} is installed with optional dependencies. ${REINSTALL_HINT2}`);
@@ -30004,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",
@@ -117823,4 +117828,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=FF821111964F2C9464756E2164756E21
+//# debugId=BFC81C63628747E364756E2164756E21