fix: promote key prompt parameters from optional to required

Make databasePath, language, queryPath, and sarifPath required where
the prompt depends on them. VS Code now correctly marks these fields
as required in the slash-command input dialog.

Author: data-douser

extensions/vscode/test/suite/mcp-prompt-e2e.integration.test.ts

@@ -126,6 +126,7 @@ suite('MCP Prompt Error Handling Integration Tests', () => {
     const result = await client.getPrompt({
       name: 'explain_codeql_query',
       arguments: {
+        databasePath: 'nonexistent/database',
         queryPath: 'nonexistent/path/to/query.ql',
         language: 'javascript',
       },
@@ -153,6 +154,7 @@ suite('MCP Prompt Error Handling Integration Tests', () => {
     const result = await client.getPrompt({
       name: 'explain_codeql_query',
       arguments: {
+        databasePath: existingFile,
         queryPath: existingFile,
         language: 'javascript',
       },
@@ -183,6 +185,7 @@ suite('MCP Prompt Error Handling Integration Tests', () => {
       const result = await client.getPrompt({
         name: 'explain_codeql_query',
         arguments: {
+          databasePath: '/some/db',
           queryPath: '/some/query.ql',
           language: 'rust',
         },
@@ -322,22 +325,25 @@ suite('MCP Prompt Error Handling Integration Tests', () => {
     console.log('[mcp-prompt-e2e] sarif_rank_false_positives correctly warned for nonexistent path');
   });
 
-  test('sarif_rank_false_positives with no arguments should return content without warning', async function () {
+  test('sarif_rank_false_positives with no arguments should reject missing sarifPath', async function () {
     this.timeout(15_000);
 
-    const result = await client.getPrompt({
-      name: 'sarif_rank_false_positives',
-      arguments: {},
-    });
-
-    const text = getFirstMessageText(result);
-    // With no file paths provided, there should be no file-not-found warning.
-    assert.ok(
-      !text.includes('does not exist'),
-      `Response should not contain path warnings when no paths given. Got:\n${text.slice(0, 500)}`,
-    );
+    // sarifPath is required; SDK should reject with a clear error.
+    try {
+      await client.getPrompt({
+        name: 'sarif_rank_false_positives',
+        arguments: {},
+      });
+      assert.fail('Should have thrown for missing required sarifPath');
+    } catch (error: unknown) {
+      const msg = error instanceof Error ? error.message : String(error);
+      assert.ok(
+        msg.includes('sarifPath') || msg.includes('Required'),
+        `Error should mention the missing field. Got: ${msg.slice(0, 500)}`,
+      );
+    }
 
-    console.log('[mcp-prompt-e2e] sarif_rank_false_positives returned clean response with no args');
+    console.log('[mcp-prompt-e2e] sarif_rank_false_positives correctly rejected missing sarifPath');
   });
 
   // ─────────────────────────────────────────────────────────────────────
@@ -389,25 +395,28 @@ suite('MCP Prompt Error Handling Integration Tests', () => {
   });
 
   // ─────────────────────────────────────────────────────────────────────
-  // All prompts with all-optional params should handle empty args gracefully
+  // Prompts with required fields should return validation error on empty args
   // ─────────────────────────────────────────────────────────────────────
 
-  test('ql_tdd_basic with empty arguments should return content without errors', async function () {
+  test('ql_tdd_basic with empty arguments should reject missing language', async function () {
     this.timeout(15_000);
 
-    const result = await client.getPrompt({
-      name: 'ql_tdd_basic',
-      arguments: {},
-    });
-
-    const text = getFirstMessageText(result);
-    assert.ok(text.length > 0, 'Should return non-empty content');
-    assert.ok(
-      !text.includes('does not exist'),
-      'Should not contain path warnings with no args',
-    );
+    // language is required; SDK should reject with a clear error.
+    try {
+      await client.getPrompt({
+        name: 'ql_tdd_basic',
+        arguments: {},
+      });
+      assert.fail('Should have thrown for missing required language');
+    } catch (error: unknown) {
+      const msg = error instanceof Error ? error.message : String(error);
+      assert.ok(
+        msg.includes('language') || msg.includes('Required'),
+        `Error should mention the missing field. Got: ${msg.slice(0, 500)}`,
+      );
+    }
 
-    console.log('[mcp-prompt-e2e] ql_tdd_basic returned clean response with empty args');
+    console.log('[mcp-prompt-e2e] ql_tdd_basic correctly rejected missing language');
   });
 
   test('run_query_and_summarize_false_positives with nonexistent queryPath should return warning', async function () {

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

@@ -64387,23 +64387,23 @@ var workshopCreationWorkflowSchema = external_exports.object({
   numStages: external_exports.coerce.number().optional().describe("Number of incremental stages (default: 4-8)")
 });
 var qlTddBasicSchema = external_exports.object({
-  language: external_exports.enum(SUPPORTED_LANGUAGES).optional().describe("Programming language for the query (optional)"),
+  language: external_exports.enum(SUPPORTED_LANGUAGES).describe("Programming language for the query"),
   queryName: external_exports.string().optional().describe("Name of the query to develop")
 });
 var qlTddAdvancedSchema = external_exports.object({
   database: external_exports.string().optional().describe("Path to the CodeQL database for analysis"),
-  language: external_exports.enum(SUPPORTED_LANGUAGES).optional().describe("Programming language for the query (optional)"),
+  language: external_exports.enum(SUPPORTED_LANGUAGES).describe("Programming language for the query"),
   queryName: external_exports.string().optional().describe("Name of the query to develop")
 });
 var sarifRankSchema = external_exports.object({
   queryId: external_exports.string().optional().describe("CodeQL query/rule identifier"),
-  sarifPath: external_exports.string().optional().describe("Path to the SARIF file to analyze")
+  sarifPath: external_exports.string().describe("Path to the SARIF file to analyze")
 });
 var describeFalsePositivesSchema = external_exports.object({
-  queryPath: external_exports.string().optional().describe("Path to the CodeQL query file")
+  queryPath: external_exports.string().describe("Path to the CodeQL query file")
 });
 var explainCodeqlQuerySchema = external_exports.object({
-  databasePath: external_exports.string().optional().describe("Optional path to a real CodeQL database for profiling"),
+  databasePath: external_exports.string().describe("Path to a CodeQL database for profiling"),
   language: external_exports.enum(SUPPORTED_LANGUAGES).describe("Programming language of the query"),
   queryPath: external_exports.string().describe("Path to the CodeQL query file (.ql or .qlref)")
 });
@@ -64412,8 +64412,8 @@ var documentCodeqlQuerySchema = external_exports.object({
   queryPath: external_exports.string().describe("Path to the CodeQL query file (.ql or .qlref)")
 });
 var qlLspIterativeDevelopmentSchema = external_exports.object({
-  language: external_exports.enum(SUPPORTED_LANGUAGES).optional().describe("Programming language for the query"),
-  queryPath: external_exports.string().optional().describe("Path to the query file being developed"),
+  language: external_exports.enum(SUPPORTED_LANGUAGES).describe("Programming language for the query"),
+  queryPath: external_exports.string().describe("Path to the query file being developed"),
   workspaceUri: external_exports.string().optional().describe("Workspace URI for LSP dependency resolution")
 });
 function toPermissiveShape(shape) {
@@ -64627,17 +64627,13 @@ ${content}`
       async ({ language, queryName }) => {
         const template = loadPromptTemplate("ql-tdd-basic.prompt.md");
         let contextSection = "## Your Development Context\n\n";
-        if (language) {
-          contextSection += `- **Language**: ${language}
+        contextSection += `- **Language**: ${language}
 `;
-        }
         if (queryName) {
           contextSection += `- **Query Name**: ${queryName}
 `;
         }
-        if (language || queryName) {
-          contextSection += "\n";
-        }
+        contextSection += "\n";
         return {
           messages: [
             {
@@ -64669,10 +64665,8 @@ ${content}`
           if (dbResult.warning) warnings.push(dbResult.warning);
         }
         let contextSection = "## Your Development Context\n\n";
-        if (language) {
-          contextSection += `- **Language**: ${language}
+        contextSection += `- **Language**: ${language}
 `;
-        }
         if (queryName) {
           contextSection += `- **Query Name**: ${queryName}
 `;
@@ -64681,9 +64675,7 @@ ${content}`
           contextSection += `- **Database**: ${resolvedDatabase}
 `;
         }
-        if (language || queryName || resolvedDatabase) {
-          contextSection += "\n";
-        }
+        contextSection += "\n";
         const warningSection = warnings.length > 0 ? warnings.join("\n") + "\n\n" : "";
         return {
           messages: [
@@ -64709,24 +64701,17 @@ ${content}`
       async ({ queryId, sarifPath }) => {
         const template = loadPromptTemplate("sarif-rank-false-positives.prompt.md");
         const warnings = [];
-        let resolvedSarifPath = sarifPath;
-        if (sarifPath) {
-          const spResult = resolvePromptFilePath(sarifPath);
-          resolvedSarifPath = spResult.resolvedPath;
-          if (spResult.warning) warnings.push(spResult.warning);
-        }
+        const spResult = resolvePromptFilePath(sarifPath);
+        const resolvedSarifPath = spResult.resolvedPath;
+        if (spResult.warning) warnings.push(spResult.warning);
         let contextSection = "## Analysis Context\n\n";
         if (queryId) {
           contextSection += `- **Query ID**: ${queryId}
 `;
         }
-        if (resolvedSarifPath) {
-          contextSection += `- **SARIF File**: ${resolvedSarifPath}
+        contextSection += `- **SARIF File**: ${resolvedSarifPath}
 `;
-        }
-        if (queryId || resolvedSarifPath) {
-          contextSection += "\n";
-        }
+        contextSection += "\n";
         const warningSection = warnings.length > 0 ? warnings.join("\n") + "\n\n" : "";
         return {
           messages: [
@@ -64752,24 +64737,17 @@ ${content}`
       async ({ queryId, sarifPath }) => {
         const template = loadPromptTemplate("sarif-rank-true-positives.prompt.md");
         const warnings = [];
-        let resolvedSarifPath = sarifPath;
-        if (sarifPath) {
-          const spResult = resolvePromptFilePath(sarifPath);
-          resolvedSarifPath = spResult.resolvedPath;
-          if (spResult.warning) warnings.push(spResult.warning);
-        }
+        const spResult = resolvePromptFilePath(sarifPath);
+        const resolvedSarifPath = spResult.resolvedPath;
+        if (spResult.warning) warnings.push(spResult.warning);
         let contextSection = "## Analysis Context\n\n";
         if (queryId) {
           contextSection += `- **Query ID**: ${queryId}
 `;
         }
-        if (resolvedSarifPath) {
-          contextSection += `- **SARIF File**: ${resolvedSarifPath}
+        contextSection += `- **SARIF File**: ${resolvedSarifPath}
 `;
-        }
-        if (queryId || resolvedSarifPath) {
-          contextSection += "\n";
-        }
+        contextSection += "\n";
         const warningSection = warnings.length > 0 ? warnings.join("\n") + "\n\n" : "";
         return {
           messages: [
@@ -64795,18 +64773,14 @@ ${content}`
       async ({ queryPath }) => {
         const template = loadPromptTemplate("run-query-and-summarize-false-positives.prompt.md");
         const warnings = [];
-        let resolvedQueryPath = queryPath;
-        if (queryPath) {
-          const qpResult = resolvePromptFilePath(queryPath);
-          resolvedQueryPath = qpResult.resolvedPath;
-          if (qpResult.warning) warnings.push(qpResult.warning);
-        }
-        let contextSection = "## Analysis Context\n\n";
-        if (resolvedQueryPath) {
-          contextSection += `- **Query Path**: ${resolvedQueryPath}
+        const qpResult = resolvePromptFilePath(queryPath);
+        const resolvedQueryPath = qpResult.resolvedPath;
+        if (qpResult.warning) warnings.push(qpResult.warning);
+        const contextSection = `## Analysis Context
+
+- **Query Path**: ${resolvedQueryPath}
+
 `;
-        }
-        contextSection += "\n";
         const warningSection = warnings.length > 0 ? warnings.join("\n") + "\n\n" : "";
         return {
           messages: [
@@ -64835,21 +64809,16 @@ ${content}`
         const qpResult = resolvePromptFilePath(queryPath);
         const resolvedQueryPath = qpResult.resolvedPath;
         if (qpResult.warning) warnings.push(qpResult.warning);
-        let resolvedDatabasePath = databasePath;
-        if (databasePath) {
-          const dbResult = resolvePromptFilePath(databasePath);
-          resolvedDatabasePath = dbResult.resolvedPath;
-          if (dbResult.warning) warnings.push(dbResult.warning);
-        }
+        const dbResult = resolvePromptFilePath(databasePath);
+        const resolvedDatabasePath = dbResult.resolvedPath;
+        if (dbResult.warning) warnings.push(dbResult.warning);
         let contextSection = "## Query to Explain\n\n";
         contextSection += `- **Query Path**: ${resolvedQueryPath}
 `;
         contextSection += `- **Language**: ${language}
 `;
-        if (resolvedDatabasePath) {
-          contextSection += `- **Database Path**: ${resolvedDatabasePath}
+        contextSection += `- **Database Path**: ${resolvedDatabasePath}
 `;
-        }
         contextSection += "\n";
         const warningSection = warnings.length > 0 ? warnings.join("\n") + "\n\n" : "";
         return {
@@ -64910,34 +64879,25 @@ ${content}`
       async ({ language, queryPath, workspaceUri }) => {
         const template = loadPromptTemplate("ql-lsp-iterative-development.prompt.md");
         const warnings = [];
-        let resolvedQueryPath = queryPath;
-        if (queryPath) {
-          const qpResult = resolvePromptFilePath(queryPath);
-          resolvedQueryPath = qpResult.resolvedPath;
-          if (qpResult.warning) warnings.push(qpResult.warning);
-        }
+        const qpResult = resolvePromptFilePath(queryPath);
+        const resolvedQueryPath = qpResult.resolvedPath;
+        if (qpResult.warning) warnings.push(qpResult.warning);
         let resolvedWorkspaceUri = workspaceUri;
         if (workspaceUri) {
           const wsResult = resolvePromptFilePath(workspaceUri);
           resolvedWorkspaceUri = wsResult.resolvedPath;
           if (wsResult.warning) warnings.push(wsResult.warning);
         }
         let contextSection = "## Your Development Context\n\n";
-        if (language) {
-          contextSection += `- **Language**: ${language}
+        contextSection += `- **Language**: ${language}
 `;
-        }
-        if (resolvedQueryPath) {
-          contextSection += `- **Query Path**: ${resolvedQueryPath}
+        contextSection += `- **Query Path**: ${resolvedQueryPath}
 `;
-        }
         if (resolvedWorkspaceUri) {
           contextSection += `- **Workspace URI**: ${resolvedWorkspaceUri}
 `;
         }
-        if (language || resolvedQueryPath || resolvedWorkspaceUri) {
-          contextSection += "\n";
-        }
+        contextSection += "\n";
         const warningSection = warnings.length > 0 ? warnings.join("\n") + "\n\n" : "";
         return {
           messages: [