chore: Resolve merge conflicts for 2026.07.2 (#2104)

This resolves merge conflicts in #2101 in preparation for release 2026.07.2. The merge conflicts arose from our use of a `release/2026.07.1` branch for release 2026.07.1.

Author: divbzero

.github/workflows/codeql.yml

@@ -47,4 +47,4 @@ jobs:
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4
       with:
-        category: "/language:${{matrix.language}}"
+        category: "/language:${{matrix.language}}"