From 102c216d601adf5905e6b5fd4a85c888b180a0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihai=20-=20Alexandru=20Chindri=C8=99?=
 <mihai@Mihais-MacBook-Pro.local>
Date: Fri, 13 Mar 2026 15:45:56 +0200
Subject: [PATCH] fix: fall back to PATH when codex binary missing

---
 apps/server/src/codexAppServerManager.ts | 34 +++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/apps/server/src/codexAppServerManager.ts b/apps/server/src/codexAppServerManager.ts
index a8a8ce460..c9cf7f9ea 100644
--- a/apps/server/src/codexAppServerManager.ts
+++ b/apps/server/src/codexAppServerManager.ts
@@ -541,10 +541,9 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
       };
 
       const codexOptions = readCodexProviderOptions(input);
-      const codexBinaryPath = codexOptions.binaryPath ?? "codex";
       const codexHomePath = codexOptions.homePath;
-      this.assertSupportedCodexCliVersion({
-        binaryPath: codexBinaryPath,
+      const codexBinaryPath = resolveCodexBinaryPath({
+        binaryPath: codexOptions.binaryPath ?? "codex",
         cwd: resolvedCwd,
         ...(codexHomePath ? { homePath: codexHomePath } : {}),
       });
@@ -1566,6 +1565,35 @@ function assertSupportedCodexCliVersion(input: {
   }
 }
 
+function resolveCodexBinaryPath(input: {
+  readonly binaryPath: string;
+  readonly cwd: string;
+  readonly homePath?: string;
+}): string {
+  try {
+    assertSupportedCodexCliVersion(input);
+    return input.binaryPath;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (
+      input.binaryPath !== "codex" &&
+      message.includes("is not installed or not executable")
+    ) {
+      assertSupportedCodexCliVersion({
+        binaryPath: "codex",
+        cwd: input.cwd,
+        ...(input.homePath ? { homePath: input.homePath } : {}),
+      });
+      console.warn(
+        "codex cli binary path not executable; falling back to PATH lookup",
+        { binaryPath: input.binaryPath },
+      );
+      return "codex";
+    }
+    throw error;
+  }
+}
+
 function readResumeCursorThreadId(resumeCursor: unknown): string | undefined {
   if (!resumeCursor || typeof resumeCursor !== "object" || Array.isArray(resumeCursor)) {
     return undefined;