fix: prevent empty-string binary paths from breaking CLI spawning and migrate old flat binary path keys

cursoragent · cursoragent · commit f8c9d7118703 · 2026-03-25T21:07:23.000Z
- Guard claude branch in deriveProviderStartOptions on binaryPath being truthy,
  not just the claude object existing (which is always truthy due to schema defaults)
- Use || instead of ?? for binaryPath fallbacks in ClaudeTextGeneration and
  CodexTextGeneration so empty strings correctly fall back to default CLI names
- Add explicit migration of old flat keys (claudeBinaryPath, codexBinaryPath,
  codexHomePath) into the new nested codex/claude objects in
  migrateLocalSettingsToServer
diff --git a/apps/server/src/git/Layers/ClaudeTextGeneration.ts b/apps/server/src/git/Layers/ClaudeTextGeneration.ts
@@ -95,7 +95,7 @@ const makeClaudeTextGeneration = Effect.gen(function* () {
 
       const runClaudeCommand = Effect.gen(function* () {
         const command = ChildProcess.make(
-          claudeSettings?.binaryPath ?? "claude",
+          claudeSettings?.binaryPath || "claude",
           [
             "-p",
             "--output-format",
diff --git a/apps/server/src/git/Layers/CodexTextGeneration.ts b/apps/server/src/git/Layers/CodexTextGeneration.ts
@@ -153,7 +153,7 @@ const makeCodexTextGeneration = Effect.gen(function* () {
         const reasoningEffort =
           modelSelection.options?.reasoningEffort ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
         const command = ChildProcess.make(
-          codexSettings?.binaryPath ?? "codex",
+          codexSettings?.binaryPath || "codex",
           [
             "exec",
             "--ephemeral",
diff --git a/apps/server/src/serverSettings.ts b/apps/server/src/serverSettings.ts
@@ -97,7 +97,7 @@ export function deriveProviderStartOptions(
           },
         }
       : {}),
-    ...(settings.claude
+    ...(settings.claude?.binaryPath
       ? {
           claudeAgent: {
             binaryPath: settings.claude.binaryPath,
diff --git a/apps/web/src/hooks/useSettings.ts b/apps/web/src/hooks/useSettings.ts
@@ -159,6 +159,33 @@ export function migrateLocalSettingsToServer(): void {
       }
     }
 
+    // Migrate old flat binary-path keys into their new nested shape
+    const codexBinaryPath = old["codexBinaryPath"];
+    const codexHomePath = old["codexHomePath"];
+    const claudeBinaryPath = old["claudeBinaryPath"];
+
+    if (
+      (typeof codexBinaryPath === "string" && codexBinaryPath) ||
+      (typeof codexHomePath === "string" && codexHomePath)
+    ) {
+      const existing = (serverPatch["codex"] as Record<string, unknown> | undefined) ?? {};
+      serverPatch["codex"] = {
+        ...existing,
+        ...(typeof codexBinaryPath === "string" && codexBinaryPath
+          ? { binaryPath: codexBinaryPath }
+          : {}),
+        ...(typeof codexHomePath === "string" && codexHomePath ? { homePath: codexHomePath } : {}),
+      };
+    }
+
+    if (typeof claudeBinaryPath === "string" && claudeBinaryPath) {
+      const existing = (serverPatch["claude"] as Record<string, unknown> | undefined) ?? {};
+      serverPatch["claude"] = {
+        ...existing,
+        binaryPath: claudeBinaryPath,
+      };
+    }
+
     if (Object.keys(serverPatch).length > 0) {
       void ensureNativeApi()
         .server.updateSettings(serverPatch as ServerSettingsPatch)

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ const makeClaudeTextGeneration = Effect.gen(function* () {`
`95`	`95`
`96`	`96`	`const runClaudeCommand = Effect.gen(function* () {`
`97`	`97`	`const command = ChildProcess.make(`
`98`		`- claudeSettings?.binaryPath ?? "claude",`
	`98`	`+ claudeSettings?.binaryPath \|\| "claude",`
`99`	`99`	`[`
`100`	`100`	`"-p",`
`101`	`101`	`"--output-format",`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ const makeCodexTextGeneration = Effect.gen(function* () {`
`153`	`153`	`const reasoningEffort =`
`154`	`154`	`modelSelection.options?.reasoningEffort ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;`
`155`	`155`	`const command = ChildProcess.make(`
`156`		`- codexSettings?.binaryPath ?? "codex",`
	`156`	`+ codexSettings?.binaryPath \|\| "codex",`
`157`	`157`	`[`
`158`	`158`	`"exec",`
`159`	`159`	`"--ephemeral",`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ export function deriveProviderStartOptions(`
`97`	`97`	`},`
`98`	`98`	`}`
`99`	`99`	`: {}),`
`100`		`- ...(settings.claude`
	`100`	`+ ...(settings.claude?.binaryPath`
`101`	`101`	`? {`
`102`	`102`	`claudeAgent: {`
`103`	`103`	`binaryPath: settings.claude.binaryPath,`