Merge pull request #4241 from github/backport-v3.39.0-6f2ac81f5

Merge releases/v4 into releases/v3
Rebuild
2026-10-18 00:11:34 +03:00 · 2026-10-15 12:39:31 +01:00 · 2026-10-15 10:58:58 +00:00 · 2026-10-15 10:58:49 +00:00 · 2026-10-15 10:58:49 +00:00 · 2026-10-15 10:58:49 +00:00
72 changed files with 679 additions and 1014 deletions
@@ -16,5 +16,5 @@ inputs:
      Comma separated list of query ids that should NOT be included in this SARIF file.

 runs:
-  using: node24
+  using: node20
  main: index.js
@@ -1,6 +1,6 @@
 name: Verify that the best-effort debug artifact scan completed
 description: Verifies that the best-effort debug artifact scan completed successfully during tests
 runs:
-  using: node24
+  using: node20
  main: index.js
  post: post.js
@@ -11,12 +11,9 @@ The CodeQL Action is used in GitHub Actions workflows to run CodeQL scans using

 ## Review instructions

- Prioritise identifying critical issues, such as logic bugs, over comments on documentation or typos.
- When wording review comments, be helpful and friendly. Assume that the PR author has written the code with the best of intentions. Never word suggestions as commands or using the imperative. Examples of what you should never write: "Preserve that non-fatal behaviour here" or "Please preserve that non-fatal behaviour here".
- When writing feedback, assume that the PR author is competent and is able to understand whether the point you are making is valid or not, why you are raising it, and how to best address it. While you can suggest how to address a point you are making, don't phrase it as a requirement or assume that it is the only solution.
- Always word your comments constructively as suggestions for improvements, for example: "It would make sense to ..." or "Could you add ...?" or "Would it make sense to ...?"
+- When wording review comments, be helpful and friendly. Assume that the PR author has written the code with the best of intentions. Word your comments constructively as suggestions for improvements. Do not word suggestions as commands.
 - If you want to comment on a change that you believe will fail a CI check, do not present the CI failure you expect as a fact. Instead, write that you think a change "may" lead to a failure in CI. Suggest that, if such a failure manifests, the changes you are commenting on may be the place responsible for the failure and are worth looking at.
- If a suggestion you make is suitable for a follow-up, such as a refactoring that doesn't change the behaviour or fixing a typo in a comment, mention that it can be addressed in a later PR rather than blocking this one or prefix your comment with "Minor: ".
+- If a suggestion you make is suitable for a follow-up, such as a refactoring that doesn't change the behaviour or fixing a typo in a comment, mention that it can be addressed in a later PR rather than blocking this one.
 - If a change is a net improvement, for example because it improves on an existing limitation of existing code, do not complain about pre-existing problems that remain. You may comment on them, but you should make it clear that the thing you are commenting on is not new by writing e.g. "Not new in this PR, but [..]" followed by your description of the issue and a suggestion that it could be improved at the same time with e.g. "Consider whether this is worth addressing as part of this PR as well."

 ## Generated code
@@ -25,16 +22,6 @@ The main codebase of the CodeQL Action is written in TypeScript and compiled to

 GitHub Actions workflows in the `.github/workflows` directory whose filenames start with two underscores (e.g. `__all-platform-bundle.yml`) are automatically generated using the `pr-checks/sync.sh` script from template files in the `pr-checks/checks` directory. Therefore, you do not need to review files in the `.github/workflows` directory that start with two underscores. However, you should review changes to the `pr-checks` directory as well as workflows in the `.github/workflows` directory that do not start with underscores.

-## Feature flags
-
-Some functionality in the code may be gated behind feature flags, which are controlled server-side. If the functionality that is gated behind them is user-facing, then this should be documented in a change note at the time that the gated functionality is added. See `CHANGELOG.md` for existing notes that mention "experimental" for examples. These typically include information about when users may expect to see the feature rolled out.
-
-When a feature flag that gates some functionality is removed, this does not need to be documented in a change note since the feature is already rolled out and the notes for the release which introduced the feature already describe it. The only exception is functionality which will start having an effect on GHES as a result of the feature flag removal:
-
- Most functionality gated behind feature flags does not affect GHES.
- We can make functionality available on GHES by setting `defaultValue` to `true` first and waiting for this to have had an effect on GHES. No change note is needed if a feature flag is removed where `defaultValue` was `true`.
- When removing a feature flag where `defaultValue` was `false` and the functionality starts to affect GHES, a change note may be appropriate.
-
 ## Release process

 Changes that are merged to the `main` branch are not used in production straight away. Instead, changes from `main` must first be released using the release process, which has to be manually triggered by a staff member. Therefore, it is possible for further changes to be made to the code after some changes have been merged to `main` but before they are released. Once the release process automation is started, a series of PRs are automatically generated:
@@ -87,7 +87,7 @@ jobs:
          post-processed-sarif-path: '${{ runner.temp }}/post-processed'

      - name: Upload SARIF files
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: |
            analysis-kinds-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}
@@ -95,7 +95,7 @@ jobs:
          retention-days: 7

      - name: Upload post-processed SARIF
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: |
            post-processed-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}
@@ -65,7 +65,7 @@ jobs:
          output: '${{ runner.temp }}/results'
          upload-database: false
      - name: Upload SARIF
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
          path: '${{ runner.temp }}/results/javascript.sarif'
@@ -47,7 +47,7 @@ jobs:
      - name: Check out repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Install Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 20.x
          cache: npm
@@ -76,7 +76,7 @@ jobs:
          output: '${{ runner.temp }}/results'
          upload-database: false
      - name: Upload SARIF
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
          path: '${{ runner.temp }}/results/javascript.sarif'
@@ -97,7 +97,7 @@ jobs:
        with:
          output: '${{ runner.temp }}/results'
      - name: Upload SARIF
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json
          path: '${{ runner.temp }}/results/javascript.sarif'
@@ -62,7 +62,7 @@ jobs:
        with:
          output: '${{ runner.temp }}/results'
      - name: Upload SARIF
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: ${{ matrix.os }}-${{ matrix.version }}.sarif.json
          path: '${{ runner.temp }}/results/javascript.sarif'
@@ -192,5 +192,6 @@ jobs:
            exit 1
          fi
    env:
+      CODEQL_ACTION_CLEANUP_TOOLCACHE_BUNDLES: true
      CODEQL_ACTION_RESOLVE_SUPPORTED_LANGUAGES_USING_CLI: true
      CODEQL_ACTION_TEST_MODE: true
@@ -80,7 +80,7 @@ jobs:
          go-version: ${{ inputs.go-version || '>=1.21.0' }}
          cache: false
      - name: Install Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 20.x
          cache: npm
@@ -80,7 +80,7 @@ jobs:
          go-version: ${{ inputs.go-version || '>=1.21.0' }}
          cache: false
      - name: Install Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 20.x
          cache: npm
@@ -80,7 +80,7 @@ jobs:
          go-version: ${{ inputs.go-version || '>=1.21.0' }}
          cache: false
      - name: Install Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 20.x
          cache: npm
@@ -80,7 +80,7 @@ jobs:
          go-version: ${{ inputs.go-version || '>=1.21.0' }}
          cache: false
      - name: Install Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 20.x
          cache: npm
@@ -57,7 +57,7 @@ jobs:
      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

    - name: Set up Node.js
-      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
      with:
        node-version: 24
        cache: 'npm'
@@ -89,7 +89,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Download all artifacts
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
      - name: Check expected artifacts exist
        run: |
          LANGUAGES="cpp csharp go java javascript python"
@@ -82,7 +82,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Download all artifacts
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
      - name: Check expected artifacts exist
        run: |
          VERSIONS="stable-v2.20.7 default linked nightly-latest"
@@ -47,7 +47,7 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          fetch-depth: 0  # ensure we have all tags and can push commits
-      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24
          cache: 'npm'
@@ -42,7 +42,7 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Set up Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: ${{ matrix.node-version }}
          cache: "npm"
@@ -110,7 +110,7 @@ jobs:
          fi

      - name: Set up Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24
          cache: "npm"
@@ -175,7 +175,7 @@ jobs:

      - name: Upload repo size comment
        if: steps.fetch-base.outcome == 'success'
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: repo-size-comment
          path: ${{ runner.temp }}/repo-size/
@@ -223,7 +223,7 @@ jobs:

    steps:
      - name: Download repo size comment
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          name: repo-size-comment
          path: repo-size-comment
@@ -33,7 +33,7 @@ jobs:
      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

    - name: Install Node.js
-      uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+      uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
      with:
        node-version: 24
        cache: npm
@@ -30,7 +30,7 @@ jobs:
          ref: ${{ env.HEAD_REF }}

      - name: Set up Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24
          cache: 'npm'
@@ -41,7 +41,7 @@ jobs:
          git config --global user.name "github-actions[bot]"

      - name: Set up Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24
          cache: 'npm'
@@ -26,7 +26,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Set up Node.js
-        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: 24
          cache: 'npm'
@@ -2,113 +2,109 @@

 See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.

