Merge branch 'main' of github.com:OpenAgentPlatform/Dive

Author: johnfunmula

electron/main/index.ts

@@ -5,7 +5,7 @@ import path from "node:path"
 import os from "node:os"
 import AppState from "./state"
 import { cleanup, initMCPClient } from "./service"
-import { getNvmPath, modifyPath } from "./util"
+import { getDarwinSystemPath, getNvmPath, modifyPath } from "./util"
 import { binDirList, darwinPathList } from "./constant"
 import { update } from "./update"
 import { ipcHandler } from "./ipc"
@@ -57,6 +57,10 @@ async function onReady() {
   if (process.platform === "win32") {
     binDirList.forEach(modifyPath)
   } else if (process.platform === "darwin") {
+    if (!process.env.PATH) {
+      process.env.PATH = await getDarwinSystemPath().catch(() => "")
+    }
+
     darwinPathList.forEach(modifyPath)
 
     const nvmPath = getNvmPath()

electron/main/util.ts

@@ -3,6 +3,7 @@ import path from "node:path"
 import { spawn } from "cross-spawn"
 import { app } from "electron"
 import fse from "fs-extra"
+import { exec } from "node:child_process"
 
 export function isPortInUse(port: number): Promise<boolean> {
   return new Promise((resolve) => {
@@ -116,3 +117,15 @@ export function compareFilesAndReplace(filePath1: string, filePath2: string) {
     fse.copyFileSync(filePath1, filePath2)
   }
 }
+
+export function getDarwinSystemPath(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    exec("echo $PATH", (error, stdout, stderr) => {
+      if (error) {
+        reject(error)
+        return
+      }
+      resolve(stdout.trim())
+    })
+  })
+}