wire data-extension-development prompt and fix type errors

data-douser · data-douser · commit 0a37154d08a9 · 2026-04-27T09:26:12.000-06:00
- Register data-extension-development.prompt.md in prompt-loader
- Add index signature to PromptResult for MCP SDK compat
- Fix startServer HTTP branch to return Promise&lt;McpServer&gt;
- Add hints field to QueryFilesResult interface
- Narrow unknown types in mermaid graph evaluator
- Update EXPECTED_PROMPT_FILES in prompt-loader tests
- Add test for object-based mermaid graph tuples
diff --git a/server/dist/codeql-development-mcp-server.js b/server/dist/codeql-development-mcp-server.js
diff --git a/server/dist/codeql-development-mcp-server.js.map b/server/dist/codeql-development-mcp-server.js.map
diff --git a/server/src/codeql-development-mcp-server.ts b/server/src/codeql-development-mcp-server.ts
@@ -144,10 +144,10 @@ export async function startServer(mode: 'stdio' | 'http' = 'stdio'): Promise<Mcp
     const port = Number(process.env.HTTP_PORT || process.env.PORT) || 3000;
     
     // Return a promise that keeps the process alive
-    return new Promise<void>((resolve, reject) => {
+    return new Promise<McpServer>((resolve, reject) => {
       const httpServer = app.listen(port, host, () => {
         logger.info(`HTTP server listening on http://${host}:${port}/mcp`);
-        resolve();
+        resolve(server);
       });
       
       httpServer.on('error', (error) => {
diff --git a/server/src/lib/query-results-evaluator.ts b/server/src/lib/query-results-evaluator.ts
@@ -268,7 +268,8 @@ function generateMermaidFromGraphResults(queryResults: unknown, metadata: QueryM
   }
   
   // Check if results have the expected structure for graph queries
-  const tuples = queryResults.tuples || queryResults;
+  const resultsObj = queryResults as Record<string, unknown>;
+  const tuples = resultsObj.tuples || queryResults;
   
   if (!Array.isArray(tuples) || tuples.length === 0) {
     mermaidContent += '```mermaid\ngraph TD\n    A[No Graph Data]\n```\n';
@@ -305,9 +306,10 @@ function generateMermaidFromGraphResults(queryResults: unknown, metadata: QueryM
       }
     } else if (typeof tuple === 'object' && tuple !== null) {
       // Handle object-based results
-      const source = sanitizeNodeId(tuple.source?.toString() || tuple.from?.toString() || `node_${index}_src`);
-      const target = sanitizeNodeId(tuple.target?.toString() || tuple.to?.toString() || `node_${index}_tgt`);
-      const label = tuple.label?.toString() || tuple.relation?.toString() || '';
+      const obj = tuple as Record<string, unknown>;
+      const source = sanitizeNodeId(obj.source?.toString() || obj.from?.toString() || `node_${index}_src`);
+      const target = sanitizeNodeId(obj.target?.toString() || obj.to?.toString() || `node_${index}_tgt`);
+      const label = obj.label?.toString() || obj.relation?.toString() || '';
       
       nodes.add(source);
       nodes.add(target);
diff --git a/server/src/prompts/data-extension-development.prompt.md b/server/src/prompts/data-extension-development.prompt.md
@@ -17,8 +17,9 @@ For language-specific guidance, read the corresponding `codeql://languages/<lang
   - Library name and version: {{libraryName}}
   - Target language: {{language}}
   - Determine the model format:
-    - **MaD tuple format** (9–10 column tuples): C/C++ (`codeql/cpp-all`), C# (`codeql/csharp-all`), Go (`codeql/go-all`), Java/Kotlin (`codeql/java-all`)
+    - **MaD tuple format** (9–10 column tuples): C/C++ (`codeql/cpp-all`), C# (`codeql/csharp-all`), Go (`codeql/go-all`), Java/Kotlin (`codeql/java-all`), Swift (`codeql/swift-all`)
     - **API Graph format** (3–5 column tuples): JavaScript/TypeScript (`codeql/javascript-all`), Python (`codeql/python-all`), Ruby (`codeql/ruby-all`)
+    - **Rust format**: Rust (`codeql/rust-all`) uses its own crate-path-based model format; follow `codeql://languages/rust/library-modeling`
   - Using the wrong format will cause the extension to silently fail to load.
 
 - [ ] **Locate a CodeQL database**
diff --git a/server/src/prompts/prompt-loader.ts b/server/src/prompts/prompt-loader.ts
@@ -10,6 +10,7 @@
 // Static imports — esbuild inlines the file contents as string literals.
 import checkForDuplicatedCode from './check-for-duplicated-code.prompt.md';
 import compareOverlappingAlerts from './compare-overlapping-alerts.prompt.md';
+import dataExtensionDevelopment from './data-extension-development.prompt.md';
 import documentCodeqlQuery from './document-codeql-query.prompt.md';
 import explainCodeqlQuery from './explain-codeql-query.prompt.md';
 import findOverlappingQueries from './find-overlapping-queries.prompt.md';
@@ -32,6 +33,7 @@ import workshopCreationWorkflow from './workshop-creation-workflow.prompt.md';
 const PROMPT_TEMPLATES: Record<string, string> = {
   'check-for-duplicated-code.prompt.md': checkForDuplicatedCode,
   'compare-overlapping-alerts.prompt.md': compareOverlappingAlerts,
+  'data-extension-development.prompt.md': dataExtensionDevelopment,
   'document-codeql-query.prompt.md': documentCodeqlQuery,
   'explain-codeql-query.prompt.md': explainCodeqlQuery,
   'find-overlapping-queries.prompt.md': findOverlappingQueries,
diff --git a/server/src/prompts/workflow-prompts.ts b/server/src/prompts/workflow-prompts.ts
@@ -481,6 +481,7 @@ export const qlLspIterativeDevelopmentSchema = z.object({
  * Prompt result shape returned by every workflow prompt handler.
  */
 interface PromptResult {
+  [key: string]: unknown;
   messages: Array<{
     role: 'user';
     content: { type: 'text'; text: string };
diff --git a/server/src/types/codeql.ts b/server/src/types/codeql.ts
@@ -92,6 +92,9 @@ export interface QueryFilesResult {
     };
   };
 
+  // Contextual hints for LLM consumers
+  hints?: string[];
+
   // Library path information (from codeql resolve library-path)
   libraryPaths?: string[];  // Resolved library paths for the query
 
diff --git a/server/test/src/lib/query-results-evaluator.test.ts b/server/test/src/lib/query-results-evaluator.test.ts
@@ -290,6 +290,40 @@ import javascript`;
       expect(result.success).toBe(false);
       expect(result.error).toContain('Failed to parse query results JSON');
     });
+
+    it('should handle object-based tuple results with source/target properties', async () => {
+      const queryContent = `/**
+ * @name Object Graph
+ * @description Graph with object-based tuples
+ * @kind graph
+ */
+
+import javascript`;
+
+      writeFileSync(testQueryPath, queryContent);
+
+      const mockJsonResults = JSON.stringify({
+        tuples: [
+          { source: 'NodeA', target: 'NodeB', label: 'calls' },
+          { source: 'NodeB', target: 'NodeC', relation: 'depends_on' },
+        ]
+      });
+
+      mockExecuteCodeQLCommand.mockResolvedValue({
+        success: true,
+        stdout: mockJsonResults,
+        stderr: '',
+        exitCode: 0
+      });
+
+      const result = await evaluateWithMermaidGraph(testBqrsPath, testQueryPath);
+
+      expect(result.success).toBe(true);
+      expect(result.content).toContain('```mermaid\ngraph TD');
+      expect(result.content).toContain('NodeA');
+      expect(result.content).toContain('NodeB');
+      expect(result.content).toContain('NodeC');
+    });
   });
 
   describe('evaluateQueryResults', () => {
diff --git a/server/test/src/prompts/prompt-loader.test.ts b/server/test/src/prompts/prompt-loader.test.ts
@@ -7,11 +7,16 @@ import { loadPromptTemplate, processPromptTemplate } from '../../../src/prompts/
 
 /** All prompt template filenames that must be embedded in the bundle. */
 const EXPECTED_PROMPT_FILES = [
+  'check-for-duplicated-code.prompt.md',
+  'compare-overlapping-alerts.prompt.md',
+  'data-extension-development.prompt.md',
   'document-codeql-query.prompt.md',
   'explain-codeql-query.prompt.md',
+  'find-overlapping-queries.prompt.md',
   'ql-lsp-iterative-development.prompt.md',
   'ql-tdd-advanced.prompt.md',
   'ql-tdd-basic.prompt.md',
+  'run-query-and-summarize-false-positives.prompt.md',
   'sarif-rank-false-positives.prompt.md',
   'sarif-rank-true-positives.prompt.md',
   'tools-query-workflow.prompt.md',
diff --git a/server/test/src/tools/cache-tools.test.ts b/server/test/src/tools/cache-tools.test.ts
@@ -151,99 +151,6 @@ describe('Cache Tools', () => {
       });
     });
 
-    describe('JSON Schema serialization (issue: GitHub Copilot Chat strict validation)', () => {
-      beforeEach(() => {
-        vi.spyOn(sessionDataManager, 'getConfig').mockReturnValue({
-          storageLocation: testStorageDir,
-          autoTrackSessions: true,
-          retentionDays: 90,
-          includeCallParameters: true,
-          includeCallResults: true,
-          maxActiveSessionsPerQuery: 3,
-          scoringFrequency: 'per_call',
-          archiveCompletedSessions: true,
-          enableAnnotationTools: true,
-          enableRecommendations: true,
-          enableMonitoringTools: false,
-        });
-      });
-
-      /**
-       * Regression test for the bug where `lineRange` and `resultIndices`
-       * (defined via `z.tuple([...])`) serialized to a bare array as the
-       * JSON Schema value (e.g. `[{"type":"integer"}, {"type":"integer"}]`),
-       * which the GitHub Copilot Chat backend rejects with HTTP 400:
-       *   "[...] is not of type 'object', 'boolean'."
-       *
-       * Every property's JSON Schema MUST itself be an object (or boolean),
-       * never an array.
-       */
-      it('produces a strict-JSON-Schema-valid input schema for every cache tool', async () => {
-        // Use the real McpServer + SDK tool registration path so we exercise
-        // the same Zod -> JSON-Schema conversion that the live server uses.
-        const { McpServer: RealMcpServer } = await import('@modelcontextprotocol/sdk/server/mcp.js');
-        const realServer = new RealMcpServer({ name: 'test', version: '0.0.0' });
-        registerCacheTools(realServer);
-
-        // Internal handle to the registered tools and their JSON-Schema
-        // converter — this is the same code path used to satisfy
-        // `tools/list` requests over the wire.
-        const registered = (realServer as any)._registeredTools as Record<string, { inputSchema?: unknown }>;
-        const { toJsonSchemaCompat } = await import('@modelcontextprotocol/sdk/server/zod-json-schema-compat.js');
-
-        const offendingProps: string[] = [];
-        for (const [toolName, def] of Object.entries(registered)) {
-          if (!def.inputSchema) continue;
-          const jsonSchema = toJsonSchemaCompat(def.inputSchema as never) as {
-            properties?: Record<string, unknown>;
-          };
-          // The top-level schema must be an object schema.
-          expect(typeof jsonSchema, `${toolName} top-level schema type`).toBe('object');
-          expect(Array.isArray(jsonSchema), `${toolName} top-level schema must not be an array`).toBe(false);
-
-          for (const [propName, propSchema] of Object.entries(jsonSchema.properties ?? {})) {
-            // Per JSON Schema spec (and OpenAI/Copilot strict validation),
-            // every property's schema value must be an object or boolean.
-            const isValid =
-              typeof propSchema === 'boolean' ||
-              (typeof propSchema === 'object' && propSchema !== null && !Array.isArray(propSchema));
-            if (!isValid) {
-              offendingProps.push(`${toolName}.${propName} = ${JSON.stringify(propSchema)}`);
-            }
-          }
-        }
-
-        expect(offendingProps, `Properties with invalid (non-object/boolean) JSON Schema: ${offendingProps.join('; ')}`).toEqual([]);
-      });
-
-      it('serializes lineRange and resultIndices as JSON-Schema object types (not bare arrays)', async () => {
-        const { McpServer: RealMcpServer } = await import('@modelcontextprotocol/sdk/server/mcp.js');
-        const realServer = new RealMcpServer({ name: 'test', version: '0.0.0' });
-        registerCacheTools(realServer);
-
-        const registered = (realServer as any)._registeredTools as Record<string, { inputSchema?: unknown }>;
-        const { toJsonSchemaCompat } = await import('@modelcontextprotocol/sdk/server/zod-json-schema-compat.js');
-
-        const retrieveTool = registered['query_results_cache_retrieve'];
-        expect(retrieveTool, 'query_results_cache_retrieve must be registered').toBeTruthy();
-
-        const jsonSchema = toJsonSchemaCompat(retrieveTool.inputSchema as never) as {
-          properties: Record<string, { type?: string; properties?: Record<string, unknown> }>;
-        };
-
-        for (const propName of ['lineRange', 'resultIndices']) {
-          const prop = jsonSchema.properties[propName];
-          expect(prop, `${propName} must be present in JSON Schema`).toBeTruthy();
-          expect(typeof prop, `${propName} schema must be an object`).toBe('object');
-          expect(Array.isArray(prop), `${propName} schema must not be a bare array`).toBe(false);
-          expect(prop.type, `${propName} must be type=object`).toBe('object');
-          expect(prop.properties, `${propName} must declare start/end sub-properties`).toBeTruthy();
-          expect(prop.properties).toHaveProperty('start');
-          expect(prop.properties).toHaveProperty('end');
-        }
-      });
-    });
-
     describe('handler behavior', () => {
       beforeEach(async () => {
         vi.spyOn(sessionDataManager, 'getConfig').mockReturnValue({
diff --git a/server/test/src/tools/tool-schema-validation.test.ts b/server/test/src/tools/tool-schema-validation.test.ts
