Address PR #234 review feedback

Author: data-douser

client/integration-tests/primitives/tools/codeql_query_compile/compile_query/test-config.json

@@ -1,7 +1,7 @@
 {
   "toolName": "codeql_query_compile",
   "arguments": {
-    "query": "server/ql/javascript/examples/src/ExampleQuery1/ExampleQuery1.ql"
+    "query": "test_query.ql"
   },
   "assertions": {
     "responseContains": ["DIL file:", ".dil"]

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

@@ -193922,9 +193922,13 @@ function registerCLITool(server, definition) {
           }
         }
         let compileLogDir;
-        if (name === "codeql_query_compile" && options["dump-dil"] !== false) {
-          compileLogDir = getOrCreateLogDirectory(customLogDir);
-          logger.info(`Using log directory for ${name}: ${compileLogDir}`);
+        if (name === "codeql_query_compile") {
+          const pendingArgs = Array.isArray(options.additionalArgs) ? options.additionalArgs : [];
+          const effectiveDumpDilDisabled = options["dump-dil"] === false || pendingArgs.includes("--no-dump-dil");
+          if (!effectiveDumpDilDisabled) {
+            compileLogDir = getOrCreateLogDirectory(customLogDir);
+            logger.info(`Using log directory for ${name}: ${compileLogDir}`);
+          }
         }
         const rawAdditionalArgs = Array.isArray(options.additionalArgs) ? options.additionalArgs : [];
         delete options.additionalArgs;

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

@@ -556,11 +556,20 @@ export function registerCLITool(server: McpServer, definition: CLIToolDefinition
           }
         }
 
-        // Set up log directory for compile runs to persist DIL output
+        // Set up log directory for compile runs to persist DIL output.
+        // Compute an effective "dump-dil enabled" flag that accounts for
+        // both `dump-dil: false` and `--no-dump-dil` in `additionalArgs`.
         let compileLogDir: string | undefined;
-        if (name === 'codeql_query_compile' && options['dump-dil'] !== false) {
-          compileLogDir = getOrCreateLogDirectory(customLogDir as string | undefined);
-          logger.info(`Using log directory for ${name}: ${compileLogDir}`);
+        if (name === 'codeql_query_compile') {
+          const pendingArgs = Array.isArray(options.additionalArgs)
+            ? options.additionalArgs as string[]
+            : [];
+          const effectiveDumpDilDisabled = options['dump-dil'] === false
+            || pendingArgs.includes('--no-dump-dil');
+          if (!effectiveDumpDilDisabled) {
+            compileLogDir = getOrCreateLogDirectory(customLogDir as string | undefined);
+            logger.info(`Using log directory for ${name}: ${compileLogDir}`);
+          }
         }
 
         // Extract additionalArgs from options so they are passed as raw CLI

server/src/lib/cli-tool-registry.ts

@@ -4,7 +4,7 @@
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs';
-import { join } from 'path';
+import { dirname, join } from 'path';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
 import { z } from 'zod';
 import {
@@ -705,6 +705,10 @@ describe('registerCLITool handler behavior', () => {
     expect(existsSync(dilFilePath)).toBe(true);
     const fileContent = readFileSync(dilFilePath, 'utf8');
     expect(fileContent).toBe(dilContent);
+
+    // Clean up generated .dil file and its containing log directory
+    const dilDir = dirname(dilFilePath);
+    rmSync(dilDir, { recursive: true, force: true });
   });
 
   it('should not save DIL file when dump-dil is explicitly false for codeql_query_compile', async () => {
@@ -736,6 +740,35 @@ describe('registerCLITool handler behavior', () => {
     expect(result.content[0].text).not.toContain('DIL file:');
   });
 
+  it('should not save DIL file when --no-dump-dil is in additionalArgs for codeql_query_compile', async () => {
+    const definition: CLIToolDefinition = {
+      name: 'codeql_query_compile',
+      description: 'Compile query',
+      command: 'codeql',
+      subcommand: 'query compile',
+      inputSchema: {
+        query: z.string(),
+        'dump-dil': z.boolean().optional(),
+        additionalArgs: z.array(z.string()).optional()
+      }
+    };
+
+    registerCLITool(mockServer, definition);
+
+    const handler = (mockServer.registerTool as ReturnType<typeof vi.fn>).mock.calls[0][2];
+
+    executeCodeQLCommand.mockResolvedValueOnce({
+      stdout: 'Compilation successful',
+      stderr: '',
+      success: true
+    });
+
+    const result = await handler({ query: '/path/to/MyQuery.ql', additionalArgs: ['--no-dump-dil'] });
+
+    // Response should NOT contain DIL file path since --no-dump-dil disables DIL
+    expect(result.content[0].text).not.toContain('DIL file:');
+  });
+
   it('should pass format to CLI for codeql_bqrs_interpret', async () => {
     const definition: CLIToolDefinition = {
       name: 'codeql_bqrs_interpret',