Merge pull request #56 from closedloop-ai/fix/shell-path-resolution

fix/shell-path-resolution: extract shared shell PATH resolver for CLI spawns

Author: shafty023

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desktop",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "ClosedLoop Desktop",
   "author": "ClosedLoop AI <support@closedloop.ai>",
   "private": true,

apps/desktop/src/server/operations/codex.ts

@@ -4,6 +4,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import type { ServerResponse } from "node:http";
 import type { OperationDispatcher, OperationRequestContext } from "../operation-dispatcher.js";
+import { getShellPath } from "../shell-path.js";
 import { DirectoryNotAllowedError } from "../security.js";
 import { ENGINEER_CHAT_TOOLS, withMcpTools } from "./chat-tools.js";
 import { loadJsonFile, saveJsonFile } from "./chat-history-store.js";
@@ -1158,7 +1159,7 @@ export function registerCodexRoutes(
         stdio: ["pipe", "pipe", "pipe"],
         env: {
           ...process.env,
-          PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`
+          PATH: await getShellPath()
         }
       });
 
@@ -1549,7 +1550,8 @@ function similarityScore(messageA: string, messageB: string, fileA: string, file
   return Math.min(score, 1);
 }
 
-function spawnClaudeReview(cwd: string, model: string): ChildProcess {
+async function spawnClaudeReview(cwd: string, model: string): Promise<ChildProcess> {
+  const shellPath = await getShellPath();
   return spawn(
     "claude",
     [
@@ -1570,7 +1572,7 @@ function spawnClaudeReview(cwd: string, model: string): ChildProcess {
       stdio: ["pipe", "pipe", "pipe"],
       env: {
         ...process.env,
-        PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`
+        PATH: shellPath
       }
     }
   );
@@ -1587,7 +1589,7 @@ async function resolveClaudeReviewProcess(
   prNum: string,
   logPath: string
 ): Promise<ChildProcess> {
-  const first = spawnClaudeReview(cwd, model);
+  const first = await spawnClaudeReview(cwd, model);
   first.stdin?.write("/code-review:start");
   first.stdin?.end();
 
@@ -1659,7 +1661,7 @@ async function resolveClaudeReviewProcess(
   // Skill exited without producing review content — fall back to /review <prNum>
   await fs.writeFile(logPath, "", "utf-8");
 
-  const fallback = spawnClaudeReview(cwd, model);
+  const fallback = await spawnClaudeReview(cwd, model);
   fallback.stdin?.write(`/review ${prNum}`);
   fallback.stdin?.end();
   return fallback;
@@ -2085,12 +2087,13 @@ async function waitForExit(child: ChildProcess): Promise<number> {
 }
 
 async function runCommand(command: string, args: string[]): Promise<string> {
+  const shellPath = await getShellPath();
   return await new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       stdio: ["ignore", "pipe", "pipe"],
       env: {
         ...process.env,
-        PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`
+        PATH: shellPath
       }
     });
 
@@ -2369,11 +2372,12 @@ function runCodexVerdict(worktreeDir: string, sessionId: string): Promise<string
   );
 }
 
-function runClaudeVerdict(worktreeDir: string, sessionId: string): Promise<string> {
+async function runClaudeVerdict(worktreeDir: string, sessionId: string): Promise<string> {
+  const shellPath = await getShellPath();
   return runVerdictProcess(
     "claude",
     ["-p", "--resume", sessionId, "--output-format", "stream-json", "--model", "sonnet", "--allowedTools", "Read,Glob,Grep"],
-    { cwd: worktreeDir, stdin: VERDICT_PROMPT, env: { PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin` } },
+    { cwd: worktreeDir, stdin: VERDICT_PROMPT, env: { PATH: shellPath } },
     extractClaudeVerdictLine
   );
 }

apps/desktop/src/server/operations/deploy.ts

@@ -4,6 +4,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import net from "node:net";
 import type { OperationDispatcher, OperationRequestContext } from "../operation-dispatcher.js";
+import { getShellPath } from "../shell-path.js";
 import { DirectoryNotAllowedError, assertPathAllowed } from "../security.js";
 import {
   loadReposConfig,
@@ -97,7 +98,7 @@ export function registerDeployRoutes(
     copyEnvLocalFiles(expandedRepoPath, expandedWorktreePath).catch(() => undefined);
 
     const spawnEnv: NodeJS.ProcessEnv = {
-      PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`,
+      PATH: await getShellPath(),
       HOME: process.env.HOME,
       USER: process.env.USER,
       SHELL: process.env.SHELL ?? "/bin/bash",
@@ -304,7 +305,7 @@ export function registerDeployRoutes(
     }
 
     if (deployConfig?.teardownCommand) {
-      if (runTeardownCommand(deployConfig.teardownCommand, expandedWorktreePath)) {
+      if (await runTeardownCommand(deployConfig.teardownCommand, expandedWorktreePath)) {
         json(context, 200, { success: true });
         return;
       }
@@ -875,7 +876,7 @@ function killByPort(port: number): "killed" | "none" | "error" {
   }
 }
 
-function runTeardownCommand(command: string, worktreePath: string): boolean {
+async function runTeardownCommand(command: string, worktreePath: string): Promise<boolean> {
   try {
     execSync(command, {
       cwd: worktreePath,
@@ -884,7 +885,7 @@ function runTeardownCommand(command: string, worktreePath: string): boolean {
       stdio: "pipe",
       env: {
         ...process.env,
-        PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`
+        PATH: await getShellPath()
       }
     });
     return true;

