fix: treat empty env vars as unset in vscodeUserDir/getMcpUrl + test isolation

- vscodeUserDir(): use || instead of ?? so empty APPDATA/XDG_CONFIG_HOME
  fall back to the homedir-based default instead of producing a relative path
- getMcpUrl(): trim and check truthiness so CLERK_MCP_URL="" doesn't win
- clients.test.ts, user-scope.test.ts: clear XDG_CONFIG_HOME/APPDATA in
  beforeEach and restore in afterEach to prevent VS Code path leaking to
  the runner's real config directory (fixes CI test failure)

Author: rafa-thayto

packages/cli-core/src/commands/mcp/clients/clients.test.ts

@@ -63,11 +63,28 @@ const cases = [
 ];
 
 describe("client config paths + encoded shapes (homedir redirected)", () => {
+  let origXdgConfigHome: string | undefined;
+  let origAppData: string | undefined;
+
   beforeEach(async () => {
     mockHome = await mkdtemp(join(realOs.tmpdir(), "clerk-mcp-clients-"));
+    origXdgConfigHome = process.env.XDG_CONFIG_HOME;
+    origAppData = process.env.APPDATA;
+    process.env.XDG_CONFIG_HOME = "";
+    process.env.APPDATA = "";
   });
 
   afterEach(async () => {
+    if (origXdgConfigHome === undefined) {
+      delete process.env.XDG_CONFIG_HOME;
+    } else {
+      process.env.XDG_CONFIG_HOME = origXdgConfigHome;
+    }
+    if (origAppData === undefined) {
+      delete process.env.APPDATA;
+    } else {
+      process.env.APPDATA = origAppData;
+    }
     await rm(mockHome, { recursive: true, force: true });
   });
 

packages/cli-core/src/commands/mcp/clients/paths.ts

@@ -25,13 +25,15 @@ export function userPath(...segments: string[]): string {
  */
 export function vscodeUserDir(): string {
   const home = homedir();
+  const appData = process.env.APPDATA?.trim();
+  const xdgConfigHome = process.env.XDG_CONFIG_HOME?.trim();
   switch (platform()) {
     case "win32":
-      return join(process.env.APPDATA ?? join(home, "AppData", "Roaming"), "Code", "User");
+      return join(appData || join(home, "AppData", "Roaming"), "Code", "User");
     case "darwin":
       return join(home, "Library", "Application Support", "Code", "User");
     default:
-      return join(process.env.XDG_CONFIG_HOME ?? join(home, ".config"), "Code", "User");
+      return join(xdgConfigHome || join(home, ".config"), "Code", "User");
   }
 }
 

packages/cli-core/src/commands/mcp/clients/user-scope.test.ts

@@ -99,17 +99,33 @@ describe("user-scope MCP clients (homedir redirected to a tmpdir)", () => {
 describe("install/uninstall across all clients (homedir + cwd redirected)", () => {
   let cwd: string;
   let originalCwd: string;
+  let origXdgConfigHome: string | undefined;
+  let origAppData: string | undefined;
 
   beforeEach(async () => {
     originalCwd = process.cwd();
     cwd = await mkdtemp(join(realOs.tmpdir(), "clerk-mcp-all-cwd-"));
     mockHome = await mkdtemp(join(realOs.tmpdir(), "clerk-mcp-all-home-"));
+    origXdgConfigHome = process.env.XDG_CONFIG_HOME;
+    origAppData = process.env.APPDATA;
+    process.env.XDG_CONFIG_HOME = "";
+    process.env.APPDATA = "";
     process.chdir(cwd);
     mockIsAgent.mockReturnValue(true);
   });
 
   afterEach(async () => {
     process.chdir(originalCwd);
+    if (origXdgConfigHome === undefined) {
+      delete process.env.XDG_CONFIG_HOME;
+    } else {
+      process.env.XDG_CONFIG_HOME = origXdgConfigHome;
+    }
+    if (origAppData === undefined) {
+      delete process.env.APPDATA;
+    } else {
+      process.env.APPDATA = origAppData;
+    }
     await rm(cwd, { recursive: true, force: true });
     await rm(mockHome, { recursive: true, force: true });
     mockIsAgent.mockReset();
@@ -152,6 +168,8 @@ describe("install/uninstall across all clients (homedir + cwd redirected)", () =
 describe("clerk doctor — checkMcp (homedir + cwd redirected)", () => {
   let cwd: string;
   let originalCwd: string;
+  let origXdgConfigHome: string | undefined;
+  let origAppData: string | undefined;
   const originalFetch = globalThis.fetch;
 
   // Assign globalThis.fetch directly (cast to its own type) rather than via the
@@ -167,12 +185,26 @@ describe("clerk doctor — checkMcp (homedir + cwd redirected)", () => {
     originalCwd = process.cwd();
     cwd = await mkdtemp(join(realOs.tmpdir(), "clerk-mcp-check-cwd-"));
     mockHome = await mkdtemp(join(realOs.tmpdir(), "clerk-mcp-check-home-"));
+    origXdgConfigHome = process.env.XDG_CONFIG_HOME;
+    origAppData = process.env.APPDATA;
+    process.env.XDG_CONFIG_HOME = "";
+    process.env.APPDATA = "";
     process.chdir(cwd);
     mockIsAgent.mockReturnValue(true);
   });
 
   afterEach(async () => {
     process.chdir(originalCwd);
+    if (origXdgConfigHome === undefined) {
+      delete process.env.XDG_CONFIG_HOME;
+    } else {
+      process.env.XDG_CONFIG_HOME = origXdgConfigHome;
+    }
+    if (origAppData === undefined) {
+      delete process.env.APPDATA;
+    } else {
+      process.env.APPDATA = origAppData;
+    }
     await rm(cwd, { recursive: true, force: true });
     await rm(mockHome, { recursive: true, force: true });
     globalThis.fetch = originalFetch;

packages/cli-core/src/lib/environment.ts

@@ -161,5 +161,7 @@ export function getDashboardUrl(): string {
  * profile omits `mcpUrl`, mirroring `getDashboardUrl`.
  */
 export function getMcpUrl(): string {
-  return process.env.CLERK_MCP_URL ?? getCurrentEnv().mcpUrl ?? DEFAULT_MCP_URL;
+  const envUrl = process.env.CLERK_MCP_URL?.trim();
+  const profileUrl = getCurrentEnv().mcpUrl?.trim();
+  return envUrl || profileUrl || DEFAULT_MCP_URL;
 }