Address PR review feedback

data-douser · data-douser · commit 9b4c279ff415 · 2026-03-25T20:14:03.000-06:00
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/ql/cpp/tools/src/ExternalPredicates.qll b/server/ql/cpp/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/csharp/tools/src/ExternalPredicates.qll b/server/ql/csharp/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/go/tools/src/ExternalPredicates.qll b/server/ql/go/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/java/tools/src/ExternalPredicates.qll b/server/ql/java/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/javascript/tools/src/ExternalPredicates.qll b/server/ql/javascript/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/python/tools/src/ExternalPredicates.qll b/server/ql/python/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/ruby/tools/src/ExternalPredicates.qll b/server/ql/ruby/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/swift/tools/src/CallGraphFrom/CallGraphFrom.ql b/server/ql/swift/tools/src/CallGraphFrom/CallGraphFrom.ql
@@ -19,11 +19,12 @@ string getSourceFunctionName() {
 
 /**
  * Gets a function by matching against the selected source function names.
+ * Supports both base names (e.g. "sourceFunc") and full Swift signatures (e.g. "sourceFunc()").
  */
 Function getSourceFunction() {
   exists(string selectedFunc |
     selectedFunc = getSourceFunctionName() and
-    result.getName() = selectedFunc
+    (result.getName() = selectedFunc or result.getName().matches(selectedFunc + "(%"))
   )
 }
 
diff --git a/server/ql/swift/tools/src/CallGraphFromTo/CallGraphFromTo.ql b/server/ql/swift/tools/src/CallGraphFromTo/CallGraphFromTo.ql
@@ -26,21 +26,23 @@ string getTargetFunctionName() {
 
 /**
  * Gets a function by matching against the selected source function names.
+ * Supports both base names (e.g. "source") and full Swift signatures (e.g. "source()").
  */
 Function getSourceFunction() {
   exists(string selectedFunc |
     selectedFunc = getSourceFunctionName() and
-    result.getName() = selectedFunc
+    (result.getName() = selectedFunc or result.getName().matches(selectedFunc + "(%"))
   )
 }
 
 /**
  * Gets a function by matching against the selected target function names.
+ * Supports both base names (e.g. "target") and full Swift signatures (e.g. "target()").
  */
 Function getTargetFunction() {
   exists(string selectedFunc |
     selectedFunc = getTargetFunctionName() and
-    result.getName() = selectedFunc
+    (result.getName() = selectedFunc or result.getName().matches(selectedFunc + "(%"))
   )
 }
 
diff --git a/server/ql/swift/tools/src/CallGraphTo/CallGraphTo.ql b/server/ql/swift/tools/src/CallGraphTo/CallGraphTo.ql
@@ -35,6 +35,9 @@ string getCalleeName(CallExpr call) {
   else result = call.toString()
 }
 
-from CallExpr call
-where call.getStaticTarget().getName() = getTargetFunctionName()
+from CallExpr call, string targetName
+where
+  targetName = getTargetFunctionName() and
+  (call.getStaticTarget().getName() = targetName or
+    call.getStaticTarget().getName().matches(targetName + "(%"))
 select call, "Call to `" + getCalleeName(call) + "` from `" + getCallerName(call) + "`"
diff --git a/server/ql/swift/tools/src/ExternalPredicates.qll b/server/ql/swift/tools/src/ExternalPredicates.qll
@@ -1,7 +1,7 @@
 /**
  * Shared extensible predicate declarations for MCP server tools queries.
  * Values are provided via dataExtensions YAML files during testing,
- * or via CSV files at runtime from the MCP server.
+ * or via a temporary data extension pack at runtime from the MCP server.
  */
 
 /** Holds for each source function name for call graph analysis. */
diff --git a/server/ql/swift/tools/test/CallGraphFrom/CallGraphFrom.expected b/server/ql/swift/tools/test/CallGraphFrom/CallGraphFrom.expected
@@ -0,0 +1,2 @@
+| Example1.swift:12:5:12:16 | call to unrelated1() | Call from `sourceFunc()` to `unrelated1()` |
+| Example1.swift:13:5:13:16 | call to unrelated2() | Call from `sourceFunc()` to `unrelated2()` |
diff --git a/server/ql/swift/tools/test/CallGraphFromTo/CallGraphFromTo.expected b/server/ql/swift/tools/test/CallGraphFromTo/CallGraphFromTo.expected
@@ -0,0 +1,2 @@
+| Example1.swift:10:5:10:12 | call to target() | Reachable call from `intermediate()` to `target()` |
+| Example1.swift:14:5:14:18 | call to intermediate() | Reachable call from `source()` to `intermediate()` |
diff --git a/server/ql/swift/tools/test/CallGraphTo/CallGraphTo.expected b/server/ql/swift/tools/test/CallGraphTo/CallGraphTo.expected
@@ -0,0 +1,2 @@
+| Example1.swift:12:5:12:16 | call to targetFunc() | Call to `targetFunc()` from `caller1()` |
+| Example1.swift:16:5:16:16 | call to targetFunc() | Call to `targetFunc()` from `caller2()` |
diff --git a/server/src/lib/cli-tool-registry.ts b/server/src/lib/cli-tool-registry.ts
@@ -10,7 +10,8 @@ import { evaluateQueryResults, QueryEvaluationResult, extractQueryMetadata } fro
 import { getOrCreateLogDirectory } from './log-directory-manager';
 import { getUserWorkspaceDir, packageRootDir, resolveToolQueryPackPath } from '../utils/package-paths';
 import { writeFileSync, rmSync, existsSync, mkdirSync, readdirSync, statSync } from 'fs';
-import { basename, dirname, isAbsolute, join, resolve } from 'path';
+import { basename, delimiter, dirname, isAbsolute, join, resolve } from 'path';
+import * as yaml from 'js-yaml';
 import { createProjectTempDir } from '../utils/temp-dir';
 
 export type { CLIExecutionResult } from './cli-executor';
@@ -322,7 +323,9 @@ export function registerCLITool(server: McpServer, definition: CLIToolDefinition
                 targetPackName = `advanced-security/ql-mcp-${_queryLanguage}-tools-src`;
               } else if (query && typeof query === 'string') {
                 // Extract language from query path: .../ql/{lang}/tools/src/...
-                const match = (query as string).match(/\/ql\/([^/]+)\/tools\/src\//);
+                // Normalize backslashes for Windows compatibility
+                const normalizedQuery = (query as string).replace(/\\/g, '/');
+                const match = normalizedQuery.match(/\/ql\/([^/]+)\/tools\/src\//);
                 if (match) {
                   targetPackName = `advanced-security/ql-mcp-${match[1]}-tools-src`;
                 }
@@ -350,25 +353,23 @@ export function registerCLITool(server: McpServer, definition: CLIToolDefinition
                   const extDir = join(extPackDir, 'ext');
                   mkdirSync(extDir, { recursive: true });
                   
-                  // Build the YAML data extensions content
-                  const extensions: string[] = ['extensions:'];
-                  for (const [predName, values] of Object.entries(extensiblePredicates)) {
-                    extensions.push('  - addsTo:');
-                    extensions.push(`      pack: ${targetPackName}`);
-                    extensions.push(`      extensible: ${predName}`);
-                    extensions.push('    data:');
-                    for (const val of values) {
-                      extensions.push(`      - ["${val}"]`);
-                    }
-                  }
-                  extensions.push('');
+                  // Build the YAML data extensions content using js-yaml for safe serialization
+                  const extensionsData = {
+                    extensions: Object.entries(extensiblePredicates).map(([predName, values]) => ({
+                      addsTo: {
+                        pack: targetPackName,
+                        extensible: predName,
+                      },
+                      data: values.map((val) => [val]),
+                    })),
+                  };
                   
-                  writeFileSync(join(extDir, 'runtime.model.yml'), extensions.join('\n'), 'utf8');
+                  writeFileSync(join(extDir, 'runtime.model.yml'), yaml.dump(extensionsData, { lineWidth: -1 }), 'utf8');
                   
                   // Add the extension pack directory to --additional-packs so it can be resolved
                   const existingPacks = options['additional-packs'] as string | undefined;
                   options['additional-packs'] = existingPacks
-                    ? `${existingPacks}:${extPackDir}`
+                    ? `${existingPacks}${delimiter}${extPackDir}`
                     : extPackDir;
                   
                   // Use --model-packs to activate the extension pack for extensible predicates

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,12 @@ string getSourceFunctionName() {`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* Gets a function by matching against the selected source function names.`
	`22`	`+ * Supports both base names (e.g. "sourceFunc") and full Swift signatures (e.g. "sourceFunc()").`
`22`	`23`	`*/`
`23`	`24`	`Function getSourceFunction() {`
`24`	`25`	`exists(string selectedFunc \|`
`25`	`26`	`selectedFunc = getSourceFunctionName() and`
`26`		`- result.getName() = selectedFunc`
	`27`	`+ (result.getName() = selectedFunc or result.getName().matches(selectedFunc + "(%"))`
`27`	`28`	`)`
`28`	`29`	`}`
`29`	`30`