apps/desktop/src/server/operations/git-pr.ts

@@ -1,6 +1,7 @@
 import { execFile, spawn, spawnSync } from "node:child_process";
 import { promisify } from "node:util";
 import type { OperationDispatcher, OperationRequestContext } from "../operation-dispatcher.js";
+import { getShellPath } from "../shell-path.js";
 import { DirectoryNotAllowedError } from "../security.js";
 import { assertRepoAllowed } from "./symphony-utils.js";
 
@@ -298,7 +299,7 @@ export function registerGitPrRoutes(
           {
             cwd,
             encoding: "utf-8",
-            env: withPathEnv()
+            env: await withPathEnv()
           }
         );
 
@@ -772,7 +773,7 @@ async function runRead(
   const { stdout } = await execFileAsync(command, args, {
     cwd,
     encoding: "utf-8",
-    env: withPathEnv()
+    env: await withPathEnv()
   });
   return stdout.trim();
 }
@@ -781,26 +782,27 @@ async function run(cwd: string | undefined, command: string, args: string[]): Pr
   await execFileAsync(command, args, {
     cwd,
     encoding: "utf-8",
-    env: withPathEnv()
+    env: await withPathEnv()
   });
 }
 
-function withPathEnv(): NodeJS.ProcessEnv {
+async function withPathEnv(): Promise<NodeJS.ProcessEnv> {
   return {
     ...process.env,
-    PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`
+    PATH: await getShellPath()
   };
 }
 
-function ghApiViaStdin(
+async function ghApiViaStdin(
   apiPath: string,
   payload: Record<string, unknown>,
   cwd: string
 ): Promise<{ stdout: string; stderr: string }> {
+  const env = await withPathEnv();
   return new Promise((resolve, reject) => {
     const process = spawn("gh", ["api", apiPath, "--method", "POST", "--input", "-"], {
       cwd,
-      env: withPathEnv()
+      env
     });
 
     let stdout = "";
@@ -828,15 +830,16 @@ function ghApiViaStdin(
   });
 }
 
-function ghPrCommentViaStdin(
+async function ghPrCommentViaStdin(
   args: string[],
   body: string,
   cwd: string
 ): Promise<{ stdout: string; stderr: string }> {
+  const env = await withPathEnv();
   return new Promise((resolve, reject) => {
     const process = spawn("gh", [...args, "--body-file", "-"], {
       cwd,
-      env: withPathEnv()
+      env
     });
 
     let stdout = "";

apps/desktop/src/server/operations/health-check.ts

@@ -3,6 +3,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { promisify } from "node:util";
 import type { OperationDispatcher, OperationRequestContext } from "../operation-dispatcher.js";
+import { getShellPath } from "../shell-path.js";
 import { isPluginInstalled } from "./plugin-cache.js";
 import type { ProcessManager } from "../process-manager.js";
 
@@ -55,30 +56,6 @@ export function registerHealthCheckRoutes(
   });
 }
 
-/**
- * Resolve the user's login-shell PATH.
- * Electron on macOS inherits a minimal PATH that excludes /opt/homebrew/bin,
- * nvm paths, etc.  Spawning the user's shell with -ilc gives us the real PATH.
- */
-let resolvedPathPromise: Promise<string> | undefined;
-async function getShellPath(): Promise<string> {
-  if (resolvedPathPromise) {
-    return resolvedPathPromise;
-  }
-  resolvedPathPromise = (async () => {
-    try {
-      const shell = process.env.SHELL || "/bin/zsh";
-      const { stdout } = await execFileAsync(shell, ["-ilc", "echo $PATH"], {
-        timeout: 3000,
-      });
-      return stdout.trim();
-    } catch {
-      return `${process.env.PATH ?? ""}:/opt/homebrew/bin:/usr/local/bin`;
-    }
-  })();
-  return resolvedPathPromise;
-}
-
 async function runCommand(_processManager: ProcessManager, cmd: string, args: string[]): Promise<string> {
   const shellPath = await getShellPath();
   const { stdout } = await execFileAsync(cmd, args, {

apps/desktop/src/server/operations/learnings.ts

@@ -4,6 +4,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import type { OperationDispatcher, OperationRequestContext } from "../operation-dispatcher.js";
+import { getShellPath } from "../shell-path.js";
 import { findPluginScript } from "./plugin-cache.js";
 import { DirectoryNotAllowedError, assertPathAllowed } from "../security.js";
 import { assertRepoAllowed, findFirstExisting, resolveWorktreeDir } from "./symphony-utils.js";
@@ -275,7 +276,7 @@ export function registerLearningsRoutes(
         cwd: worktreeDir,
         env: {
           ...process.env,
-          PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`,
+          PATH: await getShellPath(),
           CLOSEDLOOP_WORKDIR: claudeWorkDir
         }
       });
