Address review feedback for PR #266

Author: data-douser

CHANGELOG.md

@@ -14,6 +14,24 @@ release cadence.
 
 _Changes on `main` since the latest tagged release that have not yet been included in a stable release._
 
+### Added
+
+#### MCP Server Prompts
+
+| Prompt                       | Description                                                                                                                                                                                                                                 |
+| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `data_extension_development` | End-to-end workflow for authoring CodeQL data extensions (Models-as-Data) for third-party libraries; restricts `language` to MaD-supported languages. ([#266](https://github.com/advanced-security/codeql-development-mcp-server/pull/266)) |
+
+#### MCP Server Resources
+
+| URI                                         | Description                                                                                                                                                                                             |
+| ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `codeql://learning/data-extensions`         | Models-as-Data (MaD) overview: YAML model formats, extensible predicates, and model-pack layout. ([#266](https://github.com/advanced-security/codeql-development-mcp-server/pull/266))                  |
+| `codeql://languages/rust/library-modeling`  | Rust-specific library-modeling guide (crate-path-based MaD format) for the `data_extension_development` workflow. ([#266](https://github.com/advanced-security/codeql-development-mcp-server/pull/266)) |
+| `codeql://languages/swift/library-modeling` | Swift-specific library-modeling guide (MaD tuple format) for the `data_extension_development` workflow. ([#266](https://github.com/advanced-security/codeql-development-mcp-server/pull/266))           |
+
+Every CodeQL language that supports Models-as-Data upstream (`cpp`, `csharp`, `go`, `java`, `javascript`, `python`, `ruby`, `rust`, `swift`) now has a registered `codeql://languages/<language>/library-modeling` resource. `actions` is intentionally excluded because it does not support data extensions.
+
 ### Fixed
 
 - **`query_results_cache_retrieve` rejected by GitHub Copilot Chat (HTTP 400 invalid schema)** — The `lineRange` and `resultIndices` parameters were defined with `z.tuple([...])`, which the MCP SDK serialized to a bare-array JSON Schema value (e.g. `[{"type":"integer"}, {"type":"integer"}]`). GitHub Copilot Chat enforces strict JSON Schema validation and rejected the entire `ql-mcp` server with `"... is not of type 'object', 'boolean'"`. Both parameters now use `z.object({ start, end })` so they serialize to a valid `type: "object"` JSON Schema. Tool callers must now pass `{ "lineRange": { "start": 1, "end": 10 } }` instead of `{ "lineRange": [1, 10] }`. ([#263](https://github.com/advanced-security/codeql-development-mcp-server/pull/263))

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

@@ -8,7 +8,7 @@
  */
 
 // Static imports — esbuild inlines the file contents as string literals.
-import dataExtensionsOverviewContent from '../resources/data-extensions-overview.md';
+import learningDataExtensionsContent from '../resources/learning-data-extensions.md';
 import dataflowMigrationContent from '../resources/dataflow-migration-v1-to-v2.md';
 import learningQueryBasicsContent from '../resources/learning-query-basics.md';
 import performancePatternsContent from '../resources/performance-patterns.md';
@@ -84,10 +84,10 @@ export function getQueryUnitTesting(): string {
 }
 
 /**
- * Get the data extensions overview content
+ * Get the data extensions learning resource content
  */
-export function getDataExtensionsOverview(): string {
-  return dataExtensionsOverviewContent;
+export function getLearningDataExtensions(): string {
+  return learningDataExtensionsContent;
 }
 
 /**

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

@@ -20,3 +20,23 @@ export const SUPPORTED_LANGUAGES = [
   'rust',
   'swift',
 ] as const;
+
+/**
+ * CodeQL languages that support Models-as-Data (MaD) data extensions.
+ *
+ * This is the subset of {@link SUPPORTED_LANGUAGES} for which the server
+ * registers a `codeql://languages/<language>/library-modeling` resource.
+ * `actions` is intentionally excluded because the GitHub Actions language
+ * does not support data extensions upstream.
+ */
+export const MAD_SUPPORTED_LANGUAGES = [
+  'cpp',
+  'csharp',
+  'go',
+  'java',
+  'javascript',
+  'python',
+  'ruby',
+  'rust',
+  'swift',
+] as const;

server/src/lib/resources.ts

@@ -10,7 +10,7 @@ import { z } from 'zod';
 import { access } from 'fs/promises';
 import { basename, isAbsolute, normalize, relative, resolve, sep } from 'path';
 import { fileURLToPath } from 'url';
-import { SUPPORTED_LANGUAGES } from './constants';
+import { MAD_SUPPORTED_LANGUAGES, SUPPORTED_LANGUAGES } from './constants';
 import { addCompletions, getEffectiveLanguage } from './prompt-completions';
 import { loadPromptTemplate, processPromptTemplate } from './prompt-loader';
 import { getUserWorkspaceDir } from '../utils/package-paths';
@@ -195,13 +195,17 @@ export async function resolvePromptFilePath(
  * Schema for data_extension_development prompt parameters.
  *
  * - `language` is **required** – the model format depends on the language.
+ *   Restricted to {@link MAD_SUPPORTED_LANGUAGES} (the subset of supported
+ *   languages that have a registered `library-modeling` resource and
+ *   upstream Models-as-Data support); `actions` is excluded because it
+ *   does not support data extensions.
  * - `libraryName` is optional – the library or framework to model.
  * - `database` is optional – path to a CodeQL database for testing.
  */
 export const dataExtensionDevelopmentSchema = z.object({
   language: z
-    .enum(SUPPORTED_LANGUAGES)
-    .describe('Programming language for the data extension'),
+    .enum(MAD_SUPPORTED_LANGUAGES)
+    .describe('Programming language for the data extension (Models-as-Data supported languages only)'),
   libraryName: z
     .string()
     .optional()

server/src/prompts/constants.ts

@@ -4,7 +4,7 @@
 
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import {
-  getDataExtensionsOverview,
+  getLearningDataExtensions,
   getDataflowMigration,
   getLearningQueryBasics,
   getPerformancePatterns,
@@ -224,7 +224,7 @@ export function registerCodeQLResources(server: McpServer): void {
           {
             uri: 'codeql://learning/data-extensions',
             mimeType: 'text/markdown',
-            text: getDataExtensionsOverview(),
+            text: getLearningDataExtensions(),
           },
         ],
       };