Implement changes for PR review comments

Author: data-douser

extensions/vscode/test/codeql/cli-resolver.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest';
 import { CliResolver } from '../../src/codeql/cli-resolver';
 
 // Mock child_process
@@ -171,8 +171,10 @@ describe('CliResolver', () => {
     const storagePath = '/mock/globalStorage/github.vscode-codeql';
     const binaryName = process.platform === 'win32' ? 'codeql.exe' : 'codeql';
 
+    let originalEnv: string | undefined;
+
     beforeEach(() => {
-      const originalEnv = process.env.CODEQL_PATH;
+      originalEnv = process.env.CODEQL_PATH;
       delete process.env.CODEQL_PATH;
 
       // Make `which codeql` fail
@@ -190,14 +192,14 @@ describe('CliResolver', () => {
 
       // All known filesystem locations fail
       vi.mocked(access).mockRejectedValue(new Error('ENOENT'));
+    });
 
-      return () => {
-        if (originalEnv === undefined) {
-          delete process.env.CODEQL_PATH;
-        } else {
-          process.env.CODEQL_PATH = originalEnv;
-        }
-      };
+    afterEach(() => {
+      if (originalEnv === undefined) {
+        delete process.env.CODEQL_PATH;
+      } else {
+        process.env.CODEQL_PATH = originalEnv;
+      }
     });
 
     it('should resolve from distribution.json hint', async () => {

server/dist/codeql-development-mcp-server.js

@@ -38212,12 +38212,14 @@ function getVsCodeGlobalStorageCandidates() {
 function discoverVsCodeCodeQLDistribution() {
   const globalStorageCandidates = getVsCodeGlobalStorageCandidates();
   for (const gsRoot of globalStorageCandidates) {
-    const codeqlStorage = join4(gsRoot, "github.vscode-codeql");
-    if (!existsSync2(codeqlStorage)) continue;
-    const hintResult = discoverFromDistributionJson(codeqlStorage);
-    if (hintResult) return hintResult;
-    const scanResult = discoverFromDistributionScan(codeqlStorage);
-    if (scanResult) return scanResult;
+    for (const dirName of VSCODE_CODEQL_STORAGE_DIR_NAMES) {
+      const codeqlStorage = join4(gsRoot, dirName);
+      if (!existsSync2(codeqlStorage)) continue;
+      const hintResult = discoverFromDistributionJson(codeqlStorage);
+      if (hintResult) return hintResult;
+      const scanResult = discoverFromDistributionScan(codeqlStorage);
+      if (scanResult) return scanResult;
+    }
   }
   return void 0;
 }
@@ -38524,7 +38526,7 @@ async function validateCommandExists(command) {
     return false;
   }
 }
-var execFileAsync, ALLOWED_COMMANDS, testCommands, SAFE_ENV_VARS, SAFE_ENV_PREFIXES, DANGEROUS_CONTROL_CHARS, resolvedCodeQLDir, resolvedBinaryResult, CODEQL_BINARY_NAME, VSCODE_APP_NAMES, FRESH_PROCESS_SUBCOMMANDS;
+var execFileAsync, ALLOWED_COMMANDS, testCommands, SAFE_ENV_VARS, SAFE_ENV_PREFIXES, DANGEROUS_CONTROL_CHARS, resolvedCodeQLDir, resolvedBinaryResult, CODEQL_BINARY_NAME, VSCODE_APP_NAMES, VSCODE_CODEQL_STORAGE_DIR_NAMES, FRESH_PROCESS_SUBCOMMANDS;
 var init_cli_executor = __esm({
   "src/lib/cli-executor.ts"() {
     "use strict";
@@ -38575,6 +38577,7 @@ var init_cli_executor = __esm({
     resolvedCodeQLDir = null;
     CODEQL_BINARY_NAME = process.platform === "win32" ? "codeql.exe" : "codeql";
     VSCODE_APP_NAMES = ["Code", "Code - Insiders", "VSCodium"];
+    VSCODE_CODEQL_STORAGE_DIR_NAMES = ["github.vscode-codeql", "GitHub.vscode-codeql"];
     FRESH_PROCESS_SUBCOMMANDS = /* @__PURE__ */ new Set([
       "database analyze",
       "database create",

server/src/lib/cli-executor.ts

@@ -128,6 +128,14 @@ const CODEQL_BINARY_NAME = process.platform === 'win32' ? 'codeql.exe' : 'codeql
  */
 const VSCODE_APP_NAMES = ['Code', 'Code - Insiders', 'VSCodium'];
 
+/**
+ * Possible directory names for the vscode-codeql extension's global storage.
+ * VS Code lowercases the extension ID on some platforms/versions, but the
+ * extension's publisher casing (`GitHub`) may also appear on disk. We check
+ * both to ensure discovery works on case-sensitive filesystems.
+ */
+const VSCODE_CODEQL_STORAGE_DIR_NAMES = ['github.vscode-codeql', 'GitHub.vscode-codeql'];
+
 /**
  * Compute candidate VS Code global-storage root directories for the current
  * platform. Returns an array of absolute paths that may or may not exist.
@@ -155,7 +163,11 @@ export function getVsCodeGlobalStorageCandidates(): string[] {
  * extension, if present.
  *
  * The vscode-codeql extension stores its managed CLI in:
- *   `<globalStorage>/github.vscode-codeql/distribution<N>/codeql/codeql`
+ *   `<globalStorage>/<extensionDirName>/distribution<N>/codeql/codeql`
+ *
+ * where `<extensionDirName>` may be `github.vscode-codeql` (lowercased by
+ * some VS Code versions) or `GitHub.vscode-codeql` (original publisher casing).
+ * Both casings are checked to ensure discovery works on case-sensitive filesystems.
  *
  * A `distribution.json` file in the storage root contains a `folderIndex`
  * property that identifies the current distribution directory. We use that
@@ -168,18 +180,21 @@ export function discoverVsCodeCodeQLDistribution(): string | undefined {
   const globalStorageCandidates = getVsCodeGlobalStorageCandidates();
 
   for (const gsRoot of globalStorageCandidates) {
-    // The extension ID is always lowercased on disk by VS Code
-    const codeqlStorage = join(gsRoot, 'github.vscode-codeql');
+    // Check both casings: VS Code may lowercase the extension ID on disk,
+    // but the original publisher casing (GitHub.vscode-codeql) can also appear.
+    for (const dirName of VSCODE_CODEQL_STORAGE_DIR_NAMES) {
+      const codeqlStorage = join(gsRoot, dirName);
 
-    if (!existsSync(codeqlStorage)) continue;
+      if (!existsSync(codeqlStorage)) continue;
 
-    // Fast path: read distribution.json for the exact folder index
-    const hintResult = discoverFromDistributionJson(codeqlStorage);
-    if (hintResult) return hintResult;
+      // Fast path: read distribution.json for the exact folder index
+      const hintResult = discoverFromDistributionJson(codeqlStorage);
+      if (hintResult) return hintResult;
 
-    // Fallback: scan distribution* directories
-    const scanResult = discoverFromDistributionScan(codeqlStorage);
-    if (scanResult) return scanResult;
+      // Fallback: scan distribution* directories
+      const scanResult = discoverFromDistributionScan(codeqlStorage);
+      if (scanResult) return scanResult;
+    }
   }
 
   return undefined;

server/test/src/lib/cli-executor.test.ts

@@ -5,7 +5,7 @@
 import { describe, it, expect, beforeAll, afterAll, afterEach } from 'vitest';
 import { writeFileSync, rmSync, chmodSync, mkdirSync, existsSync } from 'fs';
 import { execFileSync } from 'child_process';
-import { join } from 'path';
+import { isAbsolute, join } from 'path';
 import { createProjectTempDir } from '../../../src/utils/temp-dir';
 import {
   buildCodeQLArgs,
@@ -810,7 +810,7 @@ describe('getVsCodeGlobalStorageCandidates', () => {
   it('should return absolute paths', () => {
     const candidates = getVsCodeGlobalStorageCandidates();
     for (const candidate of candidates) {
-      expect(candidate.startsWith('/')).toBe(true);
+      expect(isAbsolute(candidate)).toBe(true);
     }
   });