@@ -413,7 +414,7 @@ export function registerLearningsRoutes(
     });
 
     await fs.appendFile(outcomesPath, `${lines.join("\n")}\n`, "utf-8");
-    triggerSuccessRateComputation(claudeWorkDir);
+    void triggerSuccessRateComputation(claudeWorkDir);
 
     json(context, 200, {
       status: "recorded",
@@ -439,7 +440,7 @@ function parseToon(content: string): ParsedLearningPattern[] {
   });
 }
 
-function triggerSuccessRateComputation(workDir: string): void {
+async function triggerSuccessRateComputation(workDir: string): Promise<void> {
   const runLoopPath = findPluginScript("code", "run-loop.sh");
   if (!runLoopPath) {
     return;
@@ -451,12 +452,13 @@ function triggerSuccessRateComputation(workDir: string): void {
     return;
   }
 
+  const shellPath = await getShellPath();
   const child = spawn("python3", [ratesScript, "--workdir", workDir], {
     stdio: "ignore",
     detached: true,
     env: {
       ...process.env,
-      PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`
+      PATH: shellPath
     }
   });
   child.unref();

apps/desktop/src/server/operations/run-viewer-chat.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 import type { ServerResponse } from "node:http";
 import type { OperationDispatcher, OperationRequestContext } from "../operation-dispatcher.js";
 import type { ProcessManager } from "../process-manager.js";
+import { getShellEnv } from "../shell-path.js";
 import { DirectoryNotAllowedError, assertPathAllowed } from "../security.js";
 import { loadJsonFile, saveJsonFile } from "./chat-history-store.js";
 import { READONLY_CODEBASE_TOOLS, WEB_ONLY_TOOLS } from "./chat-tools.js";
@@ -83,6 +84,8 @@ export function registerRunViewerChatRoutes(
     setStreamingHeaders(context.response);
     writeEvent(context.response, { type: "status", status: "spawning", mode: "claude" });
 
+    const shellEnv = await getShellEnv();
+
     await new Promise<void>((resolve) => {
       const streamState = createStreamState(async (sessionId) => {
         if (!history.claudeSessionId) {
@@ -127,6 +130,7 @@ export function registerRunViewerChatRoutes(
               : [])
           ],
           cwd: validatedRunDir ?? os.homedir(),
+          env: shellEnv,
           input: prompt,
           onLine: (line) => {
             try {

apps/desktop/src/server/operations/symphony-interactive.ts

@@ -7,6 +7,7 @@ import type {
   OperationDispatcher,
   OperationRequestContext,
 } from "../operation-dispatcher.js";
+import { getShellPath } from "../shell-path.js";
 import { assertPathAllowed, DirectoryNotAllowedError } from "../security.js";
 import { loadJsonFile, saveJsonFile } from "./chat-history-store.js";
 import { ENGINEER_CHAT_TOOLS, withMcpTools } from "./chat-tools.js";
@@ -702,7 +703,7 @@ export function registerSymphonyInteractiveRoutes(
             env: {
               ...process.env,
               CLOSEDLOOP_WORKDIR: claudeWorkDir,
-              PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`,
+              PATH: await getShellPath(),
             },
           });
           child.unref();
@@ -774,7 +775,7 @@ async function streamClaudeChat(options: {
         stdio: ["pipe", "pipe", "pipe"],
         env: {
           ...process.env,
-          PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`,
+          PATH: await getShellPath(),
         },
       }
     );
@@ -990,11 +991,12 @@ function getGitDiff(worktreeDir: string): string {
   }
 }
 
-function generateCommitWithClaude(
+async function generateCommitWithClaude(
   worktreeDir: string,
   ticketId: string,
   diff: string
 ): Promise<{ title: string; description: string }> {
+  const shellPath = await getShellPath();
   return new Promise((resolve, reject) => {
     const prompt = [
       `Generate a git commit message for ticket ${ticketId}.`,
@@ -1015,7 +1017,7 @@ function generateCommitWithClaude(
       stdio: ["ignore", "pipe", "pipe"],
       env: {
         ...process.env,
-        PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`,
+        PATH: shellPath,
       },
     });