@trops/dash-core 0.1.50 → 0.1.52

package/dist/electron/index.js

@@ -4828,6 +4828,25 @@ let _shellPath$1 = null;
 function getShellPath$1() {
   if (_shellPath$1 !== null) return _shellPath$1;
 
+  const fallbackDirs = [
+    "/usr/local/bin",
+    "/opt/homebrew/bin",
+  ];
+
+  // Add nvm/volta/nodenv paths if available
+  const home = process.env.HOME || "";
+  if (home) {
+    fallbackDirs.push(`${home}/.volta/bin`);
+    fallbackDirs.push(`${home}/.nodenv/shims`);
+    try {
+      const nvmDir = `${home}/.nvm/versions/node`;
+      const versions = fs$5.readdirSync(nvmDir).sort();
+      if (versions.length > 0) {
+        fallbackDirs.push(`${nvmDir}/${versions[versions.length - 1]}/bin`);
+      }
+    } catch {}
+  }
+
   try {
     const { execSync } = require("child_process");
     const shell = process.env.SHELL || "/bin/bash";
@@ -4835,10 +4854,20 @@ function getShellPath$1() {
       encoding: "utf8",
       timeout: 5000,
     });
-  } catch {
+  } catch (err) {
+    console.warn("[mcpController] Failed to resolve shell PATH:", err.message);
     _shellPath$1 = process.env.PATH || "";
   }
 
+  // Append fallback dirs that aren't already present
+  const currentPaths = _shellPath$1.split(":");
+  for (const dir of fallbackDirs) {
+    if (!currentPaths.includes(dir)) {
+      _shellPath$1 += `:${dir}`;
+    }
+  }
+
+  console.log("[mcpController] Resolved PATH:", _shellPath$1);
   return _shellPath$1;
 }
 
@@ -8348,6 +8377,17 @@ const {
   LLM_STREAM_ERROR,
 } = llmEvents$1;
 
+let _nextListenerId = 0;
+const _listenerMap = new Map();
+
+function _addListener(channel, callback) {
+    const id = String(++_nextListenerId);
+    const wrapped = (_event, data) => callback(data);
+    ipcRenderer$2.on(channel, wrapped);
+    _listenerMap.set(id, { channel, wrapped });
+    return id;
+}
+
 const llmApi$2 = {
   /**
    * sendMessage
@@ -8417,84 +8457,40 @@ const llmApi$2 = {
     ipcRenderer$2.invoke(LLM_CLI_END_SESSION, { widgetUuid }),
 
   // --- Stream event listeners ---
-  // Each on* method returns the wrapped callback so callers can remove
-  // their own listener without nuking listeners from other widgets.
+  // Each on* method returns an opaque string ID. Strings cross the
+  // contextBridge safely (unlike function refs which get proxied).
+  // Use removeStreamListener(id) to clean up.
 
-  /**
-   * onStreamDelta
-   * Listen for text chunks as they stream in.
-   * @returns {Function} wrapped callback for use with removeStreamListener
-   */
-  onStreamDelta: (callback) => {
-    const wrapped = (_event, data) => callback(data);
-    ipcRenderer$2.on(LLM_STREAM_DELTA, wrapped);
-    return wrapped;
-  },
+  /** @returns {string} listener ID */
+  onStreamDelta: (callback) => _addListener(LLM_STREAM_DELTA, callback),
 
-  /**
-   * onStreamToolCall
-   * Listen for tool call notifications.
-   * @returns {Function} wrapped callback for use with removeStreamListener
-   */
-  onStreamToolCall: (callback) => {
-    const wrapped = (_event, data) => callback(data);
-    ipcRenderer$2.on(LLM_STREAM_TOOL_CALL, wrapped);
-    return wrapped;
-  },
+  /** @returns {string} listener ID */
+  onStreamToolCall: (callback) => _addListener(LLM_STREAM_TOOL_CALL, callback),
 
-  /**
-   * onStreamToolResult
-   * Listen for tool result notifications.
-   * @returns {Function} wrapped callback for use with removeStreamListener
-   */
-  onStreamToolResult: (callback) => {
-    const wrapped = (_event, data) => callback(data);
-    ipcRenderer$2.on(LLM_STREAM_TOOL_RESULT, wrapped);
-    return wrapped;
-  },
+  /** @returns {string} listener ID */
+  onStreamToolResult: (callback) =>
+    _addListener(LLM_STREAM_TOOL_RESULT, callback),
 
-  /**
-   * onStreamComplete
-   * Listen for stream completion (final response).
-   * @returns {Function} wrapped callback for use with removeStreamListener
-   */
-  onStreamComplete: (callback) => {
-    const wrapped = (_event, data) => callback(data);
-    ipcRenderer$2.on(LLM_STREAM_COMPLETE, wrapped);
-    return wrapped;
-  },
+  /** @returns {string} listener ID */
+  onStreamComplete: (callback) => _addListener(LLM_STREAM_COMPLETE, callback),
 
-  /**
-   * onStreamError
-   * Listen for stream errors.
-   * @returns {Function} wrapped callback for use with removeStreamListener
-   */
-  onStreamError: (callback) => {
-    const wrapped = (_event, data) => callback(data);
-    ipcRenderer$2.on(LLM_STREAM_ERROR, wrapped);
-    return wrapped;
-  },
+  /** @returns {string} listener ID */
+  onStreamError: (callback) => _addListener(LLM_STREAM_ERROR, callback),
 
   /**
    * removeStreamListener
-   * Remove a specific stream listener by channel and callback reference.
+   * Remove a specific stream listener by its opaque ID.
    *
-   * @param {string} channel - the IPC channel name
-   * @param {Function} wrapped - the callback returned by on*
-   */
-  removeStreamListener: (channel, wrapped) => {
-    ipcRenderer$2.removeListener(channel, wrapped);
-  },
-
-  /**
-   * Stream channel constants for use with removeStreamListener.
+   * @param {string} idOrChannel - listener ID (or legacy channel name when second arg is provided)
+   * @param {string} [id] - listener ID when called with legacy (channel, id) signature
    */
-  streamChannels: {
-    delta: LLM_STREAM_DELTA,
-    toolCall: LLM_STREAM_TOOL_CALL,
-    toolResult: LLM_STREAM_TOOL_RESULT,
-    complete: LLM_STREAM_COMPLETE,
-    error: LLM_STREAM_ERROR,
+  removeStreamListener: (idOrChannel, id) => {
+    const listenerId = id !== undefined ? String(id) : String(idOrChannel);
+    const entry = _listenerMap.get(listenerId);
+    if (entry) {
+      ipcRenderer$2.removeListener(entry.channel, entry.wrapped);
+      _listenerMap.delete(listenerId);
+    }
   },
 
   /**
@@ -8503,6 +8499,10 @@ const llmApi$2 = {
    * Prefer removeStreamListener for scoped cleanup.
    */
   removeAllStreamListeners: () => {
+    for (const [, entry] of _listenerMap) {
+      ipcRenderer$2.removeListener(entry.channel, entry.wrapped);
+    }
+    _listenerMap.clear();
     ipcRenderer$2.removeAllListeners(LLM_STREAM_DELTA);
     ipcRenderer$2.removeAllListeners(LLM_STREAM_TOOL_CALL);
     ipcRenderer$2.removeAllListeners(LLM_STREAM_TOOL_RESULT);