fix: install wizard uses code --add-mcp + profile patching (v0.2.5)

- Rewrite install.ts to use VS Code native --add-mcp CLI flag
- Fix Windows: route through cmd.exe /c for .cmd batch files
- Patch custom VS Code profiles (--add-mcp only covers default)
- Update README with npx mcp-dataverse install as recommended method
- Update unit tests for new registerViaCodeCli logic
- Bump version to 0.2.5

Author: Dev Agent Amelia

.vscode/mcp.json

@@ -1,11 +1,3 @@
 {
-	"inputs": [
-		{
-			"id": "dataverse_env_url",
-			"type": "promptString",
-			"description": "Dataverse environment URL (e.g. https://yourorg.crm.dynamics.com)",
-			"password": false
-		}
-	],
-	"servers": {}
-}
+  "servers": {}
+}

README.md

@@ -8,56 +8,65 @@ MCP server that exposes the Microsoft Dataverse Web API as **50 AI-callable tool
 
 ## Install
 
-### ✅ Recommended — VS Code Command Palette
+### ✅ Recommended — Interactive CLI (VS Code 1.99+)
 
-This is the most reliable installation method, confirmed working on both VS Code and VS Code Insiders.
+```bash
+npx mcp-dataverse install
+```
+
+The wizard will:
+
+1. Ask for your Dataverse environment URL
+2. Save configuration to `~/.mcp-dataverse/config.json`
+3. Register the server in VS Code and/or VS Code Insiders via `code --add-mcp`
+4. Authenticate with your Microsoft account (device code flow)
+
+After the wizard completes, the server is immediately available in VS Code — open Copilot chat and the 50 Dataverse tools are ready.
+
+> **Requires VS Code 1.99+** — the CLI registration uses `code --add-mcp`, introduced in March 2025. If neither `code` nor `code-insiders` is on your PATH, the wizard prints a manual snippet to copy-paste. Custom VS Code profiles are also detected and patched automatically.
+
+---
 
-1. Open VS Code
-2. Press **Ctrl+Shift+P** (or **Cmd+Shift+P** on macOS)
-3. Type **`MCP: Add Server`** and select it
-4. Choose **`NPM Package`**
-5. Enter the package name: **`mcp-dataverse`**
-6. Choose the scope: **User** (available in all workspaces) or **Workspace** (current project only)
+### Alternative — VS Code Command Palette
 
-VS Code will create or update `mcp.json` automatically. Then **edit the generated entry** to add your environment URL:
+1. Press **Ctrl+Shift+P** (or **Cmd+Shift+P** on macOS)
+2. Type **`MCP: Add Server`** → choose **`NPM Package`** → enter **`mcp-dataverse`**
+3. Choose the scope: **User** or **Workspace**
+4. Edit the generated entry to add your environment URL:
 
 ```jsonc
-// ~/.config/Code/User/mcp.json  (User scope)
-// or  .vscode/mcp.json           (Workspace scope)
 {
   "servers": {
     "mcp-dataverse": {
       "type": "stdio",
       "command": "npx",
       "args": ["-y", "mcp-dataverse"],
       "env": {
-        "DATAVERSE_ENV_URL": "https://yourorg.crm.dynamics.com",
-      },
-    },
-  },
+        "MCP_CONFIG_PATH": "/path/to/.mcp-dataverse/config.json"
+      }
+    }
+  }
 }
 ```
 
-Replace `https://yourorg.crm.dynamics.com` with your actual Dataverse environment URL.
-
 ---
 
 ### Manual (mcp.json)
 
-Create or edit `.vscode/mcp.json` in your project (workspace scope) or the user-level `mcp.json`:
+Create or edit `.vscode/mcp.json` (workspace scope) or the user-level `mcp.json` (**Ctrl+Shift+P** → **MCP: Open User Configuration**):
 
 ```jsonc
 {
   "servers": {
-    "dataverse": {
+    "mcp-dataverse": {
       "type": "stdio",
       "command": "npx",
       "args": ["-y", "mcp-dataverse"],
       "env": {
-        "DATAVERSE_ENV_URL": "https://yourorg.crm.dynamics.com",
-      },
-    },
-  },
+        "MCP_CONFIG_PATH": "/path/to/.mcp-dataverse/config.json"
+      }
+    }
+  }
 }
 ```
 
