@trops/dash-core 0.1.63 → 0.1.65

package/dist/electron/index.js

@@ -4904,10 +4904,21 @@ function getShellPath$1() {
 
   try {
     const shell = process.env.SHELL || "/bin/bash";
-    _shellPath$1 = execSync(`${shell} -ilc 'echo -n "$PATH"'`, {
-      encoding: "utf8",
-      timeout: 5000,
-    });
+    const marker = "__DASH_PATH__";
+    const raw = execSync(
+      `${shell} -ilc 'echo "${marker}$PATH${marker}"'`,
+      { encoding: "utf8", timeout: 5000 },
+    );
+    // Extract PATH between markers, stripping session restore noise
+    const startIdx = raw.indexOf(marker);
+    const endIdx = raw.lastIndexOf(marker);
+    if (startIdx !== -1 && endIdx > startIdx) {
+      _shellPath$1 = raw
+        .substring(startIdx + marker.length, endIdx)
+        .replace(/[\r\n]/g, "");
+    } else {
+      _shellPath$1 = process.env.PATH || "";
+    }
   } catch (err) {
     console.warn("[mcpController] Failed to resolve shell PATH:", err.message);
     _shellPath$1 = process.env.PATH || "";
@@ -4943,6 +4954,21 @@ function getShellPath$1() {
   return _shellPath$1;
 }
 
+/**
+ * Create a clean environment for MCP child processes.
+ * Strips npm_* and ELECTRON_* vars that would force the child
+ * to use Electron's or npm's Node binary instead of the PATH one.
+ */
+function cleanEnvForChildProcess() {
+  const env = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (key.startsWith("npm_") || key.startsWith("ELECTRON_")) continue;
+    env[key] = value;
+  }
+  env.PATH = getShellPath$1();
+  return env;
+}
+
 /**
  * Active MCP server connections
  * Map<string, { client: Client, transport: Transport, tools: Array, status: string }>
@@ -5055,10 +5081,7 @@ const mcpController$2 = {
           });
         } else {
           // stdio transport (default) - spawn a local child process
-          const env = { ...process.env };
-          // Ensure full shell PATH is available (Electron GUI apps
-          // on macOS don't inherit nvm/homebrew paths)
-          env.PATH = getShellPath$1();
+          const env = cleanEnvForChildProcess();
           if (mcpConfig.envMapping && credentials) {
             Object.entries(mcpConfig.envMapping).forEach(
               ([envVar, credentialKey]) => {
@@ -5499,7 +5522,7 @@ const mcpController$2 = {
   runAuth: async (win, mcpConfig, credentials, authCommand) => {
     const { spawn } = require$$5$2;
 
-    const env = { ...process.env, PATH: getShellPath$1() };
+    const env = cleanEnvForChildProcess();
 
     // Inject credentials as env vars using the same envMapping as startServer
     if (mcpConfig?.envMapping && credentials) {