Address latest feedback for PR #153

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.24.3","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"}}]}
+{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.25.0","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"}}]}

client/src/lib/integration-test-runner.js

@@ -225,6 +225,7 @@ export class IntegrationTestRunner {
       }
 
       this.logger.log(`Completed ${totalIntegrationTests} tool-specific integration tests`);
+      const toolIntegrationSucceeded = totalIntegrationTests > 0;
 
       // Also run workflow integration tests
       const workflowIntegrationSucceeded = await this.runWorkflowIntegrationTests(baseDir);
@@ -246,15 +247,18 @@ export class IntegrationTestRunner {
         );
       }
 
-      if (totalIntegrationTests === 0) {
+      const anyTestsExecuted =
+        toolIntegrationSucceeded || workflowIntegrationSucceeded || promptIntegrationSucceeded;
+
+      if (!anyTestsExecuted) {
         this.logger.log(
-          "No integration tests were executed across tool, workflow, or prompt suites.",
+          "No integration tests completed successfully across tool, workflow, or prompt suites.",
           "ERROR"
         );
         return false;
       }
 
-      return workflowIntegrationSucceeded && promptIntegrationSucceeded;
+      return toolIntegrationSucceeded && workflowIntegrationSucceeded && promptIntegrationSucceeded;
     } catch (error) {
       this.logger.log(`Error running integration tests: ${error.message}`, "ERROR");
       return false;

extensions/vscode/scripts/download-vscode.js

@@ -31,7 +31,10 @@ const version = process.argv[2] || getEnginesVscodeVersion();
 console.log(`Downloading VS Code (${version}) for integration tests...`);
 
 try {
-  const vscodeExecutablePath = await downloadAndUnzipVSCode(version);
+  const vscodeExecutablePath = await downloadAndUnzipVSCode({
+    version,
+    timeout: 120_000,
+  });
   console.log(`✅ VS Code downloaded to: ${vscodeExecutablePath}`);
 } catch (error) {
   console.error(

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

@@ -64378,8 +64378,8 @@ function registerLanguageResources(server) {
 }
 
 // src/prompts/workflow-prompts.ts
-import { basename as basename7, isAbsolute as isAbsolute7, normalize, relative, resolve as resolve13, sep as sep2 } from "path";
 import { access as access2 } from "fs/promises";
+import { basename as basename7, isAbsolute as isAbsolute7, normalize, relative, resolve as resolve13, sep as sep2 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/prompts/check-for-duplicated-code.prompt.md

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

@@ -7,8 +7,8 @@
 
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { basename, isAbsolute, normalize, relative, resolve, sep } from 'path';
 import { access } from 'fs/promises';
+import { basename, isAbsolute, normalize, relative, resolve, sep } from 'path';
 import { fileURLToPath } from 'url';
 import { loadPromptTemplate, processPromptTemplate } from './prompt-loader';
 import { getUserWorkspaceDir } from '../utils/package-paths';

server/src/prompts/workflow-prompts.ts

@@ -1208,7 +1208,7 @@ describe('Workflow Prompts', () => {
       expect(text).toContain('**Query Name**: WeakCrypto');
     });
 
-    it('ql_tdd_basic handler (createSafePromptHandler) should return inline validation error when required parameters are missing', async () => {
+    it('ql_tdd_basic handler (createSafePromptHandler) should return inline validation error when called directly with missing parameters (defense-in-depth; SDK validates required fields before handler in real MCP usage)', async () => {
       const handler = getRegisteredHandler(mockServer, 'ql_tdd_basic');
       const result: PromptResult = await handler({});
       expect(result.messages[0].content.text).toContain('Invalid input');
@@ -1227,7 +1227,7 @@ describe('Workflow Prompts', () => {
       expect(text).toContain('**Query Name**: TaintTrack');
     });
 
-    it('ql_tdd_advanced handler (createSafePromptHandler) should return inline validation error when required parameters are missing', async () => {
+    it('ql_tdd_advanced handler (createSafePromptHandler) should return inline validation error when called directly with missing parameters (defense-in-depth; SDK validates required fields before handler in real MCP usage)', async () => {
       const handler = getRegisteredHandler(mockServer, 'ql_tdd_advanced');
       const result: PromptResult = await handler({});
       expect(result.messages[0].content.text).toContain('Invalid input');
@@ -1255,7 +1255,7 @@ describe('Workflow Prompts', () => {
       expect(text).toContain('out.sarif');
     });
 
-    it('sarif_rank handlers should return inline error with no parameters', async () => {
+    it('sarif_rank handlers (createSafePromptHandler) should return inline error when called directly with no parameters (defense-in-depth; SDK validates required sarifPath before handler in real MCP usage)', async () => {
       for (const name of ['sarif_rank_false_positives', 'sarif_rank_true_positives']) {
         const handler = getRegisteredHandler(mockServer, name);
         const result: PromptResult = await handler({});
@@ -1272,7 +1272,7 @@ describe('Workflow Prompts', () => {
       expect(text).toContain('queries/SqlInjection.ql');
     });
 
-    it('run_query_and_summarize_false_positives handler should return inline error with no parameters', async () => {
+    it('run_query_and_summarize_false_positives handler (createSafePromptHandler) should return inline error when called directly with no parameters (defense-in-depth; SDK validates required queryPath before handler in real MCP usage)', async () => {
       const handler = getRegisteredHandler(mockServer, 'run_query_and_summarize_false_positives');
       const result: PromptResult = await handler({});
       expect(result.messages[0].content.text).toContain('Invalid input');