Fix search-ql-code.ts and environment-builder.test.ts

Author: data-douser

client/integration-tests/primitives/tools/codeql_bqrs_interpret/sarif_format/after/results.sarif

@@ -1 +1 @@
-{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.25.2","rules":[{"id":"test/query","name":"test/query","shortDescription":{"text":"ExampleQuery1"},"fullDescription":{"text":"Example query for integration testing of the codeql_test_extract MCP server tool."},"defaultConfiguration":{"enabled":true,"level":"warning"},"help":{"text":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n","markdown":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n"},"properties":{"tags":["mcp-integration-tests"],"description":"Example query for integration testing of the codeql_test_extract MCP server tool.","id":"test/query","kind":"problem","name":"ExampleQuery1","precision":"medium","problem.severity":"warning"}}]},"extensions":[{"name":"mcp-client-integration-tests-static-javascript-src","semanticVersion":"0.0.1+fe0e7d2a7059ebb6c6075ff8eaea04f382747656","locations":[{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/codeql-pack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/javascript-all","semanticVersion":"2.6.11+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.25.2/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.25.2/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/threat-models","semanticVersion":"1.0.31+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/2.25.2/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/2.25.2/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]}]},"artifacts":[{"location":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}],"results":[{"ruleId":"test/query","ruleIndex":0,"rule":{"id":"test/query","index":0},"message":{"text":"Example test code file found for codeql_test_extract example query."},"locations":[{"physicalLocation":{"artifactLocation":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}}]}],"columnKind":"utf16CodeUnits","properties":{"semmle.formatSpecifier":"sarif-latest"}}]}
+{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.25.2","rules":[{"id":"test/query","name":"test/query","shortDescription":{"text":"ExampleQuery1"},"fullDescription":{"text":"Example query for integration testing of the codeql_test_extract MCP server tool."},"defaultConfiguration":{"enabled":true,"level":"warning"},"help":{"text":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n","markdown":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n"},"properties":{"tags":["mcp-integration-tests"],"description":"Example query for integration testing of the codeql_test_extract MCP server tool.","id":"test/query","kind":"problem","name":"ExampleQuery1","precision":"medium","problem.severity":"warning"}}]},"extensions":[{"name":"mcp-client-integration-tests-static-javascript-src","semanticVersion":"0.0.1+fe0e7d2a7059ebb6c6075ff8eaea04f382747656","locations":[{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/codeql-pack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/javascript-all","semanticVersion":"2.6.11+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/threat-models","semanticVersion":"1.0.31+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]}]},"artifacts":[{"location":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}],"results":[{"ruleId":"test/query","ruleIndex":0,"rule":{"id":"test/query","index":0},"message":{"text":"Example test code file found for codeql_test_extract example query."},"locations":[{"physicalLocation":{"artifactLocation":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}}]}],"columnKind":"utf16CodeUnits","properties":{"semmle.formatSpecifier":"sarif-latest"}}]}

extensions/vscode/test/bridge/environment-builder.test.ts

@@ -347,25 +347,6 @@ describe('EnvironmentBuilder', () => {
     }
   });
 
-  it('should preserve ENABLE_ANNOTATION_TOOLS from parent process environment', async () => {
-    const origValue = process.env.ENABLE_ANNOTATION_TOOLS;
-
-    try {
-      process.env.ENABLE_ANNOTATION_TOOLS = 'false';
-
-      builder.invalidate();
-      const env = await builder.build();
-      // Inherited process.env value should be preserved
-      expect(env.ENABLE_ANNOTATION_TOOLS).toBe('false');
-    } finally {
-      if (origValue === undefined) {
-        delete process.env.ENABLE_ANNOTATION_TOOLS;
-      } else {
-        process.env.ENABLE_ANNOTATION_TOOLS = origValue;
-      }
-    }
-  });
-
   it('should set CODEQL_MCP_SCAN_EXCLUDE_DIRS when scanExcludeDirs setting is non-empty', async () => {
     const vscode = await import('vscode');
     const originalGetConfig = vscode.workspace.getConfiguration;

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

@@ -196971,10 +196971,13 @@ var MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024;
 var MAX_FILES_TRAVERSED = 1e4;
 var MAX_CONTEXT_LINES = 50;
 var MAX_MAX_RESULTS = 1e4;
-var SKIP_DIRS2 = getScanExcludeDirs();
+function getSkipDirs() {
+  return getScanExcludeDirs();
+}
 function collectFiles(paths, extensions, fileCount) {
   const files = [];
   const visitedDirs = /* @__PURE__ */ new Set();
+  const skipDirs = getSkipDirs();
   function walk(p) {
     if (fileCount.value >= MAX_FILES_TRAVERSED) return;
     let stat;
@@ -196990,7 +196993,7 @@ function collectFiles(paths, extensions, fileCount) {
       }
       fileCount.value++;
     } else if (stat.isDirectory()) {
-      if (SKIP_DIRS2.has(basename9(p))) return;
+      if (skipDirs.has(basename9(p))) return;
       let realPath;
       try {
         realPath = realpathSync2(p);
@@ -198417,7 +198420,7 @@ init_package_paths();
 var MAX_FILE_COMPLETIONS = 50;
 var MAX_SCAN_DEPTH = 8;
 var CACHE_TTL_MS = 5e3;
-var SKIP_DIRS3 = getScanExcludeDirs();
+var SKIP_DIRS2 = getScanExcludeDirs();
 var scanCache = /* @__PURE__ */ new Map();
 function getCachedResults(cacheKey2) {
   const entry = scanCache.get(cacheKey2);
@@ -198445,7 +198448,7 @@ async function findFilesByExtension(dir, baseDir, extensions, maxDepth, results)
     if (results.length >= MAX_FILE_COMPLETIONS) break;
     const fullPath = join22(dir, entry.name);
     if (entry.isDirectory()) {
-      if (SKIP_DIRS3.has(entry.name)) {
+      if (SKIP_DIRS2.has(entry.name)) {
         continue;
       }
       await findFilesByExtension(fullPath, baseDir, extensions, maxDepth - 1, results);
@@ -198558,7 +198561,7 @@ async function findDatabaseDirs(dir, _baseDir, maxDepth, results) {
   }
   for (const entry of entries) {
     if (results.length >= MAX_FILE_COMPLETIONS) break;
-    if (entry.isDirectory() && !SKIP_DIRS3.has(entry.name)) {
+    if (entry.isDirectory() && !SKIP_DIRS2.has(entry.name)) {
       await findDatabaseDirs(join22(dir, entry.name), _baseDir, maxDepth - 1, results);
     }
   }
@@ -198585,7 +198588,7 @@ async function completePackRoot(value) {
       }
       for (const entry of entries) {
         if (results.length >= MAX_FILE_COMPLETIONS) break;
-        if (entry.isDirectory() && !SKIP_DIRS3.has(entry.name)) {
+        if (entry.isDirectory() && !SKIP_DIRS2.has(entry.name)) {
           await scan(join22(dir, entry.name), depth - 1);
         }
       }

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

@@ -32,10 +32,13 @@ const MAX_CONTEXT_LINES = 50;
 const MAX_MAX_RESULTS = 10_000;
 
 /**
- * Directory names to skip during traversal.
- * Uses the shared, configurable exclusion list from scan-exclude.ts.
+ * Returns the set of directory names to skip during traversal.
+ * Re-reads the environment variable on each call so that runtime
+ * changes to `CODEQL_MCP_SCAN_EXCLUDE_DIRS` are respected.
  */
-const SKIP_DIRS: Set<string> = getScanExcludeDirs();
+function getSkipDirs(): Set<string> {
+  return getScanExcludeDirs();
+}
 
 // ---------------------------------------------------------------------------
 // Types
@@ -73,6 +76,7 @@ function collectFiles(
 ): string[] {
   const files: string[] = [];
   const visitedDirs = new Set<string>();
+  const skipDirs = getSkipDirs();
 
   function walk(p: string): void {
     if (fileCount.value >= MAX_FILES_TRAVERSED) return;
@@ -95,7 +99,7 @@ function collectFiles(
       fileCount.value++;
     } else if (stat.isDirectory()) {
       // Skip well-known directories that mirror source or contain deps
-      if (SKIP_DIRS.has(basename(p))) return;
+      if (skipDirs.has(basename(p))) return;
 
       // Track visited directories by real path to prevent cycles
       let realPath: string;