-## [UNRELEASED]
-
-No user facing changes.
-
-## 4.39.0 - 15 Oct 2026
+## 3.39.0 - 15 Oct 2026

 - _Breaking change_: Bump the minimum required CodeQL bundle version to 2.20.7. [#4205](https://github.com/github/codeql-action/pull/4205)
 - The `codeql-action/analyze` step now validates that a correct argument for the `checkout_path` input has been provided. The `checkout_path` input must be set to the path where the repository that is being analyzed is checked out at on the runner, if that path is something other than the workspace root. If the path does not point to a repository checkout or is different from the path that was used by `codeql-action/init`, then the CodeQL Action now produces a warning. [#4148](https://github.com/github/codeql-action/pull/4148)
 - Resolved an issue with third-party caching implementations that prevented caches from being restored correctly. [#4206](https://github.com/github/codeql-action/pull/4206)
 - The `codeql-action/start-proxy` step that is used in Code Scanning Default Setup now finds CodeQL releases using the same logic as `codeql-action/init`. This primarily benefits customers who are using GitHub instances other than `github.com` where the `codeql-action/start-proxy` step may previously have been unable to locate recent releases and ended up using outdated versions of the private registry authentication proxy as a result. [#4198](https://github.com/github/codeql-action/pull/4198)

-## 4.38.3 - 08 Oct 2026
+## 3.38.3 - 08 Oct 2026

 - _Upcoming breaking change_: CodeQL version 2.21.2 and earlier were discontinued on 24 September 2026 alongside GitHub Enterprise Server 3.17, and will be unsupported by the next minor release of the CodeQL Action. Added a deprecation warning for customers using these versions of CodeQL. [#4188](https://github.com/github/codeql-action/pull/4188)
 - Update default CodeQL bundle version to [2.27.2](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.27.2). [#4203](https://github.com/github/codeql-action/pull/4203)
 - Fixed a bug where the decision of whether to use a per-language bundle did not account for custom configurations that reference queries outside of compiled CodeQL packs. This issue was caught during internal testing and did not affect any customer repositories. We will resume the roll out of per-language bundles in the coming weeks. [#4184](https://github.com/github/codeql-action/pull/4184)

-## 4.38.2 - 24 Sept 2026
+## 3.38.2 - 24 Sept 2026

 - Update default CodeQL bundle version to [2.27.1](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.27.1). [#4160](https://github.com/github/codeql-action/pull/4160)

-## 4.38.1 - 18 Sept 2026
+## 3.38.1 - 18 Sept 2026

 - The CodeQL Action now has experimental support for CodeQL releases for which per-language bundles are available. Per-language bundles support analysis for a single language and are therefore smaller than the combined bundles that allow analysis for all supported languages. As a result, per-language bundles take up less space on disk and are faster to download. We expect to roll this change out to everyone in the coming weeks. [#4146](https://github.com/github/codeql-action/pull/4146)

-## 4.38.0 - 09 Sept 2026
+## 3.38.0 - 09 Sept 2026

 - On GitHub-hosted runners, the CodeQL Action now deletes unused CodeQL bundles from the toolcache before downloading a different bundle, which frees up disk space for the analysis. We expect to roll this change out to everyone in September. [#4124](https://github.com/github/codeql-action/pull/4124)
 - The CodeQL Action now supports CodeQL releases that are compatible with Linux Arm64 and downloads the native `linux-arm64` CodeQL bundle when available. [#4072](https://github.com/github/codeql-action/pull/4072)
 - Update default CodeQL bundle version to [2.27.0](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.27.0). [#4129](https://github.com/github/codeql-action/pull/4129)

-## 4.37.9 - 26 Aug 2026
+## 3.37.9 - 26 Aug 2026

 - Update default CodeQL bundle version to [2.26.4](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.4). [#4106](https://github.com/github/codeql-action/pull/4106)

-## 4.37.8 - 21 Aug 2026
+## 3.37.8 - 21 Aug 2026

 No user facing changes.

-## 4.37.7 - 13 Aug 2026
+## 3.37.7 - 13 Aug 2026

 - Update default CodeQL bundle version to [2.26.3](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.3). [#4085](https://github.com/github/codeql-action/pull/4085)

-## 4.37.6 - 04 Aug 2026
+## 3.37.6 - 04 Aug 2026

 - Changed the default filepath for the new remote file address format that was introduced in CodeQL Action 4.37.0 / 3.37.0 to `.github/codeql-config.yml` to align it with the suggested path that is used elsewhere. [#4070](https://github.com/github/codeql-action/pull/4070)

-## 4.37.5 - 03 Aug 2026
+## 3.37.5 - 03 Aug 2026

 - Fixed a bug where a network error while streaming the download of the CodeQL bundle could terminate the `init` Action instead of falling back to downloading the bundle before extracting it. [#4061](https://github.com/github/codeql-action/pull/4061)

-## 4.37.4 - 29 Jul 2026
+## 3.37.4 - 29 Jul 2026

 - This version of the CodeQL Action adds support for the `tools` input for the `codeql-action/init` step to be specified using a `github-codeql-tools` [repository property](https://docs.github.com/en/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization). This feature will gradually be rolled out following the release of this version. Once rolled out, this allows for the CodeQL CLI version that is used in GitHub-managed workflows, such as Default Setup, to be set to a custom value. For example, customers who run into issues with rate limits when a new CodeQL CLI version is released can set the value to `toolcache` to always use the CodeQL CLI version that is available in the runner toolcache. For Advanced Setup workflows, the value provided for `tools` in the workflow definition always takes precedence unless the value of the repository property starts with `!`. [#4037](https://github.com/github/codeql-action/pull/4037)
 - Update default CodeQL bundle version to [2.26.2](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.2). [#4051](https://github.com/github/codeql-action/pull/4051)

-## 4.37.3 - 22 Jul 2026
+## 3.37.3 - 22 Jul 2026

 No user facing changes.

-## 4.37.2 - 21 Jul 2026
+## 3.37.2 - 21 Jul 2026

 - The new address format for the `config-file` input that was introduced in CodeQL Action 4.37.0 is now enabled by default. In addition to the format described there, the `remote=` prefix can now be used to explicitly indicate that the input refers to a remote file. All previous input formats continue to be accepted as well. [#4023](https://github.com/github/codeql-action/pull/4023)
 - The CodeQL Action can now make use of [configured private registries](https://docs.github.com/en/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/giving-org-access-private-registries) in Default Setup to retrieve CodeQL configuration files from remote repositories that require authentication. This will allow customers to store their CodeQL configuration in a single repository that can then be referenced by Default Setup workflows in other repositories. We expect to roll this and other, related changes out to everyone in July. [#4007](https://github.com/github/codeql-action/pull/4007)

-## 4.37.1 - 16 Jul 2026
+## 3.37.1 - 16 Jul 2026

 - _Upcoming breaking change_: Add a deprecation warning for customers using CodeQL version 2.20.6 and earlier. These versions of CodeQL were discontinued on 1 July 2026 alongside GitHub Enterprise Server 3.16, and will be unsupported by the next minor release of the CodeQL Action. [#3956](https://github.com/github/codeql-action/pull/3956)
 - Update default CodeQL bundle version to [2.26.1](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.1). [#4019](https://github.com/github/codeql-action/pull/4019)

-## 4.37.0 - 08 Jul 2026
+## 3.37.0 - 08 Jul 2026

 - Update default CodeQL bundle version to [2.26.0](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.26.0). [#3995](https://github.com/github/codeql-action/pull/3995)
 - In addition to the existing input format, the `config-file` input for the `codeql-action/init` step will soon support a new `[owner/]repo[@ref][:path]` format. All components except the repository name are optional. If omitted, `owner` defaults to the same owner as the repository the analysis is running for, `ref` to `main`, and `path` to `.github/codeql-action.yaml`. Support for this format ships in this version of the CodeQL Action, but will only be enabled over the coming weeks. [#3973](https://github.com/github/codeql-action/pull/3973)

-## 4.36.3 - 01 Jul 2026
+## 3.36.3 - 01 Jul 2026

 No user facing changes.

-## 4.36.2 - 04 Jun 2026
+## 3.36.2 - 04 Jun 2026

 - Cache CodeQL CLI version information across Actions steps. [#3943](https://github.com/github/codeql-action/pull/3943)
 - Reduce requests while waiting for analysis processing by using exponential backoff when polling SARIF processing status. [#3937](https://github.com/github/codeql-action/pull/3937)
 - Update default CodeQL bundle version to [2.25.6](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.6). [#3948](https://github.com/github/codeql-action/pull/3948)

-## 4.36.1 - 02 Jun 2026
+## 3.36.1 - 02 Jun 2026

 No user facing changes.

-## 4.36.0 - 22 May 2026
+## 3.36.0 - 22 May 2026

 - _Breaking change_: Bump the minimum required CodeQL bundle version to 2.19.4. [#3894](https://github.com/github/codeql-action/pull/3894)
 - Add support for SHA-256 Git object IDs. [#3893](https://github.com/github/codeql-action/pull/3893)
 - Update default CodeQL bundle version to [2.25.5](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.5). [#3926](https://github.com/github/codeql-action/pull/3926)

-## 4.35.5 - 15 May 2026
+## 3.35.5 - 15 May 2026

 - We have improved how the JavaScript bundles for the CodeQL Action are generated to avoid duplication across bundles and reduce the size of the repository by around 70%. This should have no effect on the runtime behaviour of the CodeQL Action. [#3899](https://github.com/github/codeql-action/pull/3899)
 - For performance and accuracy reasons, [improved incremental analysis](https://github.com/github/roadmap/issues/1158) will now only be enabled on a pull request when diff-informed analysis is also enabled for that run. If diff-informed analysis is unavailable (for example, because the PR diff ranges could not be computed), the action will fall back to a full analysis. [#3791](https://github.com/github/codeql-action/pull/3791)
 - If multiple inputs are provided for the GitHub-internal `analysis-kinds` input, only `code-scanning` will be enabled. The `analysis-kinds` input is experimental, for GitHub-internal use only, and may change without notice at any time. [#3892](https://github.com/github/codeql-action/pull/3892)
 - Added an experimental change which, when running a Code Scanning analysis for a PR with [improved incremental analysis](https://github.com/github/roadmap/issues/1158) enabled, prefers CodeQL CLI versions that have a cached overlay-base database for the configured languages. This speeds up analysis for a repository when there is not yet a cached overlay-base database for the latest CLI version. We expect to roll this change out to everyone in May. [#3880](https://github.com/github/codeql-action/pull/3880)

-## 4.35.4 - 07 May 2026
+## 3.35.4 - 07 May 2026

 - Update default CodeQL bundle version to [2.25.4](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.4). [#3881](https://github.com/github/codeql-action/pull/3881)

-## 4.35.3 - 01 May 2026
+## 3.35.3 - 01 May 2026

 - _Upcoming breaking change_: Add a deprecation warning for customers using CodeQL version 2.19.3 and earlier. These versions of CodeQL were discontinued on 9 April 2026 alongside GitHub Enterprise Server 3.15, and will be unsupported by the next minor release of the CodeQL Action. [#3837](https://github.com/github/codeql-action/pull/3837)
 - Configurations for private registries that use Cloudsmith or GCP OIDC are now accepted. [#3850](https://github.com/github/codeql-action/pull/3850)
@@ -116,7 +112,7 @@ No user facing changes.
 - Fixed a bug where two diagnostics produced within the same millisecond could overwrite each other on disk, causing one of them to be lost. [#3852](https://github.com/github/codeql-action/pull/3852)
 - Update default CodeQL bundle version to [2.25.3](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.3). [#3865](https://github.com/github/codeql-action/pull/3865)

-## 4.35.2 - 15 Apr 2026
+## 3.35.2 - 15 Apr 2026

 - The undocumented TRAP cache cleanup feature that could be enabled using the `CODEQL_ACTION_CLEANUP_TRAP_CACHES` environment variable is deprecated and will be removed in May 2026. If you are affected by this, we recommend disabling TRAP caching by passing the `trap-caching: false` input to the `init` Action. [#3795](https://github.com/github/codeql-action/pull/3795)
 - The Git version 2.36.0 requirement for improved incremental analysis now only applies to repositories that contain submodules. [#3789](https://github.com/github/codeql-action/pull/3789)
@@ -124,26 +120,26 @@ No user facing changes.
 - Fixed a bug in the validation of OIDC configurations for private registries that was added in CodeQL Action 4.33.0 / 3.33.0. [#3807](https://github.com/github/codeql-action/pull/3807)
 - Update default CodeQL bundle version to [2.25.2](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.2). [#3823](https://github.com/github/codeql-action/pull/3823)

-## 4.35.1 - 27 Mar 2026
+## 3.35.1 - 27 Mar 2026

 - Fix incorrect minimum required Git version for [improved incremental analysis](https://github.com/github/roadmap/issues/1158): it should have been 2.36.0, not 2.11.0. [#3781](https://github.com/github/codeql-action/pull/3781)

-## 4.35.0 - 27 Mar 2026
+## 3.35.0 - 27 Mar 2026

 - Reduced the minimum Git version required for [improved incremental analysis](https://github.com/github/roadmap/issues/1158) from 2.38.0 to 2.11.0. [#3767](https://github.com/github/codeql-action/pull/3767)
 - Update default CodeQL bundle version to [2.25.1](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.1). [#3773](https://github.com/github/codeql-action/pull/3773)

-## 4.34.1 - 20 Mar 2026
+## 3.34.1 - 20 Mar 2026

 - Downgrade default CodeQL bundle version to [2.24.3](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.24.3) due to issues with a small percentage of Actions and JavaScript analyses. [#3762](https://github.com/github/codeql-action/pull/3762)

-## 4.34.0 - 20 Mar 2026
+## 3.34.0 - 20 Mar 2026

 - Added an experimental change which disables TRAP caching when [improved incremental analysis](https://github.com/github/roadmap/issues/1158) is enabled, since improved incremental analysis supersedes TRAP caching. This will improve performance and reduce Actions cache usage. We expect to roll this change out to everyone in March. [#3569](https://github.com/github/codeql-action/pull/3569)
 - We are rolling out improved incremental analysis to C/C++ analyses that use build mode `none`. We expect this rollout to be complete by the end of April 2026. [#3584](https://github.com/github/codeql-action/pull/3584)
 - Update default CodeQL bundle version to [2.25.0](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.0). [#3585](https://github.com/github/codeql-action/pull/3585)

-## 4.33.0 - 16 Mar 2026
+## 3.33.0 - 16 Mar 2026

 - Upcoming change: Starting April 2026, the CodeQL Action will skip collecting file coverage information on pull requests to improve analysis performance. File coverage information will still be computed on non-PR analyses. Pull request analyses will log a warning about this upcoming change. [#3562](https://github.com/github/codeql-action/pull/3562)

@@ -157,11 +153,11 @@ No user facing changes.
 - Fixed the retry mechanism for database uploads. Previously this would fail with the error "Response body object should not be disturbed or locked". [#3564](https://github.com/github/codeql-action/pull/3564)
 - A warning is now emitted if the CodeQL Action detects a repository property whose name suggests that it relates to the CodeQL Action, but which is not one of the properties recognised by the current version of the CodeQL Action. [#3570](https://github.com/github/codeql-action/pull/3570)

-## 4.32.6 - 05 Mar 2026
+## 3.32.6 - 05 Mar 2026

 - Update default CodeQL bundle version to [2.24.3](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.24.3). [#3548](https://github.com/github/codeql-action/pull/3548)

-## 4.32.5 - 02 Mar 2026
+## 3.32.5 - 02 Mar 2026

 - Repositories owned by an organization can now set up the `github-codeql-disable-overlay` custom repository property to disable [improved incremental analysis for CodeQL](https://github.com/github/roadmap/issues/1158). First, create a custom repository property with the name `github-codeql-disable-overlay` and the type "True/false" in the organization's settings. Then in the repository's settings, set this property to `true` to disable improved incremental analysis. For more information, see [Managing custom properties for repositories in your organization](https://docs.github.com/en/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization). This feature is not yet available on GitHub Enterprise Server. [#3507](https://github.com/github/codeql-action/pull/3507)
 - Added an experimental change so that when [improved incremental analysis](https://github.com/github/roadmap/issues/1158) fails on a runner — potentially due to insufficient disk space — the failure is recorded in the Actions cache so that subsequent runs will automatically skip improved incremental analysis until something changes (e.g. a larger runner is provisioned or a new CodeQL version is released). We expect to roll this change out to everyone in March. [#3487](https://github.com/github/codeql-action/pull/3487)
@@ -171,7 +167,7 @@ No user facing changes.
 - Added an experimental change which allows the `start-proxy` action to resolve the CodeQL CLI version from feature flags instead of using the linked CLI bundle version. We expect to roll this change out to everyone in March. [#3512](https://github.com/github/codeql-action/pull/3512)
 - The previously experimental changes from versions 4.32.3, 4.32.4, 3.32.3 and 3.32.4 are now enabled by default. [#3503](https://github.com/github/codeql-action/pull/3503), [#3504](https://github.com/github/codeql-action/pull/3504)

-## 4.32.4 - 20 Feb 2026
+## 3.32.4 - 20 Feb 2026

 - Update default CodeQL bundle version to [2.24.2](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.24.2). [#3493](https://github.com/github/codeql-action/pull/3493)
 - Added an experimental change which improves how certificates are generated for the authentication proxy that is used by the CodeQL Action in Default Setup when [private package registries are configured](https://docs.github.com/en/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/giving-org-access-private-registries). This is expected to generate more widely compatible certificates and should have no impact on analyses which are working correctly already. We expect to roll this change out to everyone in February. [#3473](https://github.com/github/codeql-action/pull/3473)
@@ -179,89 +175,89 @@ No user facing changes.
 - Added a setting which allows the CodeQL Action to enable network debugging for Java programs. This will help GitHub staff support customers with troubleshooting issues in GitHub-managed CodeQL workflows, such as Default Setup. This setting can only be enabled by GitHub staff. [#3485](https://github.com/github/codeql-action/pull/3485)
 - Added a setting which enables GitHub-managed workflows, such as Default Setup, to use a [nightly CodeQL CLI release](https://github.com/dsp-testing/codeql-cli-nightlies) instead of the latest, stable release that is used by default. This will help GitHub staff support customers whose analyses for a given repository or organization require early access to a change in an upcoming CodeQL CLI release. This setting can only be enabled by GitHub staff. [#3484](https://github.com/github/codeql-action/pull/3484)

-## 4.32.3 - 13 Feb 2026
+## 3.32.3 - 13 Feb 2026

 - Added experimental support for testing connections to [private package registries](https://docs.github.com/en/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/giving-org-access-private-registries). This feature is not currently enabled for any analysis. In the future, it may be enabled by default for Default Setup. [#3466](https://github.com/github/codeql-action/pull/3466)

-## 4.32.2 - 05 Feb 2026
+## 3.32.2 - 05 Feb 2026

 - Update default CodeQL bundle version to [2.24.1](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.24.1). [#3460](https://github.com/github/codeql-action/pull/3460)

-## 4.32.1 - 02 Feb 2026
+## 3.32.1 - 02 Feb 2026

 - A warning is now shown in Default Setup workflow logs if a [private package registry is configured](https://docs.github.com/en/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/giving-org-access-private-registries) using a GitHub Personal Access Token (PAT), but no username is configured. [#3422](https://github.com/github/codeql-action/pull/3422)
 - Fixed a bug which caused the CodeQL Action to fail when repository properties cannot successfully be retrieved. [#3421](https://github.com/github/codeql-action/pull/3421)

-## 4.32.0 - 26 Jan 2026
+## 3.32.0 - 26 Jan 2026

 - Update default CodeQL bundle version to [2.24.0](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.24.0). [#3425](https://github.com/github/codeql-action/pull/3425)

-## 4.31.11 - 23 Jan 2026
+## 3.31.11 - 23 Jan 2026

 - When running a Default Setup workflow with [Actions debugging enabled](https://docs.github.com/en/actions/how-tos/monitor-workflows/enable-debug-logging), the CodeQL Action will now use more unique names when uploading logs from the Dependabot authentication proxy as workflow artifacts. This ensures that the artifact names do not clash between multiple jobs in a build matrix. [#3409](https://github.com/github/codeql-action/pull/3409)
 - Improved error handling throughout the CodeQL Action. [#3415](https://github.com/github/codeql-action/pull/3415)
 - Added experimental support for automatically excluding [generated files](https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github) from the analysis. This feature is not currently enabled for any analysis. In the future, it may be enabled by default for some GitHub-managed analyses. [#3318](https://github.com/github/codeql-action/pull/3318)
 - The changelog extracts that are included with releases of the CodeQL Action are now shorter to avoid duplicated information from appearing in Dependabot PRs. [#3403](https://github.com/github/codeql-action/pull/3403)

-## 4.31.10 - 12 Jan 2026
+## 3.31.10 - 12 Jan 2026

 - Update default CodeQL bundle version to 2.23.9. [#3393](https://github.com/github/codeql-action/pull/3393)

-## 4.31.9 - 16 Dec 2025
+## 3.31.9 - 16 Dec 2025

 No user facing changes.

-## 4.31.8 - 11 Dec 2025
+## 3.31.8 - 11 Dec 2025

 - Update default CodeQL bundle version to 2.23.8. [#3354](https://github.com/github/codeql-action/pull/3354)

-## 4.31.7 - 05 Dec 2025
+## 3.31.7 - 05 Dec 2025

 - Update default CodeQL bundle version to 2.23.7. [#3343](https://github.com/github/codeql-action/pull/3343)

-## 4.31.6 - 01 Dec 2025
+## 3.31.6 - 01 Dec 2025

 No user facing changes.

-## 4.31.5 - 24 Nov 2025
+## 3.31.5 - 24 Nov 2025

 - Update default CodeQL bundle version to 2.23.6. [#3321](https://github.com/github/codeql-action/pull/3321)

-## 4.31.4 - 18 Nov 2025
+## 3.31.4 - 18 Nov 2025

 No user facing changes.

-## 4.31.3 - 13 Nov 2025
+## 3.31.3 - 13 Nov 2025

 - CodeQL Action v3 will be deprecated in December 2026.  The Action now logs a warning for customers who are running v3 but could be running v4. For more information, see [Upcoming deprecation of CodeQL Action v3](https://github.blog/changelog/2025-10-28-upcoming-deprecation-of-codeql-action-v3/).
 - Update default CodeQL bundle version to 2.23.5. [#3288](https://github.com/github/codeql-action/pull/3288)

-## 4.31.2 - 30 Oct 2025
+## 3.31.2 - 30 Oct 2025

 No user facing changes.

-## 4.31.1 - 30 Oct 2025
+## 3.31.1 - 30 Oct 2025

 - The `add-snippets` input has been removed from the `analyze` action. This input has been deprecated since CodeQL Action 3.26.4 in August 2024 when this removal was announced.

-## 4.31.0 - 24 Oct 2025
+## 3.31.0 - 24 Oct 2025

 - Bump minimum CodeQL bundle version to 2.17.6. [#3223](https://github.com/github/codeql-action/pull/3223)
 - When SARIF files are uploaded by the `analyze` or `upload-sarif` actions, the CodeQL Action automatically performs post-processing steps to prepare the data for the upload. Previously, these post-processing steps were only performed before an upload took place. We are now changing this so that the post-processing steps will always be performed, even when the SARIF files are not uploaded. This does not change anything for the `upload-sarif` action. For `analyze`, this may affect Advanced Setup for CodeQL users who specify a value other than `always` for the `upload` input. [#3222](https://github.com/github/codeql-action/pull/3222)

-## 4.30.9 - 17 Oct 2025
+## 3.30.9 - 17 Oct 2025

 - Update default CodeQL bundle version to 2.23.3. [#3205](https://github.com/github/codeql-action/pull/3205)
 - Experimental: A new `setup-codeql` action has been added which is similar to `init`, except it only installs the CodeQL CLI and does not initialize a database. Do not use this in production as it is part of an internal experiment and subject to change at any time. [#3204](https://github.com/github/codeql-action/pull/3204)

-## 4.30.8 - 10 Oct 2025
+## 3.30.8 - 10 Oct 2025

 No user facing changes.

-## 4.30.7 - 06 Oct 2025
+## 3.30.7 - 06 Oct 2025

- [v4+ only] The CodeQL Action now runs on Node.js v24. [#3169](https://github.com/github/codeql-action/pull/3169)

+No user facing changes.
 ## 3.30.6 - 02 Oct 2025

 - Update default CodeQL bundle version to 2.23.2. [#3168](https://github.com/github/codeql-action/pull/3168)
@@ -94,6 +94,6 @@ outputs:
  sarif-id:
    description: The ID of the uploaded SARIF file.
 runs:
-  using: node24
+  using: node20
  main: "../lib/analyze-entry.js"
  post: "../lib/analyze-post-entry.js"
@@ -15,5 +15,5 @@ inputs:
      $GITHUB_WORKSPACE as its working directory.
    required: false
 runs:
-  using: node24
+  using: node20
  main: '../lib/autobuild-entry.js'
@@ -177,6 +177,6 @@ outputs:
  codeql-version:
    description: The version of the CodeQL binary used for analysis
 runs:
-  using: node24
+  using: node20
  main: '../lib/init-entry.js'
  post: '../lib/init-post-entry.js'
@@ -26401,7 +26401,7 @@ var require_utils4 = __commonJS({
    })();
    Object.defineProperty(exports2, "__esModule", { value: true });
    exports2.GitHub = exports2.defaults = exports2.context = void 0;
-    exports2.getOctokitOptions = getOctokitOptions;
+    exports2.getOctokitOptions = getOctokitOptions2;
    var Context = __importStar2(require_context());
    var Utils = __importStar2(require_utils3());
    var core_1 = (init_dist_src2(), __toCommonJS(dist_src_exports));
@@ -26417,7 +26417,7 @@ var require_utils4 = __commonJS({
      }
    };
    exports2.GitHub = core_1.Octokit.plugin(plugin_rest_endpoint_methods_1.restEndpointMethods, plugin_paginate_rest_1.paginateRest).defaults(exports2.defaults);
-    function getOctokitOptions(token, options) {
+    function getOctokitOptions2(token, options) {
      const opts = Object.assign({}, options || {});
      const auth2 = Utils.getAuthString(token, opts);
      if (auth2) {
@@ -34719,7 +34719,7 @@ var require_cacheUtils = __commonJS({
    var crypto3 = __importStar2(require("crypto"));
    var fs32 = __importStar2(require("fs"));
    var path30 = __importStar2(require("path"));
-    var semver12 = __importStar2(require_semver3());
+    var semver11 = __importStar2(require_semver3());
    var util4 = __importStar2(require("util"));
    var constants_1 = require_constants7();
    var versionSalt = "1.0";
@@ -34812,7 +34812,7 @@ var require_cacheUtils = __commonJS({
    function getCompressionMethod() {
      return __awaiter2(this, void 0, void 0, function* () {
        const versionOutput = yield getVersion("zstd", ["--quiet"]);
-        const version = semver12.clean(versionOutput);
+        const version = semver11.clean(versionOutput);
        core29.debug(`zstd version: ${version}`);
        if (versionOutput === "") {
          return constants_1.CompressionMethod.Gzip;
@@ -42967,11 +42967,11 @@ var require_tracingPolicy = __commonJS({
    var import_log = require_log3();
    var import_core_util = require_commonjs4();
    var import_restError = require_restError3();
-    var import_util58 = require_internal3();
+    var import_util59 = require_internal3();
    var tracingPolicyName2 = "tracingPolicy";
    function tracingPolicy2(options = {}) {
      const userAgentPromise = (0, import_userAgent.getUserAgentValue)(options.userAgentPrefix);
-      const sanitizer = new import_util58.Sanitizer({
+      const sanitizer = new import_util59.Sanitizer({
        additionalAllowedQueryParameters: options.additionalAllowedQueryParameters
      });
      const tracingClient = tryCreateTracingClient();
@@ -46597,11 +46597,11 @@ var require_response2 = __commonJS({
    });
    module2.exports = __toCommonJS2(response_exports);
    var import_core_rest_pipeline = require_commonjs6();
-    var import_util58 = require_util9();
+    var import_util59 = require_util9();
    var originalResponse = /* @__PURE__ */ Symbol("Original FullOperationResponse");
    function toCompatResponse2(response, options) {
-      let request3 = (0, import_util58.toWebResourceLike)(response.request);
-      let headers = (0, import_util58.toHttpHeadersLike)(response.headers);
+      let request3 = (0, import_util59.toWebResourceLike)(response.request);
+      let headers = (0, import_util59.toHttpHeadersLike)(response.headers);
      if (options?.createProxy) {
        return new Proxy(response, {
          get(target, prop, receiver) {
@@ -46642,7 +46642,7 @@ var require_response2 = __commonJS({
        return {
          ...compatResponse,
          headers,
-          request: (0, import_util58.toPipelineRequest)(compatResponse.request)
+          request: (0, import_util59.toPipelineRequest)(compatResponse.request)
        };
      }
    }
@@ -46749,7 +46749,7 @@ var require_requestPolicyFactoryPolicy = __commonJS({
      requestPolicyFactoryPolicyName: () => requestPolicyFactoryPolicyName2
    });
    module2.exports = __toCommonJS2(requestPolicyFactoryPolicy_exports);
-    var import_util58 = require_util9();
+    var import_util59 = require_util9();
    var import_response = require_response2();
    var HttpPipelineLogLevel2 = /* @__PURE__ */ ((HttpPipelineLogLevel22) => {
      HttpPipelineLogLevel22[HttpPipelineLogLevel22["ERROR"] = 1] = "ERROR";
@@ -46773,14 +46773,14 @@ var require_requestPolicyFactoryPolicy = __commonJS({
        async sendRequest(request3, next) {
          let httpPipeline = {
            async sendRequest(httpRequest) {
-              const response2 = await next((0, import_util58.toPipelineRequest)(httpRequest));
+              const response2 = await next((0, import_util59.toPipelineRequest)(httpRequest));
              return (0, import_response.toCompatResponse)(response2, { createProxy: true });
            }
          };
          for (const factory of orderedFactories) {
            httpPipeline = factory.create(httpPipeline, mockRequestPolicyOptions);
          }
-          const webResourceLike = (0, import_util58.toWebResourceLike)(request3, { createProxy: true });
+          const webResourceLike = (0, import_util59.toWebResourceLike)(request3, { createProxy: true });
          const response = await httpPipeline.sendRequest(webResourceLike);
          return (0, import_response.toPipelineResponse)(response);
        }
@@ -46815,12 +46815,12 @@ var require_httpClientAdapter = __commonJS({
    });
    module2.exports = __toCommonJS2(httpClientAdapter_exports);
    var import_response = require_response2();
-    var import_util58 = require_util9();
+    var import_util59 = require_util9();
    function convertHttpClient2(requestPolicyClient) {
      return {
        sendRequest: async (request3) => {
          const response = await requestPolicyClient.sendRequest(
-            (0, import_util58.toWebResourceLike)(request3, { createProxy: true })
+            (0, import_util59.toWebResourceLike)(request3, { createProxy: true })
          );
          return (0, import_response.toPipelineResponse)(response);
        }
@@ -46858,7 +46858,7 @@ var require_commonjs9 = __commonJS({
      disableKeepAlivePolicyName: () => import_disableKeepAlivePolicy.disableKeepAlivePolicyName,
      requestPolicyFactoryPolicyName: () => import_requestPolicyFactoryPolicy.requestPolicyFactoryPolicyName,
      toCompatResponse: () => import_response.toCompatResponse,
-      toHttpHeadersLike: () => import_util58.toHttpHeadersLike
+      toHttpHeadersLike: () => import_util59.toHttpHeadersLike
    });
    module2.exports = __toCommonJS2(src_exports);
    var import_extendedClient = require_extendedClient();
@@ -46866,7 +46866,7 @@ var require_commonjs9 = __commonJS({
    var import_requestPolicyFactoryPolicy = require_requestPolicyFactoryPolicy();
    var import_disableKeepAlivePolicy = require_disableKeepAlivePolicy();
    var import_httpClientAdapter = require_httpClientAdapter();
-    var import_util58 = require_util9();
+    var import_util59 = require_util9();
  }
 });

@@ -106361,7 +106361,7 @@ var require_manifest = __commonJS({
    exports2._findMatch = _findMatch;
    exports2._getOsVersion = _getOsVersion;
    exports2._readLinuxVersionFile = _readLinuxVersionFile;
-    var semver12 = __importStar2(require_semver2());
+    var semver11 = __importStar2(require_semver2());
    var core_1 = require_core();
    var os7 = require("os");
    var cp = require("child_process");
@@ -106375,7 +106375,7 @@ var require_manifest = __commonJS({
        for (const candidate of candidates) {
          const version = candidate.version;
          (0, core_1.debug)(`check ${version} satisfies ${versionSpec}`);
-          if (semver12.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
+          if (semver11.satisfies(version, versionSpec) && (!stable || candidate.stable === stable)) {
            file = candidate.files.find((item) => {
              (0, core_1.debug)(`${item.arch}===${archFilter} && ${item.platform}===${platFilter}`);
              let chk = item.arch === archFilter && item.platform === platFilter;
@@ -106384,7 +106384,7 @@ var require_manifest = __commonJS({
                if (osVersion === item.platform_version) {
                  chk = true;
                } else {
-                  chk = semver12.satisfies(osVersion, item.platform_version);
+                  chk = semver11.satisfies(osVersion, item.platform_version);
                }
              }
              return chk;
@@ -106644,7 +106644,7 @@ var require_tool_cache = __commonJS({
    var os7 = __importStar2(require("os"));
    var path30 = __importStar2(require("path"));
    var httpm = __importStar2(require_lib());
-    var semver12 = __importStar2(require_semver2());
+    var semver11 = __importStar2(require_semver2());
    var stream2 = __importStar2(require("stream"));
    var util4 = __importStar2(require("util"));
    var assert_1 = require("assert");
@@ -106917,7 +106917,7 @@ var require_tool_cache = __commonJS({
    }
    function cacheDir2(sourceDir, tool, version, arch2) {
      return __awaiter2(this, void 0, void 0, function* () {
-        version = semver12.clean(version) || version;
+        version = semver11.clean(version) || version;
        arch2 = arch2 || os7.arch();
        core29.debug(`Caching tool ${tool} ${version} ${arch2}`);
        core29.debug(`source dir: ${sourceDir}`);
@@ -106935,7 +106935,7 @@ var require_tool_cache = __commonJS({
    }
    function cacheFile(sourceFile, targetFile, tool, version, arch2) {
      return __awaiter2(this, void 0, void 0, function* () {
-        version = semver12.clean(version) || version;
+        version = semver11.clean(version) || version;
        arch2 = arch2 || os7.arch();
        core29.debug(`Caching tool ${tool} ${version} ${arch2}`);
        core29.debug(`source file: ${sourceFile}`);
@@ -106965,7 +106965,7 @@ var require_tool_cache = __commonJS({
      }
      let toolPath = "";
      if (versionSpec) {
-        versionSpec = semver12.clean(versionSpec) || "";
+        versionSpec = semver11.clean(versionSpec) || "";
        const cachePath = path30.join(_getCacheDirectory(), toolName, versionSpec, arch2);
        core29.debug(`checking cache: ${cachePath}`);
        if (fs32.existsSync(cachePath) && fs32.existsSync(`${cachePath}.complete`)) {
@@ -107045,7 +107045,7 @@ var require_tool_cache = __commonJS({
    }
    function _createToolPath(tool, version, arch2) {
      return __awaiter2(this, void 0, void 0, function* () {
-        const folderPath = path30.join(_getCacheDirectory(), tool, semver12.clean(version) || version, arch2 || "");
+        const folderPath = path30.join(_getCacheDirectory(), tool, semver11.clean(version) || version, arch2 || "");
        core29.debug(`destination ${folderPath}`);
        const markerPath = `${folderPath}.complete`;
        yield io9.rmRF(folderPath);
@@ -107055,15 +107055,15 @@ var require_tool_cache = __commonJS({
      });
    }
    function _completeToolPath(tool, version, arch2) {
-      const folderPath = path30.join(_getCacheDirectory(), tool, semver12.clean(version) || version, arch2 || "");
+      const folderPath = path30.join(_getCacheDirectory(), tool, semver11.clean(version) || version, arch2 || "");
      const markerPath = `${folderPath}.complete`;
      fs32.writeFileSync(markerPath, "");
      core29.debug("finished caching tool");
    }
    function isExplicitVersion(versionSpec) {
-      const c = semver12.clean(versionSpec) || "";
+      const c = semver11.clean(versionSpec) || "";
      core29.debug(`isExplicit: ${c}`);
-      const valid4 = semver12.valid(c) != null;
+      const valid4 = semver11.valid(c) != null;
      core29.debug(`explicit? ${valid4}`);
      return valid4;
    }
@@ -107071,14 +107071,14 @@ var require_tool_cache = __commonJS({
      let version = "";
      core29.debug(`evaluating ${versions.length} versions`);
      versions = versions.sort((a, b) => {
-        if (semver12.gt(a, b)) {
+        if (semver11.gt(a, b)) {
          return 1;
        }
        return -1;
      });
      for (let i = versions.length - 1; i >= 0; i--) {
        const potential = versions[i];
-        const satisfied = semver12.satisfies(potential, versionSpec);
+        const satisfied = semver11.satisfies(potential, versionSpec);
        if (satisfied) {
          version = potential;
          break;
@@ -140010,7 +140010,7 @@ var require_utils10 = __commonJS({
      }
    };
    exports2.GitHub = core_1.Octokit.plugin(plugin_rest_endpoint_methods_1.restEndpointMethods, plugin_paginate_rest_1.paginateRest).defaults(exports2.defaults);
-    function getOctokitOptions(token, options) {
+    function getOctokitOptions2(token, options) {
      const opts = Object.assign({}, options || {});
      const auth2 = Utils.getAuthString(token, opts);
      if (auth2) {
@@ -140018,7 +140018,7 @@ var require_utils10 = __commonJS({
      }
      return opts;
    }
-    exports2.getOctokitOptions = getOctokitOptions;
+    exports2.getOctokitOptions = getOctokitOptions2;
  }
 });

@@ -166182,17 +166182,6 @@ var Env = class extends ReadOnlyEnv {
      core.exportVariable(name, val);
    }
  }
-  /**
-   * Set some initial environment variables that we can set even without
-   * knowing what version of CodeQL we're running.
-   */
-  initialise(version) {
-    this.export("CODEQL_ACTION_FEATURE_MULTI_LANGUAGE" /* FEATURE_MULTI_LANGUAGE */, "false");
-    this.export("CODEQL_ACTION_FEATURE_SANDWICH" /* FEATURE_SANDWICH */, "false");
-    this.export("CODEQL_ACTION_FEATURE_SARIF_COMBINE" /* FEATURE_SARIF_COMBINE */, "true");
-    this.export("CODEQL_ACTION_FEATURE_WILL_UPLOAD" /* FEATURE_WILL_UPLOAD */, "true");
-    this.export("CODEQL_ACTION_VERSION" /* VERSION */, version);
-  }
  /** Gets a value indicating whether `set` was called at least once. */
  hasChanged() {
    return this.changed;
@@ -169566,85 +169555,10 @@ function checkSchema(schema, obj, options = {}, path30 = "") {
  return result;
 }

-// src/errors/index.ts
-function wrapError(error3) {
-  return error3 instanceof Error ? error3 : new Error(String(error3));
-}
-function getErrorMessage(error3) {
-  return error3 instanceof Error ? error3.message : String(error3);
-}
-function isDiskConfigurationError(e) {
-  if (!(e instanceof Error)) {
-    return false;
-  }
-  return (
-    // out of disk space
-    e.message.includes("ENOSPC") || // access denied
-    e.message.includes("EACCES")
-  );
-}
-var ConfigurationError = class extends Error {
-};
-var HTTPError = class extends Error {
-  status;
-  constructor(message, status) {
-    super(message);
-    this.status = status;
-  }
-};
-function asHTTPError(arg) {
-  if (!isObject2(arg) || !isString(arg.message)) {
-    return void 0;
-  }
-  if (Number.isInteger(arg.status)) {
-    return new HTTPError(arg.message, arg.status);
-  }
-  if (Number.isInteger(arg.httpStatusCode)) {
-    return new HTTPError(arg.message, arg.httpStatusCode);
-  }
-  return void 0;
-}
-
-// src/github.ts
-var GITHUB_DOTCOM_URL = "https://github.com";
-function parseGitHubUrl(inputUrl) {
-  const originalUrl = inputUrl;
-  if (inputUrl.indexOf("://") === -1) {
-    inputUrl = `https://${inputUrl}`;
-  }
-  if (!inputUrl.startsWith("http://") && !inputUrl.startsWith("https://")) {
-    throw new ConfigurationError(`"${originalUrl}" is not a http or https URL`);
-  }
-  let url2;
-  try {
-    url2 = new URL(inputUrl);
-  } catch {
-    throw new ConfigurationError(`"${originalUrl}" is not a valid URL`);
-  }
-  if (url2.hostname === "github.com" || url2.hostname === "api.github.com") {
-    return GITHUB_DOTCOM_URL;
-  }
-  if (url2.pathname.indexOf("/api/v3") !== -1) {
-    url2.pathname = url2.pathname.substring(0, url2.pathname.indexOf("/api/v3"));
-  }
-  if (url2.hostname.startsWith("api.")) {
-    url2.hostname = url2.hostname.substring(4);
-  }
-  if (!url2.pathname.endsWith("/")) {
-    url2.pathname = `${url2.pathname}/`;
-  }
-  return url2.toString();
-}
-function getCurrentInstance(env) {
-  return {
-    url: env.getRequired("GITHUB_SERVER_URL" /* GITHUB_SERVER_URL */),
-    apiURL: env.getRequired("GITHUB_API_URL" /* GITHUB_API_URL */)
-  };
-}
-
 // src/util.ts
 var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json";
 var BROKEN_VERSIONS = ["0.0.0-20211207"];
+var GITHUB_DOTCOM_URL = "https://github.com";
 var DEFAULT_DEBUG_ARTIFACT_NAME = "debug-artifacts";
 var DEFAULT_DEBUG_DATABASE_NAME = "db";
 var DEFAULT_RESERVED_RAM_SCALING_FACTOR = 0.05;
@@ -169860,6 +169774,34 @@ function getGeneratedSuitePath(config, language) {
    "config-queries.qls"
  );
 }
+function parseGitHubUrl(inputUrl) {
+  const originalUrl = inputUrl;
+  if (inputUrl.indexOf("://") === -1) {
+    inputUrl = `https://${inputUrl}`;
+  }
+  if (!inputUrl.startsWith("http://") && !inputUrl.startsWith("https://")) {
+    throw new ConfigurationError(`"${originalUrl}" is not a http or https URL`);
+  }
+  let url2;
+  try {
+    url2 = new URL(inputUrl);
+  } catch {
+    throw new ConfigurationError(`"${originalUrl}" is not a valid URL`);
+  }
+  if (url2.hostname === "github.com" || url2.hostname === "api.github.com") {
+    return GITHUB_DOTCOM_URL;
+  }
+  if (url2.pathname.indexOf("/api/v3") !== -1) {
+    url2.pathname = url2.pathname.substring(0, url2.pathname.indexOf("/api/v3"));
+  }
+  if (url2.hostname.startsWith("api.")) {
+    url2.hostname = url2.hostname.substring(4);
+  }
+  if (!url2.pathname.endsWith("/")) {
+    url2.pathname = `${url2.pathname}/`;
+  }
+  return url2.toString();
+}
 var CODEQL_ACTION_WARNED_ABOUT_VERSION_ENV_VAR = "CODEQL_ACTION_WARNED_ABOUT_VERSION";
 var hasBeenWarnedAboutVersion = false;
 function checkGitHubVersionInRange(version, logger2) {
@@ -169903,6 +169845,37 @@ var ExhaustivityCheckingError = class extends Error {
 function assertNever(value) {
  throw new ExhaustivityCheckingError(value);
 }
+function initializeEnvironment(version, env = getEnv()) {
+  env.export("CODEQL_ACTION_FEATURE_MULTI_LANGUAGE" /* FEATURE_MULTI_LANGUAGE */, "false");
+  env.export("CODEQL_ACTION_FEATURE_SANDWICH" /* FEATURE_SANDWICH */, "false");
+  env.export("CODEQL_ACTION_FEATURE_SARIF_COMBINE" /* FEATURE_SARIF_COMBINE */, "true");
+  env.export("CODEQL_ACTION_FEATURE_WILL_UPLOAD" /* FEATURE_WILL_UPLOAD */, "true");
+  env.export("CODEQL_ACTION_VERSION" /* VERSION */, version);
+}
+var HTTPError = class extends Error {
+  status;
+  constructor(message, status) {
+    super(message);
+    this.status = status;
+  }
+};
+var ConfigurationError = class extends Error {
+};
+function asHTTPError(arg) {
+  if (!isObject2(arg) || !isString(arg.message)) {
+    return void 0;
+  }
+  if (Number.isInteger(arg.status)) {
+    return new HTTPError(arg.message, arg.status);
+  }
+  if (Number.isInteger(arg.httpStatusCode)) {
+    return new HTTPError(arg.message, arg.httpStatusCode);
+  }
+  return void 0;
+}
+async function codeQlVersionAtLeast(codeql, requiredVersion) {
+  return semver.gte((await codeql.getVersion()).version, requiredVersion);
+}
 function getBaseDatabaseOidsFilePath(config) {
  return path.join(config.dbLocation, BASE_DATABASE_OIDS_FILE_NAME);
 }
@@ -170037,6 +170010,12 @@ function parseMatrixInput(matrixInput) {
    );
  }
 }
+function wrapError(error3) {
+  return error3 instanceof Error ? error3 : new Error(String(error3));
+}
+function getErrorMessage(error3) {
+  return error3 instanceof Error ? error3.message : String(error3);
+}
 function prettyPrintPack(pack) {
  return `${pack.name}${pack.version ? `@${pack.version}` : ""}${pack.path ? `:${pack.path}` : ""}`;
 }
@@ -170204,7 +170183,7 @@ function getDiffRangesJsonFilePath(env = getEnv()) {
  return path2.join(getTemporaryDirectory(env), PR_DIFF_RANGE_JSON_FILENAME);
 }
 function getActionVersion() {
-  return "4.39.1";
+  return "3.39.0";
 }
 function getWorkflowEventName(env = getEnv()) {
  return env.getRequired("GITHUB_EVENT_NAME" /* GITHUB_EVENT_NAME */);
@@ -170745,46 +170724,43 @@ function makeProxyRequestOptions(dispatcher) {
  };
 }
 function createApiClientWithDetails(apiDetails, { allowExternal = false, proxy = void 0 } = {}) {
-  const auth2 = allowExternal && apiDetails.externalRepoAuth !== void 0 ? apiDetails.externalRepoAuth : apiDetails.auth;
+  const auth2 = allowExternal && apiDetails.externalRepoAuth || apiDetails.auth;
  const retryingOctokit = githubUtils.GitHub.plugin(retry);
  const requestOptions = makeProxyRequestOptions(proxy);
-  const opts = {
-    auth: auth2 !== void 0 && auth2.trim() !== "" ? `token ${auth2}` : void 0,
-    baseUrl: apiDetails.apiURL,
-    userAgent: `CodeQL-Action/${getActionVersion()}`,
-    log: {
-      debug: core6.debug,
-      info: core6.info,
-      warn: core6.warning,
-      error: core6.error
-    },
-    request: requestOptions,
-    retry: {
-      doNotRetry: DO_NOT_RETRY_STATUSES
-    }
-  };
-  return new retryingOctokit(opts);
+  return new retryingOctokit(
+    githubUtils.getOctokitOptions(auth2, {
+      baseUrl: apiDetails.apiURL,
+      userAgent: `CodeQL-Action/${getActionVersion()}`,
+      log: {
+        debug: core6.debug,
+        info: core6.info,
+        warn: core6.warning,
+        error: core6.error
+      },
+      request: requestOptions,
+      retry: {
+        doNotRetry: DO_NOT_RETRY_STATUSES
+      }
+    })
+  );
 }
 function getApiDetails(env = getEnv()) {
  return {
    auth: getRequiredInput("token"),
-    ...getCurrentInstance(env)
+    url: env.getRequired("GITHUB_SERVER_URL" /* GITHUB_SERVER_URL */),
+    apiURL: env.getRequired("GITHUB_API_URL" /* GITHUB_API_URL */)
  };
 }
-function getApiClient(env = getEnv(), apiDetails) {
-  return createApiClientWithDetails(apiDetails ?? getApiDetails(env));
+function getApiClient(env = getEnv()) {
+  return createApiClientWithDetails(getApiDetails(env));
 }
 function getApiClientWithExternalAuth(apiDetails, proxy) {
  return createApiClientWithDetails(apiDetails, { allowExternal: true, proxy });
 }
 function getAuthorizationHeaderFor(logger2, apiDetails, url2) {
-  const token = apiDetails.auth?.trim();
-  if (token === void 0 || token === "") {
-    return void 0;
-  }
  if (url2.startsWith(`${apiDetails.url}/`) || apiDetails.apiURL && url2.startsWith(`${apiDetails.apiURL}/`)) {
    logger2.debug(`Providing an authorization token.`);
-    return `token ${token}`;
+    return `token ${apiDetails.auth}`;
  }
  logger2.debug(`Not using an authorization token.`);
  return void 0;
@@ -171945,6 +171921,11 @@ var featureConfig = {
    envVar: "CODEQL_ACTION_ALLOW_MULTIPLE_ANALYSIS_KINDS",
    minimumVersion: void 0
  },
+  ["cleanup_toolcache_bundles" /* CleanupToolcacheBundles */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_CLEANUP_TOOLCACHE_BUNDLES",
+    minimumVersion: void 0
+  },
  ["cleanup_trap_caches" /* CleanupTrapCaches */]: {
    defaultValue: false,
    envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES",
@@ -172263,7 +172244,7 @@ var OfflineFeatures = class {
    }
    const minimumVersion2 = config.minimumVersion;
    if (codeql && minimumVersion2) {
-      if (!await codeql.isVersionAtLeast(minimumVersion2)) {
+      if (!await codeQlVersionAtLeast(codeql, minimumVersion2)) {
        this.logger.debug(
          `Feature ${feature} is disabled because the CodeQL CLI version is older than the minimum version ${minimumVersion2}.`
        );
@@ -172686,7 +172667,6 @@ var fs16 = __toESM(require("fs"));
 var path15 = __toESM(require("path"));
 var core12 = __toESM(require_core());
 var toolrunner3 = __toESM(require_toolrunner());
-var semver10 = __toESM(require_semver2());

 // src/cli-errors.ts
 var SUPPORTED_PLATFORMS = [
@@ -174675,7 +174655,10 @@ function runnerHasSufficientDiskSpace(diskUsage, logger2, minimumDiskSpaceMb) {
  return true;
 }
 async function runnerHasSufficientMemory(codeql, ramInput, logger2) {
-  if (await codeql.isVersionAtLeast(CODEQL_VERSION_REDUCED_OVERLAY_MEMORY_USAGE)) {
+  if (await codeQlVersionAtLeast(
+    codeql,
+    CODEQL_VERSION_REDUCED_OVERLAY_MEMORY_USAGE
+  )) {
    logger2.debug(
      `Skipping memory check for overlay analysis because CodeQL version is at least ${CODEQL_VERSION_REDUCED_OVERLAY_MEMORY_USAGE}.`
    );
@@ -174813,7 +174796,7 @@ async function validateOverlayDatabaseMode(overlayDatabaseMode, useOverlayDataba
    );
    return new Failure("incompatible-build-mode" /* IncompatibleBuildMode */);
  }
-  if (!await codeql.isVersionAtLeast(CODEQL_OVERLAY_MINIMUM_VERSION)) {
+  if (!await codeQlVersionAtLeast(codeql, CODEQL_OVERLAY_MINIMUM_VERSION)) {
    logger2.warning(
      `Cannot build an ${overlayDatabaseMode} database because the CodeQL CLI is older than ${CODEQL_OVERLAY_MINIMUM_VERSION}. Falling back to creating a normal full database instead.`
    );
@@ -176735,6 +176718,7 @@ function getToolcacheDestination({ logger: logger2 }, source) {
 }
 async function tryDeleteToolcacheBundles({
  env,
+  features,
  logger: logger2
 }) {
  if (env.getOptional("CODEQL_ACTION_HAS_SET_UP_CODEQL" /* HAS_SET_UP_CODEQL */) !== void 0) {
@@ -176743,7 +176727,7 @@ async function tryDeleteToolcacheBundles({
    );
    return;
  }
-  if (!isGitHubHostedRunner(env) || !isToolcacheOnWorkspaceFilesystem(logger2)) {
+  if (!isGitHubHostedRunner() || !isToolcacheOnWorkspaceFilesystem(logger2) || !await features.getValue("cleanup_toolcache_bundles" /* CleanupToolcacheBundles */)) {
    return;
  }
  const result = await deleteToolcacheBundles({ env, logger: logger2 });
@@ -176803,7 +176787,7 @@ async function setupCodeQLBundle(toolsInput, apiDetails, tempDir, variant, defau
      break;
    case "download": {
      const result = await downloadCodeQLBundle(
-        { env: getEnv(), logger: logger2 },
+        { env: getEnv(), features, logger: logger2 },
        source,
        apiDetails,
        zstdAvailability.version,
@@ -177013,6 +176997,16 @@ var CODEQL_NEXT_MINIMUM_VERSION = "2.21.3";
 var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.17";
 var GHES_MOST_RECENT_DEPRECATION_DATE = "2026-09-24";
 var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++";
+function isDiskConfigurationError(e) {
+  if (!(e instanceof Error)) {
+    return false;
+  }
+  return (
+    // out of disk space
+    e.message.includes("ENOSPC") || // access denied
+    e.message.includes("EACCES")
+  );
+}
 async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, rawLanguages, otherLanguagePacksReason, useOverlayAwareDefaultCliVersion, features, logger2, checkVersion) {
  try {
    const {
@@ -177087,9 +177081,6 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion) {
      }
      return result;
    },
-    async isVersionAtLeast(requiredVersion) {
-      return semver10.gte((await this.getVersion()).version, requiredVersion);
-    },
    async printVersion() {
      core12.info(JSON.stringify(await this.getVersion(), null, 2));
    },
@@ -177478,11 +177469,11 @@ Output was: ${extractorPath}`
      await runCli(cmd, args);
    }
  };
-  if (checkVersion && !await codeql.isVersionAtLeast(CODEQL_MINIMUM_VERSION)) {
+  if (checkVersion && !await codeQlVersionAtLeast(codeql, CODEQL_MINIMUM_VERSION)) {
    throw new ConfigurationError(
      `Expected a CodeQL CLI with version at least ${CODEQL_MINIMUM_VERSION} but got version ${(await codeql.getVersion()).version}`
    );
-  } else if (checkVersion && process.env["CODEQL_ACTION_SUPPRESS_DEPRECATED_SOON_WARNING" /* SUPPRESS_DEPRECATED_SOON_WARNING */] !== "true" && !await codeql.isVersionAtLeast(CODEQL_NEXT_MINIMUM_VERSION)) {
+  } else if (checkVersion && process.env["CODEQL_ACTION_SUPPRESS_DEPRECATED_SOON_WARNING" /* SUPPRESS_DEPRECATED_SOON_WARNING */] !== "true" && !await codeQlVersionAtLeast(codeql, CODEQL_NEXT_MINIMUM_VERSION)) {
    const result = await codeql.getVersion();
    core12.warning(
      `CodeQL CLI version ${result.version} was discontinued on ${GHES_MOST_RECENT_DEPRECATION_DATE} alongside GitHub Enterprise Server ${GHES_VERSION_MOST_RECENTLY_DEPRECATED} and will not be supported by the next minor release of the CodeQL Action. Please update to CodeQL CLI version ${CODEQL_NEXT_MINIMUM_VERSION} or later. For instance, if you have specified a custom version of the CLI using the 'tools' input to the 'init' Action, you can remove this input to use the default version.
@@ -178500,7 +178491,7 @@ async function recordClearCleanupSizes(codeql, config, reports, logger2) {
  }
 }
 async function uploadBundledDatabase(repositoryNwo, language, commitOid, bundledDb, bundledDbSize, apiDetails) {
-  const client = getApiClient(getEnv(), apiDetails);
+  const client = getApiClient();
  const uploadsUrl = new URL(parseGitHubUrl(apiDetails.url));
  uploadsUrl.hostname = `uploads.${uploadsUrl.hostname}`;
  let uploadsBaseUrl = uploadsUrl.toString();
@@ -178521,6 +178512,7 @@ async function uploadBundledDatabase(repositoryNwo, language, commitOid, bundled
        commit_oid: commitOid,
        data: bundledDbReadStream,
        headers: {
+          authorization: `token ${apiDetails.auth}`,
          "Content-Type": "application/zip",
          "Content-Length": bundledDbSize
        },
@@ -180019,7 +180011,6 @@ async function shouldDisableCombineSarifFiles(sarifObjects, githubVersion) {
  return true;
 }
 async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, logger2) {
-  const env = getEnv();
  logger2.info("Combining SARIF files using the CodeQL CLI");
  const sarifObjects = sarifFiles.map(readSarifFile);
  const deprecationWarningMessage = gitHubVersion.type === "GitHub Enterprise Server" /* GHES */ ? "and will be removed in GitHub Enterprise Server 3.18" : "and will be removed in July 2025";
@@ -180052,7 +180043,8 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo
      externalRepoAuth: getOptionalInput(
        "external-repository-token"
      ),
-      ...getCurrentInstance(env)
+      url: getRequiredEnvParam("GITHUB_SERVER_URL"),
+      apiURL: getRequiredEnvParam("GITHUB_API_URL")
    };
    const codeQLDefaultVersionInfo = await features.getEnabledDefaultCliVersions(gitHubVersion.type);
    const initCodeQLResult = await initCodeQL(
@@ -180763,7 +180755,7 @@ async function run(action) {
  let dependencyCacheResults;
  let databaseUploadResults = [];
  try {
-    action.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());
    persistInputs();
    const statusReportBase = await createStatusReportBase(
      "finish" /* Analyze */,
@@ -183094,7 +183086,7 @@ var import_async = __toESM(require_async(), 1);
 var import_path7 = require("path");

 // node_modules/archiver/lib/error.js
-var import_util36 = __toESM(require("util"), 1);
+var import_util37 = __toESM(require("util"), 1);
 var ERROR_CODES = {
  ABORTED: "archive was aborted",
  DIRECTORYDIRPATHREQUIRED: "diretory dirpath argument must be a non-empty string value",
@@ -183119,7 +183111,7 @@ function ArchiverError(code, data) {
  this.code = code;
  this.data = data;
 }
-import_util36.default.inherits(ArchiverError, Error);
+import_util37.default.inherits(ArchiverError, Error);

 // node_modules/archiver/lib/core.js
 var import_readable_stream2 = __toESM(require_ours(), 1);
@@ -185942,8 +185934,8 @@ async function runWrapper2() {

 // src/autobuild-action.ts
 var core17 = __toESM(require_core());
-async function sendCompletedStatusReport(env, config, logger2, startedAt, allLanguages, failingLanguage, cause) {
-  env.initialise(getActionVersion());
+async function sendCompletedStatusReport(config, logger2, startedAt, allLanguages, failingLanguage, cause) {
+  initializeEnvironment(getActionVersion());
  const status = getActionsStatus(cause, failingLanguage);
  const statusReportBase = await createStatusReportBase(
    "autobuild" /* Autobuild */,
@@ -186015,7 +186007,6 @@ async function run2({
      `We were unable to automatically build your code. Please replace the call to the autobuild action with your custom build steps. ${error3.message}`
    );
    await sendCompletedStatusReport(
-      env,
      config,
      logger2,
      startedAt,
@@ -186026,13 +186017,7 @@ async function run2({
    return;
  }
  env.export("CODEQL_ACTION_AUTOBUILD_DID_COMPLETE_SUCCESSFULLY" /* AUTOBUILD_DID_COMPLETE_SUCCESSFULLY */, "true");
-  await sendCompletedStatusReport(
-    env,
-    config,
-    logger2,
-    startedAt,
-    languages ?? []
-  );
+  await sendCompletedStatusReport(config, logger2, startedAt, languages ?? []);
 }
 var autobuild = {
  name: "autobuild" /* Autobuild */,
@@ -186047,7 +186032,7 @@ var fs29 = __toESM(require("fs"));
 var path25 = __toESM(require("path"));
 var core19 = __toESM(require_core());
 var io7 = __toESM(require_io());
-var semver11 = __toESM(require_semver2());
+var semver10 = __toESM(require_semver2());

 // src/config/inputs.ts
 async function getToolsInput(action, repositoryProperties) {
@@ -186460,12 +186445,13 @@ async function run3(actionState) {
  let toolsSource;
  let toolsVersion;
  try {
-    actionState.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());
    persistInputs();
    apiDetails = {
      auth: getRequiredInput("token"),
      externalRepoAuth: getOptionalInput("external-repository-token"),
-      ...getCurrentInstance(actionState.env)
+      url: actionState.env.getRequired("GITHUB_SERVER_URL" /* GITHUB_SERVER_URL */),
+      apiURL: actionState.env.getRequired("GITHUB_API_URL" /* GITHUB_API_URL */)
    };
    const gitHubVersion = await getGitHubVersion();
    checkGitHubVersionInRange(gitHubVersion, logger2);
@@ -186557,7 +186543,7 @@ async function run3(actionState) {
    ) {
      const publicPreview = "2.22.1";
      const actualVer = (await codeql.getVersion()).version;
-      if (semver11.lt(actualVer, publicPreview)) {
+      if (semver10.lt(actualVer, publicPreview)) {
        actionState.env.export("CODEQL_ENABLE_EXPERIMENTAL_FEATURES" /* EXPERIMENTAL_FEATURES */, "true");
        logger2.info("Experimental Rust analysis enabled");
      }
@@ -186790,7 +186776,7 @@ exec ${goBinaryPath} "$@"`
      logger2.debug(
        `${"CODEQL_EXTRACTOR_JAVA_OPTION_MINIMIZE_DEPENDENCY_JARS" /* JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS */} is already set to '${process.env["CODEQL_EXTRACTOR_JAVA_OPTION_MINIMIZE_DEPENDENCY_JARS" /* JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS */]}', so the Action will not override it.`
      );
-    } else if (await codeql.isVersionAtLeast(CODEQL_VERSION_JAR_MINIMIZATION) && config.dependencyCachingEnabled && config.buildMode === "none" /* None */ && config.languages.includes("java" /* java */)) {
+    } else if (await codeQlVersionAtLeast(codeql, CODEQL_VERSION_JAR_MINIMIZATION) && config.dependencyCachingEnabled && config.buildMode === "none" /* None */ && config.languages.includes("java" /* java */)) {
      actionState.env.export(
        "CODEQL_EXTRACTOR_JAVA_OPTION_MINIMIZE_DEPENDENCY_JARS" /* JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS */,
        "true"
@@ -187503,11 +187489,12 @@ async function run6(actionState) {
  let toolsSource;
  let toolsVersion;
  try {
-    actionState.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());
    const apiDetails = {
      auth: getRequiredInput("token"),
      externalRepoAuth: getOptionalInput("external-repository-token"),
-      ...getCurrentInstance(actionState.env)
+      url: actionState.env.getRequired("GITHUB_SERVER_URL" /* GITHUB_SERVER_URL */),
+      apiURL: actionState.env.getRequired("GITHUB_API_URL" /* GITHUB_API_URL */)
    };
    const gitHubVersion = await getGitHubVersion();
    checkGitHubVersionInRange(gitHubVersion, logger2);
@@ -188455,10 +188442,9 @@ async function sendSuccessStatusReport2(startedAt, uploadStats, logger2) {
    await sendStatusReport(statusReport);
  }
 }
-async function run8(action) {
-  const logger2 = action.logger;
+async function run8({ startedAt, logger: logger2 }) {
  try {
-    action.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());
    const gitHubVersion = await getGitHubVersion();
    checkActionVersion(getActionVersion(), gitHubVersion);
    persistInputs();
@@ -188472,7 +188458,7 @@ async function run8(action) {
    const startingStatusReportBase = await createStatusReportBase(
      "upload-sarif" /* UploadSarif */,
      "starting",
-      action.startedAt,
+      startedAt,
      void 0,
      await checkDiskUsage(logger2),
      logger2
@@ -188515,7 +188501,7 @@ async function run8(action) {
      }
    }
    await sendSuccessStatusReport2(
-      action.startedAt,
+      startedAt,
      codeScanningResult?.statusReport || {},
      logger2
    );
@@ -188526,7 +188512,7 @@ async function run8(action) {
    const errorStatusReportBase = await createStatusReportBase(
      "upload-sarif" /* UploadSarif */,
      getActionsStatus(error3),
-      action.startedAt,
+      startedAt,
      void 0,
      await checkDiskUsage(logger2),
      logger2,
@@ -1,12 +1,12 @@
 {
  "name": "codeql",
-  "version": "4.39.1",
+  "version": "4.39.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "codeql",
-      "version": "4.39.1",
+      "version": "4.39.0",
      "license": "MIT",
      "workspaces": [
        "pr-checks"
@@ -1,6 +1,6 @@
 {
  "name": "codeql",
-  "version": "4.39.1",
+  "version": "3.39.0",
  "private": true,
  "description": "CodeQL action",
  "scripts": {
@@ -46,7 +46,7 @@ steps:
      post-processed-sarif-path: "${{ runner.temp }}/post-processed"

  - name: Upload SARIF files
-    uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
    with:
      name: |
        analysis-kinds-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}
@@ -54,7 +54,7 @@ steps:
      retention-days: 7

  - name: Upload post-processed SARIF
-    uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
    with:
      name: |
        post-processed-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}
@@ -14,7 +14,7 @@ steps:
      output: "${{ runner.temp }}/results"
      upload-database: false
  - name: Upload SARIF
-    uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
    with:
      name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
      path: "${{ runner.temp }}/results/javascript.sarif"
@@ -27,7 +27,7 @@ steps:
      output: "${{ runner.temp }}/results"
      upload-database: false
  - name: Upload SARIF
-    uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
    with:
      name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
      path: "${{ runner.temp }}/results/javascript.sarif"
@@ -27,7 +27,7 @@ steps:
    with:
      output: "${{ runner.temp }}/results"
  - name: Upload SARIF
-    uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
    with:
      name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json
      path: "${{ runner.temp }}/results/javascript.sarif"
@@ -12,7 +12,7 @@ steps:
    with:
      output: "${{ runner.temp }}/results"
  - name: Upload SARIF
-    uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
    with:
      name: ${{ matrix.os }}-${{ matrix.version }}.sarif.json
      path: "${{ runner.temp }}/results/javascript.sarif"
@@ -14,6 +14,7 @@ operatingSystems:
      - stable-v2.21.4
      - stable-v2.22.4
 env:
+  CODEQL_ACTION_CLEANUP_TOOLCACHE_BUNDLES: true
  CODEQL_ACTION_RESOLVE_SUPPORTED_LANGUAGES_USING_CLI: true
 installGo: true
 installDotNet: true
@@ -215,8 +215,8 @@ const languageSetups: LanguageSetups = {
        name: "Install Node.js",
        uses: pinnedUses(
          "actions/setup-node",
-          "949feb2413d6458794dcd2491c4babbbce0c15c1",
-          "v7.1.0",
+          "820762786026740c76f36085b0efc47a31fe5020",
+          "v7.0.0",
        ),
        with: {
          "node-version": defaultLanguageVersions.javascript,
@@ -21,5 +21,5 @@ outputs:
  environment:
    description: The inferred build environment configuration.
 runs:
-  using: node24
+  using: node20
  main: '../lib/resolve-environment-entry.js'
@@ -51,5 +51,5 @@ outputs:
  codeql-version:
    description: The version of the CodeQL binary that was installed.
 runs:
-  using: node24
+  using: node20
  main: '../lib/setup-codeql-entry.js'
@@ -12,8 +12,8 @@ import {
 import { computeAutomationID } from "./api-client";
 import { EnvVar } from "./environment";
 import { getRunnerLogger } from "./logging";
-import { getTestEnv, RecordingLogger, setupTests } from "./testing-utils";
-import { withTmpDir } from "./util";
+import { RecordingLogger, setupTests } from "./testing-utils";
+import { initializeEnvironment, withTmpDir } from "./util";

 setupTests(test);

@@ -228,9 +228,8 @@ test.serial(
 );

 test.serial("initializeEnvironment", (t) => {
-  const env = getTestEnv();
-  env.initialise("1.2.3");
-  t.deepEqual(env.getOptional(EnvVar.VERSION), "1.2.3");
+  initializeEnvironment("1.2.3");
+  t.deepEqual(process.env[EnvVar.VERSION], "1.2.3");
 });

 test.serial("fixCodeQualityCategory", (t) => {
@@ -238,7 +238,7 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
  let databaseUploadResults: DatabaseUploadResult[] = [];

  try {
-    action.env.initialise(actionsUtil.getActionVersion());
+    util.initializeEnvironment(actionsUtil.getActionVersion());

    // Make inputs accessible in the `post` step, details at
    // https://github.com/github/codeql-action/issues/2553
@@ -7,21 +7,14 @@ import { ProxyAgent } from "undici";
 import * as actionsUtil from "./actions-util";
 import * as api from "./api-client";
 import { DO_NOT_RETRY_STATUSES } from "./api-client";
-import { ActionsEnvVars, RegistryProxyVars, getEnv } from "./environment";
-import { GITHUB_DOTCOM_API_URL, GITHUB_DOTCOM_URL } from "./github";
-import {
-  callee,
-  getTestEnv,
-  RecordingLogger,
-  SAMPLE_DOTCOM_API_DETAILS,
-  setupTests,
-} from "./testing-utils";
+import { ActionsEnvVars, RegistryProxyVars } from "./environment";
+import { callee, getTestEnv, setupTests } from "./testing-utils";
 import * as util from "./util";

 setupTests(test);

 test.beforeEach(() => {
-  getEnv().initialise(actionsUtil.getActionVersion());
+  util.initializeEnvironment(actionsUtil.getActionVersion());
 });

 test.serial("getApiClient", async (t) => {
@@ -291,87 +284,3 @@ test("makeProxyRequestOptions - returns fetch with custom proxy", async (t) => {
    githubUtils.defaults.request,
  );
 });
-
-test.serial(
-  "getApiClientWithExternalAuth constructs clients with or without tokens",
-  (t) => {
-    t.notThrows(() => {
-      api.getApiClientWithExternalAuth(SAMPLE_DOTCOM_API_DETAILS);
-      api.getApiClientWithExternalAuth({
-        ...SAMPLE_DOTCOM_API_DETAILS,
-        auth: undefined,
-      });
-    });
-  },
-);
-
-test("getAuthorizationHeaderFor - returns undefined if there's no token", (t) => {
-  const logger = new RecordingLogger();
-
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      { ...SAMPLE_DOTCOM_API_DETAILS, auth: undefined },
-      `${GITHUB_DOTCOM_URL}/github`,
-    ),
-    undefined,
-  );
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      { ...SAMPLE_DOTCOM_API_DETAILS, auth: "" },
-      `${GITHUB_DOTCOM_URL}/github`,
-    ),
-    undefined,
-  );
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      { ...SAMPLE_DOTCOM_API_DETAILS, auth: "    " },
-      `${GITHUB_DOTCOM_URL}/github`,
-    ),
-    undefined,
-  );
-});
-
-test("getAuthorizationHeaderFor - returns header value with token if url is allowed", (t) => {
-  const logger = new RecordingLogger();
-
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      SAMPLE_DOTCOM_API_DETAILS,
-      `${GITHUB_DOTCOM_URL}/github`,
-    ),
-    `token ${SAMPLE_DOTCOM_API_DETAILS.auth}`,
-  );
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      SAMPLE_DOTCOM_API_DETAILS,
-      `${GITHUB_DOTCOM_API_URL}/github`,
-    ),
-    `token ${SAMPLE_DOTCOM_API_DETAILS.auth}`,
-  );
-});
-
-test("getAuthorizationHeaderFor - returns undefined if url is not allowed", (t) => {
-  const logger = new RecordingLogger();
-
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      SAMPLE_DOTCOM_API_DETAILS,
-      `https://localhost/github`,
-    ),
-    undefined,
-  );
-  t.is(
-    api.getAuthorizationHeaderFor(
-      logger,
-      SAMPLE_DOTCOM_API_DETAILS,
-      `https://api.localhost/github`,
-    ),
-    undefined,
-  );
-});
@@ -1,6 +1,5 @@
 import * as core from "@actions/core";
 import * as githubUtils from "@actions/github/lib/utils";
-import type { OctokitOptions } from "@octokit/core";
 import * as retry from "@octokit/plugin-retry";
 import { RequestRequestOptions } from "@octokit/types";
 import {
@@ -13,32 +12,26 @@ import {
 import type { ActionState } from "./action-common";
 import { getActionVersion, getRequiredInput } from "./actions-util";
 import {
+  ActionsEnvVars,
  EnvVar,
  ReadOnlyEnv,
  RegistryProxyVars,
  getEnv,
  exportEnvVar,
 } from "./environment";
-import {
-  getCurrentInstance,
-  GITHUB_DOTCOM_URL,
-  parseGitHubUrl,
-  type GitHubApiCombinedDetails,
-  type GitHubApiDetails,
-} from "./github";
 import { Logger } from "./logging";
 import { getRepositoryNwo, RepositoryNwo } from "./repository";
 import {
  asHTTPError,
  ConfigurationError,
  getRequiredEnvParam,
+  GITHUB_DOTCOM_URL,
  GitHubVariant,
  GitHubVersion,
+  parseGitHubUrl,
  parseMatrixInput,
 } from "./util";

-export type { GitHubApiDetails, GitHubApiCombinedDetails } from "./github";
-
 const GITHUB_ENTERPRISE_VERSION_HEADER = "x-github-enterprise-version";

 /**
@@ -50,6 +43,21 @@ const GITHUB_ENTERPRISE_VERSION_HEADER = "x-github-enterprise-version";
 */
 export const DO_NOT_RETRY_STATUSES = [400, 410, 422, 451];

+export type GitHubApiCombinedDetails = GitHubApiDetails &
+  GitHubApiExternalRepoDetails;
+
+export interface GitHubApiDetails {
+  auth: string;
+  url: string;
+  apiURL: string | undefined;
+}
+
+export interface GitHubApiExternalRepoDetails {
+  externalRepoAuth?: string;
+  url: string;
+  apiURL: string | undefined;
+}
+
 /**
 * Gets the configuration for the private registry authentication proxy,
 * if it is available in the environment.
@@ -131,60 +139,37 @@ function createApiClientWithDetails(
  { allowExternal = false, proxy = undefined }: CreateApiClientOptions = {},
 ): ApiClient {
  const auth =
-    allowExternal && apiDetails.externalRepoAuth !== undefined
-      ? apiDetails.externalRepoAuth
-      : apiDetails.auth;
+    (allowExternal && apiDetails.externalRepoAuth) || apiDetails.auth;
  const retryingOctokit = githubUtils.GitHub.plugin(retry.retry);
  const requestOptions = makeProxyRequestOptions(proxy);
-
-  const opts: OctokitOptions = {
-    auth:
-      auth !== undefined && auth.trim() !== "" ? `token ${auth}` : undefined,
-    baseUrl: apiDetails.apiURL,
-    userAgent: `CodeQL-Action/${getActionVersion()}`,
-    log: {
-      debug: core.debug,
-      info: core.info,
-      warn: core.warning,
-      error: core.error,
-    },
-    request: requestOptions,
-    retry: {
-      doNotRetry: DO_NOT_RETRY_STATUSES,
-    },
-  };
-
-  return new retryingOctokit(opts);
+  return new retryingOctokit(
+    githubUtils.getOctokitOptions(auth, {
+      baseUrl: apiDetails.apiURL,
+      userAgent: `CodeQL-Action/${getActionVersion()}`,
+      log: {
+        debug: core.debug,
+        info: core.info,
+        warn: core.warning,
+        error: core.error,
+      },
+      request: requestOptions,
+      retry: {
+        doNotRetry: DO_NOT_RETRY_STATUSES,
+      },
+    }),
+  );
 }

-/**
- * Gets a `GitHubApiDetails` object describing the GitHub instance we are currently running on.
- *
- * @param env The environment variables to read.
- */
 export function getApiDetails(env: ReadOnlyEnv = getEnv()): GitHubApiDetails {
  return {
    auth: getRequiredInput("token"),
-    ...getCurrentInstance(env),
+    url: env.getRequired(ActionsEnvVars.GITHUB_SERVER_URL),
+    apiURL: env.getRequired(ActionsEnvVars.GITHUB_API_URL),
  };
 }

-/**
- * Constructs an {@link ApiClient} using {@link apiDetails}.
- *
- * If {@link apiDetails} is not specified, then the GitHub instance URLs and auth token
- * are taken from {@link env}.
- *
- * If {@link env} is not specified, then the process environment is used.
- *
- * @param env The environment to obtain the GitHub instance URLs from.
- * @param apiDetails The {@link GitHubApiDetails} to construct the {@link ApiClient} for.
- */
-export function getApiClient(
-  env: ReadOnlyEnv = getEnv(),
-  apiDetails?: GitHubApiDetails,
-) {
-  return createApiClientWithDetails(apiDetails ?? getApiDetails(env));
+export function getApiClient(env: ReadOnlyEnv = getEnv()) {
+  return createApiClientWithDetails(getApiDetails(env));
 }

 export function getApiClientWithExternalAuth(
@@ -209,12 +194,6 @@ export function getAuthorizationHeaderFor(
  apiDetails: GitHubApiDetails,
  url: string,
 ): string | undefined {
-  // We don't have to check the `url` if we don't have a token to begin with.
-  const token = apiDetails.auth?.trim();
-  if (token === undefined || token === "") {
-    return undefined;
-  }
-
  // We only want to provide an authorization header if we are downloading
  // from the same GitHub instance the Action is running on.
  // This avoids leaking Enterprise tokens to dotcom.
@@ -223,7 +202,7 @@ export function getAuthorizationHeaderFor(
    (apiDetails.apiURL && url.startsWith(`${apiDetails.apiURL}/`))
  ) {
    logger.debug(`Providing an authorization token.`);
-    return `token ${token}`;
+    return `token ${apiDetails.auth}`;
  }

  logger.debug(`Not using an authorization token.`);
@@ -10,7 +10,7 @@ import { getGitHubVersion } from "./api-client";
 import { determineAutobuildLanguages, runAutobuild } from "./autobuild";
 import { getCodeQL } from "./codeql";
 import { Config, getConfig } from "./config-utils";
-import { EnvVar, type Env } from "./environment";
+import { EnvVar } from "./environment";
 import { Language } from "./languages";
 import { Logger } from "./logging";
 import {
@@ -26,6 +26,7 @@ import {
  checkDiskUsage,
  checkGitHubVersionInRange,
  ConfigurationError,
+  initializeEnvironment,
  wrapError,
 } from "./util";

@@ -37,7 +38,6 @@ interface AutobuildStatusReport extends StatusReportBase {
 }

 async function sendCompletedStatusReport(
-  env: Env,
  config: Config | undefined,
  logger: Logger,
  startedAt: Date,
@@ -45,7 +45,7 @@ async function sendCompletedStatusReport(
  failingLanguage?: string,
  cause?: Error,
 ) {
-  env.initialise(getActionVersion());
+  initializeEnvironment(getActionVersion());

  const status = getActionsStatus(cause, failingLanguage);
  const statusReportBase = await createStatusReportBase(
@@ -129,7 +129,6 @@ async function run({
      `We were unable to automatically build your code. Please replace the call to the autobuild action with your custom build steps. ${error.message}`,
    );
    await sendCompletedStatusReport(
-      env,
      config,
      logger,
      startedAt,
@@ -142,13 +141,7 @@ async function run({

  env.export(EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY, "true");

-  await sendCompletedStatusReport(
-    env,
-    config,
-    logger,
-    startedAt,
-    languages ?? [],
-  );
+  await sendCompletedStatusReport(config, logger, startedAt, languages ?? []);
 }

 /** Defines the `autobuild` Action. */
@@ -21,7 +21,6 @@ import {
 import type { Config } from "./config-utils";
 import * as defaults from "./defaults.json";
 import { DocUrl } from "./doc-url";
-import { getEnv } from "./environment";
 import { BuiltInLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
 import { ToolsSource } from "./setup-codeql";
@@ -38,13 +37,14 @@ import {
 } from "./testing-utils";
 import { ToolsDownloadStatusReport } from "./tools-download";
 import * as util from "./util";
+import { initializeEnvironment } from "./util";

 setupTests(test);

 let stubConfig: Config;

 test.beforeEach(() => {
-  getEnv().initialise("1.2.3");
+  initializeEnvironment("1.2.3");

  stubConfig = createTestConfig({
    languages: [BuiltInLanguage.cpp],
@@ -126,7 +126,7 @@ function mockReleaseApi({
    });
 }

-function mockApiDetails(apiDetails: Required<GitHubApiDetails>) {
+function mockApiDetails(apiDetails: GitHubApiDetails) {
  // This is a workaround to mock `api.getApiDetails()` since it doesn't seem to be possible to
  // mock this directly. The difficulty is that `getApiDetails()` is called locally in
  // `api-client.ts`, but `sinon.stub(api, "getApiDetails")` only affects calls to
@@ -4,7 +4,6 @@ import * as path from "path";
 import * as core from "@actions/core";
 import * as toolrunner from "@actions/exec/lib/toolrunner";
 import * as yaml from "js-yaml";
-import * as semver from "semver";

 import {
  CommandInvocationError,
@@ -20,7 +19,6 @@ import type { ActionConfig } from "./config/action-config";
 import { appendExtraQueryExclusions, type Config } from "./config-utils";
 import { DocUrl } from "./doc-url";
 import { EnvVar, getEnv, exportEnvVar } from "./environment";
-import { getErrorMessage, isDiskConfigurationError } from "./errors";
 import {
  CodeQLDefaultVersionInfo,
  Feature,
@@ -36,9 +34,7 @@ import { ToolsDownloadStatusReport } from "./tools-download";
 import { ToolsFeature, isSupportedToolsFeature } from "./tools-features";
 import { shouldEnableIndirectTracing } from "./tracer-config";
 import * as util from "./util";
-import { BuildMode, CleanupLevel } from "./util";
-
-export { isDiskConfigurationError } from "./errors";
+import { BuildMode, CleanupLevel, getErrorMessage } from "./util";

 type Options = Array<string | number | boolean>;

@@ -74,11 +70,6 @@ export interface CodeQL {
   * Get a string containing the semver version of the CodeQL executable.
   */
  getVersion(): Promise<VersionInfo>;
-  /**
-   * Determines whether the CLI installation represented by this {@link CodeQL} instance
-   * has at least the {@link requiredVersion}.
-   */
-  isVersionAtLeast(requiredVersion: string): Promise<boolean>;
  /**
   * Print version information about CodeQL.
   */
@@ -283,6 +274,26 @@ const GHES_MOST_RECENT_DEPRECATION_DATE = "2026-09-24";
 /** The CLI verbosity level to use for extraction in debug mode. */
 const EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++";

+/**
+ * Decides whether `e` is a disk-related error outside of our control
+ * that should be classified as a `ConfigurationError`.
+ *
+ * @param e The error to check.
+ * @returns True if the error should be treated as a `ConfigurationError` or false if not.
+ */
+export function isDiskConfigurationError(e: unknown): boolean {
+  if (!(e instanceof Error)) {
+    return false;
+  }
+
+  return (
+    // out of disk space
+    e.message.includes("ENOSPC") ||
+    // access denied
+    e.message.includes("EACCES")
+  );
+}
+
 /**
 * Set up CodeQL CLI access.
 *
@@ -420,19 +431,6 @@ export function createStubCodeQL(partialCodeql: Partial<CodeQL>): CodeQL {
    getVersion: resolveFunction(partialCodeql, "getVersion", async () => ({
      version: "1.0.0",
    })),
-    isVersionAtLeast: resolveFunction(
-      partialCodeql,
-      "codeQlVersionAtLeast",
-      async (requiredVersion) => {
-        return (
-          !!partialCodeql.getVersion &&
-          semver.gte(
-            (await partialCodeql.getVersion()).version,
-            requiredVersion,
-          )
-        );
-      },
-    ),
    printVersion: resolveFunction(partialCodeql, "printVersion"),
    supportsFeature: resolveFunction(
      partialCodeql,
@@ -536,9 +534,6 @@ async function getCodeQLForCmd(
      }
      return result;
    },
-    async isVersionAtLeast(requiredVersion: string) {
-      return semver.gte((await this.getVersion()).version, requiredVersion);
-    },
    async printVersion() {
      // Reuse the cached version information rather than invoking the CLI again.
      core.info(JSON.stringify(await this.getVersion(), null, 2));
@@ -1033,7 +1028,7 @@ async function getCodeQLForCmd(
  // CodeQL object is created.
  if (
    checkVersion &&
-    !(await codeql.isVersionAtLeast(CODEQL_MINIMUM_VERSION))
+    !(await util.codeQlVersionAtLeast(codeql, CODEQL_MINIMUM_VERSION))
  ) {
    throw new util.ConfigurationError(
      `Expected a CodeQL CLI with version at least ${CODEQL_MINIMUM_VERSION} but got version ${
@@ -1043,7 +1038,7 @@ async function getCodeQLForCmd(
  } else if (
    checkVersion &&
    process.env[EnvVar.SUPPRESS_DEPRECATED_SOON_WARNING] !== "true" &&
-    !(await codeql.isVersionAtLeast(CODEQL_NEXT_MINIMUM_VERSION))
+    !(await util.codeQlVersionAtLeast(codeql, CODEQL_NEXT_MINIMUM_VERSION))
  ) {
    const result = await codeql.getVersion();
    core.warning(
@@ -82,6 +82,7 @@ import {
  GitHubVersion,
  ConfigurationError,
  BuildMode,
+  codeQlVersionAtLeast,
  cloneObject,
  isDefined,
  checkDiskUsage,
@@ -651,7 +652,10 @@ async function runnerHasSufficientMemory(
  logger: Logger,
 ): Promise<boolean> {
  if (
-    await codeql.isVersionAtLeast(CODEQL_VERSION_REDUCED_OVERLAY_MEMORY_USAGE)
+    await codeQlVersionAtLeast(
+      codeql,
+      CODEQL_VERSION_REDUCED_OVERLAY_MEMORY_USAGE,
+    )
  ) {
    logger.debug(
      `Skipping memory check for overlay analysis because CodeQL version is at least ${CODEQL_VERSION_REDUCED_OVERLAY_MEMORY_USAGE}.`,
@@ -895,7 +899,7 @@ async function validateOverlayDatabaseMode(
    );
    return new Failure(OverlayDisabledReason.IncompatibleBuildMode);
  }
-  if (!(await codeql.isVersionAtLeast(CODEQL_OVERLAY_MINIMUM_VERSION))) {
+  if (!(await codeQlVersionAtLeast(codeql, CODEQL_OVERLAY_MINIMUM_VERSION))) {
    logger.warning(
      `Cannot build an ${overlayDatabaseMode} database because ` +
        `the CodeQL CLI is older than ${CODEQL_OVERLAY_MINIMUM_VERSION}. ` +
@@ -1,5 +1,4 @@
-import fs from "fs";
-import path from "path";
+import * as fs from "fs";

 import * as github from "@actions/github";
 import test from "ava";
@@ -11,11 +10,7 @@ import { GitHubApiDetails } from "./api-client";
 import * as apiClient from "./api-client";
 import { createStubCodeQL } from "./codeql";
 import { Config } from "./config-utils";
-import {
-  cleanupAndUploadDatabases,
-  uploadBundledDatabase,
-} from "./database-upload";
-import { getEnv } from "./environment";
+import { cleanupAndUploadDatabases } from "./database-upload";
 import { Feature } from "./feature-flags";
 import * as gitUtils from "./git-utils";
 import { BuiltInLanguage } from "./languages";
@@ -28,16 +23,21 @@ import {
  getTestEnv,
  initAllState,
  RecordingLogger,
-  SAMPLE_DOTCOM_API_DETAILS,
  setupActionsVars,
  setupTests,
 } from "./testing-utils";
-import { CleanupLevel, GitHubVariant, HTTPError, withTmpDir } from "./util";
+import {
+  CleanupLevel,
+  GitHubVariant,
+  HTTPError,
+  initializeEnvironment,
+  withTmpDir,
+} from "./util";

 setupTests(test);

 test.beforeEach(() => {
-  getEnv().initialise("1.2.3");
+  initializeEnvironment("1.2.3");
 });

 const testRepoName: RepositoryNwo = { owner: "github", repo: "example" };
@@ -550,86 +550,3 @@ test.serial(
    });
  },
 );
-
-test.serial(
-  "uploadBundledDatabase provides expected request arguments",
-  async (t) =>
-    withTmpDir(async (tmpDir) => {
-      // Write some file that `uploadBundledDatabase` can use for its `fs.createReadStream(bundledDb)` call
-      // so we don't have to stub that or create a fake `ReadStream`.
-      const dbPath = path.join(tmpDir, "db");
-      const content = JSON.stringify({});
-      fs.writeFileSync(dbPath, content);
-
-      // A simple stub for `fetch` that satisfies Octokit when it inspects the response.
-      const fetchStub = sinon.stub().resolves({
-        status: 200,
-        headers: new Headers(),
-        text: async () => "",
-      });
-
-      // Construct a real `ApiClient`.
-      const client = apiClient.getApiClient(
-        getTestEnv(),
-        SAMPLE_DOTCOM_API_DETAILS,
-      );
-
-      // Then wrap the real `request` method in a stub that calls it with our stubbed `fetch`.
-      // This ensures that we have a real `ApiClient` with a mostly real `request`, but which
-      // does not perform any actual requests.
-      const request = client.request;
-      sinon.stub(client, "request").callsFake(async (route, options) =>
-        request(route, {
-          ...options,
-          request: { ...options?.request, fetch: fetchStub },
-        }),
-      );
-
-      // Stub `getApiClient` to return our modified `ApiClient`.
-      const getApiClient = sinon
-        .stub(apiClient, "getApiClient")
-        .returns(client);
-
-      // Calling `uploadBundledDatabase` shouldn't throw.
-      const nwo: RepositoryNwo = { owner: "test", repo: "foo" };
-      const language: BuiltInLanguage = BuiltInLanguage.java;
-
-      await t.notThrowsAsync(async () => {
-        await uploadBundledDatabase(
-          nwo,
-          language,
-          "123",
-          dbPath,
-          content.length,
-          SAMPLE_DOTCOM_API_DETAILS,
-        );
-      });
-
-      // Check that our stubs were called and that they received the expected arguments.
-      t.is(getApiClient.callCount, 1);
-      t.is(fetchStub.callCount, 1);
-
-      const args = fetchStub.args[0];
-      t.is(args.length, 2);
-
-      const url = args[0];
-      t.is(
-        url,
-        `https://uploads.github.com/repos/${nwo.owner}/${nwo.repo}/code-scanning/codeql/databases/${language}?name=${language}-database&commit_oid=123`,
-      );
-
-      const options = args[1];
-      t.like(options, {
-        // Going via `new Headers` and `Object.fromEntries` ensures we get the same cases
-        // for the header keys as we are given.
-        headers: Object.fromEntries(
-          new Headers({
-            authorization: `token ${SAMPLE_DOTCOM_API_DETAILS.auth}`,
-            "Content-Type": "application/zip",
-            "Content-Length": content.length.toString(),
-          }).entries(),
-        ),
-        method: "POST",
-      } satisfies RequestInit);
-    }),
-);
@@ -12,12 +12,11 @@ import { type CodeQL } from "./codeql";
 import { Config } from "./config-utils";
 import { Feature } from "./feature-flags";
 import * as gitUtils from "./git-utils";
-import { parseGitHubUrl } from "./github";
 import { Logger, withGroupAsync } from "./logging";
 import { OverlayDatabaseMode } from "./overlay/overlay-database-mode";
 import { RepositoryNwo } from "./repository";
 import * as util from "./util";
-import { asHTTPError, bundleDb, CleanupLevel } from "./util";
+import { asHTTPError, bundleDb, CleanupLevel, parseGitHubUrl } from "./util";

 /** Information about a database upload. */
 export interface DatabaseUploadResult {
@@ -259,7 +258,7 @@ async function recordClearCleanupSizes(
 *
 * @returns the duration of the upload in milliseconds
 */
-export async function uploadBundledDatabase(
+async function uploadBundledDatabase(
  repositoryNwo: RepositoryNwo,
  language: string,
  commitOid: string,
@@ -267,10 +266,7 @@ export async function uploadBundledDatabase(
  bundledDbSize: number,
  apiDetails: GitHubApiDetails,
 ): Promise<number> {
-  // Ensure that the `apiDetails` that `getApiClient` uses match the ones we were given here,
-  // because we use `apiDetails.auth` below which must be used with the same instance that
-  // `apiDetails` refers to.
-  const client = getApiClient(util.getEnv(), apiDetails);
+  const client = getApiClient();

  const uploadsUrl = new URL(parseGitHubUrl(apiDetails.url));
  uploadsUrl.hostname = `uploads.${uploadsUrl.hostname}`;
@@ -296,6 +292,7 @@ export async function uploadBundledDatabase(
        commit_oid: commitOid,
        data: bundledDbReadStream,
        headers: {
+          authorization: `token ${apiDetails.auth}`,
          "Content-Type": "application/zip",
          "Content-Length": bundledDbSize,
        },
@@ -281,8 +281,8 @@ export function getOptionalEnvVar(paramName: string): string | undefined {
 * in tests, while clearly signalling in regular code that the consumer of the `ReadOnlyEnv` instance
 * will only read from it.
 */
-export class ReadOnlyEnv {
-  constructor(protected readonly vars: Record<string, string | undefined>) {}
+export class ReadOnlyEnv<T extends string | undefined = string | undefined> {
+  constructor(protected readonly vars: Record<string, T>) {}

  /** Clones the object while detaching the underlying environment from the original. */
  public clone(): this {
@@ -290,7 +290,7 @@ export class ReadOnlyEnv {
  }

  /** Gets a copy of the underlying environment. */
-  public get(): Record<string, string | undefined> {
+  public get(): Record<string, T> {
    return { ...this.vars };
  }

@@ -305,7 +305,7 @@ export class ReadOnlyEnv {
  }

  /** Gets the entries of the underlying `ProcessEnv`. */
-  public entries(): Array<[string, string | undefined]> {
+  public entries(): Array<[string, T]> {
    return Object.entries(this.vars);
  }

@@ -335,17 +335,19 @@ export class ReadOnlyEnv {
 * Use `ReadOnlyEnv` instead if you only plan to read from the environment.
 * This type allows writing to the environment.
 */
-export class Env extends ReadOnlyEnv {
+export class Env<
+  T extends string | undefined = string | undefined,
+> extends ReadOnlyEnv<T> {
  private changed: boolean = false;

  /** Sets an environment variable. */
-  public set(name: string, value: string): void {
+  public set(name: string, value: T): void {
    this.vars[name] = value;
    this.changed = true;
  }

  /** Sets all environment variables given by `vars`. */
-  public setAll(vars: Record<string, string>): void {
+  public setAll(vars: Record<string, T>): void {
    for (const [key, val] of Object.entries(vars)) {
      this.set(key, val);
    }
@@ -359,7 +361,7 @@ export class Env extends ReadOnlyEnv {
   * @param name The name of the environment variable to set and export.
   * @param val The value to set and export for the environment variable.
   */
-  public export(name: string, val: string): void {
+  public export(name: string, val: T): void {
    // Setting the environment variable for this instance is always OK, including
    // in tests, since we use fresh `Env` instances whenever needed. This allows
    // tests to pass that rely on that part of the `core.exportVariable` behaviour.
@@ -371,18 +373,6 @@ export class Env extends ReadOnlyEnv {
    }
  }

-  /**
-   * Set some initial environment variables that we can set even without
-   * knowing what version of CodeQL we're running.
-   */
-  public initialise(version: string) {
-    this.export(EnvVar.FEATURE_MULTI_LANGUAGE, "false");
-    this.export(EnvVar.FEATURE_SANDWICH, "false");
-    this.export(EnvVar.FEATURE_SARIF_COMBINE, "true");
-    this.export(EnvVar.FEATURE_WILL_UPLOAD, "true");
-    this.export(EnvVar.VERSION, version);
-  }
-
  /** Gets a value indicating whether `set` was called at least once. */
  public hasChanged(): boolean {
    return this.changed;
@@ -1,73 +0,0 @@
-import * as json from "../json";
-
-/**
- * If {@link error} is not already an instance of {@link Error}, then this function constructs
- * an {@link Error} with a string representation of {@link error} as the message.
- */
-export function wrapError(error: unknown): Error {
-  return error instanceof Error ? error : new Error(String(error));
-}
-
-/**
- * Returns an appropriate message for the error.
- *
- * If the error is an {@link Error} instance, this returns the error message without
- * an `Error: ` prefix.
- */
-export function getErrorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
-/**
- * Decides whether `e` is a disk-related error outside of our control
- * that should be classified as a `ConfigurationError`.
- *
- * @param e The error to check.
- * @returns True if the error should be treated as a `ConfigurationError` or false if not.
- */
-export function isDiskConfigurationError(e: unknown): boolean {
-  if (!(e instanceof Error)) {
-    return false;
-  }
-
-  return (
-    // out of disk space
-    e.message.includes("ENOSPC") ||
-    // access denied
-    e.message.includes("EACCES")
-  );
-}
-
-/**
- * An Error class that indicates an error that occurred due to
- * a misconfiguration of the action or the CodeQL CLI.
- */
-export class ConfigurationError extends Error {}
-
-/** Minimal representation of errors resulting from HTTP requests. */
-export class HTTPError extends Error {
-  public status: number;
-
-  constructor(message: string, status: number) {
-    super(message);
-    this.status = status;
-  }
-}
-
-/**
- * Tries to convert {@link arg} to a {@link HTTPError}, but returns `undefined` if
- * {@link arg} is not like a {@link HTTPError}.
- */
-export function asHTTPError(arg: any): HTTPError | undefined {
-  if (!json.isObject<any>(arg) || !json.isString(arg.message)) {
-    return undefined;
-  }
-  if (Number.isInteger(arg.status)) {
-    return new HTTPError(arg.message, arg.status as number);
-  }
-  // See https://github.com/actions/toolkit/blob/acb230b99a46ed33a3f04a758cd68b47b9a82908/packages/tool-cache/src/tool-cache.ts#L19
-  if (Number.isInteger(arg.httpStatusCode)) {
-    return new HTTPError(arg.message, arg.httpStatusCode as number);
-  }
-  return undefined;
-}
@@ -4,7 +4,6 @@ import * as path from "path";
 import test from "ava";

 import * as defaults from "./defaults.json";
-import { getEnv } from "./environment";
 import {
  Feature,
  featureConfig,
@@ -27,12 +26,12 @@ import {
  setupTests,
  stubFeatureFlagApiEndpoint,
 } from "./testing-utils";
-import { GitHubVariant, withTmpDir } from "./util";
+import { GitHubVariant, initializeEnvironment, withTmpDir } from "./util";

 setupTests(test);

 test.beforeEach(() => {
-  getEnv().initialise("1.2.3");
+  initializeEnvironment("1.2.3");
 });

 test.serial(
@@ -74,6 +74,11 @@ export enum Feature {
  AllowMergeConfigFiles = "allow_merge_config_files",
  /** Controls whether we allow multiple values for the `analysis-kinds` input. */
  AllowMultipleAnalysisKinds = "allow_multiple_analysis_kinds",
+  /**
+   * Controls whether we delete CodeQL bundles that we are not going to use from the toolcache
+   * before downloading a different bundle, in order to reclaim disk space.
+   */
+  CleanupToolcacheBundles = "cleanup_toolcache_bundles",
  CleanupTrapCaches = "cleanup_trap_caches",
  /** Whether to allow the `config-file` input to be specified via a repository property. */
  ConfigFileRepositoryProperty = "config_file_repository_property",
@@ -216,6 +221,11 @@ export const featureConfig = {
    envVar: "CODEQL_ACTION_ALLOW_MULTIPLE_ANALYSIS_KINDS",
    minimumVersion: undefined,
  },
+  [Feature.CleanupToolcacheBundles]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_CLEANUP_TOOLCACHE_BUNDLES",
+    minimumVersion: undefined,
+  },
  [Feature.CleanupTrapCaches]: {
    defaultValue: false,
    envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES",
@@ -589,7 +599,7 @@ class OfflineFeatures implements FeatureEnablement {
    // Never use this feature if the CLI version explicitly can't support it.
    const minimumVersion = config.minimumVersion;
    if (codeql && minimumVersion) {
-      if (!(await codeql.isVersionAtLeast(minimumVersion))) {
+      if (!(await util.codeQlVersionAtLeast(codeql, minimumVersion))) {
        this.logger.debug(
          `Feature ${feature} is disabled because the CodeQL CLI version is older than the minimum ` +
            `version ${minimumVersion}.`,
@@ -8,7 +8,7 @@ import {
  LoggedMessage,
  setupTests,
 } from "../testing-utils";
-import { getEnv, GitHubVariant, withTmpDir } from "../util";
+import { GitHubVariant, initializeEnvironment, withTmpDir } from "../util";

 import {
  assertAllFeaturesHaveDefaultValues,
@@ -18,7 +18,7 @@ import {
 setupTests(test);

 test.beforeEach(() => {
-  getEnv().initialise("1.2.3");
+  initializeEnvironment("1.2.3");
 });

 test("OfflineFeatures makes no API requests", async (t) => {
@@ -1,111 +0,0 @@
-import test from "ava";
-
-import { ActionsEnvVars } from "./environment";
-import * as github from "./github";
-import { getTestEnv, setupTests } from "./testing-utils";
-
-setupTests(test);
-
-test("parseGitHubUrl", (t) => {
-  t.deepEqual(github.parseGitHubUrl("github.com"), "https://github.com");
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.com"),
-    "https://github.com",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://api.github.com"),
-    "https://github.com",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.com/foo/bar"),
-    "https://github.com",
-  );
-
-  t.deepEqual(
-    github.parseGitHubUrl("github.example.com"),
-    "https://github.example.com/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.example.com"),
-    "https://github.example.com/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://api.github.example.com"),
-    "https://github.example.com/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.example.com/api/v3"),
-    "https://github.example.com/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.example.com:1234"),
-    "https://github.example.com:1234/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://api.github.example.com:1234"),
-    "https://github.example.com:1234/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.example.com:1234/api/v3"),
-    "https://github.example.com:1234/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.example.com/base/path"),
-    "https://github.example.com/base/path/",
-  );
-  t.deepEqual(
-    github.parseGitHubUrl("https://github.example.com/base/path/api/v3"),
-    "https://github.example.com/base/path/",
-  );
-
-  t.throws(() => github.parseGitHubUrl(""), {
-    message: '"" is not a valid URL',
-  });
-  t.throws(() => github.parseGitHubUrl("ssh://github.com"), {
-    message: '"ssh://github.com" is not a http or https URL',
-  });
-  t.throws(() => github.parseGitHubUrl("http:///::::433"), {
-    message: '"http:///::::433" is not a valid URL',
-  });
-});
-
-test("getCurrentInstance throws if required env vars aren't set", (t) => {
-  t.throws(() => github.getCurrentInstance(getTestEnv()));
-  t.throws(() => {
-    const env = getTestEnv({
-      [ActionsEnvVars.GITHUB_SERVER_URL]: "https://localhost",
-    });
-    github.getCurrentInstance(env);
-  });
-  t.throws(() => {
-    const env = getTestEnv({
-      [ActionsEnvVars.GITHUB_API_URL]: "https://api.localhost",
-    });
-    github.getCurrentInstance(env);
-  });
-});
-
-test("getCurrentInstance constructs instance from environment", (t) => {
-  const url = "https://localhost";
-  const apiUrl = "https://api.localhost";
-
-  const env = getTestEnv({
-    [ActionsEnvVars.GITHUB_SERVER_URL]: url,
-    [ActionsEnvVars.GITHUB_API_URL]: apiUrl,
-  });
-  const instance = github.getCurrentInstance(env);
-
-  t.is(instance.url, url);
-  t.is(instance.apiURL, apiUrl);
-});
-
-test("getCurrentInstance constructs dotcom instance with dotcom env vars", (t) => {
-  const env = getTestEnv({
-    [ActionsEnvVars.GITHUB_SERVER_URL]: github.GITHUB_DOTCOM_URL,
-    [ActionsEnvVars.GITHUB_API_URL]: github.GITHUB_DOTCOM_API_URL,
-  });
-  const instance = github.getCurrentInstance(env);
-  const dotcomInstance = github.getDotcomInstance();
-
-  t.deepEqual(dotcomInstance, instance);
-});
@@ -1,124 +0,0 @@
-import { ActionsEnvVars, type ReadOnlyEnv } from "./environment";
-import { ConfigurationError } from "./errors";
-
-export enum GitHubVariant {
-  /** [GitHub.com](https://github.com) */
-  DOTCOM = "GitHub.com",
-  /** [GitHub Enterprise Server](https://docs.github.com/en/enterprise-server@latest/admin/overview/about-github-enterprise-server) */
-  GHES = "GitHub Enterprise Server",
-  /** [GitHub Enterprise Cloud with data residency](https://docs.github.com/en/enterprise-cloud@latest/admin/data-residency/about-github-enterprise-cloud-with-data-residency) */
-  GHEC_DR = "GitHub Enterprise Cloud with data residency",
-}
-
-export type GitHubVersion =
-  | { type: GitHubVariant.DOTCOM }
-  | { type: GitHubVariant.GHEC_DR }
-  | { type: GitHubVariant.GHES; version: string };
-
-/** A string representing a GitHub instance address. */
-export type InstanceURL = string;
-
-/**
- * The URL for github.com.
- */
-export const GITHUB_DOTCOM_URL: InstanceURL = "https://github.com";
-
-/** A string representing a GitHub API instance address. */
-export type InstanceApiURL = string;
-
-/**
- * The URL for api.github.com.
- */
-export const GITHUB_DOTCOM_API_URL: InstanceApiURL = "https://api.github.com";
-
-/**
- * Represents information about a GitHub instance, how to authenticate to it,
- * and how to authenticate to other repos on it.
- */
-export type GitHubApiCombinedDetails = GitHubApiDetails &
-  GitHubApiExternalRepoDetails;
-
-/** Represents information about a GitHub instance. */
-export type GitHubInstance = {
-  /** The base URL of the GitHub instance, such as `https://github.com`. */
-  url: string;
-  /**
-   * The API base URL of the GitHub instance, such as `https://api.github.com`.
-   * Typically this is the `api.` subdomain of the `url` domain.
-   */
-  apiURL: string | undefined;
-};
-
-/** Represents a {@link GitHubInstance} with a token for accessing the API. */
-export type GitHubApiDetails = GitHubInstance & {
-  /** The token to use for accessing the API of the GitHub instance. */
-  auth?: string;
-};
-
-/**
- * Represents information for accessing a repository on the same GitHub instance as the Action
- * is currently running on.
- */
-export type GitHubApiExternalRepoDetails = {
-  /** An optional token for accessing repo(s) on the same GitHub instance. */
-  externalRepoAuth?: string;
-};
-
-/**
- * Parses user input of a github.com or GHES URL to a canonical form.
- * Removes any API prefix or suffix if one is present.
- */
-export function parseGitHubUrl(inputUrl: string): string {
-  const originalUrl = inputUrl;
-  if (inputUrl.indexOf("://") === -1) {
-    inputUrl = `https://${inputUrl}`;
-  }
-  if (!inputUrl.startsWith("http://") && !inputUrl.startsWith("https://")) {
-    throw new ConfigurationError(`"${originalUrl}" is not a http or https URL`);
-  }
-
-  let url: URL;
-  try {
-    url = new URL(inputUrl);
-  } catch {
-    throw new ConfigurationError(`"${originalUrl}" is not a valid URL`);
-  }
-
-  // If we detect this is trying to be to github.com
-  // then return with a fixed canonical URL.
-  if (url.hostname === "github.com" || url.hostname === "api.github.com") {
-    return GITHUB_DOTCOM_URL;
-  }
-
-  // Remove the API prefix if it's present
-  if (url.pathname.indexOf("/api/v3") !== -1) {
-    url.pathname = url.pathname.substring(0, url.pathname.indexOf("/api/v3"));
-  }
-  // Also consider subdomain isolation on GHES
-  if (url.hostname.startsWith("api.")) {
-    url.hostname = url.hostname.substring(4);
-  }
-
-  // Normalise path to having a trailing slash for consistency
-  if (!url.pathname.endsWith("/")) {
-    url.pathname = `${url.pathname}/`;
-  }
-
-  return url.toString();
-}
-
-/** Retrieves a {@link GitHubInstance} describing the instance we are running on. */
-export function getCurrentInstance(env: ReadOnlyEnv): GitHubInstance {
-  return {
-    url: env.getRequired(ActionsEnvVars.GITHUB_SERVER_URL),
-    apiURL: env.getRequired(ActionsEnvVars.GITHUB_API_URL),
-  };
-}
-
-/** Retrieves a {@link GitHubInstance} describing the GitHub.com instance. */
-export function getDotcomInstance(): GitHubInstance {
-  return {
-    url: GITHUB_DOTCOM_URL,
-    apiURL: GITHUB_DOTCOM_API_URL,
-  };
-}
@@ -50,7 +50,6 @@ import {
  loadRepositoryProperties,
  RepositoryPropertyName,
 } from "./feature-flags/properties";
-import * as github from "./github";
 import {
  checkInstallPython311,
  checkPacksForOverlayCompatibility,
@@ -88,10 +87,12 @@ import {
  checkDiskUsage,
  checkForTimeout,
  checkGitHubVersionInRange,
+  codeQlVersionAtLeast,
  DEFAULT_DEBUG_ARTIFACT_NAME,
  DEFAULT_DEBUG_DATABASE_NAME,
  getCodeQLMemoryLimit,
  getThreadsFlagValue,
+  initializeEnvironment,
  ConfigurationError,
  wrapError,
  checkActionVersion,
@@ -224,7 +225,7 @@ async function run(
  let toolsVersion: string;

  try {
-    actionState.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());

    // Make inputs accessible in the `post` step.
    persistInputs();
@@ -232,7 +233,8 @@ async function run(
    apiDetails = {
      auth: getRequiredInput("token"),
      externalRepoAuth: getOptionalInput("external-repository-token"),
-      ...github.getCurrentInstance(actionState.env),
+      url: actionState.env.getRequired(ActionsEnvVars.GITHUB_SERVER_URL),
+      apiURL: actionState.env.getRequired(ActionsEnvVars.GITHUB_API_URL),
    };

    const gitHubVersion = await getGitHubVersion();
@@ -684,7 +686,7 @@ async function run(
        `${EnvVar.JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS} is already set to '${process.env[EnvVar.JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS]}', so the Action will not override it.`,
      );
    } else if (
-      (await codeql.isVersionAtLeast(CODEQL_VERSION_JAR_MINIMIZATION)) &&
+      (await codeQlVersionAtLeast(codeql, CODEQL_VERSION_JAR_MINIMIZATION)) &&
      config.dependencyCachingEnabled &&
      config.buildMode === BuildMode.None &&
      config.languages.includes(BuiltInLanguage.java)
@@ -17,10 +17,9 @@ import { getGitHubVersion } from "./api-client";
 import { CodeQL } from "./codeql";
 import { ComputedInput, getToolsInput } from "./config/inputs";
 import { getRawLanguagesNoAutodetect } from "./config-utils";
-import { EnvVar } from "./environment";
+import { ActionsEnvVars, EnvVar } from "./environment";
 import { initFeatures } from "./feature-flags";
 import { loadRepositoryProperties } from "./feature-flags/properties";
-import * as github from "./github";
 import { initCodeQL } from "./init";
 import { Logger } from "./logging";
 import { getRepositoryNwo } from "./repository";
@@ -38,6 +37,7 @@ import {
  checkDiskUsage,
  checkForTimeout,
  checkGitHubVersionInRange,
+  initializeEnvironment,
  ConfigurationError,
  wrapError,
  checkActionVersion,
@@ -107,12 +107,13 @@ async function run(
  let toolsVersion: string;

  try {
-    actionState.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());

    const apiDetails = {
      auth: getRequiredInput("token"),
      externalRepoAuth: getOptionalInput("external-repository-token"),
-      ...github.getCurrentInstance(actionState.env),
+      url: actionState.env.getRequired(ActionsEnvVars.GITHUB_SERVER_URL),
+      apiURL: actionState.env.getRequired(ActionsEnvVars.GITHUB_API_URL),
    };

    const gitHubVersion = await getGitHubVersion();
@@ -11,13 +11,7 @@ import * as sinon from "sinon";
 import * as actionsUtil from "./actions-util";
 import * as api from "./api-client";
 import * as diagnostics from "./diagnostics";
-import {
-  ActionsEnvVars,
-  Env,
-  EnvVar,
-  getEnv,
-  ReadOnlyEnv,
-} from "./environment";
+import { ActionsEnvVars, Env, EnvVar, ReadOnlyEnv } from "./environment";
 import { Feature } from "./feature-flags";
 import { BuiltInLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
@@ -43,12 +37,18 @@ import {
  setupTests,
 } from "./testing-utils";
 import * as toolsDownload from "./tools-download";
-import { getErrorMessage, GitHubVariant, HTTPError, withTmpDir } from "./util";
+import {
+  getErrorMessage,
+  GitHubVariant,
+  HTTPError,
+  initializeEnvironment,
+  withTmpDir,
+} from "./util";

 setupTests(test);

 test.beforeEach(() => {
-  getEnv().initialise("1.2.3");
+  initializeEnvironment("1.2.3");
 });

 function stubDownloadAndExtract() {
@@ -596,7 +596,7 @@ test.serial(
        undefined, // rawLanguages
        undefined, // otherLanguagePacksReason
        false, // useOverlayAwareDefaultCliVersion
-        createFeatures([]),
+        createFeatures([Feature.CleanupToolcacheBundles]),
        getRunnerLogger(true),
      );

@@ -1375,7 +1375,10 @@ for (const bundle of ["per-language", "combined", "fallback"] as const) {
          };
        });
      const addDiagnostic = sinon.stub(diagnostics, "addNoLanguageDiagnostic");
-      const features = createFeatures([Feature.PerLanguageBundles]);
+      const features = createFeatures([
+        Feature.PerLanguageBundles,
+        Feature.CleanupToolcacheBundles,
+      ]);

      await withTmpDir(async (tmpDir) => {
        setupActionsVars(tmpDir, tmpDir);
@@ -1823,15 +1826,11 @@ function createToolcacheEntry(
 */
 async function runDownloadCodeQL(
  toolcacheRoot: string,
+  features: Feature[],
  bundleVersion: string | undefined,
-  {
-    env = getTestEnv({
-      [ActionsEnvVars.RUNNER_ENVIRONMENT]: "github-hosted",
-      [ActionsEnvVars.RUNNER_TOOL_CACHE]: toolcacheRoot,
-    }),
-  }: {
-    env?: Env;
-  } = {},
+  env = getTestEnv({
+    [ActionsEnvVars.RUNNER_TOOL_CACHE]: toolcacheRoot,
+  }),
 ): Promise<{
  codeqlFolder: string;
  cleanupDiagnostic: toolsDownload.ToolcacheCleanupResult | undefined;
@@ -1842,6 +1841,7 @@ async function runDownloadCodeQL(
  const { codeqlFolder } = await setupCodeql.downloadCodeQLBundle(
    initAllState({
      env,
+      features: createFeatures(features),
    }),
    {
      bundle: {
@@ -1879,9 +1879,11 @@ async function runDownloadCodeQL(
 async function testToolcacheCleanup(
  t: ExecutionContext<unknown>,
  {
+    features,
    runnerEnvironment,
    setUp,
  }: {
+    features: Feature[];
    runnerEnvironment: string | undefined;
    setUp?: (env: Env) => void;
  },
@@ -1893,8 +1895,12 @@ async function testToolcacheCleanup(
 ) {
  await withTmpDir(async (tmpDir) => {
    setupActionsVars(tmpDir, tmpDir);
+    if (runnerEnvironment === undefined) {
+      delete process.env[ActionsEnvVars.RUNNER_ENVIRONMENT];
+    } else {
+      process.env[ActionsEnvVars.RUNNER_ENVIRONMENT] = runnerEnvironment;
+    }
    const env = getTestEnv({
-      [ActionsEnvVars.RUNNER_ENVIRONMENT]: runnerEnvironment,
      [ActionsEnvVars.RUNNER_TOOL_CACHE]: tmpDir,
    });
    setUp?.(env);
@@ -1914,8 +1920,9 @@ async function testToolcacheCleanup(

    const { cleanupDiagnostic } = await runDownloadCodeQL(
      tmpDir,
+      features,
      CLEANUP_BUNDLE_VERSION,
-      { env },
+      env,
    );

    t.true(
@@ -1927,12 +1934,28 @@ async function testToolcacheCleanup(
  });
 }

+test.serial(
+  "downloadCodeQLBundle does not clean up the toolcache when the feature flag is disabled",
+  async (t) => {
+    await testToolcacheCleanup(
+      t,
+      { features: [], runnerEnvironment: "github-hosted" },
+      ({ cleanupDiagnostic, destinationDirectory, staleDirectory }) => {
+        t.true(fs.existsSync(staleDirectory));
+        t.true(fs.existsSync(destinationDirectory));
+        t.is(cleanupDiagnostic, undefined);
+      },
+    );
+  },
+);
+
 test.serial(
  "downloadCodeQLBundle does not clean up the toolcache when the runner is not GitHub-hosted",
  async (t) => {
    await testToolcacheCleanup(
      t,
      {
+        features: [Feature.CleanupToolcacheBundles],
        runnerEnvironment: "self-hosted",
      },
      ({ cleanupDiagnostic, destinationDirectory, staleDirectory }) => {
@@ -1952,6 +1975,7 @@ test.serial(
    await testToolcacheCleanup(
      t,
      {
+        features: [Feature.CleanupToolcacheBundles],
        runnerEnvironment: undefined,
      },
      ({ cleanupDiagnostic, destinationDirectory, staleDirectory }) => {
@@ -1964,11 +1988,12 @@ test.serial(
 );

 test.serial(
-  "downloadCodeQLBundle deletes other CodeQL bundles from the toolcache on a GitHub-hosted runner",
+  "downloadCodeQLBundle deletes other CodeQL bundles from the toolcache when enabled on a GitHub-hosted runner",
  async (t) => {
    await testToolcacheCleanup(
      t,
      {
+        features: [Feature.CleanupToolcacheBundles],
        runnerEnvironment: "github-hosted",
      },
      ({ cleanupDiagnostic, destinationDirectory, staleDirectory }) => {
@@ -2002,6 +2027,7 @@ test.serial(

      const { cleanupDiagnostic } = await runDownloadCodeQL(
        tmpDir,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
      );

@@ -2031,6 +2057,7 @@ test.serial(

      const { cleanupDiagnostic } = await runDownloadCodeQL(
        tmpDir,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
      );

@@ -2162,6 +2189,7 @@ test.serial(

      const { cleanupDiagnostic } = await runDownloadCodeQL(
        toolcacheRoot,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
      );

@@ -2184,6 +2212,7 @@ test.serial(
    await testToolcacheCleanup(
      t,
      {
+        features: [Feature.CleanupToolcacheBundles],
        runnerEnvironment: "github-hosted",
        setUp: (env) => {
          env.set(EnvVar.HAS_SET_UP_CODEQL, "true");
@@ -2213,13 +2242,9 @@ test.serial(
      );
      const { codeqlFolder, cleanupDiagnostic } = await runDownloadCodeQL(
        tmpDir,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
-        {
-          env: getTestEnv({
-            [ActionsEnvVars.RUNNER_ENVIRONMENT]: "github-hosted",
-            [EnvVar.HAS_SET_UP_CODEQL]: "true",
-          }),
-        },
+        getTestEnv({ [EnvVar.HAS_SET_UP_CODEQL]: "true" }),
      );

      t.true(fs.existsSync(staleDirectory));
@@ -2287,7 +2312,7 @@ test.serial(
          undefined, // rawLanguages
          undefined, // otherLanguagePacksReason
          false, // useOverlayAwareDefaultCliVersion
-          createFeatures([]),
+          createFeatures([Feature.CleanupToolcacheBundles]),
          getRunnerLogger(true),
        ),
        { is: error },
@@ -2322,6 +2347,7 @@ test.serial(

      const { codeqlFolder, cleanupDiagnostic } = await runDownloadCodeQL(
        tmpDir,
+        [Feature.CleanupToolcacheBundles],
        undefined, // bundleVersion
      );

@@ -2355,6 +2381,7 @@ test.serial(

      const { cleanupDiagnostic } = await runDownloadCodeQL(
        tmpDir,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
      );

@@ -2390,6 +2417,7 @@ test.serial(

      const { cleanupDiagnostic } = await runDownloadCodeQL(
        tmpDir,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
      );

@@ -2439,6 +2467,7 @@ test.serial(

      const { cleanupDiagnostic } = await runDownloadCodeQL(
        toolcacheRoot,
+        [Feature.CleanupToolcacheBundles],
        CLEANUP_BUNDLE_VERSION,
      );

@@ -839,7 +839,7 @@ function getToolcacheDestination(
 }

 /**
- * Reclaims disk space by deleting the CodeQL tools from the toolcache on GitHub-hosted runners.
+ * Reclaims disk space by deleting the CodeQL tools from the toolcache, if enabled.
 *
 * On GitHub-hosted runners the toolcache shares a filesystem with the workspace, so tools left in
 * the toolcache take up space that the analysis could use instead. This holds wherever we extract
@@ -847,8 +847,9 @@ function getToolcacheDestination(
 */
 async function tryDeleteToolcacheBundles({
  env,
+  features,
  logger,
-}: ActionState<["Logger", "ReadOnlyEnv"]>): Promise<void> {
+}: ActionState<["Logger", "ReadOnlyEnv", "FeatureFlags"]>): Promise<void> {
  // A step that has already set up CodeQL may hand out a path into the toolcache that a later step
  // runs, so only the first step to set it up can know that nothing else relies on the toolcache.
  if (env.getOptional(EnvVar.HAS_SET_UP_CODEQL) !== undefined) {
@@ -859,7 +860,11 @@ async function tryDeleteToolcacheBundles({
    return;
  }

-  if (!isGitHubHostedRunner(env) || !isToolcacheOnWorkspaceFilesystem(logger)) {
+  if (
+    !isGitHubHostedRunner() ||
+    !isToolcacheOnWorkspaceFilesystem(logger) ||
+    !(await features.getValue(Feature.CleanupToolcacheBundles))
+  ) {
    return;
  }

@@ -978,7 +983,7 @@ export async function setupCodeQLBundle(
      break;
    case "download": {
      const result = await downloadCodeQLBundle(
-        { env: getEnv(), logger },
+        { env: getEnv(), features, logger },
        source,
        apiDetails,
        zstdAvailability.version,
@@ -1014,7 +1019,7 @@ export async function setupCodeQLBundle(
 * @returns The extraction directory and download timings.
 */
 export async function downloadCodeQLBundle(
-  action: ActionState<["Logger", "ReadOnlyEnv"]>,
+  action: ActionState<["Logger", "ReadOnlyEnv", "FeatureFlags"]>,
  source: CodeQLDownloadSource,
  apiDetails: api.GitHubApiDetails,
  tarVersion: tar.TarVersion | undefined,
@@ -6,6 +6,7 @@ import * as sinon from "sinon";
 import * as actionsUtil from "../actions-util";
 import { ActionsEnvVars } from "../environment";
 import { callee, getTestEnv, setupTests } from "../testing-utils";
+import { initializeEnvironment } from "../util";

 import { getCodeQLActionRepository } from "./repository";

@@ -15,7 +16,7 @@ test.serial("getCodeQLActionRepository", async (t) => {
  const initialEnv = getTestEnv({
    [ActionsEnvVars.RUNNER_TEMP]: path.dirname(__dirname),
  });
-  initialEnv.initialise("1.2.3");
+  initializeEnvironment("1.2.3", initialEnv);

  const target = callee(getCodeQLActionRepository)
    .withArgs()
@@ -2,12 +2,12 @@ import { ActionState } from "../action-common";
 import { isRunningLocalAction } from "../actions-util";
 import * as api from "../api-client";
 import { ActionsEnvVars } from "../environment";
-import { GITHUB_DOTCOM_URL, type InstanceURL } from "../github";
 import {
  isRepositoryNwoStr,
  parseRepositoryNwo,
  type RepositoryNwoStr,
 } from "../repository";
+import { GITHUB_DOTCOM_URL, type InstanceURL } from "../util";

 /** The NWO of the standard CodeQL Action repository. */
 export const CODEQL_DEFAULT_ACTION_REPOSITORY = "github/codeql-action";
@@ -31,7 +31,6 @@ import {
  exportEnvVar,
 } from "./environment";
 import { getRef } from "./git-utils";
-import { GITHUB_DOTCOM_URL } from "./github";
 import * as json from "./json";
 import type { Logger } from "./logging";
 import type { OverlayBaseDatabaseDownloadStats } from "./overlay/caching";
@@ -42,6 +41,7 @@ import {
  ConfigurationError,
  getRequiredEnvParam,
  isInTestMode,
+  GITHUB_DOTCOM_URL,
  DiskUsage,
  assertNever,
  BuildMode,
@@ -10,7 +10,6 @@ import { https } from "follow-redirects";
 import nock from "nock";
 import * as sinon from "sinon";

-import * as errors from "./errors";
 import { getRunnerLogger } from "./logging";
 import * as tar from "./tar";
 import { setupTests } from "./testing-utils";
@@ -165,7 +164,7 @@ test.serial(
 test.serial(
  "downloadAndExtract handles an unknown status as a non-HTTP error",
  async (t) => {
-    const asHTTPError = sinon.spy(errors, "asHTTPError");
+    const asHTTPError = sinon.spy(util, "asHTTPError");
    await util.withTmpDir(async (tmpDir) => {
      sinon.stub(process, "platform").value("linux");
      const archivePath = path.join(tmpDir, "codeql-bundle.tar.zst");
@@ -10,18 +10,17 @@ import * as analyses from "./analyses";
 import { AnalysisKind, CodeQuality, CodeScanning } from "./analyses";
 import * as api from "./api-client";
 import * as diffUtils from "./diff-informed-analysis-utils";
-import { getEnv } from "./environment";
 import { getRunnerLogger, Logger } from "./logging";
 import * as sarif from "./sarif";
 import { setupTests } from "./testing-utils";
 import * as uploadLib from "./upload-lib";
 import { UploadPayload } from "./upload-lib/types";
-import { GitHubVariant, withTmpDir } from "./util";
+import { GitHubVariant, initializeEnvironment, withTmpDir } from "./util";

 setupTests(test);

 test.beforeEach(() => {
-  getEnv().initialise("1.2.3");
+  initializeEnvironment("1.2.3");
 });

 test.serial("validateSarifFileSchema - valid", (t) => {
@@ -18,7 +18,6 @@ import { ActionsEnvVars, EnvVar, exportEnvVar } from "./environment";
 import { FeatureEnablement } from "./feature-flags";
 import * as fingerprints from "./fingerprints";
 import * as gitUtils from "./git-utils";
-import * as github from "./github";
 import { initCodeQL } from "./init";
 import { Logger } from "./logging";
 import { getRepositoryNwo, RepositoryNwo } from "./repository";
@@ -34,6 +33,7 @@ import * as util from "./util";
 import {
  ConfigurationError,
  getErrorMessage,
+  getRequiredEnvParam,
  GitHubVariant,
  GitHubVersion,
  satisfiesGHESVersion,
@@ -104,8 +104,6 @@ async function combineSarifFilesUsingCLI(
  features: FeatureEnablement,
  logger: Logger,
 ): Promise<Partial<sarif.Log>> {
-  const env = util.getEnv();
-
  logger.info("Combining SARIF files using the CodeQL CLI");

  const sarifObjects = sarifFiles.map(sarif.readSarifFile);
@@ -154,7 +152,8 @@ async function combineSarifFilesUsingCLI(
      externalRepoAuth: actionsUtil.getOptionalInput(
        "external-repository-token",
      ),
-      ...github.getCurrentInstance(env),
+      url: getRequiredEnvParam("GITHUB_SERVER_URL"),
+      apiURL: getRequiredEnvParam("GITHUB_API_URL"),
    };

    const codeQLDefaultVersionInfo =
@@ -23,6 +23,7 @@ import {
  ConfigurationError,
  checkActionVersion,
  checkDiskUsage,
+  initializeEnvironment,
  shouldSkipSarifUpload,
  wrapError,
 } from "./util";
@@ -53,13 +54,11 @@ async function sendSuccessStatusReport(
  }
 }

-async function run(action: ActionState<["Base", "Env", "Logger"]>) {
+async function run({ startedAt, logger }: ActionState<["Base", "Logger"]>) {
  // To capture errors appropriately, keep as much code within the try-catch as
  // possible, and only use safe functions outside.
-  const logger = action.logger;
-
  try {
-    action.env.initialise(getActionVersion());
+    initializeEnvironment(getActionVersion());

    const gitHubVersion = await getGitHubVersion();
    checkActionVersion(getActionVersion(), gitHubVersion);
@@ -78,7 +77,7 @@ async function run(action: ActionState<["Base", "Env", "Logger"]>) {
    const startingStatusReportBase = await createStatusReportBase(
      ActionName.UploadSarif,
      "starting",
-      action.startedAt,
+      startedAt,
      undefined,
      await checkDiskUsage(logger),
      logger,
@@ -132,7 +131,7 @@ async function run(action: ActionState<["Base", "Env", "Logger"]>) {
      // so we can't wait for that here.
    }
    await sendSuccessStatusReport(
-      action.startedAt,
+      startedAt,
      codeScanningResult?.statusReport || {},
      logger,
    );
@@ -148,7 +147,7 @@ async function run(action: ActionState<["Base", "Env", "Logger"]>) {
    const errorStatusReportBase = await createStatusReportBase(
      ActionName.UploadSarif,
      getActionsStatus(error),
-      action.startedAt,
+      startedAt,
      undefined,
      await checkDiskUsage(logger),
      logger,
@@ -164,6 +164,66 @@ test.serial("getExtraOptionsEnvParam() fails on invalid JSON", (t) => {
  process.env.CODEQL_ACTION_EXTRA_OPTIONS = origExtraOptions;
 });

+test("parseGitHubUrl", (t) => {
+  t.deepEqual(util.parseGitHubUrl("github.com"), "https://github.com");
+  t.deepEqual(util.parseGitHubUrl("https://github.com"), "https://github.com");
+  t.deepEqual(
+    util.parseGitHubUrl("https://api.github.com"),
+    "https://github.com",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.com/foo/bar"),
+    "https://github.com",
+  );
+
+  t.deepEqual(
+    util.parseGitHubUrl("github.example.com"),
+    "https://github.example.com/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.example.com"),
+    "https://github.example.com/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://api.github.example.com"),
+    "https://github.example.com/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.example.com/api/v3"),
+    "https://github.example.com/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.example.com:1234"),
+    "https://github.example.com:1234/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://api.github.example.com:1234"),
+    "https://github.example.com:1234/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.example.com:1234/api/v3"),
+    "https://github.example.com:1234/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.example.com/base/path"),
+    "https://github.example.com/base/path/",
+  );
+  t.deepEqual(
+    util.parseGitHubUrl("https://github.example.com/base/path/api/v3"),
+    "https://github.example.com/base/path/",
+  );
+
+  t.throws(() => util.parseGitHubUrl(""), {
+    message: '"" is not a valid URL',
+  });
+  t.throws(() => util.parseGitHubUrl("ssh://github.com"), {
+    message: '"ssh://github.com" is not a http or https URL',
+  });
+  t.throws(() => util.parseGitHubUrl("http:///::::433"), {
+    message: '"http:///::::433" is not a valid URL',
+  });
+});
+
 test("allowed API versions", async (t) => {
  t.is(util.apiVersionInRange("1.33.0", "1.33", "2.0"), undefined);
  t.is(util.apiVersionInRange("1.33.1", "1.33", "2.0"), undefined);
@@ -20,21 +20,20 @@ import {
  getRequiredEnvParam,
  isInTestMode,
  exportEnvVar,
+  getEnv,
+  type Env,
 } from "./environment";
-import { ConfigurationError, getErrorMessage, wrapError } from "./errors";
-import { GitHubVariant, type GitHubVersion } from "./github";
-import type { Language } from "./languages";
-import type { Logger } from "./logging";
+import * as json from "./json";
+import { Language } from "./languages";
+import { Logger } from "./logging";

 // Re-export for backwards compatibility to avoid updating a lot of imports elsewhere.
-export * from "./errors";
 export {
  getRequiredEnvParam,
  getOptionalEnvVar,
  getEnv,
  isInTestMode,
 } from "./environment";
-export { GitHubVariant, type GitHubVersion } from "./github";

 /**
 * The name of the file containing the base database OIDs, as stored in the
@@ -48,6 +47,14 @@ const BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json";
 */
 const BROKEN_VERSIONS = ["0.0.0-20211207"];

+/** A string representing a GitHub instance. */
+export type InstanceURL = string;
+
+/**
+ * The URL for github.com.
+ */
+export const GITHUB_DOTCOM_URL: InstanceURL = "https://github.com";
+
 /**
 * Default name of the debugging artifact.
 */
@@ -463,11 +470,68 @@ export function getGeneratedSuitePath(config: Config, language: Language) {
  );
 }

+/**
+ * Parses user input of a github.com or GHES URL to a canonical form.
+ * Removes any API prefix or suffix if one is present.
+ */
+export function parseGitHubUrl(inputUrl: string): string {
+  const originalUrl = inputUrl;
+  if (inputUrl.indexOf("://") === -1) {
+    inputUrl = `https://${inputUrl}`;
+  }
+  if (!inputUrl.startsWith("http://") && !inputUrl.startsWith("https://")) {
+    throw new ConfigurationError(`"${originalUrl}" is not a http or https URL`);
+  }
+
+  let url: URL;
+  try {
+    url = new URL(inputUrl);
+  } catch {
+    throw new ConfigurationError(`"${originalUrl}" is not a valid URL`);
+  }
+
+  // If we detect this is trying to be to github.com
+  // then return with a fixed canonical URL.
+  if (url.hostname === "github.com" || url.hostname === "api.github.com") {
+    return GITHUB_DOTCOM_URL;
+  }
+
+  // Remove the API prefix if it's present
+  if (url.pathname.indexOf("/api/v3") !== -1) {
+    url.pathname = url.pathname.substring(0, url.pathname.indexOf("/api/v3"));
+  }
+  // Also consider subdomain isolation on GHES
+  if (url.hostname.startsWith("api.")) {
+    url.hostname = url.hostname.substring(4);
+  }
+
+  // Normalise path to having a trailing slash for consistency
+  if (!url.pathname.endsWith("/")) {
+    url.pathname = `${url.pathname}/`;
+  }
+
+  return url.toString();
+}
+
 const CODEQL_ACTION_WARNED_ABOUT_VERSION_ENV_VAR =
  "CODEQL_ACTION_WARNED_ABOUT_VERSION";

 let hasBeenWarnedAboutVersion = false;

+export enum GitHubVariant {
+  /** [GitHub.com](https://github.com) */
+  DOTCOM = "GitHub.com",
+  /** [GitHub Enterprise Server](https://docs.github.com/en/enterprise-server@latest/admin/overview/about-github-enterprise-server) */
+  GHES = "GitHub Enterprise Server",
+  /** [GitHub Enterprise Cloud with data residency](https://docs.github.com/en/enterprise-cloud@latest/admin/data-residency/about-github-enterprise-cloud-with-data-residency) */
+  GHEC_DR = "GitHub Enterprise Cloud with data residency",
+}
+
+export type GitHubVersion =
+  | { type: GitHubVariant.DOTCOM }
+  | { type: GitHubVariant.GHEC_DR }
+  | { type: GitHubVariant.GHES; version: string };
+
 export function checkGitHubVersionInRange(
  version: GitHubVersion,
  logger: Logger,
@@ -536,6 +600,54 @@ export function assertNever(value: never): never {
  throw new ExhaustivityCheckingError(value);
 }

+/**
+ * Set some initial environment variables that we can set even without
+ * knowing what version of CodeQL we're running.
+ */
+export function initializeEnvironment(version: string, env: Env = getEnv()) {
+  env.export(EnvVar.FEATURE_MULTI_LANGUAGE, "false");
+  env.export(EnvVar.FEATURE_SANDWICH, "false");
+  env.export(EnvVar.FEATURE_SARIF_COMBINE, "true");
+  env.export(EnvVar.FEATURE_WILL_UPLOAD, "true");
+  env.export(EnvVar.VERSION, version);
+}
+
+export class HTTPError extends Error {
+  public status: number;
+
+  constructor(message: string, status: number) {
+    super(message);
+    this.status = status;
+  }
+}
+
+/**
+ * An Error class that indicates an error that occurred due to
+ * a misconfiguration of the action or the CodeQL CLI.
+ */
+export class ConfigurationError extends Error {}
+
+export function asHTTPError(arg: any): HTTPError | undefined {
+  if (!json.isObject<any>(arg) || !json.isString(arg.message)) {
+    return undefined;
+  }
+  if (Number.isInteger(arg.status)) {
+    return new HTTPError(arg.message, arg.status as number);
+  }
+  // See https://github.com/actions/toolkit/blob/acb230b99a46ed33a3f04a758cd68b47b9a82908/packages/tool-cache/src/tool-cache.ts#L19
+  if (Number.isInteger(arg.httpStatusCode)) {
+    return new HTTPError(arg.message, arg.httpStatusCode as number);
+  }
+  return undefined;
+}
+
+export async function codeQlVersionAtLeast(
+  codeql: CodeQL,
+  requiredVersion: string,
+): Promise<boolean> {
+  return semver.gte((await codeql.getVersion()).version, requiredVersion);
+}
+
 export function getBaseDatabaseOidsFilePath(
  config: ActionConfig<"dbLocation">,
 ): string {
@@ -803,6 +915,20 @@ export function parseMatrixInput(
  }
 }

+export function wrapError(error: unknown): Error {
+  return error instanceof Error ? error : new Error(String(error));
+}
+
+/**
+ * Returns an appropriate message for the error.
+ *
+ * If the error is an `Error` instance, this returns the error message without
+ * an `Error: ` prefix.
+ */
+export function getErrorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
 export function prettyPrintPack(pack: Pack) {
  return `${pack.name}${pack.version ? `@${pack.version}` : ""}${
    pack.path ? `:${pack.path}` : ""
@@ -29,6 +29,6 @@ outputs:
  proxy_urls:
    description: A stringified JSON array of objects containing the types and URLs of the configured registries.
 runs:
-  using: node24
+  using: node20
  main: "../lib/start-proxy-entry.js"
  post: "../lib/start-proxy-post-entry.js"
@@ -2,16 +2,6 @@

 Change-notes are Markdown files used to document user-facing changes. When making a change that affects users, create a Markdown file here that describes the change. During the next release, the change-note files in `unreleased-change-notes/` will automatically be added to `CHANGELOG.md`.

-### What do document
-
-Some guidelines to help you decide whether a change needs a change note:
-
- New functionality that is gated behind a feature flag should be documented when it is added, highlighting that the feature will only be rolled out later. Ideally, this should also include an estimate for when the feature is expected to become available.
- When a feature flag is removed and the gated functionality becomes the default behaviour, this does not need to be documented.
- Changes that may require users to make changes to their workflows must be documented.
-
-If in doubt, see `CHANGELOG.md` for what we have included previously.
-
 ### Change-note file format

 Change-note files must follow a certain format so that they can be automatically validated and processed. Failure to follow the format will result in a failed PR check.
@@ -41,6 +41,6 @@ outputs:

      { "code-scanning": "some-id", "code-quality": "some-other-id" }
 runs:
-  using: node24
+  using: node20
  main: '../lib/upload-sarif-entry.js'
  post: '../lib/upload-sarif-post-entry.js'