Skip to content

Commit bef8afc

Browse files
github-actions[bot]data-douser
github-actions[bot]
and
data-douser
authored
Upgrade CodeQL CLI dependency to v2.25.4 (#272)
* Upgrade CodeQL CLI dependency to v2.25.4 * Sync server dist map * Fix PrintCFG queries for CodeQL CLI v2.25.4 Upgrading codeql/csharp-all to 6.0.0 (bundled with CLI v2.25.4) removed the legacy `ControlFlow::Node` namespace; the shared-CFG library now exposes `ControlFlowNode` directly. The csharp PrintCFG query failed to compile against the new pack with: ERROR: could not resolve type ControlFlow::Node Update server/ql/csharp/tools/src/PrintCFG/PrintCFG.ql to use `ControlFlowNode` and re-baseline the test expectations: - csharp: regenerate PrintCFG.expected against csharp-all 6.0.0. The new CFG uses `Entry` / `Normal Exit` / `Exit` markers and explicit `Before <expr>` nodes instead of the previous `enter <Method>` / `exit <Method>` form. - java: regenerate PrintCFG.expected to absorb a deterministic node ordering change in 2.25.4 (same nodes and edges, reordered). Verified with `codeql test run` against server/ql/{csharp,java}/tools/test — all 10 tests pass. --------- Co-authored-by: data-douser <70299490+data-douser@users.noreply.github.com> Co-authored-by: Nathan Randall <data-douser@github.com>
1 parent d18d88f commit bef8afc

54 files changed

Lines changed: 650 additions & 452 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.codeql-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.25.3
1+
v2.25.4

‎client/integration-tests/primitives/tools/codeql_bqrs_interpret/sarif_format/after/results.sarif‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.25.3","rules":[{"id":"test/query","name":"test/query","shortDescription":{"text":"ExampleQuery1"},"fullDescription":{"text":"Example query for integration testing of the codeql_test_extract MCP server tool."},"defaultConfiguration":{"enabled":true,"level":"warning"},"help":{"text":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n","markdown":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n"},"properties":{"tags":["mcp-integration-tests"],"description":"Example query for integration testing of the codeql_test_extract MCP server tool.","id":"test/query","kind":"problem","name":"ExampleQuery1","precision":"medium","problem.severity":"warning"}}]},"extensions":[{"name":"mcp-client-integration-tests-static-javascript-src","semanticVersion":"0.0.1+fe0e7d2a7059ebb6c6075ff8eaea04f382747656","locations":[{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/codeql-pack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/javascript-all","semanticVersion":"2.6.11+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/threat-models","semanticVersion":"1.0.31+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]}]},"artifacts":[{"location":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}],"results":[{"ruleId":"test/query","ruleIndex":0,"rule":{"id":"test/query","index":0},"message":{"text":"Example test code file found for codeql_test_extract example query."},"locations":[{"physicalLocation":{"artifactLocation":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}}]}],"columnKind":"utf16CodeUnits","properties":{"semmle.formatSpecifier":"sarif-latest"}}]}
1+
{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.25.4","rules":[{"id":"test/query","name":"test/query","shortDescription":{"text":"ExampleQuery1"},"fullDescription":{"text":"Example query for integration testing of the codeql_test_extract MCP server tool."},"defaultConfiguration":{"enabled":true,"level":"warning"},"help":{"text":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n","markdown":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n"},"properties":{"tags":["mcp-integration-tests"],"description":"Example query for integration testing of the codeql_test_extract MCP server tool.","id":"test/query","kind":"problem","name":"ExampleQuery1","precision":"medium","problem.severity":"warning"}}]},"extensions":[{"name":"mcp-client-integration-tests-static-javascript-src","semanticVersion":"0.0.1+fe0e7d2a7059ebb6c6075ff8eaea04f382747656","locations":[{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/codeql-pack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/javascript-all","semanticVersion":"2.6.11+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/threat-models","semanticVersion":"1.0.31+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]}]},"artifacts":[{"location":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}],"results":[{"ruleId":"test/query","ruleIndex":0,"rule":{"id":"test/query","index":0},"message":{"text":"Example test code file found for codeql_test_extract example query."},"locations":[{"physicalLocation":{"artifactLocation":{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}}]}],"columnKind":"utf16CodeUnits","properties":{"semmle.formatSpecifier":"sarif-latest"}}]}

‎extensions/vscode/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-codeql-development-mcp-server",
33
"displayName": "CodeQL Development MCP Server",
44
"description": "LLM-assisted development of CodeQL queries, libraries, and tests via #ql-mcp prompts, resources, and tools.",
5-
"version": "2.25.3",
5+
"version": "2.25.4",
66
"publisher": "advanced-security",
77
"license": "LicenseRef-CodeQL-Terms",
88
"icon": "media/codeql-icon.png",

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql-development-mcp-server_repo",
3-
"version": "2.25.3",
3+
"version": "2.25.4",
44
"description": "An MCP server supporting LLM requests for CodeQL development tools and resources.",
55
"private": true,
66
"type": "module",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201687,7 +201687,7 @@ init_package_paths();
201687201687
init_logger();
201688201688
import_dotenv.default.config({ path: resolve14(packageRootDir, ".env"), quiet: true });
201689201689
var PACKAGE_NAME = "codeql-development-mcp-server";
201690-
var VERSION = "2.25.3";
201690+
var VERSION = "2.25.4";
201691201691
async function startServer(mode = "stdio") {
201692201692
logger.info(`Starting CodeQL Development MCP McpServer v${VERSION} in ${mode} mode`);
201693201693
const codeqlBinary = resolveCodeQLBinary();

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql-development-mcp-server",
3-
"version": "2.25.3",
3+
"version": "2.25.4",
44
"description": "An MCP server supporting LLM requests for CodeQL development tools and resources.",
55
"main": "dist/codeql-development-mcp-server.js",
66
"type": "module",

‎server/ql/actions/tools/src/codeql-pack.lock.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/actions-all:
5-
version: 0.4.34
5+
version: 0.4.35
66
codeql/concepts:
7-
version: 0.0.22
7+
version: 0.0.23
88
codeql/controlflow:
9-
version: 2.0.32
9+
version: 2.0.33
1010
codeql/dataflow:
11-
version: 2.1.4
11+
version: 2.1.5
1212
codeql/javascript-all:
13-
version: 2.6.28
13+
version: 2.7.0
1414
codeql/mad:
15-
version: 1.0.48
15+
version: 1.0.49
1616
codeql/regex:
17-
version: 1.0.48
17+
version: 1.0.49
1818
codeql/ssa:
19-
version: 2.0.24
19+
version: 2.0.25
2020
codeql/threat-models:
21-
version: 1.0.48
21+
version: 1.0.49
2222
codeql/tutorial:
23-
version: 1.0.48
23+
version: 1.0.49
2424
codeql/typetracking:
25-
version: 2.0.32
25+
version: 2.0.33
2626
codeql/util:
27-
version: 2.0.35
27+
version: 2.0.36
2828
codeql/xml:
29-
version: 1.0.48
29+
version: 1.0.49
3030
codeql/yaml:
31-
version: 1.0.48
31+
version: 1.0.49
3232
compiled: false

‎server/ql/actions/tools/src/codeql-pack.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: advanced-security/ql-mcp-actions-tools-src
2-
version: 2.25.3
2+
version: 2.25.4
33
description: 'Queries for codeql-development-mcp-server tools for actions language'
44
library: false
55
dependencies:
6-
codeql/actions-all: 0.4.34
6+
codeql/actions-all: 0.4.35

0 commit comments

Comments
 (0)