chatroom-cli 1.91.2 → 1.91.4

package/dist/index.js

@@ -29879,6 +29879,71 @@ function resolveCodexSdkPackageJson(chatroomCliRoot) {
     throw new CodexSdkPackageError(`Could not locate @openai/codex-sdk package.json from ${chatroomCliRoot}. ${REINSTALL_HINT2}`);
   }
 }
+function resolveTargetTriple() {
+  const { platform, arch } = process;
+  if (platform === "linux" && arch === "x64")
+    return "x86_64-unknown-linux-musl";
+  if (platform === "linux" && arch === "arm64")
+    return "aarch64-unknown-linux-musl";
+  if (platform === "darwin" && arch === "x64")
+    return "x86_64-apple-darwin";
+  if (platform === "darwin" && arch === "arm64")
+    return "aarch64-apple-darwin";
+  if (platform === "win32" && arch === "x64")
+    return "x86_64-pc-windows-msvc";
+  if (platform === "win32" && arch === "arm64")
+    return "aarch64-pc-windows-msvc";
+  throw new CodexSdkPackageError(`Unsupported platform for ${CODEX_NPM_NAME}: ${platform}-${arch}. ${REINSTALL_HINT2}`);
+}
+function resolvePlatformPackageName2(targetTriple) {
+  const pkg = PLATFORM_PACKAGE_BY_TARGET[targetTriple];
+  if (!pkg) {
+    throw new CodexSdkPackageError(`Unsupported platform for ${CODEX_NPM_NAME}: ${targetTriple}. ${REINSTALL_HINT2}`);
+  }
+  return pkg;
+}
+function resolveCodexExecutablePath(moduleRef = import.meta.url) {
+  if (cachedExecutablePath2)
+    return cachedExecutablePath2;
+  const chatroomCliRoot = resolveChatroomCliRoot2(moduleRef);
+  const require3 = createRequire4(join8(chatroomCliRoot, "package.json"));
+  let codexPackageDir;
+  try {
+    codexPackageDir = dirname3(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 {
+    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;
+  }
+  throw new CodexSdkPackageError(`Unable to locate Codex CLI binaries for ${targetTriple}. Ensure ${CODEX_NPM_NAME} is installed with optional dependencies. ${REINSTALL_HINT2}`);
+}
 async function importBundledCodexSdk(moduleRef = import.meta.url) {
   const chatroomCliRoot = resolveChatroomCliRoot2(moduleRef);
   const pinnedVersion = readPinnedSdkVersion2(chatroomCliRoot);
@@ -29887,11 +29952,11 @@ async function importBundledCodexSdk(moduleRef = import.meta.url) {
   if (installedVersion !== pinnedVersion) {
     throw new CodexSdkPackageError(`@openai/codex-sdk@${installedVersion} does not match chatroom-cli pin (${pinnedVersion}). ${REINSTALL_HINT2}`);
   }
-  const entryPath = join8(dirname3(packageJsonPath), "dist", "index.js");
-  if (!existsSync2(entryPath)) {
-    throw new CodexSdkPackageError(`@openai/codex-sdk entry file is missing: ${entryPath}. ${REINSTALL_HINT2}`);
+  const distEntryPath = join8(dirname3(packageJsonPath), "dist", "index.js");
+  if (!existsSync2(distEntryPath)) {
+    throw new CodexSdkPackageError(`@openai/codex-sdk entry file is missing: ${distEntryPath}. ${REINSTALL_HINT2}`);
   }
-  return import(pathToFileURL2(entryPath).href);
+  return import(pathToFileURL2(distEntryPath).href);
 }
 function getBundledCodexSdkVersion(moduleRef = import.meta.url) {
   const chatroomCliRoot = resolveChatroomCliRoot2(moduleRef);
@@ -29908,12 +29973,28 @@ function formatCodexSdkError(err) {
 }
 function formatCodexSdkLoadError(err) {
   if (err instanceof CodexSdkPackageError) {
-    return err.message;
+    const message2 = err.message;
+    if ((message2.includes("Codex CLI") || message2.includes("optional dependencies")) && !message2.includes(REINSTALL_HINT2)) {
+      return `${message2} ${REINSTALL_HINT2}`;
+    }
+    return message2;
+  }
+  const message = err instanceof Error ? err.message : String(err);
+  if (message.includes("Codex CLI") || message.includes("optional dependencies")) {
+    return `${message} ${REINSTALL_HINT2}`;
   }
   return formatCodexSdkError(err);
 }
-var REINSTALL_HINT2 = "Reinstall chatroom-cli: npm install -g chatroom-cli@latest", CodexSdkPackageError;
+var REINSTALL_HINT2 = "Reinstall chatroom-cli: npm install -g chatroom-cli@latest", CODEX_NPM_NAME = "@openai/codex", PLATFORM_PACKAGE_BY_TARGET, CodexSdkPackageError, cachedExecutablePath2;
 var init_codex_sdk_package = __esm(() => {
+  PLATFORM_PACKAGE_BY_TARGET = {
+    "x86_64-unknown-linux-musl": "@openai/codex-linux-x64",
+    "aarch64-unknown-linux-musl": "@openai/codex-linux-arm64",
+    "x86_64-apple-darwin": "@openai/codex-darwin-x64",
+    "aarch64-apple-darwin": "@openai/codex-darwin-arm64",
+    "x86_64-pc-windows-msvc": "@openai/codex-win32-x64",
+    "aarch64-pc-windows-msvc": "@openai/codex-win32-arm64"
+  };
   CodexSdkPackageError = class CodexSdkPackageError extends Error {
     code = "CODEX_SDK_PACKAGE_INCOMPLETE";
     constructor(message) {
@@ -30354,6 +30435,7 @@ var init_codex_sdk_agent_service = __esm(() => {
     async isInstalled() {
       try {
         await loadSdk2();
+        resolveCodexExecutablePath();
         return true;
       } catch (err) {
         console.warn(`[codex-sdk] unavailable: ${formatCodexSdkLoadError(err)}`);
@@ -30697,7 +30779,11 @@ ${options.prompt}`;
       let thread;
       try {
         const { Codex } = await loadSdk2();
-        codex = new Codex({ env: buildCodexEnv(options.resolvedConvexUrl) });
+        const codexPath = resolveCodexExecutablePath();
+        codex = new Codex({
+          codexPathOverride: codexPath,
+          env: buildCodexEnv(options.resolvedConvexUrl)
+        });
         thread = codex.startThread(buildThreadOptions(options.workingDir, variant));
       } catch (err) {
         writeSpawnError2(buildAgentLogPrefix("codex-sdk", context5), err);
@@ -30724,7 +30810,11 @@ ${options.prompt}`;
         const pid = keeper.pid;
         const variant = decodeCodexVariant(options.model ?? stored.model);
         const { Codex } = await loadSdk2();
-        const codex = new Codex({ env: buildCodexEnv(options.resolvedConvexUrl) });
+        const codexPath = resolveCodexExecutablePath();
+        const codex = new Codex({
+          codexPathOverride: codexPath,
+          env: buildCodexEnv(options.resolvedConvexUrl)
+        });
         const thread = codex.resumeThread(stored.harnessSessionId, buildThreadOptions(stored.workingDir, variant));
         return this.startRunningSession({
           pid,
@@ -117714,4 +117804,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=E1D1B59D5776760164756E2164756E21
+//# debugId=E74FDA2AD007D39564756E2164756E21