@@ -313,5 +322,6 @@ GitHub Copilot → stdio → MCP Server → Tool Router → DataverseClient →
 | Browser didn't open automatically          | Copy the URL from the Output panel manually: `https://microsoft.com/devicelogin` |
 | `No MSAL accounts found`                   | Run `npx mcp-dataverse-auth` to re-authenticate, then restart the server         |
 | `Authentication timed out`                 | The 5-minute window expired — restart the MCP server to get a new code           |
-| `"https://" is required`                   | Check `DATAVERSE_ENV_URL` in your `mcp.json` — must start with `https://`        |
-| Server not appearing in Copilot Agent mode | Restart VS Code; check **Output → MCP** panel for errors                         |
+| `"https://" is required`                   | Check your `~/.mcp-dataverse/config.json` — URL must start with `https://`       |
+| Server not appearing in Copilot Agent mode | Re-run `npx mcp-dataverse install`; check **Output → MCP** panel for errors     |
+| Install wizard says "not found on PATH"    | Install VS Code Shell Command (**Ctrl+Shift+P** → *Shell Command: Install...*) or use the manual snippet provided |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-dataverse",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "MCP Server for Microsoft Dataverse Web API",
   "type": "module",
   "main": "dist/server.js",

server.json

@@ -15,13 +15,13 @@
     "url": "https://github.com/codeurali/mcp-dataverse",
     "source": "github"
   },
