mobbdev 1.0.184 → 1.0.185

package/dist/index.mjs

@@ -13357,52 +13357,119 @@ var gitInfo = {
   name: runCommand("git config user.name"),
   email: runCommand("git config user.email")
 };
-var getMCPConfigPath = (hostName) => {
+var getClaudeWorkspacePaths = () => {
   const home = os3.homedir();
+  const claudeIdePath = path11.join(home, ".claude", "ide");
+  const workspacePaths = [];
+  if (!fs10.existsSync(claudeIdePath)) {
+    return workspacePaths;
+  }
+  try {
+    const lockFiles = fs10.readdirSync(claudeIdePath).filter((file) => file.endsWith(".lock"));
+    for (const lockFile of lockFiles) {
+      const lockFilePath = path11.join(claudeIdePath, lockFile);
+      try {
+        const lockContent = JSON.parse(fs10.readFileSync(lockFilePath, "utf8"));
+        if (lockContent.workspaceFolders && Array.isArray(lockContent.workspaceFolders)) {
+          workspacePaths.push(...lockContent.workspaceFolders);
+        }
+      } catch (error) {
+        logWarn(
+          `[UsageService] Failed to read Claude lock file: ${lockFilePath}`
+        );
+      }
+    }
+  } catch (error) {
+    logWarn(
+      `[UsageService] Failed to read Claude IDE directory: ${claudeIdePath}`
+    );
+  }
+  return workspacePaths;
+};
+var getMCPConfigPaths = (hostName) => {
+  const home = os3.homedir();
+  const currentDir = process.env["WORKSPACE_FOLDER_PATHS"] || process.env["PWD"] || process.cwd();
   switch (hostName.toLowerCase()) {
     case "cursor":
-      return path11.join(home, ".cursor", "mcp.json");
+      return [
+        path11.join(currentDir, ".cursor", "mcp.json"),
+        // local first
+        path11.join(home, ".cursor", "mcp.json")
+      ];
     case "windsurf":
-      return path11.join(home, ".codeium", "windsurf", "mcp_config.json");
+      return [
+        path11.join(currentDir, ".codeium", "mcp_config.json"),
+        // local first
+        path11.join(home, ".codeium", "windsurf", "mcp_config.json")
+      ];
     case "webstorm":
-      return "";
+      return [];
     case "visualstudiocode":
     case "vscode":
-      return process.platform === "win32" ? path11.join(home, "AppData", "Roaming", "Code", "User", "mcp.json") : path11.join(
-        home,
-        "Library",
-        "Application Support",
-        "Code",
-        "User",
-        "mcp.json"
-      );
-    case "claude":
-      return path11.join(home, ".claude.json");
+      return [
+        path11.join(currentDir, ".vscode", "mcp.json"),
+        // local first
+        process.platform === "win32" ? path11.join(home, "AppData", "Roaming", "Code", "User", "mcp.json") : path11.join(
+          home,
+          "Library",
+          "Application Support",
+          "Code",
+          "User",
+          "mcp.json"
+        )
+      ];
+    case "claude": {
+      const claudePaths = [
+        path11.join(currentDir, ".claude.json"),
+        // local first
+        path11.join(home, ".claude.json")
+      ];
+      const workspacePaths = getClaudeWorkspacePaths();
+      for (const workspacePath of workspacePaths) {
+        claudePaths.push(path11.join(workspacePath, ".mcp.json"));
+      }
+      return claudePaths;
+    }
     default:
       throw new Error(`Unknown hostName: ${hostName}`);
   }
 };
-var readMCPConfig = (hostName) => {
-  const filePath = getMCPConfigPath(hostName);
+var readConfigFile = (filePath) => {
   if (!fs10.existsSync(filePath)) return null;
-  const config4 = JSON.parse(fs10.readFileSync(filePath, "utf8"));
-  if (hostName === "claude" && config4.projects) {
-    const allMcpServers = {};
-    for (const projectPath in config4.projects) {
-      const project = config4.projects[projectPath];
-      if (project?.mcpServers) {
-        for (const [serverName, serverConfig] of Object.entries(
-          project.mcpServers
-        )) {
-          allMcpServers[serverName] = serverConfig;
+  try {
+    return JSON.parse(fs10.readFileSync(filePath, "utf8"));
+  } catch (error) {
+    logWarn(`[UsageService] Failed to read MCP config: ${filePath}`);
+    return null;
+  }
+};
+var readMCPConfig = (hostName) => {
+  const configPaths = getMCPConfigPaths(hostName);
+  const mergedConfig = {};
+  for (const configPath of configPaths) {
+    const config4 = readConfigFile(configPath);
+    if (hostName === "claude" && config4?.projects) {
+      const allMcpServers = {};
+      for (const projectPath in config4.projects) {
+        const project = config4.projects[projectPath];
+        if (project?.mcpServers) {
+          Object.assign(allMcpServers, project.mcpServers);
         }
       }
+      mergedConfig.mcpServers = { ...mergedConfig.mcpServers, ...allMcpServers };
+      continue;
+    }
+    if (config4?.mcpServers) {
+      mergedConfig.mcpServers = {
+        ...mergedConfig.mcpServers,
+        ...config4.mcpServers
+      };
+    }
+    if (config4?.servers) {
+      mergedConfig.servers = { ...mergedConfig.servers, ...config4.servers };
     }
-    return {
-      mcpServers: allMcpServers
-    };
   }
-  return config4;
+  return Object.keys(mergedConfig).length > 0 ? mergedConfig : null;
 };
 var getRunningProcesses = () => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "1.0.184",
+  "version": "1.0.185",
   "description": "Automated secure code remediation tool",
   "repository": "git+https://github.com/mobb-dev/bugsy.git",
   "main": "dist/index.mjs",