@iletai/nzb 1.2.1 → 1.2.2

package/dist/copilot/mcp-config.js

@@ -1,31 +1,84 @@
-import { readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 let cachedConfig;
 /**
- * Load MCP server configs from ~/.copilot/mcp-config.json.
- * Returns an empty record if the file doesn't exist or is invalid.
- * Only includes entries that have a valid 'type' field.
- * Result is cached — call clearMcpConfigCache() to force a reload.
+ * Detect if running inside WSL.
+ */
+const isWSL = (() => {
+    try {
+        return readFileSync("/proc/version", "utf-8").toLowerCase().includes("microsoft");
+    }
+    catch {
+        return false;
+    }
+})();
+/**
+ * Transform a VS Code MCP server entry for native WSL execution.
+ * Strips `wsl.exe bash -c "..."` wrappers since NZB runs inside WSL directly.
+ * Also resolves `${input:...}` placeholders from environment or strips them.
+ */
+function transformForWSL(entry) {
+    if (!isWSL || entry.type !== "stdio")
+        return entry;
+    const cmd = entry.command;
+    const args = entry.args || [];
+    // Detect wsl.exe wrapper: wsl.exe [bash -c "actual command"]
+    if (cmd === "wsl.exe" || cmd === "wsl") {
+        // Find the actual command inside `bash -c "..."` pattern
+        const bashIdx = args.indexOf("bash");
+        const cIdx = bashIdx >= 0 ? args.indexOf("-c", bashIdx) : -1;
+        if (cIdx >= 0 && args.length > cIdx + 1) {
+            const innerCmd = args[cIdx + 1];
+            // Strip nvm source prefix if present (NZB already has node in PATH)
+            const cleaned = innerCmd
+                .replace(/^source\s+~\/\.nvm\/nvm\.sh\s*&&\s*/, "")
+                .replace(/^source\s+~\/\.nvm\/nvm\.sh\s*;\s*/, "")
+                .trim();
+            return {
+                ...entry,
+                command: "bash",
+                args: ["-c", cleaned],
+            };
+        }
+    }
+    // npx commands referencing Windows paths — convert to Linux
+    if (cmd === "npx") {
+        const fixedArgs = args.map((a) => a.replace(/^([a-zA-Z]):\\/, (_, drive) => `/mnt/${drive.toLowerCase()}/`).replace(/\\/g, "/"));
+        return { ...entry, args: fixedArgs };
+    }
+    return entry;
+}
+/**
+ * Load MCP server configs from ~/.nzb/mcp.json (NZB-specific, priority)
+ * then fall back to ~/.copilot/mcp-config.json (shared with VS Code).
+ * Skips disabled entries. Transforms wsl.exe wrappers for native WSL execution.
  */
 export function loadMcpConfig() {
     if (cachedConfig)
         return cachedConfig;
-    const configPath = join(homedir(), ".copilot", "mcp-config.json");
+    const nzbPath = join(homedir(), ".nzb", "mcp.json");
+    const copilotPath = join(homedir(), ".copilot", "mcp-config.json");
+    const configPath = existsSync(nzbPath) ? nzbPath : copilotPath;
     try {
         const raw = readFileSync(configPath, "utf-8");
         const parsed = JSON.parse(raw);
         if (parsed.mcpServers && typeof parsed.mcpServers === "object") {
-            // Filter out malformed entries — each server must have at least a type
             const servers = {};
             for (const [name, entry] of Object.entries(parsed.mcpServers)) {
-                if (entry && typeof entry === "object" && "type" in entry && typeof entry.type === "string") {
-                    servers[name] = entry;
+                if (!entry || typeof entry !== "object" || !("type" in entry)) {
+                    console.log(`[nzb] Skipping malformed MCP server '${name}'`);
+                    continue;
                 }
-                else {
-                    console.log(`[nzb] Skipping malformed MCP server entry '${name}' (missing or invalid 'type' field)`);
+                const e = entry;
+                if (e.disabled) {
+                    console.log(`[nzb] Skipping disabled MCP server '${name}'`);
+                    continue;
                 }
+                const transformed = transformForWSL(e);
+                servers[name] = transformed;
             }
+            console.log(`[nzb] Loaded ${Object.keys(servers).length} MCP servers from ${configPath}`);
             cachedConfig = servers;
             return servers;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@iletai/nzb",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"description": "NZB — a personal AI assistant for developers, built on the GitHub Copilot SDK",
 	"bin": {
 		"nzb": "dist/cli.js"