Skip to content

Commit 4161cb6

Browse files
Merge branch 'main' into other/AST-129350-mcp-fallback
2 parents b04e498 + 39d4c56 commit 4161cb6

File tree

5 files changed

+35
-9
lines changed

5 files changed

+35
-9
lines changed

packages/checkmarx/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ This tool enables VS Code users to initiate SCA scans directly from their VS Cod
211211

212212
We appreciate feedback and contribution to the VsCode extension! Before you get started, please see the following:
213213

214-
- [Checkmarx contribution guidelines](https://github.com/Checkmarx/ast-vscode-extension/blob/packages/checkmarx/contributing.md)
215-
- [Checkmarx Code of Conduct](https://github.com/Checkmarx/ast-vscode-extension/blob/packages/checkmarx/code_of_conduct.md)
214+
- [Checkmarx contribution guidelines](https://github.com/Checkmarx/ast-vscode-extension/blob/HEAD/packages/checkmarx/contributing.md)
215+
- [Checkmarx Code of Conduct](https://github.com/Checkmarx/ast-vscode-extension/blob/HEAD/packages/checkmarx/code_of_conduct.md)
216216

217217
<!-- LICENSE -->
218218
## License

packages/checkmarx/package.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"type": "git",
99
"url": "https://github.com/Checkmarx/ast-vscode-extension.git"
1010
},
11-
"homepage": "https://github.com/Checkmarx/ast-vscode-extension#readme",
11+
"homepage": "https://github.com/Checkmarx/ast-vscode-extension/blob/main/packages/checkmarx/README.md",
1212
"bugs": {
1313
"url": "https://github.com/Checkmarx/ast-vscode-extension/issues"
1414
},
@@ -22,6 +22,19 @@
2222
"categories": [
2323
"Other"
2424
],
25+
"keywords": [
26+
"AppSec",
27+
"SAST",
28+
"OSS",
29+
"IaC",
30+
"Secrets",
31+
"Containers",
32+
"Secure Coding",
33+
"Developer Assist",
34+
"Real-time Scanning",
35+
"Kics",
36+
"SCA"
37+
],
2538
"activationEvents": [
2639
"*"
2740
],
@@ -1098,4 +1111,4 @@
10981111
"typescript": "^5.3.3",
10991112
"vscode-extension-tester": "8.17.0"
11001113
}
1101-
}
1114+
}

packages/project-ignite/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ol>
3838
</details>
3939

40-
> This document relates to the standalone ​**Checkmarx Developer Assist**​ extension. Checkmarx One customers with a Developer Assist license should use the ​[**Checkmarx**](https://marketplace.visualstudio.com/items?itemName=checkmarx.cx-dev-assist) extension, which has Developer Assist bundeled together with the Checkmarx One platform tool. <br>The two extensions are **mutually exclusive**, so that if you want to use this extension, you must **first ​uninstall**​​ the Checkmarx extension.
40+
> This document relates to the standalone ​**Checkmarx Developer Assist**​ extension. Checkmarx One customers with a Developer Assist license should use the ​[**Checkmarx**](https://marketplace.visualstudio.com/items?itemName=checkmarx.ast-results) extension, which has Developer Assist bundeled together with the Checkmarx One platform tool. <br>The two extensions are **mutually exclusive**, so that if you want to use this extension, you must **first ​uninstall**​​ the Checkmarx extension.
4141
## Overview
4242
Checkmarx Developer Assist delivers context-aware security guidance directly within your IDE, helping prevent vulnerabilities before they reach the pipeline. As developers write or refine AI-generated and existing code, it provides real-time detection, remediation, and actionable insights—ensuring security is built in from the start.
4343
<br>

packages/project-ignite/package-lock.json

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

packages/project-ignite/package.json

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,33 @@
88
"type": "git",
99
"url": "https://github.com/Checkmarx/ast-vscode-extension.git"
1010
},
11-
"homepage": "https://github.com/Checkmarx/ast-vscode-extension#readme",
11+
"homepage": "https://github.com/Checkmarx/ast-vscode-extension/blob/main/packages/project-ignite/README.md",
1212
"bugs": {
1313
"url": "https://github.com/Checkmarx/ast-vscode-extension/issues"
1414
},
1515
"icon": "media/icon.png",
1616
"engines": {
17-
"vscode": "^1.63.0"
17+
"vscode": "^1.100.0"
1818
},
1919
"extensionKind": [
2020
"workspace"
2121
],
2222
"categories": [
2323
"Other"
2424
],
25+
"keywords": [
26+
"AppSec",
27+
"SAST",
28+
"OSS",
29+
"IaC",
30+
"Secrets",
31+
"Containers",
32+
"Secure Coding",
33+
"Developer Assist",
34+
"Real-time Scanning",
35+
"Kics",
36+
"SCA"
37+
],
2538
"activationEvents": [
2639
"onView:cx-dev-assist.cxDevAssist",
2740
"onStartupFinished"
@@ -190,4 +203,4 @@
190203
"copyfiles": "2.4.1",
191204
"typescript": "^5.3.3"
192205
}
193-
}
206+
}

0 commit comments

Comments
 (0)