-  "version": "0.2.4",
+  "version": "0.2.5",
   "packages": [
     {
       "registryType": "npm",
       "registryBaseUrl": "https://registry.npmjs.org",
       "identifier": "mcp-dataverse",
-      "version": "0.2.4",
+      "version": "0.2.5",
       "transport": {
         "type": "stdio"
       },

src/install.ts

@@ -6,13 +6,14 @@
  * Steps:
  *   1. Prompt for Dataverse environment URL
  *   2. Save config to ~/.mcp-dataverse/config.json
- *   3. Register the server in VS Code user mcp.json
+ *   3. Register the server in VS Code via `code --add-mcp` CLI
  *   4. Authenticate via Microsoft device code flow
  */
 import { createInterface } from "readline/promises";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs";
+import { execFileSync } from "child_process";
 import { homedir } from "os";
-import { dirname, join } from "path";
+import { join } from "path";
 import { DeviceCodeAuthProvider } from "./auth/device-code-auth-provider.js";
 
 // ── Constants ─────────────────────────────────────────────────────────────────
@@ -25,57 +26,101 @@ const CONFIG_FILE = join(CACHE_DIR, "config.json");
 const out = (msg: string) => process.stdout.write(msg + "\n");
 const hr  = () => process.stdout.write("─".repeat(58) + "\n");
 
-// ── VS Code mcp.json locations ─────────────────────────────────────────────────
+// ── VS Code CLI registration via --add-mcp ─────────────────────────────────────
 
-function getVSCodeUserDirs(): { label: string; mcpJson: string }[] {
-  const home = homedir();
-  if (process.platform === "win32") {
-    const appData = process.env["APPDATA"] ?? join(home, "AppData", "Roaming");
-    return [
-      { label: "VS Code Insiders", mcpJson: join(appData, "Code - Insiders", "User", "mcp.json") },
-      { label: "VS Code Stable",   mcpJson: join(appData, "Code",             "User", "mcp.json") },
-    ];
-  }
-  if (process.platform === "darwin") {
-    const base = join(home, "Library", "Application Support");
-    return [
-      { label: "VS Code Insiders", mcpJson: join(base, "Code - Insiders", "User", "mcp.json") },
-      { label: "VS Code Stable",   mcpJson: join(base, "Code",             "User", "mcp.json") },
-    ];
-  }
-  const base = join(home, ".config");
-  return [
-    { label: "VS Code Insiders", mcpJson: join(base, "Code - Insiders", "User", "mcp.json") },
-    { label: "VS Code Stable",   mcpJson: join(base, "Code",             "User", "mcp.json") },
+function registerViaCodeCli(configFilePath: string): { label: string; ok: boolean }[] {
+  const serverDef = JSON.stringify({
+    name: "mcp-dataverse",
+    type: "stdio",
+    command: "npx",
+    args: ["-y", "mcp-dataverse"],
+    env: { MCP_CONFIG_PATH: configFilePath },
+  });
+
+  const clis: { label: string; bin: string }[] = [
+    { label: "VS Code Insiders", bin: "code-insiders" },
+    { label: "VS Code Stable",   bin: "code" },
   ];
+
+  const results: { label: string; ok: boolean }[] = [];
+  for (const { label, bin } of clis) {
+    try {
+      // On Windows, VS Code CLI is a .cmd batch file — execFileSync can't run
+      // .cmd directly, so we go through cmd.exe /c.
+      const args = process.platform === "win32"
+        ? ["/c", bin, "--add-mcp", serverDef]
+        : ["--add-mcp", serverDef];
+      const exe = process.platform === "win32" ? "cmd.exe" : bin;
+      execFileSync(exe, args, { stdio: "pipe", timeout: 15_000 });
+      results.push({ label, ok: true });
+    } catch {
+      results.push({ label, ok: false });
+    }
+  }
+  return results;
 }
 
-// ── mcp.json patching ─────────────────────────────────────────────────────────
+// ── Patch custom VS Code profiles ──────────────────────────────────────────────
+// `--add-mcp` only writes to the default profile. If the user runs VS Code with
+// a custom profile, that profile has its own mcp.json that we need to patch too.
 
-function patchVSCodeMcpJson(configFilePath: string): { label: string; path: string }[] {
-  const updated: { label: string; path: string }[] = [];
+function getVSCodeUserDirs(): { label: string; dir: string }[] {
+  const home = homedir();
+  switch (process.platform) {
+    case "win32": {
+      const appData = process.env.APPDATA ?? join(home, "AppData", "Roaming");
+      return [
+        { label: "VS Code Insiders", dir: join(appData, "Code - Insiders", "User") },
+        { label: "VS Code Stable",   dir: join(appData, "Code", "User") },
+      ];
+    }
+    case "darwin":
+      return [
+        { label: "VS Code Insiders", dir: join(home, "Library", "Application Support", "Code - Insiders", "User") },
+        { label: "VS Code Stable",   dir: join(home, "Library", "Application Support", "Code", "User") },
+      ];
+    default:
+      return [
+        { label: "VS Code Insiders", dir: join(home, ".config", "Code - Insiders", "User") },
+        { label: "VS Code Stable",   dir: join(home, ".config", "Code", "User") },
+      ];
+  }
+}
+
+function patchProfileConfigs(configFilePath: string): string[] {
   const serverEntry = {
     type: "stdio",
     command: "npx",
     args: ["-y", "mcp-dataverse"],
     env: { MCP_CONFIG_PATH: configFilePath },
   };
 
-  for (const { label, mcpJson } of getVSCodeUserDirs()) {
-    // Only act when the VS Code User/ directory exists (VS Code variant is installed)
-    if (!existsSync(dirname(mcpJson))) continue;
-
-    let data: Record<string, unknown> = {};
-    if (existsSync(mcpJson)) {
-      try { data = JSON.parse(readFileSync(mcpJson, "utf-8")) as Record<string, unknown>; } catch { /* start fresh */ }
+  const patched: string[] = [];
+  for (const { dir } of getVSCodeUserDirs()) {
+    const profilesDir = join(dir, "profiles");
+    if (!existsSync(profilesDir)) continue;
+
+    let entries: string[];
+    try { entries = readdirSync(profilesDir); } catch { continue; }
+
+    for (const profile of entries) {
+      const mcpPath = join(profilesDir, profile, "mcp.json");
+      if (!existsSync(mcpPath)) continue;
+
+      try {
+        const raw = readFileSync(mcpPath, "utf-8");
+        const json = JSON.parse(raw);
+        if (!json.servers) json.servers = {};
+        json.servers["mcp-dataverse"] = serverEntry;
+        writeFileSync(mcpPath, JSON.stringify(json, null, "\t") + "\n", "utf-8");
+        patched.push(mcpPath);
+      } catch {
+        // skip malformed files
+      }
     }
-    if (!data["servers"] || typeof data["servers"] !== "object") data["servers"] = {};
-    (data["servers"] as Record<string, unknown>)["mcp-dataverse"] = serverEntry;
-    writeFileSync(mcpJson, JSON.stringify(data, null, 2) + "\n", "utf-8");
-    updated.push({ label, path: mcpJson });
   }
 
-  return updated;
+  return patched;
 }
 
 // ── URL validation ─────────────────────────────────────────────────────────────
@@ -94,7 +139,7 @@ function isValidDataverseUrl(raw: string): string | null {
 // ── Manual mcp.json snippet ────────────────────────────────────────────────────
 
 function printManualSnippet(configFilePath: string): void {
-  out("  Add this to your VS Code user mcp.json (Ctrl+Shift+P → Open User MCP Configuration):");
+  out("  Add this to your VS Code mcp.json (Ctrl+Shift+P → MCP: Open User Configuration):");
   out("");
   out('  "mcp-dataverse": {');
   out('    "type": "stdio",');
@@ -115,7 +160,7 @@ export async function runInstall(): Promise<void> {
   out("This wizard will:");
   out("  1. Ask for your Dataverse environment URL");
   out("  2. Save configuration to  ~/.mcp-dataverse/config.json");
-  out("  3. Register the server in VS Code  (user mcp.json)");
+  out("  3. Register the server in VS Code via CLI");
   out("  4. Authenticate with your Microsoft account");
   out("");
   hr();
@@ -144,16 +189,27 @@ export async function runInstall(): Promise<void> {
   out(`  ✓ ${CONFIG_FILE}`);
   out("");
 
-  // ── Step 3: Patch VS Code mcp.json ───────────────────────────────────────────
+  // ── Step 3: Register in VS Code via --add-mcp CLI ────────────────────────────
   out("Registering in VS Code…");
-  const patched = patchVSCodeMcpJson(CONFIG_FILE);
-  if (patched.length > 0) {
-    for (const { label, path } of patched) out(`  ✓ ${label}: ${path}`);
+  const results = registerViaCodeCli(CONFIG_FILE);
+  const registered = results.filter((r) => r.ok);
+
+  if (registered.length > 0) {
+    for (const { label } of registered) out(`  ✓ ${label}: registered via --add-mcp`);
+    const skipped = results.filter((r) => !r.ok);
+    for (const { label } of skipped) out(`  – ${label}: not found on PATH (skipped)`);
   } else {
-    out("  ℹ No VS Code installation detected — configure manually:");
+    out("  ⚠ Neither 'code' nor 'code-insiders' found on PATH.");
+    out("  Register manually:");
     out("");
     printManualSnippet(CONFIG_FILE);
   }
+
+  // Also patch any custom VS Code profiles (--add-mcp only covers the default)
+  const profilePatches = patchProfileConfigs(CONFIG_FILE);
+  if (profilePatches.length > 0) {
+    out(`  + Patched ${profilePatches.length} custom profile(s)`);
+  }
   out("");
   hr();
 
@@ -170,17 +226,21 @@ export async function runInstall(): Promise<void> {
     out("");
     out("  ✓  Setup complete!");
     out("");
-    out("Next steps:");
-    out("  • Reload VS Code:  Ctrl+Shift+P → Reload Window");
-    out("  • MCP Dataverse tools will appear in GitHub Copilot chat (🔧)");
+    if (registered.length > 0) {
+      out("  The MCP server is now registered in VS Code.");
+      out("  Open VS Code → Copilot chat → the 50 Dataverse tools are ready to use.");
+    } else {
+      out("  Configuration and authentication are ready.");
+      out("  Register the server manually (see snippet above), then restart VS Code.");
+    }
     out("");
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     hr();
     out(`  ✗ Authentication failed: ${msg}`);
     out("");
-    out("  Configuration was saved. Authenticate later with:");
-    out(`    npx mcp-dataverse-auth ${environmentUrl}`);
+    out("  Configuration was saved. Authenticate later by restarting the MCP server —");
+    out("  it will prompt for device code on startup.");
     out("");
     process.exit(1);
   }