@trops/dash-core 0.1.62 → 0.1.64

package/dist/electron/index.js

@@ -4844,18 +4844,43 @@ const fs$5 = require$$2;
  */
 let _shellPath$1 = null;
 
+/**
+ * Check if a Node.js major version is compatible (v18, v20, or v22).
+ * Node v24+ has stricter ESM resolution that breaks some MCP packages.
+ */
+function isCompatibleNodeVersion(majorVersion) {
+  return majorVersion >= 18 && majorVersion <= 22;
+}
+
+/**
+ * Detect if an error message indicates Node v24+ ESM incompatibility.
+ */
+function isNodeEsmError(errorText) {
+  if (!errorText) return false;
+  return (
+    errorText.includes("ERR_PACKAGE_PATH_NOT_EXPORTED") ||
+    errorText.includes("ERR_MODULE_NOT_FOUND")
+  );
+}
+
 /**
  * Get the user's full shell PATH (including nvm, homebrew, volta, etc.).
  * Electron GUI apps on macOS don't inherit the shell PATH, so we
  * resolve it once by invoking a login shell.
+ *
+ * On systems where Node v24+ is the default, this will prefer a compatible
+ * nvm-managed Node version (v18/v20/v22) to avoid ESM resolution errors
+ * in MCP packages.
  */
 function getShellPath$1() {
   if (_shellPath$1 !== null) return _shellPath$1;
 
+  const { execSync } = require$$5$2;
   const fallbackDirs = ["/usr/local/bin", "/opt/homebrew/bin"];
 
-  // Add nvm/volta/nodenv paths if available
+  // Scan nvm versions, tracking both latest and best compatible version
   const home = process.env.HOME || "";
+  let compatibleNvmBin = null;
   if (home) {
     fallbackDirs.push(`${home}/.volta/bin`);
     fallbackDirs.push(`${home}/.nodenv/shims`);
@@ -4863,18 +4888,37 @@ function getShellPath$1() {
       const nvmDir = `${home}/.nvm/versions/node`;
       const versions = fs$5.readdirSync(nvmDir).sort();
       if (versions.length > 0) {
+        // Find the highest compatible version (v18/v20/v22)
+        for (let i = versions.length - 1; i >= 0; i--) {
+          const match = versions[i].match(/^v(\d+)/);
+          if (match && isCompatibleNodeVersion(parseInt(match[1], 10))) {
+            compatibleNvmBin = `${nvmDir}/${versions[i]}/bin`;
+            break;
+          }
+        }
+        // Always add the latest nvm version as fallback
         fallbackDirs.push(`${nvmDir}/${versions[versions.length - 1]}/bin`);
       }
     } catch {}
   }
 
   try {
-    const { execSync } = require("child_process");
     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 || "";
@@ -4888,6 +4932,24 @@ function getShellPath$1() {
     }
   }
 
+  // If system Node is v24+, prepend compatible nvm version so it's found first
+  if (compatibleNvmBin) {
+    try {
+      const nodeVersion = execSync(
+        `PATH="${_shellPath$1}" node --version 2>/dev/null`,
+        { encoding: "utf8", timeout: 5000 },
+      ).trim();
+      const majorMatch = nodeVersion.match(/^v(\d+)/);
+      if (majorMatch && !isCompatibleNodeVersion(parseInt(majorMatch[1], 10))) {
+        console.log(
+          `[mcpController] System Node is ${nodeVersion} (incompatible), ` +
+            `prepending compatible nvm path: ${compatibleNvmBin}`,
+        );
+        _shellPath$1 = `${compatibleNvmBin}:${_shellPath$1}`;
+      }
+    } catch {}
+  }
+
   console.log("[mcpController] Resolved PATH:", _shellPath$1);
   return _shellPath$1;
 }
@@ -5090,6 +5152,14 @@ const mcpController$2 = {
           error,
         );
 
+        // Detect Node v24+ ESM compatibility errors and provide actionable message
+        let errorMessage = error.message;
+        if (isNodeEsmError(error.message)) {
+          errorMessage =
+            "This MCP server is incompatible with your system Node.js version. " +
+            "Install Node.js v22 (LTS) using nvm and restart the app.";
+        }
+
         // Mark as error state
         activeServers.set(serverName, {
           client: null,
@@ -5097,12 +5167,12 @@ const mcpController$2 = {
           tools: [],
           resources: [],
           status: STATUS.ERROR,
-          error: error.message,
+          error: errorMessage,
         });
 
         return {
           error: true,
-          message: error.message,
+          message: errorMessage,
           serverName,
           status: STATUS.ERROR,
         };
@@ -5486,6 +5556,16 @@ const mcpController$2 = {
           resolve({ success: true });
         } else {
           const detail = stderr.trim() || stdout.trim() || "";
+          // Detect Node v24+ ESM compatibility errors and provide actionable message
+          if (isNodeEsmError(detail)) {
+            resolve({
+              error: true,
+              message:
+                "This MCP server is incompatible with your system Node.js version. " +
+                "Install Node.js v22 (LTS) using nvm and restart the app.",
+            });
+            return;
+          }
           resolve({
             error: true,
             message: `Auth exited with code ${code}${detail ? ": " + detail : ""}`,