@trops/dash-core 0.1.79 → 0.1.81

package/dist/electron/index.js

@@ -4568,7 +4568,12 @@ function requireProviderController () {
 	      // Load MCP catalog for merging new config fields into saved providers
 	      let catalog = [];
 	      try {
-	        const catalogPath = path.join(__dirname, "..", "mcp", "mcpServerCatalog.json");
+	        const catalogPath = path.join(
+	          __dirname,
+	          "..",
+	          "mcp",
+	          "mcpServerCatalog.json",
+	        );
 	        if (existsSync(catalogPath)) {
 	          const catalogData = JSON.parse(readFileSync(catalogPath, "utf-8"));
 	          catalog = catalogData.servers || [];
@@ -4602,9 +4607,12 @@ function requireProviderController () {
 	            // (providers snapshot mcpConfig at creation time; this ensures
 	            // existing providers pick up new catalog features like argsMapping)
 	            if (!data.mcpConfig.argsMapping && data.type) {
-	              const catalogEntry = catalog.find((entry) => entry.id === data.type);
+	              const catalogEntry = catalog.find(
+	                (entry) => entry.id === data.type,
+	              );
 	              if (catalogEntry?.mcpConfig?.argsMapping) {
-	                provider.mcpConfig.argsMapping = catalogEntry.mcpConfig.argsMapping;
+	                provider.mcpConfig.argsMapping =
+	                  catalogEntry.mcpConfig.argsMapping;
 	              }
 	            }
 	          }
@@ -5168,6 +5176,30 @@ const mcpController$2 = {
           await mcpController$2.stopServer(win, serverName);
         }
 
+        // Merge with catalog entry to pick up updated command/args
+        // (saved provider config may reference a stale or archived package)
+        try {
+          const { catalog } = mcpController$2.getCatalog(win);
+          const catalogEntry = (catalog || []).find(
+            (entry) => entry.name === serverName,
+          );
+          if (catalogEntry?.mcpConfig) {
+            const cat = catalogEntry.mcpConfig;
+            if (cat.command) mcpConfig.command = cat.command;
+            if (cat.args) mcpConfig.args = [...cat.args];
+            if (cat.staticEnv) mcpConfig.staticEnv = cat.staticEnv;
+            if (cat.tokenRefresh) mcpConfig.tokenRefresh = cat.tokenRefresh;
+            if (cat.envMapping) {
+              mcpConfig.envMapping = {
+                ...mcpConfig.envMapping,
+                ...cat.envMapping,
+              };
+            }
+          }
+        } catch (catalogErr) {
+          // Non-fatal: proceed with saved config if catalog lookup fails
+        }
+
         console.log(
           `[mcpController] Starting server: ${serverName} (transport: ${
             mcpConfig.transport || "stdio"
@@ -5739,8 +5771,16 @@ const mcpController$2 = {
       });
     }
 
+    // Interpolate {{MCP_DIR}} in authCommand args (same as startServer)
+    const mcpDir = path$6.join(__dirname, "..", "mcp");
+    const resolvedArgs = (authCommand.args || []).map((arg) =>
+      typeof arg === "string" && arg.includes("{{MCP_DIR}}")
+        ? arg.replace(/\{\{MCP_DIR\}\}/g, mcpDir)
+        : arg,
+    );
+
     return new Promise((resolve) => {
-      const proc = spawn(authCommand.command, authCommand.args || [], {
+      const proc = spawn(authCommand.command, resolvedArgs, {
         env,
         stdio: ["ignore", "pipe", "pipe"],
       });
@@ -8783,11 +8823,11 @@ 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 id = String(++_nextListenerId);
+  const wrapped = (_event, data) => callback(data);
+  ipcRenderer$2.on(channel, wrapped);
+  _listenerMap.set(id, { channel, wrapped });
+  return id;
 }
 
 const llmApi$2 = {
@@ -10080,9 +10120,7 @@ var dynamicWidgetLoaderExports = dynamicWidgetLoader$2.exports;
 	        try {
 	          const head = fs.readFileSync(candidate, "utf8").slice(0, 256);
 	          if (/^\s*(import\s|export\s)/m.test(head)) {
-	            console.log(
-	              `[WidgetRegistry] Skipping ESM bundle: ${candidate}`,
-	            );
+	            console.log(`[WidgetRegistry] Skipping ESM bundle: ${candidate}`);
 	            continue;
 	          }
 	        } catch (_) {