build(stable): update to commit 2fc07b8

build(loong64): update electron and build agent (#2249 )
feat: update patch and data (#2247 )
2026-04-13 20:28:18 +10:00 · 2025-03-11 18:17:26 +00:00 · 2025-03-09 12:35:27 +01:00 · 2025-03-08 21:31:24 +01:00 · 2025-03-08 19:51:33 +01:00 · 2025-03-08 10:59:59 +01:00
63 changed files with 1226 additions and 858 deletions
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@@ -18,6 +18,7 @@ on:
    branches: [ insider ]
    paths-ignore:
    - '**/*.md'
+    - 'upstream/*.json'
  pull_request:
    branches: [ insider ]
    paths-ignore:
@@ -101,7 +102,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@@ -173,7 +174,7 @@ jobs:
        - slug: LOONG64
          vscode_arch: loong64
          npm_arch: loong64
-          image: vscodium/vscodium-linux-build-agent:trixie-loong64
+          image: vscodium/vscodium-linux-build-agent:beige-loong64
        - slug: PPC64
          vscode_arch: ppc64le
          npm_arch: ppc64
@@ -204,7 +205,7 @@ jobs:
        env:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh
-        if: env.DISABLED != 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'

      - name: Install GH
        run: ./install_gh.sh
@@ -232,7 +233,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_bin.sh
+        run: ./build/linux/package_bin.sh
        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'

      - name: Prepare assets
@@ -328,7 +329,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.DISABLED != 'yes'

      - name: Setup Python 3
@@ -362,7 +363,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_reh.sh
+        run: ./build/linux/package_reh.sh
        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')

      - name: Release
@@ -389,12 +390,15 @@ jobs:
      fail-fast: false
      matrix:
        include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
          npm_arch: x64
-        - vscode_arch: arm64
+        - slug: ARM64
+          vscode_arch: arm64
          npm_arch: arm64
    env:
      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_INSIDER_ALPINE_REH_{0}', matrix.slug)] }}
      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
      OS_NAME: alpine
@@ -438,21 +442,21 @@ jobs:
        uses: actions/download-artifact@v4
        with:
          name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')

      - name: Build
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_alpine_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        run: ./build/alpine/package_reh.sh
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')

      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
          GITHUB_USERNAME: ${{ github.repository_owner }}
        run: ./release.sh
-        if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no')

      - name: Upload assets
        uses: actions/upload-artifact@v4
@@ -460,7 +464,7 @@ jobs:
          name: reh-alpine-${{ matrix.vscode_arch }}
          path: assets/
          retention-days: 3
-        if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'

  aur:
    needs:
@@ -504,7 +508,7 @@ jobs:
        platform:
        - amd64
        - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_INSIDER_SNAP != 'yes'

    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/insider-macos.yml
+++ b/.github/workflows/insider-macos.yml
@@ -18,6 +18,7 @@ on:
    branches: [ insider ]
    paths-ignore:
    - '**/*.md'
+    - 'upstream/*.json'
  pull_request:
    branches: [ insider ]
    paths-ignore:
@@ -58,7 +59,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'

      - name: Setup Python 3
        uses: actions/setup-python@v5
--- a/.github/workflows/insider-spearhead.yml
+++ b/.github/workflows/insider-spearhead.yml
@@ -38,7 +38,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'

      - name: Clone VSCode repo
        run: . get_repo.sh
@@ -56,11 +56,17 @@ jobs:
        run: ./build.sh
        if: env.SHOULD_BUILD == 'yes'

-      - name: Update <quality>.json
-        run: ./update_qualityjson.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
-          GITHUB_USERNAME: ${{ github.repository_owner }}
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Update upstream version
+        run: ./update_upstream.sh
        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'

      - name: Prepare source
--- a/.github/workflows/insider-windows.yml
+++ b/.github/workflows/insider-windows.yml
@@ -18,6 +18,7 @@ on:
    branches: [ insider ]
    paths-ignore:
    - '**/*.md'
+    - 'upstream/*.json'
  pull_request:
    branches: [ insider ]
    paths-ignore:
@@ -98,7 +99,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@@ -183,7 +184,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@@ -214,7 +215,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.vscode_arch }}
          npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./package_windows.sh
+        run: ./build/windows/package.sh
        if: env.SHOULD_BUILD == 'yes'

      - name: Prepare assets
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@@ -18,6 +18,7 @@ on:
    branches: [ master ]
    paths-ignore:
    - '**/*.md'
+    - 'upstream/*.json'
  pull_request:
    branches: [ master ]
    paths-ignore:
@@ -90,17 +91,19 @@ jobs:
        env:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh
+        if: env.SHOULD_BUILD == 'yes'

      - name: Setup GCC
        uses: egor-tensin/setup-gcc@v1
        with:
          version: 10
          platform: x64
+        if: env.SHOULD_BUILD == 'yes'

      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@@ -172,7 +175,7 @@ jobs:
        - slug: LOONG64
          vscode_arch: loong64
          npm_arch: loong64
-          image: vscodium/vscodium-linux-build-agent:trixie-loong64
+          image: vscodium/vscodium-linux-build-agent:beige-loong64
        - slug: PPC64
          vscode_arch: ppc64le
          npm_arch: ppc64
@@ -231,7 +234,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_bin.sh
+        run: ./build/linux/package_bin.sh
        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'

      - name: Prepare assets
@@ -327,7 +330,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.DISABLED != 'yes'

      - name: Setup Python 3
@@ -361,7 +364,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_reh.sh
+        run: ./build/linux/package_reh.sh
        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')

      - name: Release
@@ -388,12 +391,15 @@ jobs:
      fail-fast: false
      matrix:
        include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
          npm_arch: x64
-        - vscode_arch: arm64
+        - slug: ARM64
+          vscode_arch: arm64
          npm_arch: arm64
    env:
      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_STABLE_ALPINE_REH_{0}', matrix.slug)] }}
      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
      OS_NAME: alpine
@@ -437,21 +443,21 @@ jobs:
        uses: actions/download-artifact@v4
        with:
          name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')

      - name: Build
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_alpine_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        run: ./build/alpine/package_reh.sh
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')

      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
          GITHUB_USERNAME: ${{ github.repository_owner }}
        run: ./release.sh
-        if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no')

      - name: Upload assets
        uses: actions/upload-artifact@v4
@@ -459,7 +465,7 @@ jobs:
          name: reh-alpine-${{ matrix.vscode_arch }}
          path: assets/
          retention-days: 3
-        if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'

  aur:
    needs:
@@ -500,7 +506,7 @@ jobs:
        platform:
        - amd64
        - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_STABLE_SNAP != 'yes'

    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/stable-macos.yml
+++ b/.github/workflows/stable-macos.yml
@@ -18,6 +18,7 @@ on:
    branches: [ master ]
    paths-ignore:
    - '**/*.md'
+    - 'upstream/*.json'
  pull_request:
    branches: [ master ]
    paths-ignore:
@@ -57,7 +58,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'

      - name: Setup Python 3
        uses: actions/setup-python@v5
--- a/.github/workflows/stable-spearhead.yml
+++ b/.github/workflows/stable-spearhead.yml
@@ -33,7 +33,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'

      - name: Clone VSCode repo
        run: . get_repo.sh
@@ -51,11 +51,17 @@ jobs:
        run: ./build.sh
        if: env.SHOULD_BUILD == 'yes'

-      - name: Update <quality>.json
-        run: ./update_qualityjson.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
-          GITHUB_USERNAME: ${{ github.repository_owner }}
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Update upstream version
+        run: ./update_upstream.sh
        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'

      - name: Prepare source
--- a/.github/workflows/stable-windows.yml
+++ b/.github/workflows/stable-windows.yml
@@ -18,6 +18,7 @@ on:
    branches: [ master ]
    paths-ignore:
    - '**/*.md'
+    - 'upstream/*.json'
  pull_request:
    branches: [ master ]
    paths-ignore:
@@ -97,7 +98,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@@ -182,7 +183,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.18'
+          node-version: '20.18.2'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@@ -213,7 +214,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          npm_config_arch: ${{ matrix.vscode_arch }}
          npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./package_windows.sh
+        run: ./build/windows/package.sh
        if: env.SHOULD_BUILD == 'yes'

      - name: Prepare assets
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.18
+20.18.1
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ If you want to update the existing patches, please follow the section [`Patch Up
 ### Add a new patch

 - first, you need to build VSCodium
- then use the command `patch.sh <your patch name>`, to initiate a new patch
+- then use the command `./dev/patch.sh <your patch name>`, to initiate a new patch
 - when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
 - run `yarn watch`
 - run `./script/code.sh`
--- a/build.sh
+++ b/build.sh
@@ -29,6 +29,9 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then

    VSCODE_PLATFORM="darwin"
  elif [[ "${OS_NAME}" == "windows" ]]; then
+    # generate Group Policy definitions
+    node build/lib/policies
+
    # in CI, packaging will be done by a different job
    if [[ "${CI_BUILD}" == "no" ]]; then
      . ../build/windows/rtf/make.sh
--- a/build/alpine/package_reh.sh
+++ b/build/alpine/package_reh.sh
@@ -7,6 +7,10 @@ if [[ "${CI_BUILD}" == "no" ]]; then
  exit 1
 fi

+APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+
+mkdir -p assets
+
 tar -xzf ./vscode.tar.gz

 cd vscode || { echo "'vscode' dir not found"; exit 1; }
@@ -42,25 +46,38 @@ done

 node build/azure-pipelines/distro/mixin-npm

-yarn gulp minify-vscode-reh
-
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
  PA_NAME="linux-alpine"
 else
  PA_NAME="alpine-arm64"
 fi

-yarn gulp "vscode-reh-${PA_NAME}-min-ci"
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building REH"
+  yarn gulp minify-vscode-reh
+  yarn gulp "vscode-reh-${PA_NAME}-min-ci"

-cd ..
+  pushd "../vscode-reh-${PA_NAME}"

-APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+  echo "Archiving REH"
+  tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .

-mkdir -p assets
+  popd
+fi
+
+if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
+  echo "Building REH-web"
+  yarn gulp minify-vscode-reh-web
+  yarn gulp "vscode-reh-web-${PA_NAME}-min-ci"
+
+  pushd "../vscode-reh-web-${PA_NAME}"
+
+  echo "Archiving REH-web"
+  tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
+
+  popd
+fi

-echo "Building and moving REH"
-cd "vscode-reh-${PA_NAME}"
-tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
 cd ..

 npm install -g checksum
--- a/build/linux/loong64/electron.sh
+++ b/build/linux/loong64/electron.sh
@@ -2,5 +2,5 @@

 set -ex

-export ELECTRON_VERSION="32.2.7"
+export ELECTRON_VERSION="34.2.0"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"
--- a/build/linux/loong64/electron.sha256sums
+++ b/build/linux/loong64/electron.sha256sums
@@ -0,0 +1,11 @@
+e47103e4191b781c9a166ec07f310b1d615866022fc896adf959f81a91615d33 *chromedriver-v34.2.0-linux-loong64.zip
+24ac8b4c6dae1e3bc31de1cda733176ac03b0a124788fe2000a07723c17aa3ad *electron-v34.2.0-linux-loong64-debug.zip
+0a2330d8aa615aa2faac3fc6d3d1924784cab9a1b9a498e00210cf90adc3e98a *electron-v34.2.0-linux-loong64-symbols.zip
+97687006d23a57ee35fc3d3ce8803dfb7e48538ccaf98a73fc8eef09afc35672 *electron-v34.2.0-linux-loong64.zip
+88f1d2e434c111203f06e17a5a23fe8ba5ea572473559055064784e37b804bb9 *hunspell-dictionaries.zip
+b085b7ae8b77b07a210026901816f440c841666222809af3ae9aaf16d95ee6a2 *libcxx-headers.zip
+1f8b7234dd1a8c219909aae8c8c4b5c064c7eb60b9b30efb2207b16a0991acfc *libcxx-objects-v34.2.0-linux-loong64.zip
+a34caad87f177ae6b6098fef84a832fb0887bd5819be9cdc1272d317f4036b96 *libcxxabi-headers.zip
+b7ea74bf6d6aac7eb96841c0c7539f5c8b853e715c4b4396c6cd097a872303b3 *mksnapshot-v34.2.0-linux-loong64.zip
+2e574c7bf182ae8dfdb302be68da8c5d783cd952391e61e166bd8069dc8752fc *node-v34.2.0-headers.tar.gz
+
--- a/build/linux/loong64/ripgrep.sh
+++ b/build/linux/loong64/ripgrep.sh
--- a/build/linux/package_bin.sh
+++ b/build/linux/package_bin.sh
@@ -41,16 +41,16 @@ elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
  export VSCODE_SKIP_SETUPENV=1
 fi

-if [[ -f "../electron_linux_${VSCODE_ARCH}.sh" ]]; then
+if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sh" ]]; then
  # add newline at the end of the file
  echo "" >> build/checksums/electron.txt

-  if [[ -f "../electron_linux_${VSCODE_ARCH}.sha256sums" ]]; then
-    cat "../electron_linux_${VSCODE_ARCH}.sha256sums" >> build/checksums/electron.txt
+  if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sha256sums" ]]; then
+    cat "../build/linux/${VSCODE_ARCH}/electron.sha256sums" >> build/checksums/electron.txt
  fi

  # shellcheck disable=SC1090
-  source "../electron_linux_${VSCODE_ARCH}.sh"
+  source "../build/linux/${VSCODE_ARCH}/electron.sh"

  if [[ "${ELECTRON_VERSION}" != "$( yarn config get target )" ]]; then
    # Fail the pipeline if electron target doesn't match what is used.
@@ -124,8 +124,8 @@ node build/azure-pipelines/distro/mixin-npm

 yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"

-if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
-  bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
+if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
+  bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
 fi

 find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
--- a/build/linux/package_reh.sh
+++ b/build/linux/package_reh.sh
@@ -17,7 +17,7 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }

 GLIBC_VERSION="2.28"
 GLIBCXX_VERSION="3.4.26"
-NODE_VERSION="20.18.1"
+NODE_VERSION="20.18.2"

 export VSCODE_NODEJS_URLROOT='/download/release'
 export VSCODE_NODEJS_URLSUFFIX=''
@@ -25,25 +25,30 @@ export VSCODE_NODEJS_URLSUFFIX=''
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
  GLIBC_VERSION="2.17"
  GLIBCXX_VERSION="3.4.22"
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-x64"

  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
  export VSCODE_NODEJS_URLSUFFIX='-glibc-217'
+
+  export VSCODE_SKIP_SETUPENV=1
 elif [[ "${VSCODE_ARCH}" == "arm64" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+  EXPECTED_GLIBC_VERSION="2.30"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-arm64"

  export VSCODE_SKIP_SYSROOT=1
  export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7"
+  EXPECTED_GLIBC_VERSION="2.30"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-armhf"

  export VSCODE_SKIP_SYSROOT=1
  export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le"

-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
  export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
  export VSCODE_SYSROOT_VERSION='20240129-253798'
  export USE_GNUPP2A=1
@@ -51,31 +56,28 @@ elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
  NODE_VERSION="20.16.0"
  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64"

-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
  export VSCODE_SKIP_SETUPENV=1
  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
 elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
  NODE_VERSION="20.16.0"
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:trixie-devtoolset-loong64"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:beige-devtoolset-loong64"

-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
  export VSCODE_SKIP_SETUPENV=1
  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
 elif [[ "${VSCODE_ARCH}" == "s390x" ]]; then
  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-s390x"

-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
  export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
  export VSCODE_SYSROOT_VERSION='20241108'
 fi

+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 export VSCODE_PLATFORM='linux'
 export VSCODE_SKIP_NODE_VERSION_CHECK=1
 export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}"

+EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION:=GLIBC_VERSION}"
 VSCODE_HOST_MOUNT="$( pwd )"

 export VSCODE_HOST_MOUNT
@@ -129,6 +131,9 @@ EOF
  echo "${INCLUDES}" > "${HOME}/.gyp/include.gypi"
 fi

+mv .npmrc .npmrc.bak
+cp ../npmrc .npmrc
+
 for i in {1..5}; do # try 5 times
  npm ci --prefix build && break
  if [[ $i == 3 ]]; then
@@ -153,8 +158,13 @@ for i in {1..5}; do # try 5 times
    exit 1
  fi
  echo "Npm install failed $i, trying again..."
+
+  # remove dependencies that fail during cleanup
+  rm -rf node_modules/@vscode node_modules/node-pty
 done

+mv .npmrc.bak .npmrc
+
 node build/azure-pipelines/distro/mixin-npm

 export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
@@ -164,7 +174,7 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
  yarn gulp minify-vscode-reh
  yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"

-  EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+  EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh

  pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"

@@ -183,7 +193,7 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
  yarn gulp minify-vscode-reh-web
  yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"

-  EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+  EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh

  pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}"

--- a/build/linux/ppc64le/electron.sh
+++ b/build/linux/ppc64le/electron.sh
@@ -2,5 +2,5 @@

 set -ex

-export ELECTRON_VERSION="32.2.7"
+export ELECTRON_VERSION="34.2.0"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"
--- a/build/linux/ppc64le/electron.sha256sums
+++ b/build/linux/ppc64le/electron.sha256sums
@@ -0,0 +1,11 @@
+e28d3ffb1a4cdcef80b93cf2a73214c4a85b2fc2a414aefc14a03b212ce07a28 *chromedriver-v34.2.0-linux-ppc64le.zip
+4cfaa3e888b9d4acb9149ca521188dc2e945fa569230b026d5a74d8a85a6f8ce *electron-v34.2.0-linux-ppc64le-debug.zip
+3a82c9ef68f60234ea6d506205d3f37fc7821f7f2a9217c1f9027078da1b3a44 *electron-v34.2.0-linux-ppc64le-symbols.zip
+85d2ddaee9d5aa93ab341e3a6f9ac2b7fce3825efee7b885cdda7ad91244a158 *electron-v34.2.0-linux-ppc64le.zip
+5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts
+a5db064d9f82e2ad8be677d5c5bcf4e9bca68b38ca1e096c54029879098bf7ba *ffmpeg-v34.2.0-linux-ppc64le.zip
+d19ee157a394a258c0d2820ca0b3d6f3403065c54bdb4b35d8227c844ebc18d9 *hunspell_dictionaries.zip
+3ba2b632a70b16315c0f975a87ebaf47b24878396d4e5b7ba1d9db49eb1bfee9 *libcxx-objects-v34.2.0-linux-ppc64le.zip
+552fe6a9afe66b9efa054856553bb88c35ccafa31bc3bb398b483d77291be12c *libcxx_headers.zip
+71d695f56d7fbee44d18d503790951c17ba22f2f75c5b96131d4c65e865860f0 *libcxxabi_headers.zip
+6e25a04c8e19e475edbc8b7145df84372b0e8abdcde3c9ea42b5aaa6fb69ccda *mksnapshot-v34.2.0-linux-ppc64le.zip
--- a/build/linux/riscv64/electron.sh
+++ b/build/linux/riscv64/electron.sh
@@ -2,5 +2,5 @@

 set -ex

-export ELECTRON_VERSION="32.2.7"
+export ELECTRON_VERSION="34.2.0"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1"
--- a/build/linux/riscv64/electron.sha256sums
+++ b/build/linux/riscv64/electron.sha256sums
@@ -0,0 +1,11 @@
+1cbe2e0aa7ce41832781b867ab1899bd83bbebf37ea89036e2d1f2e4e8c231dd *chromedriver-v34.2.0-linux-riscv64.zip
+2a6dc0241a8f62e442833e8a6438b150206d824874b3c42d41220052ce2558d2 *electron-v34.2.0-linux-riscv64-debug.tar.zst
+54c6f5a7775ca09b7c61c89ce668d68bcbd3bf9d0f88bcebbfc93d68fcf53ca9 *electron-v34.2.0-linux-riscv64-symbols.tar.zst
+edc0e2b28a05eb4c812c09c072b091df1d90a74283ad58ac7b61c6c538048882 *electron-v34.2.0-linux-riscv64.zip
+e9a934eb94580f5ff18537a9afab8eac59f21784e07952c0511fe8db3e0b63a1 *ffmpeg-v34.2.0-linux-riscv64.zip
+0e162c2636b9583d39b40a383ee4ea41f177c82b20d168ec869a625a6f7a6f6b *hunspell-dictionaries.zip
+d12dfd2413e0151c8ba800b0fa8881d2910b49793e62576798c3358eef724eec *libcxx-headers.zip
+b2befbd4a5149b6f63925f833fcb40c247b5205e90a80426d6ba87e48e259575 *libcxx-objects-v34.2.0-linux-riscv64.zip
+f70f8fdea628beac7c90453f4f4c01a587c5e0c5f6cd12bcbba6019fe6c172f9 *libcxxabi-headers.zip
+ea85918270250a56ec1217d7c79ae8f0d8f1b8bd3e21c3f80e68e3b3fca20fbb *mksnapshot-v34.2.0-linux-riscv64.zip
+25ca4f68090ac1474d7306ca74fb64a57501216fd25aeeca7795c058f8124f57 *node-v34.2.0-headers.tar.gz
--- a/build/linux/riscv64/ripgrep.sh
+++ b/build/linux/riscv64/ripgrep.sh
--- a/build/osx/include.gypi
+++ b/build/osx/include.gypi
--- a/build/windows/package.sh
+++ b/build/windows/package.sh
--- a/check_tags.sh
+++ b/check_tags.sh
@@ -258,342 +258,358 @@ elif [[ "${ASSETS}" != "null" ]]; then
        echo "Already have all the Windows x64 builds"
      fi
    fi
-  elif [[ "${OS_NAME}" == "linux" ]]; then
+  else
+    if [[ "${OS_NAME}" == "linux" ]]; then
+      if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then

-    if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
+        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux ${VSCODE_ARCH} because we have no REH archive"
+          export SHOULD_BUILD="yes"
+        else
+          echo "Already have the Linux REH ${VSCODE_ARCH} archive"
+          export SHOULD_BUILD_REH="no"
+        fi
+
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux ${VSCODE_ARCH} because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          echo "Already have the Linux REH-web ${VSCODE_ARCH} archive"
+          export SHOULD_BUILD_REH_WEB="no"
+        fi

-      if [[ -z $( contains "${APP_NAME_LC}-reh-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux ${VSCODE_ARCH} because we have no REH archive"
-        export SHOULD_BUILD="yes"
      else
-        echo "Already have the Linux REH ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH="no"
-      fi

-      if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux ${VSCODE_ARCH} because we have no REH-web archive"
-        export SHOULD_BUILD="yes"
-      else
-        echo "Already have the Linux REH-web ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH_WEB="no"
-      fi
+        # linux-arm64
+        if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "arm64.deb" ) ]]; then
+            echo "Building on Linux arm64 because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi

-    else
+          if [[ -z $( contains "aarch64.rpm" ) ]]; then
+            echo "Building on Linux arm64 because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi

-      # linux-arm64
-      if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ -z $( contains "arm64.deb" ) ]]; then
-          echo "Building on Linux arm64 because we have no DEB"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_DEB="no"
-        fi
+          if [[ -z $( contains "${APP_NAME}-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi

-        if [[ -z $( contains "aarch64.rpm" ) ]]; then
-          echo "Building on Linux arm64 because we have no RPM"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_RPM="no"
-        fi
+          if [[ -z $( contains "arm64.snap" ) ]]; then
+            echo "Building on Linux arm64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi

-        if [[ -z $( contains "${APP_NAME}-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi

-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi

-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux arm64 builds"
-        fi
-      fi
-
-      # linux-armhf
-      if [[ "${VSCODE_ARCH}" == "armhf" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ -z $( contains "armhf.deb" ) ]]; then
-          echo "Building on Linux arm because we have no DEB"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_DEB="no"
-        fi
-
-        if [[ -z $( contains "armv7hl.rpm" ) ]]; then
-          echo "Building on Linux arm because we have no RPM"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_RPM="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME}-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
-
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux arm builds"
-        fi
-      fi
-
-      # linux-ppc64le
-      if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then
-        SHOULD_BUILD_APPIMAGE="no"
-        SHOULD_BUILD_DEB="no"
-        SHOULD_BUILD_RPM="no"
-
-        if [[ -z $( contains "${APP_NAME}-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux PowerPC64LE because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux PowerPC64LE because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux PowerPC64LE because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux PowerPC64LE builds"
-        fi
-      fi
-
-      # linux-riscv64
-      if [[ "${VSCODE_ARCH}" == "riscv64" || "${CHECK_ALL}" == "yes" ]]; then
-        export SHOULD_BUILD_DEB="no"
-        export SHOULD_BUILD_RPM="no"
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ -z $( contains "${APP_NAME}-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V 64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V 64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V 64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux riscv64 builds"
-        fi
-      fi
-
-      # linux-loong64
-      if [[ "${VSCODE_ARCH}" == "loong64" || "${CHECK_ALL}" == "yes" ]]; then
-        export SHOULD_BUILD_DEB="no"
-        export SHOULD_BUILD_RPM="no"
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ -z $( contains "${APP_NAME}-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux Loong64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux Loong64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux Loong64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux Loong64 builds"
-        fi
-      fi
-
-      # linux-s390x
-      if [[ "${VSCODE_ARCH}" == "s390x" || "${CHECK_ALL}" == "yes" ]]; then
-        SHOULD_BUILD_APPIMAGE="no"
-        SHOULD_BUILD_DEB="no"
-        SHOULD_BUILD_RPM="no"
-        SHOULD_BUILD_TAR="no"
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux s390x because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux s390x because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux s390x builds"
-        fi
-      fi
-
-      # linux-x64
-      if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ -z $( contains "amd64.deb" ) ]]; then
-          echo "Building on Linux x64 because we have no DEB"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_DEB="no"
-        fi
-
-        if [[ -z $( contains "x86_64.rpm" ) ]]; then
-          echo "Building on Linux x64 because we have no RPM"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_RPM="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME}-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux x64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ "${DISABLE_APPIMAGE}" == "yes" ]]; then
          export SHOULD_BUILD_APPIMAGE="no"
-        elif [[ -z $( contains "x86_64.AppImage" ) ]]; then
-          echo "Building on Linux x64 because we have no AppImage"
-          export SHOULD_BUILD="yes"
-        else
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux arm64 builds"
+          fi
+        fi
+
+        # linux-armhf
+        if [[ "${VSCODE_ARCH}" == "armhf" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "armhf.deb" ) ]]; then
+            echo "Building on Linux arm because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "armv7hl.rpm" ) ]]; then
+            echo "Building on Linux arm because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
          export SHOULD_BUILD_APPIMAGE="no"
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux arm builds"
+          fi
        fi

-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux x64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
+        # linux-ppc64le
+        if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then
+          SHOULD_BUILD_APPIMAGE="no"
+          SHOULD_BUILD_DEB="no"
+          SHOULD_BUILD_RPM="no"
+
+          if [[ -z $( contains "${APP_NAME}-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux PowerPC64LE because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux PowerPC64LE because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux PowerPC64LE because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux PowerPC64LE builds"
+          fi
        fi

-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux x64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
+        # linux-riscv64
+        if [[ "${VSCODE_ARCH}" == "riscv64" || "${CHECK_ALL}" == "yes" ]]; then
+          export SHOULD_BUILD_DEB="no"
+          export SHOULD_BUILD_RPM="no"
+          export SHOULD_BUILD_APPIMAGE="no"
+
+          if [[ -z $( contains "${APP_NAME}-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux RISC-V 64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux RISC-V 64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux RISC-V 64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux riscv64 builds"
+          fi
        fi

-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux x64 builds"
+        # linux-loong64
+        if [[ "${VSCODE_ARCH}" == "loong64" || "${CHECK_ALL}" == "yes" ]]; then
+          export SHOULD_BUILD_DEB="no"
+          export SHOULD_BUILD_RPM="no"
+          export SHOULD_BUILD_APPIMAGE="no"
+
+          if [[ -z $( contains "${APP_NAME}-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux Loong64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux Loong64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux Loong64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux Loong64 builds"
+          fi
+        fi
+
+        # linux-s390x
+        if [[ "${VSCODE_ARCH}" == "s390x" || "${CHECK_ALL}" == "yes" ]]; then
+          SHOULD_BUILD_APPIMAGE="no"
+          SHOULD_BUILD_DEB="no"
+          SHOULD_BUILD_RPM="no"
+          SHOULD_BUILD_TAR="no"
+
+          if [[ -z $( contains "${APP_NAME_LC}-reh-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux s390x because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux s390x because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux s390x builds"
+          fi
+        fi
+
+        # linux-x64
+        if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "amd64.deb" ) ]]; then
+            echo "Building on Linux x64 because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "x86_64.rpm" ) ]]; then
+            echo "Building on Linux x64 because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${DISABLE_APPIMAGE}" == "yes" ]]; then
+            export SHOULD_BUILD_APPIMAGE="no"
+          elif [[ -z $( contains "x86_64.AppImage" ) ]]; then
+            echo "Building on Linux x64 because we have no AppImage"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_APPIMAGE="no"
+          fi
+
+          if [[ -z $( contains "amd64.snap" ) ]]; then
+            echo "Building on Linux x64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux x64 builds"
+          fi
        fi
      fi
    fi

-  elif [[ "${OS_NAME}" == "alpine" ]]; then
+    if [[ "${OS_NAME}" == "alpine" ]] || [[ "${OS_NAME}" == "linux" && "${CHECK_ALL}" == "yes" ]]; then

-    if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
-      if [[ -z $( contains "${APP_NAME_LC}-reh-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Alpine ${VSCODE_ARCH} because we have no REH archive"
-        export SHOULD_BUILD="yes"
-      else
-        echo "Already have the Alpine REH ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME_LC}-reh-web-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Alpine ${VSCODE_ARCH} because we have no REH-web archive"
-        export SHOULD_BUILD="yes"
-      else
-        echo "Already have the Alpine REH-web ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH_WEB="no"
-      fi
-    else
-
-      # alpine-arm64
-      if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine arm64 because we have no REH archive"
+      if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
+        if [[ -z $( contains "${APP_NAME_LC}-reh-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine ${VSCODE_ARCH} because we have no REH archive"
          export SHOULD_BUILD="yes"
        else
+          echo "Already have the Alpine REH ${VSCODE_ARCH} archive"
          export SHOULD_BUILD_REH="no"
        fi

-         if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine arm64 because we have no REH-web archive"
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine ${VSCODE_ARCH} because we have no REH-web archive"
          export SHOULD_BUILD="yes"
        else
+          echo "Already have the Alpine REH-web ${VSCODE_ARCH} archive"
          export SHOULD_BUILD_REH_WEB="no"
        fi
-      fi
+      else

-      # alpine-x64
-      if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine x64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
+        # alpine-arm64
+        if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine arm64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine arm64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
        fi

-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine x64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
+        # alpine-x64
+        if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine x64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine x64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
        fi
      fi
    fi
@@ -643,6 +659,7 @@ echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_REH_WEB=${SHOULD_BUILD_REH_WEB}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_SNAP=${SHOULD_BUILD_SNAP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_SRC=${SHOULD_BUILD_SRC}" >> "${GITHUB_ENV}"
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -3,4 +3,4 @@
 # first so `bash` is the one installed with `git`, avoid conflict with WSL
 $env:Path = "C:\Program Files\Git\bin;" + $env:Path

-bash ./build/build.sh
+bash ./dev/build.sh
--- a/build/build.sh
+++ b/build/build.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC1091,SC2129

 ### Windows
-# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build.sh
+# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./dev/build.sh
 ###

 export APP_NAME="VSCodium"
@@ -84,16 +84,16 @@ if [[ "${SKIP_SOURCE}" == "no" ]]; then
  . version.sh

  # save variables for later
-  echo "MS_TAG=\"${MS_TAG}\"" > build.env
-  echo "MS_COMMIT=\"${MS_COMMIT}\"" >> build.env
-  echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> build.env
-  echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> build.env
+  echo "MS_TAG=\"${MS_TAG}\"" > dev/build.env
+  echo "MS_COMMIT=\"${MS_COMMIT}\"" >> dev/build.env
+  echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> dev/build.env
+  echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> dev/build.env
 else
  if [[ "${SKIP_ASSETS}" != "no" ]]; then
    rm -rf vscode-* VSCode-*
  fi

-  . build.env
+  . dev/build.env

  echo "MS_TAG=\"${MS_TAG}\""
  echo "MS_COMMIT=\"${MS_COMMIT}\""
@@ -124,7 +124,7 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
      echo "{}" > ~/.gyp/include.gypi.pre-vscodium
    fi

-    cp ./include_osx.gypi ~/.gyp/include.gypi
+    cp ./build/osx/include.gypi ~/.gyp/include.gypi
  fi

  . build.sh
@@ -134,8 +134,8 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
  fi

  if [[ "${VSCODE_LATEST}" == "yes" ]]; then
-    jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
-    echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp
+    jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
+    echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp
  fi
 fi

@@ -144,8 +144,8 @@ if [[ "${SKIP_ASSETS}" == "no" ]]; then
    rm -rf build/windows/msi/releasedir
  fi

-  if [[ "${OS_NAME}" == "osx" && -f "./macos-codesign.env" ]]; then
-    . macos-codesign.env
+  if [[ "${OS_NAME}" == "osx" && -f "dev/osx/codesign.env" ]]; then
+    . dev/osx/macos-codesign.env

    echo "CERTIFICATE_OSX_ID: ${CERTIFICATE_OSX_ID}"
  fi
--- a/build/build_docker.sh
+++ b/build/build_docker.sh
--- a/dev/osx/codesign.env.template
+++ b/dev/osx/codesign.env.template
--- a/dev/patch.sh
+++ b/dev/patch.sh
@@ -29,7 +29,7 @@ while [ $# -gt 1 ]; do
 done

 git add .
-git commit -q -m "VSCODIUM HELPER" --no-verify
+git commit --no-verify -q -m "VSCODIUM HELPER"

 if [[ "${1}" == *patch ]]; then
  FILE="../patches/${1}"
@@ -47,6 +47,4 @@ git add .
 git diff --staged -U1 > "${FILE}"
 git reset -q --hard HEAD~

-cd ..
-
 echo "The patch has been generated."
--- a/build/update_api.sh
+++ b/build/update_api.sh
--- a/build/update_patches.sh
+++ b/build/update_patches.sh
--- a/docs/howto-build.md
+++ b/docs/howto-build.md
@@ -51,21 +51,21 @@ see [the common dependencies](#dependencies)

 ## <a id="build-scripts"></a>Build Scripts

-A build helper script can be found at `build/build.sh`.
+A build helper script can be found at `dev/build.sh`.

- Linux: `./build/build.sh`
- MacOS: `./build/build.sh`
- Windows: `powershell -ExecutionPolicy ByPass -File .\build\build.ps1` or `"C:\Program Files\Git\bin\bash.exe" ./build/build.sh`
+- Linux: `./dev/build.sh`
+- MacOS: `./dev/build.sh`
+- Windows: `powershell -ExecutionPolicy ByPass -File .\dev\build.ps1` or `"C:\Program Files\Git\bin\bash.exe" ./dev/build.sh`

 ### Insider

-The `insider` version can be built with `./build/build.sh -i` on the `insider` branch.
+The `insider` version can be built with `./dev/build.sh -i` on the `insider` branch.

-You can try the latest version with the command `./build/build.sh -il` but the patches might not be up to date.
+You can try the latest version with the command `./dev/build.sh -il` but the patches might not be up to date.

 ### Flags

-The script `build/build.sh` provides several flags:
+The script `dev/build.sh` provides several flags:

 - `-i`: build the Insiders version
 - `-l`: build with latest version of Visual Studio Code
@@ -93,8 +93,8 @@ review-tools.snap-review --allow-classic codium*.snap

 ## <a id="patch-update-process-semiauto"></a>Semi-Automated

- run `./build/build_<os>.sh`, if a patch is failing then,
- run `./build/update_patches.sh`
+- run `./dev/build.sh`, if a patch is failing then,
+- run `./dev/update_patches.sh`
 - when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
 - fix all the `*.rej` files
 - run `yarn watch`
@@ -103,7 +103,7 @@ review-tools.snap-review --allow-classic codium*.snap

 ## <a id="patch-update-process-manual"></a>Manual

- run `./build/build_<os>.sh`, if a patch is failing then,
+- run `./dev/build.sh`, if a patch is failing then,
 - open `vscode` directory in **VSCodium**
 - revert all changes
 - run `git apply --reject ../patches/<name>.patch`
--- a/docs/index.md
+++ b/docs/index.md
@@ -69,10 +69,12 @@ See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on
 You can switch from the pre-set Open VSX Registry by configuring the endpoints using the following solutions.

 You can either use the following environment variables:
- `VSCODE_GALLERY_SERVICE_URL`
- `VSCODE_GALLERY_ITEM_URL`
+- `VSCODE_GALLERY_SERVICE_URL` ***(required)***
+- `VSCODE_GALLERY_ITEM_URL` ***(required)***
 - `VSCODE_GALLERY_CACHE_URL`
 - `VSCODE_GALLERY_CONTROL_URL`
+- `VSCODE_GALLERY_EXTENSION_URL_TEMPLATE` ***(required)***
+- `VSCODE_GALLERY_RESOURCE_URL_TEMPLATE`

 Or by creating a custom `product.json` at the following location (replace `VSCodium` by `VSCodium - Insiders` if you use that):
 - Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium`
@@ -84,10 +86,12 @@ with the content like:
 ```jsonc
 {
  "extensionsGallery": {
-    "serviceUrl": "",
-    "itemUrl": "",
+    "serviceUrl": "", // required
+    "itemUrl": "", // required
    "cacheUrl": "",
-    "controlUrl": ""
+    "controlUrl": "",
+    "extensionUrlTemplate": "", // required
+    "resourceUrlTemplate": "",
  }
 }
 ```
--- a/electron_linux_loong64.sha256sums
+++ b/electron_linux_loong64.sha256sums
@@ -1,11 +0,0 @@
-2324198f130de1f5ccff6f216277eafa76fa53883c8297533f0e0c09d96faf31 *chromedriver-v32.2.7-linux-loong64.zip
-724acd5cde9e747b3765f062b9a243af344faa039f9f0218beed1b0e9455e893 *electron-v32.2.7-linux-loong64-debug.zip
-dee3600a67cc7f40f0fb4a8938940cb20fba0a95886352145cacc0334baa955e *electron-v32.2.7-linux-loong64-symbols.zip
-2904bfaa386deddf968dec71c4b4235635daa318bdbb05ae3f3673983242cefe *electron-v32.2.7-linux-loong64.zip
-e8fb755c82a58d98c70c1d3ac4d9c9c77e42021322b188183a550793ba94afe0 *ffmpeg-v32.2.7-linux-loong64.zip
-69506c95a7ce4d5270164e0613aec9eb11fdc24f3dc21df3cd78963b764a6b75 *hunspell-dictionaries.zip
-e02189a00e5170306289ba2bc0c295a9698f76899d812e35fc69fd8e4e4841d2 *libcxx-headers.zip
-0cc5c76d848d9f572ef4050839876afd8533dc71fc90c319edfffcaa3dca0e01 *libcxx-objects-v32.2.7-linux-loong64.zip
-caada8fb0a210d660e2150a0fe9f7b84a9e969a5b1110ce2d6b58f5d21637387 *libcxxabi-headers.zip
-8736592799acdaafae2214156c7755f3249f4fd577fccc3df11bf42a5481aa12 *mksnapshot-v32.2.7-linux-loong64.zip
-3d80771ab908f55cc61416b8b11d572e777b6c613ad2a7ee7aa8fef8b4ede011 *node-v32.2.7-headers.tar.gz
--- a/electron_linux_ppc64le.sha256sums
+++ b/electron_linux_ppc64le.sha256sums
@@ -1,11 +0,0 @@
-176cbd410925566ed2290d006b4a70de9d7953997d2189e67495fec5ec7648aa *chromedriver-v32.2.7-linux-ppc64le.zip
-64a683d339b87463cacef142730ac366fa39ee27e017390909a928b9afb81b12 *electron-v32.2.7-linux-ppc64le-debug.zip
-361b11b83589f64756def0a4982b611fb5220df287cd6c6fc3c9d4c5240a7b87 *electron-v32.2.7-linux-ppc64le-symbols.zip
-1cba399c82c5baccb0387971a5697920d771bc424bd65fe503289e4d8f72dfa2 *electron-v32.2.7-linux-ppc64le.zip
-ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts
-9b74c159cbc8e9f80d145117e828066b09a1703961adc4f31703271776132797 *ffmpeg-v32.2.7-linux-ppc64le.zip
-d8b47b51bb9474e39f9a0024a34a2378e4bdb3ff1ed4366db1752b3c6452afd1 *hunspell_dictionaries.zip
-0c125463ff1b1bc3e8f16e3fc09052f4061143743acddf478188d08049da4d55 *libcxx-objects-v32.2.7-linux-ppc64le.zip
-b1fc26b925ba6b896dea50bd471128cfa290c5b19673a62e8775537f6f94514d *libcxx_headers.zip
-6f00ab500f9418eb788578c67a84422ed5dc962ad9c3be0de1f2931f55066895 *libcxxabi_headers.zip
-2def4b7386e49bd658dd4f2f147710525423bb5cd3811394af0cf2b5047045ea *mksnapshot-v32.2.7-linux-ppc64le.zip
--- a/electron_linux_riscv64.sha256sums
+++ b/electron_linux_riscv64.sha256sums
@@ -1,11 +0,0 @@
-26a3b6958d4b88f8b436b429aa7702d5d3af58ce892fe985c8fd68156e0b33d6 *chromedriver-v32.2.7-linux-riscv64.zip
-3b1e9b38a722a32c7127a9646b37366ebe20470fbedf17c94e2dd7e388046c26 *electron-v32.2.7-linux-riscv64-debug.tar.zst
-e9b4738bfd9aa0a9a98ee626e760f230730655bb02185a90a246ba6398c52db3 *electron-v32.2.7-linux-riscv64-symbols.tar.zst
-e71a432a4e03458b71d2428c812d3119658b61941a59b60d346d281b5c29f827 *electron-v32.2.7-linux-riscv64.zip
-51982b096a16b6546941710225fd21855a3fe3b83ec0bf69a4b048d9995ddd19 *ffmpeg-v32.2.7-linux-riscv64.zip
-5455ce9b9a98b349ad95050ca643bfc5312cf4636dd5ec62d475d1a07b2a35a5 *hunspell-dictionaries.zip
-4f0abd2517c30de0fc3ddcaa881460924b87c6a48e28cffa41e1050e201b17e5 *libcxx-headers.zip
-3477a9c568c8c65e5a142a2b4408aec19edda2de9ba303e4aec77eef41aeea10 *libcxx-objects-v32.2.7-linux-riscv64.zip
-01ff628652bc485ce6bf41b975e15339b246771f5f9d1de79ba24d79a00e840a *libcxxabi-headers.zip
-8d47b32d2cd3d57fab542de097a10f5f632a958902172a8993fe390a6089f778 *mksnapshot-v32.2.7-linux-riscv64.zip
-29229408ca301a90be7f7862ac3efec932b198105c44e668f1b3eb6bf043198e *node-v32.2.7-headers.tar.gz
--- a/get_repo.sh
+++ b/get_repo.sh
@@ -9,13 +9,13 @@ if [[ "${CI_BUILD}" != "no" ]]; then
 fi

 if [[ -z "${RELEASE_VERSION}" ]]; then
-  if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "${VSCODE_QUALITY}.json" ]]; then
+  if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "./upstream/${VSCODE_QUALITY}.json" ]]; then
    echo "Retrieve lastest version"
    UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/darwin/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" )
  else
    echo "Get version from ${VSCODE_QUALITY}.json"
-    MS_COMMIT=$( jq -r '.commit' "${VSCODE_QUALITY}.json" )
-    MS_TAG=$( jq -r '.tag' "${VSCODE_QUALITY}.json" )
+    MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" )
+    MS_TAG=$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" )
  fi

  if [[ -z "${MS_COMMIT}" ]]; then
@@ -53,8 +53,8 @@ else
    fi
  fi

-  if [[ "${MS_TAG}" == "$( jq -r '.tag' "${VSCODE_QUALITY}".json )" ]]; then
-    MS_COMMIT=$( jq -r '.commit' "${VSCODE_QUALITY}".json )
+  if [[ "${MS_TAG}" == "$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" )" ]]; then
+    MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" )
  else
    echo "Error: No MS_COMMIT for ${RELEASE_VERSION}"
    exit 1
--- a/insider.json
+++ b/insider.json
@@ -1,4 +0,0 @@
-{
-  "tag": "1.96.0",
-  "commit": "475acb4b9bdd77d4204224990bf288ed5bfe6b0e"
-}
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000
--- a/patches/brand.patch
+++ b/patches/brand.patch
@@ -10,7 +10,7 @@ index f791557..04f138d 100644
 +					{ label: 'workspaceFolderBasename', detail: vscode.l10n.t("The name of the folder opened in VSCodium without any slashes (/)") },
 					{ label: 'fileWorkspaceFolderBasename', detail: vscode.l10n.t("The current opened file workspace folder name without any slashes (/)") },
 diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts
-index 6135df5..484721e 100644
+index 12b50f3..be792c2 100644
 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
 +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
@@ -123,3 +123,3 @@ export class SettingsDocument {
@@ -19,7 +19,7 @@ index 6135df5..484721e 100644
 +		completions.push(this.newSimpleCompletionItem(getText('appName'), range, vscode.l10n.t("e.g. VSCodium")));
 		completions.push(this.newSimpleCompletionItem(getText('remoteName'), range, vscode.l10n.t("e.g. SSH")));
 diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
-index d6e25a5..7888614 100644
+index 057ec21..45cd969 100644
 --- a/extensions/css-language-features/package.nls.json
 +++ b/extensions/css-language-features/package.nls.json
@@ -4,4 +4,4 @@
@@ -73,37 +73,37 @@ index be7eea1..389e89e 100644
 +const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as VSCodium will generate these automatically from your package.json contribution declarations.");
 const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance.");
 diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
-index d706b65..fb24421 100644
+index 101618a..b748e7a 100644
 --- a/extensions/git/package.nls.json
 +++ b/extensions/git/package.nls.json
-@@ -223,3 +223,3 @@
+@@ -227,3 +227,3 @@
 			"{Locked='](command:git.showOutput'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -251,4 +251,4 @@
+@@ -255,4 +255,4 @@
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 -	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 -	"config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 +	"config.terminalAuthentication": "Controls whether to enable VSCodium to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 +	"config.terminalGitEditor": "Controls whether to enable VSCodium to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
-@@ -312,3 +312,3 @@
- 			"{Locked='](command:workbench.action.reloadWindow'}",
+@@ -322,3 +322,3 @@
+ 			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -320,3 +320,3 @@
- 			"{Locked='](command:workbench.action.reloadWindow'}",
+@@ -332,3 +332,3 @@
+ 			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -328,3 +328,3 @@
- 			"{Locked='](command:workbench.action.reloadWindow'}",
+@@ -342,3 +342,3 @@
+ 			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -334,6 +334,6 @@
+@@ -354,6 +354,6 @@
 	"view.workbench.scm.disabled": {
 -		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@@ -112,16 +112,16 @@ index d706b65..fb24421 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -342,6 +342,6 @@
+@@ -362,6 +362,6 @@
 	"view.workbench.scm.empty": {
-		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
-+		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
+-		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:vscode.openFolder'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -350,6 +350,6 @@
+@@ -370,6 +370,6 @@
 	"view.workbench.scm.folder": {
 -		"message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@@ -130,7 +130,7 @@ index d706b65..fb24421 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -358,6 +358,6 @@
+@@ -378,6 +378,6 @@
 	"view.workbench.scm.workspace": {
 -		"message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@@ -139,7 +139,7 @@ index d706b65..fb24421 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -366,6 +366,6 @@
+@@ -386,6 +386,6 @@
 	"view.workbench.scm.emptyWorkspace": {
 -		"message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@@ -148,27 +148,27 @@ index d706b65..fb24421 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -384,3 +384,3 @@
+@@ -404,3 +404,3 @@
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -393,3 +393,3 @@
+@@ -413,3 +413,3 @@
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -401,3 +401,3 @@
+@@ -421,3 +421,3 @@
 			"{Locked='](command:git.manageUnsafeRepositories'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -409,3 +409,3 @@
+@@ -429,3 +429,3 @@
 			"{Locked='](command:git.manageUnsafeRepositories'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -414,6 +414,6 @@
+@@ -434,6 +434,6 @@
 	"view.workbench.scm.closedRepository": {
 -		"message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@@ -177,7 +177,7 @@ index d706b65..fb24421 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -422,6 +422,6 @@
+@@ -442,6 +442,6 @@
 	"view.workbench.scm.closedRepositories": {
 -		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@@ -186,34 +186,36 @@ index d706b65..fb24421 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -433,3 +433,3 @@
+@@ -453,3 +453,3 @@
 			"{Locked='](command:git.clone'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -437,3 +437,3 @@
+@@ -457,3 +457,3 @@
 	},
 -	"view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
 +	"view.workbench.learnMore": "To learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm)."
 }
 diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json
-index 5ead790..f16eb9c 100644
+index 40271be..b52ff0f 100644
 --- a/extensions/github/package.nls.json
 +++ b/extensions/github/package.nls.json
-@@ -2,5 +2,5 @@
+@@ -2,3 +2,3 @@
 	"displayName": "GitHub",
 -	"description": "GitHub features for VS Code",
 +	"description": "GitHub features for VSCodium",
+ 	"command.copyVscodeDevLink": "Copy vscode.dev Link",
+@@ -8,3 +8,3 @@
 	"config.branchProtection": "Controls whether to query repository rules for GitHub repositories",
 -	"config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.",
 +	"config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VSCodium.",
 	"config.gitProtocol": "Controls which protocol is used to clone a GitHub repository",
-@@ -12,3 +12,3 @@
+@@ -17,3 +17,3 @@
 			"{Locked='](command:github.publish'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -22,3 +22,3 @@
+@@ -27,3 +27,3 @@
 			"{Locked='](command:github.publish'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
@@ -282,15 +284,15 @@ index af6c9d8..7057b54 100644
 +	"json.tracing.desc": "Traces the communication between VSCodium and the JSON language server.",
 	"json.colorDecorators.enable.desc": "Enables or disables color decorators",
 diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
-index da567b4..37e3f7d 100644
+index fe98103..05afb90 100644
 --- a/extensions/markdown-language-features/package.nls.json
 +++ b/extensions/markdown-language-features/package.nls.json
-@@ -21,3 +21,3 @@
+@@ -22,3 +22,3 @@
 	"markdown.trace.extension.desc": "Enable debug logging for the Markdown extension.",
 -	"markdown.trace.server.desc": "Traces the communication between VS Code and the Markdown language server.",
 +	"markdown.trace.server.desc": "Traces the communication between VSCodium and the Markdown language server.",
 	"markdown.server.log.desc": "Controls the logging level of the Markdown language server.",
-@@ -75,3 +75,3 @@
+@@ -76,3 +76,3 @@
 		"comment": [
 -			"This setting is use the user drops or pastes image data into the editor. In this case, VS Code automatically creates a new image file in the workspace containing the dropped/pasted image.",
 +			"This setting is use the user drops or pastes image data into the editor. In this case, VSCodium automatically creates a new image file in the workspace containing the dropped/pasted image.",
@@ -341,7 +343,7 @@ index d6ece35..9e878df 100644
 +				"displayName": "VSCodium Builtin Notebook Output Renderer",
 				"requiresMessaging": "never",
 diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
-index ff8581b..6774e97 100644
+index 56a77ff..b1e3722 100644
 --- a/extensions/npm/package.nls.json
 +++ b/extensions/npm/package.nls.json
@@ -2,3 +2,3 @@
@@ -350,7 +352,7 @@ index ff8581b..6774e97 100644
 +	"displayName": "NPM support for VSCodium",
 	"workspaceTrust": "This extension executes tasks, which require trust to run.",
 diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
-index b18b340..ca2eb2d 100644
+index 7d6694c..0e1d484 100644
 --- a/extensions/swift/syntaxes/swift.tmLanguage.json
 +++ b/extensions/swift/syntaxes/swift.tmLanguage.json
@@ -260,3 +260,3 @@
@@ -359,7 +361,7 @@ index b18b340..ca2eb2d 100644
 +					"comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29",
 					"name": "support.variable.swift",
 diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
-index 1e5ca17..ef1e18d 100644
+index f88b9c7..b7d38ad 100644
 --- a/extensions/typescript-language-features/package.nls.json
 +++ b/extensions/typescript-language-features/package.nls.json
@@ -75,4 +75,4 @@
@@ -386,7 +388,7 @@ index 1e5ca17..ef1e18d 100644
 -	"configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 +	"configuration.tsserver.watchOptions.vscode": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 	"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
-@@ -222,6 +222,6 @@
+@@ -222,9 +222,9 @@
 	"configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.",
 -	"configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.",
 +	"configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VSCodium is running in a trusted context.",
@@ -394,13 +396,12 @@ index 1e5ca17..ef1e18d 100644
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 -	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
 +	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.",
- 	"configuration.updateImportsOnPaste": "Enable updating imports when pasting code. Requires TypeScript 5.7+.\n\nBy default this shows a option to update imports after pasting. You can use the `#editor.pasteAs.preferences#` setting to update imports automatically when pasting: `\"editor.pasteAs.preferences\": [ \"text.updateImports.jsts\" ]`.",
-@@ -229,3 +229,3 @@
+ 	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
 	"walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js",
 -	"walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.",
 +	"walkthroughs.nodejsWelcome.description": "Make the most of VSCodium's first-class JavaScript experience.",
 	"walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js",
-@@ -237,7 +237,7 @@
+@@ -236,7 +236,7 @@
 	"walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript",
 -	"walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
 -	"walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.",
@@ -440,26 +441,26 @@ index e85c715..9059335 100644
 +			vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project"));
 		return;
 diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
-index 7e18022..1243c69 100644
+index 4201d6d..ec88aa1 100644
 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
 +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
-@@ -665,3 +665,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -653,3 +653,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 						prompt = vscode.window.showErrorMessage<vscode.MessageItem>(
 -							vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 +							vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
 					} else {
-@@ -686,3 +686,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -674,3 +674,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 							prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
 -								vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 +								vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
 						} else {
-@@ -700,3 +700,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -688,3 +688,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 						prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
 -							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 +							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
 					} else {
 diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
-index 5f7681b..58bc70b 100644
+index 66a80b8..bd2d284 100644
 --- a/extensions/vscode-api-tests/package.json
 +++ b/extensions/vscode-api-tests/package.json
@@ -2,3 +2,3 @@
@@ -536,11 +537,20 @@ index a351aa7..32bfdb6 100644
 -			throw Error(`Failed to download and unzip VS Code ${quality} - ${commit}`);
 +			throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`);
 		}
+diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts
+index 2fab3ec..35d3325 100644
+--- a/extensions/vscode-test-resolver/src/extension.ts
+++ b/extensions/vscode-test-resolver/src/extension.ts
+@@ -178,3 +178,3 @@ export function activate(context: vscode.ExtensionContext) {
+ 					const serverBin = path.join(remoteDataDir, 'bin');
+-					progress.report({ message: 'Installing VSCode Server' });
+					progress.report({ message: 'Installing VSCodium Server' });
+ 					serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin, m => outputChannel.appendLine(m));
 diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
-index 11ca66e..9fc3414 100644
+index 21a297a..4efb60f 100644
 --- a/src/vs/code/electron-main/app.ts
 +++ b/src/vs/code/electron-main/app.ts
-@@ -540,3 +540,3 @@ export class CodeApplication extends Disposable {
+@@ -546,3 +546,3 @@ export class CodeApplication extends Disposable {
 	async startup(): Promise<void> {
 -		this.logService.debug('Starting VS Code');
 +		this.logService.debug('Starting VSCodium');
@@ -564,25 +574,20 @@ index c256dba..0ae2e47 100644
 +export const ProductQualityContext = new RawContextKey<string>('productQualityType', '', localize('productQualityType', "Quality type of VSCodium"));
 
 diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-index a55978c..4194925 100644
+index 04ed182..bdf41b1 100644
 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
 +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -151,3 +151,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
+@@ -150,3 +150,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 			if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, this.productService.version, this.productService.date)) {
 -				throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", extensionId, this.productService.version));
 +				throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VSCodium '{1}'.", extensionId, this.productService.version));
 			}
-@@ -233,3 +233,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
- 		} catch (e) {
-			throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VS Code before trying again.", toErrorMessage(e)));
-+			throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VSCodium before trying again.", toErrorMessage(e)));
- 		}
-@@ -1047,3 +1047,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
+@@ -1007,3 +1007,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 					} catch (e) {
 -						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 +						throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 					}
-@@ -1058,3 +1058,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
+@@ -1018,3 +1018,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 				} catch (e) {
 -					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 +					throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
@@ -600,7 +605,7 @@ index 87a9288..d2b5f3f 100644
 +				notices.push(nls.localize('apiProposalMismatch2', "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of VSCodium.",
 					incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`).join(', '),
 diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
-index 47c1271..b159ac3 100644
+index ca6c82b..346647c 100644
 --- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts
 +++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
@@ -17,3 +17,3 @@ import { ITerminalEnvironment } from '../../terminal/common/terminal.js';
@@ -627,41 +632,45 @@ index d96926b..c4bbc4a 100644
 +			description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VSCodium versions in the background on Windows."),
 			included: isWindows && !isWeb
 diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
-index 48638aa..08ea574 100644
+index a1ec3fe..c974cf7 100644
 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
 +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
-@@ -23,3 +23,3 @@ export type UpdateNotAvailableClassification = {
- 	explicit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user has manually checked for updates, or this was an automatic check.' };
-	comment: 'This is used to understand how often VS Code pings the update server for an update and there\'s none available.';
-+	comment: 'This is used to understand how often VSCodium pings the update server for an update and there\'s none available.';
- };
-@@ -29,3 +29,3 @@ export type UpdateErrorClassification = {
+@@ -23,3 +23,3 @@ export type UpdateErrorClassification = {
 	messageHash: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The hash of the error message.' };
 -	comment: 'This is used to know how often VS Code updates have failed.';
 +	comment: 'This is used to know how often VSCodium updates have failed.';
 };
 diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
-index d3f27d3..6a7e37a 100644
+index 57398fb..9129f54 100644
 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts
 +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -115,4 +115,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 			owner: 'joaomoreno';
-			version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' };
+-			newVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' };
 -			comment: 'This is used to know how often VS Code has successfully downloaded the update.';
-+			version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VSCodium that has been downloaded.' };
+			newVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VSCodium that has been downloaded.' };
 +			comment: 'This is used to know how often VSCodium has successfully downloaded the update.';
 		};
 diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
-index eb68e8a..55fd45f 100644
+index 0535ddd..79f12dc 100644
 --- a/src/vs/server/node/server.cli.ts
 +++ b/src/vs/server/node/server.cli.ts
-@@ -456,3 +456,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) {
+@@ -469,3 +469,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) {
 function fatal(message: string, err: any): void {
 -	console.error('Unable to connect to VS Code server: ' + message);
 +	console.error('Unable to connect to VSCodium server: ' + message);
 	console.error(err);
+diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+index 6441394..1984fd1 100644
+--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+@@ -334,3 +334,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
+ 				owner: 'TylerLeonhardt';
+-				comment: 'Used to see which extensions are using the VSCode client id override';
+				comment: 'Used to see which extensions are using the VSCodium client id override';
+ 				extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension id.' };
 diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
-index f5a0648..5333241 100644
+index fdf354d..502f06e 100644
 --- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
 +++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -43,3 +43,3 @@ const viewsContainerSchema: IJSONSchema = {
@@ -670,7 +679,7 @@ index f5a0648..5333241 100644
 +			description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to VSCodium through an extension/contribution point. '] }, "Unique id used to identify the container in which views can be contributed using 'views' contribution point"),
 			type: 'string',
 diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
-index 8167b0c..a43b277 100644
+index 1d08ef2..aeef203 100644
 --- a/src/vs/workbench/api/common/extHostApiCommands.ts
 +++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -443,3 +443,3 @@ const newCommands: ApiCommand[] = [
@@ -679,7 +688,7 @@ index 8167b0c..a43b277 100644
 +			ApiCommandArgument.String.with('viewId', 'Custom editor view id. This should be the viewType string for custom editors or the notebookType string for notebooks. Use \'default\' to use VSCodium\'s default text editor'),
 			new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [vscode.ViewColumn?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions',
 diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
-index b1ff981..639ada5 100644
+index 0c170ec..7683cb4 100644
 --- a/src/vs/workbench/api/common/extHostCommands.ts
 +++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -460,4 +460,4 @@ export class ApiCommandArgument<V, O = V> {
@@ -690,32 +699,32 @@ index b1ff981..639ada5 100644
 +	static readonly TestProfile = new ApiCommandArgument('testProfile', 'A VSCodium test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from);
 
 diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
-index 54b14a3..c075afb 100644
+index 0d71384..45f7923 100644
 --- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
 +++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
-@@ -363,3 +363,3 @@ suite('NotebookCell#Document', function () {
+@@ -364,3 +364,3 @@ suite('NotebookCell#Document', function () {
 
 -	test('Opening a notebook results in VS Code firing the event onDidChangeActiveNotebookEditor twice #118470', function () {
 +	test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () {
 		let count = 0;
+diff --git a/src/vs/workbench/browser/web.factory.ts b/src/vs/workbench/browser/web.factory.ts
+index 422fbba..9dc9699 100644
+--- a/src/vs/workbench/browser/web.factory.ts
+++ b/src/vs/workbench/browser/web.factory.ts
+@@ -35,3 +35,3 @@ export function create(domElement: HTMLElement, options: IWorkbenchConstructionO
+ 	if (created) {
+-		throw new Error('Unable to create the VSCode workbench more than once.');
+		throw new Error('Unable to create the VSCodium workbench more than once.');
+ 	} else {
 diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
-index 7b8a2f9..d489ddb 100644
+index 5e785e8..a8aa1b7 100644
 --- a/src/vs/workbench/browser/workbench.contribution.ts
 +++ b/src/vs/workbench/browser/workbench.contribution.ts
-@@ -673,3 +673,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
+@@ -678,3 +678,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 		localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."),
 -		localize('appName', "`${appName}`: e.g. VS Code."),
 +		localize('appName', "`${appName}`: e.g. VSCodium."),
 		localize('remoteName', "`${remoteName}`: e.g. SSH"),
-diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
-index 50ae856..de6bb10 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
-+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
-@@ -52,3 +52,3 @@ export class AccessibilityStatus extends Disposable implements IWorkbenchContrib
- 			Severity.Info,
-			localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code?"),
-+			localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VSCodium?"),
- 			[{
 diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
 index 0a13063..c62db65 100644
 --- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
@@ -726,36 +735,36 @@ index 0a13063..c62db65 100644
 +						description: nls.localize('debugServer', "For debug extension development only: if a port is specified VSCodium tries to connect to a debug adapter running in server mode"),
 						default: 4711
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-index 4a2b68d..9ad4aea 100644
+index e301639..e7b0ac4 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-@@ -378,3 +378,3 @@ CommandsRegistry.registerCommand({
+@@ -386,3 +386,3 @@ CommandsRegistry.registerCommand({
 				description: '(optional) Options for installing the extension. Object with the following properties: ' +
 -					'`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ',
 +					'`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VSCodium installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ',
 				isOptional: true,
-@@ -385,3 +385,3 @@ CommandsRegistry.registerCommand({
+@@ -393,3 +393,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."),
 +							'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VSCodium installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."),
 							default: false
-@@ -390,3 +390,3 @@ CommandsRegistry.registerCommand({
+@@ -398,3 +398,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VS Code installs the pre-release version of the extension if available."),
 +							'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VSCodium installs the pre-release version of the extension if available."),
 							default: false
-@@ -395,3 +395,3 @@ CommandsRegistry.registerCommand({
+@@ -403,3 +403,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VS Code do not sync this extension when Settings Sync is on."),
 +							'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VSCodium do not sync this extension when Settings Sync is on."),
 							default: false
-@@ -899,3 +899,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
+@@ -907,3 +907,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 						Severity.Info,
 -						localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload Visual Studio Code to enable it."),
 +						localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload VSCodium to enable it."),
 						[{
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
-index a932e4f..3e08d9a 100644
+index 8b062d1..24887c4 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -105,3 +105,3 @@ export class PromptExtensionInstallFailureAction extends Action {
@@ -773,26 +782,21 @@ index a932e4f..3e08d9a 100644
 -			alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName));
 +			alert(localize('uninstallExtensionComplete', "Please reload VSCodium to complete the uninstallation of the extension {0}.", this.extension.displayName));
 		} catch (error) {
-@@ -2555,3 +2555,3 @@ export class ExtensionStatusAction extends ExtensionAction {
+@@ -2553,3 +2553,3 @@ export class ExtensionStatusAction extends ExtensionAction {
 				const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`;
 -				this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VS Code. Configure these {0} to use this functionality.", link)) }, true);
 +				this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VSCodium. Configure these {0} to use this functionality.", link)) }, true);
 			} else {
-@@ -2894,3 +2894,3 @@ export class ReinstallAction extends Action {
- 						const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
-						const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id)
-+						const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id)
- 							: localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id);
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-index 1a86249..2230763 100644
+index 74f8e88..5b1023b 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-@@ -457,3 +457,3 @@ export class Extension implements IExtension {
+@@ -456,3 +456,3 @@ export class Extension implements IExtension {
 			return Promise.resolve(`# ${this.displayName || this.name}
 -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
 +**Notice:** This extension is bundled with VSCodium. It can be disabled but not uninstalled.
 ## Features
-@@ -495,3 +495,3 @@ ${this.description}
+@@ -494,3 +494,3 @@ ${this.description}
 		if (this.type === ExtensionType.System) {
 -			return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
 +			return Promise.resolve(`Please check the [VSCodium Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
@@ -811,20 +815,6 @@ index 818e662..2450efc 100644
 -	'\t// List of extensions recommended by VS Code that should not be recommended for users of this workspace.',
 +	'\t// List of extensions recommended by VSCodium that should not be recommended for users of this workspace.',
 	'\t"unwantedRecommendations": [',
-diff --git a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts b/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
-index 21967d3..24e3324 100644
--- a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
-+++ b/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts
-@@ -107,3 +107,3 @@ export class ExternalTerminalContribution implements IWorkbenchContribution {
- 					enumDescriptions: [
-						nls.localize('terminal.explorerKind.integrated', "Use VS Code's integrated terminal."),
-+						nls.localize('terminal.explorerKind.integrated', "Use VSCodium's integrated terminal."),
- 						nls.localize('terminal.explorerKind.external', "Use the configured external terminal."),
-@@ -122,3 +122,3 @@ export class ExternalTerminalContribution implements IWorkbenchContribution {
- 					enumDescriptions: [
-						nls.localize('terminal.sourceControlRepositoriesKind.integrated', "Use VS Code's integrated terminal."),
-+						nls.localize('terminal.sourceControlRepositoriesKind.integrated', "Use VSCodium's integrated terminal."),
- 						nls.localize('terminal.sourceControlRepositoriesKind.external', "Use the configured external terminal."),
 diff --git a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
 index f54ddfe..81ec478 100644
 --- a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
@@ -876,10 +866,10 @@ index b716bcd..07b107b 100644
 +								"You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VSCodium Accounts menu.",
 								connectionInfo.tunnelName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName, 'https://code.visualstudio.com/docs/remote/tunnels'
 diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
-index 8879209..79644c1 100644
+index d6a1234..0ed32be 100644
 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
 +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
-@@ -3197,3 +3197,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
+@@ -3199,3 +3199,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 						if (response.code && response.code === TerminateResponseCode.ProcessNotFound) {
 -							this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.'));
 +							this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VSCodium might result in orphaned processes.'));
@@ -917,98 +907,84 @@ index 6a5728c..2c561bd 100644
 +							message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VSCodium might result in orphaned processes. To avoid this start the last background process with a wait flag.'),
 							primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"),
 diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-index b71064b..d558dae 100644
+index 7e22be4..472fa8f 100644
 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
 +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-@@ -204,3 +204,3 @@ export class TerminalViewPane extends ViewPane {
+@@ -212,3 +212,3 @@ export class TerminalViewPane extends ViewPane {
 					}];
 -					this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VS Code if this is a newly installed font."), choices);
 +					this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VSCodium if this is a newly installed font."), choices);
 				}
 diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
-index 752b9e8..5d27d5e 100644
+index 2780278..3b91442 100644
 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
 +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
-@@ -290,3 +290,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -313,3 +313,3 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.DetectLocale]: {
 -			markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VS Code's terminal only supports UTF-8 encoded data coming from the shell."),
 +			markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VSCodium's terminal only supports UTF-8 encoded data coming from the shell."),
 			type: 'string',
-@@ -304,3 +304,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -327,3 +327,3 @@ const terminalConfiguration: IConfigurationNode = {
 			markdownEnumDescriptions: [
 -				localize('terminal.integrated.gpuAcceleration.auto', "Let VS Code detect which renderer will give the best experience."),
 +				localize('terminal.integrated.gpuAcceleration.auto', "Let VSCodium detect which renderer will give the best experience."),
 				localize('terminal.integrated.gpuAcceleration.on', "Enable GPU acceleration within the terminal."),
-@@ -392,3 +392,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -415,3 +415,3 @@ const terminalConfiguration: IConfigurationNode = {
 				'terminal.integrated.commandsToSkipShell',
 -				"A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VS Code. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n&nbsp;\n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n&nbsp;\n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n&nbsp;\n\nDefault Skipped Commands:\n\n{0}",
 +				"A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VSCodium. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n&nbsp;\n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n&nbsp;\n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n&nbsp;\n\nDefault Skipped Commands:\n\n{0}",
 				DEFAULT_COMMANDS_TO_SKIP_SHELL.sort().map(command => `- ${command}`).join('\n'),
-@@ -404,3 +404,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -427,3 +427,3 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.AllowChords]: {
 -			markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code).", '`#terminal.integrated.commandsToSkipShell#`'),
 +			markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VSCodium).", '`#terminal.integrated.commandsToSkipShell#`'),
 			type: 'boolean',
-@@ -415,3 +415,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -438,3 +438,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on macOS. Set to `null` to delete the environment variable."),
 +			markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on macOS. Set to `null` to delete the environment variable."),
 			type: 'object',
-@@ -424,3 +424,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -447,3 +447,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux. Set to `null` to delete the environment variable."),
 +			markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Linux. Set to `null` to delete the environment variable."),
 			type: 'object',
-@@ -433,3 +433,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -456,3 +456,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows. Set to `null` to delete the environment variable."),
 +			markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Windows. Set to `null` to delete the environment variable."),
 			type: 'object',
-@@ -462,3 +462,3 @@ const terminalConfiguration: IConfigurationNode = {
- 		[TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
-			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."),
-+			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VSCodium, instead of the one bundled with Windows."),
+@@ -485,3 +485,3 @@ const terminalConfiguration: IConfigurationNode = {
+ 		[TerminalSettingId.WindowsUseConptyDll]: {
+-			markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.22.250204002) shipped with VS Code, instead of the one bundled with Windows."),
+			markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.22.250204002) shipped with VSCodium, instead of the one bundled with Windows."),
 			type: 'boolean',
-@@ -563,3 +563,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -592,3 +592,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
 +			markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
 			type: 'boolean',
-diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
-index 860bb28..05f4eba 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
-+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
-@@ -72,3 +72,3 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
- 			'pwshCode': {
-				description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VS Code\'s `code` and `code-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'),
-+				description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VSCodium\'s `codium` and `codium-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'),
- 				type: 'boolean'
-diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
-index 9a7b334..7a9aee9 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
-+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
-@@ -914,3 +914,3 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut
- 				Severity.Info,
-				localize({ key: 'themeUpdatedNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.", newTheme.label),
-+				localize({ key: 'themeUpdatedNotification', comment: ['{0} is the name of the new default theme'] }, "VSCodium now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.", newTheme.label),
- 				choices,
-@@ -942,3 +942,3 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut
- 				Severity.Info,
-				localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. Do you want to give it a try?", theme.label),
-+				localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "VSCodium now ships with a new default theme '{0}'. Do you want to give it a try?", theme.label),
- 				choices,
+diff --git a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
+index 4979520..49d0cbd 100644
+--- a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts
+@@ -19,3 +19,3 @@ export const terminalAutoRepliesConfiguration: IStringDictionary<IConfigurationP
+ 	[TerminalAutoRepliesSettingId.AutoReplies]: {
+-		markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
+		markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VSCodium if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
+ 		type: 'object',
 diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
-index 2ff75f4..3f20d41 100644
+index fd3452f..a2c0b45 100644
 --- a/src/vs/workbench/contrib/update/browser/update.ts
 +++ b/src/vs/workbench/contrib/update/browser/update.ts
-@@ -579,4 +579,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
+@@ -575,4 +575,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
 							detail: newQuality === 'insider' ?
 -								nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of VS Code.") :
 -								nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of VS Code."),
 +								nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of VSCodium.") :
 +								nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of VSCodium."),
 							primaryButton: nls.localize({ key: 'reload', comment: ['&& denotes a mnemonic'] }, "&&Reload")
-@@ -615,3 +615,3 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
+@@ -611,3 +611,3 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
 						message: nls.localize('selectSyncService.message', "Choose the settings sync service to use after changing the version"),
 -						detail: nls.localize('selectSyncService.detail', "The Insiders version of VS Code will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
 +						detail: nls.localize('selectSyncService.detail', "The Insiders version of VSCodium will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
@@ -1051,20 +1027,55 @@ index 3f1c098..3b2a175 100644
 +											description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in VSCodium.'),
 											body: 'onCommand:${1:commandId}'
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
-index 02350e7..03a5f85 100644
+index 5b01dd4..6de326c 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
-@@ -240,3 +240,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -14,3 +14,2 @@ import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessi
+ import { URI } from '../../../../base/common/uri.js';
+-import product from '../../../../platform/product/common/product.js';
+ 
+@@ -213,24 +212,2 @@ const Button = (title: string, href: string) => `[${title}](${href})`;
+ 
+-const CopilotStepTitle = localize('gettingStarted.copilotSetup.title', "Use AI features with Copilot for free");
+-const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "You can use [Copilot]({0}) to generate code across multiple files, fix errors, ask questions about your code and much more using natural language.", product.defaultChatAgent?.documentationUrl ?? '');
+-const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Set Up Copilot for Free"), `command:workbench.action.chat.triggerSetup`);
+-const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Set Up Copilot for Free"), `command:workbench.action.chat.triggerSetup`);
+-const CopilotCompleteButton = Button(localize('setupCopilotButton.chatWithCopilot', "Chat with Copilot"), 'command:workbench.action.chat.open');
+-
+-function createCopilotSetupStep(id: string, button: string, when: string, includeTerms: boolean): BuiltinGettingStartedStep {
+-	const description = includeTerms ?
+-		`${CopilotDescription}\n\n${button}` :
+-		`${CopilotDescription}\n${button}`;
+-
+-	return {
+-		id,
+-		title: CopilotStepTitle,
+-		description,
+-		when,
+-		media: {
+-			type: 'svg', altText: 'VS Code Copilot multi file edits', path: 'multi-file-edits.svg'
+-		},
+-	};
+-}
+-
+ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -238,3 +215,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		id: 'Setup',
 -		title: localize('gettingStarted.setup.title', "Get Started with VS Code"),
 +		title: localize('gettingStarted.setup.title', "Get Started with VSCodium"),
 		description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"),
-@@ -245,3 +245,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -243,3 +220,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		when: '!isWeb',
 -		walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup VS Code'),
 +		walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup VSCodium'),
 		next: 'Beginner',
-@@ -266,6 +266,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -248,5 +225,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+ 			steps: [
+-				createCopilotSetupStep('CopilotSetupSignedOut', CopilotSignedOutButton, 'chatSetupSignedOut', true),
+-				createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'chatSetupInstalled && (chatPlanPro || chatPlanLimited)', false),
+-				createCopilotSetupStep('CopilotSetupSignedIn', CopilotSignedInButton, '!chatSetupSignedOut && (!chatSetupInstalled || chatPlanCanSignUp)', true),
+ 				{
+@@ -264,6 +238,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.extensions.title', "Code with extensions"),
 -					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
 +					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
@@ -1073,58 +1084,57 @@ index 02350e7..03a5f85 100644
 -						type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg'
 +						type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg'
 					},
-@@ -284,6 +284,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
- 					title: localize('gettingStarted.settings.title', "Tune your settings"),
-					description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
-+					description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
- 					when: '!config.chat.experimental.offerSetup',
- 					media: {
-						type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
-+						type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg'
- 					},
-@@ -303,3 +303,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -283,5 +257,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+ 				// 	title: localize('gettingStarted.settings.title', "Tune your settings"),
+-				// 	description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
+				// 	description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
+ 				// 	media: {
+-				// 		type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
+				// 		type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg'
+ 				// 	},
+@@ -301,3 +275,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.settings.title', "Tune your settings"),
 -					description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
 +					description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
- 					when: 'config.chat.experimental.offerSetup && syncStatus != uninitialized',
-@@ -307,3 +307,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+ 					when: 'syncStatus != uninitialized',
+@@ -305,3 +279,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					media: {
 -						type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
 +						type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg'
 					},
-@@ -313,3 +313,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -311,3 +285,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "),
 -					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 +					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 					media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' },
-@@ -319,3 +319,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
- 					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
-					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
-+					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
- 					when: '!config.chat.experimental.offerSetup && isMac && workspaceFolderCount == 0',
-@@ -328,3 +328,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
- 					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
-					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
-+					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
- 					when: '!config.chat.experimental.offerSetup && !isMac && workspaceFolderCount == 0',
-@@ -346,4 +346,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -318,3 +292,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+ 				// 	title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
+-				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
+				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
+ 				// 	when: 'isMac && workspaceFolderCount == 0',
+@@ -327,3 +301,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+ 				// 	title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
+-				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
+				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
+ 				// 	when: '!isMac && workspaceFolderCount == 0',
+@@ -345,4 +319,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"),
 -					description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')),
 -					media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' },
 +					description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VSCodium's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')),
 +					media: { type: 'svg', altText: 'VSCodium Settings', path: 'learn.svg' },
 				}
-@@ -355,3 +355,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -354,3 +328,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		id: 'SetupWeb',
 -		title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"),
 +		title: localize('gettingStarted.setupWeb.title', "Get Started with VSCodium for the Web"),
 		description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"),
-@@ -361,3 +361,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -360,3 +334,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		next: 'Beginner',
 -		walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup VS Code Web'),
 +		walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup VSCodium Web'),
 		content: {
-@@ -387,6 +387,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -386,6 +360,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.extensions.title', "Code with extensions"),
 -					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
 +					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
@@ -1133,32 +1143,32 @@ index 02350e7..03a5f85 100644
 -						type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg'
 +						type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg'
 					},
-@@ -415,3 +415,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -414,3 +388,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "),
 -					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 +					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 					media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' },
-@@ -421,3 +421,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -420,3 +394,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
 -					description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')),
 +					description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VSCodium.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')),
 					when: 'workspaceFolderCount == 0',
-@@ -442,3 +442,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -441,3 +415,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"),
 -		description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."),
 +		description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VSCodium accessible. Note that some actions are not actionable from within the context of the walkthrough."),
 		isFeatured: true,
-@@ -447,3 +447,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -446,3 +420,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		next: 'Setup',
 -		walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup VS Code Accessibility'),
 +		walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup VSCodium Accessibility'),
 		content: {
-@@ -478,3 +478,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -477,3 +451,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.commandPaletteAccessibility.title', "Unlock productivity with the Command Palette "),
 -					description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 +					description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 					media: { type: 'markdown', path: 'empty' },
-@@ -551,6 +551,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -550,6 +524,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.extensions.title', "Code with extensions"),
 -					description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
 +					description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VSCodium's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
@@ -1192,7 +1202,7 @@ index bdd30bf..5023e82 100644
 +Well if you have got this far then you will have touched on some of the editing features in VSCodium.  But don't stop now :)  We have lots of additional [documentation](https://code.visualstudio.com/docs), [introductory videos](https://code.visualstudio.com/docs/getstarted/introvideos) and [tips and tricks](https://go.microsoft.com/fwlink/?linkid=852118) for the product that will help you learn how to use it.  And while you are here, here are a few additional things you can try:
 - Open the Integrated Terminal by pressing kb(workbench.action.terminal.toggleTerminal), then see what's possible by [reviewing the terminal documentation](https://code.visualstudio.com/docs/editor/integrated-terminal)
 diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
-index 0ab6828..6c8b5ef 100644
+index c512b64..8034183 100644
 --- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
 +++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -733,3 +733,3 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
@@ -1206,42 +1216,33 @@ index 0ab6828..6c8b5ef 100644
 +				markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VSCodium. When used with `#{0}#`, you can enable the full functionality of VSCodium without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
 				tags: [WORKSPACE_TRUST_SETTING_TAG],
 diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-index 19a8cf1..9a8ea92 100644
+index c420ccf..206e5d6 100644
 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
 +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-@@ -404,3 +404,3 @@ import product from '../../platform/product/common/product.js';
+@@ -351,3 +351,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
+ 		allowTrailingCommas: true,
+-		description: 'VSCode static command line definition file',
+		description: 'VSCodium static command line definition file',
+ 		type: 'object',
+@@ -396,3 +396,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
 				type: 'boolean',
 -				description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.")
 +				description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VSCodium as elevated on Linux and running under Applocker on Windows.")
 			},
-@@ -408,3 +408,3 @@ import product from '../../platform/product/common/product.js';
+@@ -400,3 +400,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
 				type: 'boolean',
 -				description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.")
 +				description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VSCodium extension tests or when you're experiencing difficulties with the credential store.")
 			}
 diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
-index 6312b05..935307a 100644
+index bcf58d2..e508bad 100644
 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
 +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
-@@ -771,3 +771,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
+@@ -1044,3 +1044,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 -		const productName = localize('VS Code for Web', "{0} for the Web", this.productService.nameLong);
 +		const productName = localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong);
 		const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest);
-diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
-index ac3c7ed..542bb3c 100644
--- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
-+++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
-@@ -86,3 +86,3 @@ type ExtensionUrlHandlerClassification = {
- 	readonly extensionId: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'The ID of the extension that should handle the URI' };
-	comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VS Code.';
-+	comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VSCodium.';
- };
-@@ -98,3 +98,3 @@ type ExtensionUrlReloadHandlerClassification = {
- 	readonly isRemote: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'Whether the current window is a remote window' };
-	comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VS Code.';
-+	comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VSCodium.';
- };
 diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
 index e4c9ad4..d89b42a 100644
 --- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -1301,19 +1302,19 @@ index e4c9ad4..d89b42a 100644
 +					description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for VSCodium extension. Script that gets executed when the extension is completely uninstalled from VSCodium which is when VSCodium is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
 					type: 'string'
 diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-index 8adc7c1..00af7c2 100644
+index d38ab6b..8f704b1 100644
 --- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
 +++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-@@ -168,3 +168,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
+@@ -167,3 +167,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
 					[{
 -						label: nls.localize('relaunch', "Relaunch VS Code"),
 +						label: nls.localize('relaunch', "Relaunch VSCodium"),
 						run: () => {
 diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
-index 88b4666..e9cea01 100644
+index cc56d9a..f985bec 100644
 --- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
 +++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
-@@ -216,3 +216,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse
+@@ -199,3 +199,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 				const { confirmed } = await this.dialogService.confirm({
 -					message: reloadMessage ?? localize('reload message', "Switching a profile requires reloading VS Code."),
 +					message: reloadMessage ?? localize('reload message', "Switching a profile requires reloading VSCodium."),
--- a/patches/disable-cloud.patch
+++ b/patches/disable-cloud.patch
@@ -1,5 +1,5 @@
 diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
-index 18b5815..51a5d50 100644
+index 1bb5eb3..70f1b37 100644
 --- a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
 +++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
@@ -7,3 +7,3 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
@@ -16,9 +16,12 @@ index 18b5815..51a5d50 100644
 
 -		this.registerSignInAction();
 		this.registerResetAuthenticationAction();
-@@ -456,39 +455,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
+@@ -456,42 +455,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 
 -	private registerSignInAction() {
+-		if (!this.serverConfiguration?.url) {
+-			return;
+-		}
 -		const that = this;
 -		const id = 'workbench.editSessions.actions.signIn';
 -		const when = ContextKeyExpr.and(ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, false), ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, false));
--- a/patches/ext-from-gh.patch
+++ b/patches/ext-from-gh.patch
@@ -1,22 +1,19 @@
 diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
-index 1b0adc4..b595123 100644
+index 249777c..129af8a 100644
 --- a/build/lib/builtInExtensions.js
 +++ b/build/lib/builtInExtensions.js
-@@ -47,5 +47,3 @@ function isUpToDate(extension) {
- function getExtensionDownloadStream(extension) {
-    const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
-    return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
-        .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
-+    return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
- }
+@@ -87,5 +87,2 @@ function getExtensionDownloadStream(extension) {
+     }
+-    else if (productjson.extensionsGallery?.serviceUrl) {
+-        input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
+-    }
+     else {
 diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
-index fefed43..4ae553e 100644
+index e9a1180..b8348e3 100644
 --- a/build/lib/builtInExtensions.ts
 +++ b/build/lib/builtInExtensions.ts
-@@ -72,5 +72,3 @@ function isUpToDate(extension: IExtensionDefinition): boolean {
- function getExtensionDownloadStream(extension: IExtensionDefinition) {
-	const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
-	return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
-		.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
-+	return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
- }
+@@ -75,4 +75,2 @@ function getExtensionDownloadStream(extension: IExtensionDefinition) {
+ 		input = ext.fromVsix(path.join(root, extension.vsix), extension);
+-	} else if (productjson.extensionsGallery?.serviceUrl) {
+-		input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
+ 	} else {
--- a/patches/fix-eol-banner.patch
+++ b/patches/fix-eol-banner.patch
@@ -9,7 +9,7 @@ index 1f329c4..3e36bff 100644
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -30,2 +30,3 @@ import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
 import { BannerFocused } from '../../../common/contextkeys.js';
-+import { INeverShowAgainOptions, NeverShowAgainScope } from '../../../../platform/notification/common/notification';
+import { INeverShowAgainOptions, NeverShowAgainScope } from '../../../../platform/notification/common/notification.js';
 
@@ -67,3 +68,3 @@ export class BannerPart extends Part implements IBannerService {
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -53,7 +53,7 @@ index 2db0fa4..d179055 100644
 +++ b/src/vs/workbench/services/banner/browser/bannerService.ts
@@ -10,2 +10,3 @@ import { ILinkDescriptor } from '../../../../platform/opener/browser/link.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-+import { INeverShowAgainOptions } from '../../../../platform/notification/common/notification';
+import { INeverShowAgainOptions } from '../../../../platform/notification/common/notification.js';
 
@@ -18,2 +19,3 @@ export interface IBannerItem {
 	readonly onClose?: () => void;
--- a/patches/linux/fix-build.patch
+++ b/patches/linux/fix-build.patch
@@ -19,21 +19,21 @@ index fb0e5a4..412a6cc 100644
 +	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
 	gulp.task(buildRpmTask);
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
-index 80b11b3..0a0ca71 100644
+index 39e2b4e..aae72ae 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
-@@ -24,3 +24,3 @@ const product = require("../../product.json");
+@@ -27,3 +27,3 @@ const product = require("../../product.json");
 // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
- // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:chrome/installer/linux/BUILD.gn;l=64-80
-@@ -57,3 +57,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
+ // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:chrome/installer/linux/BUILD.gn;l=64-80
+@@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
     // Add the tunnel binary.
-    files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
-+    // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
+-    files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
+    // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
     // Add the main executable.
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 3163aee..dca1845 100644
+index 83d2ec7..6c14583 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
@@ -25,3 +25,3 @@ import product = require('../../product.json');
@@ -46,4 +46,3 @@ index 3163aee..dca1845 100644
 -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 	// Add the main executable.
-  
--- a/patches/linux/reh/s390x/arch-4-s390x-package.json.patch
+++ b/patches/linux/reh/s390x/arch-4-s390x-package.json.patch
@@ -1,10 +1,8 @@
 diff --git a/package-lock.json b/package-lock.json
-index 7b02996..4642486 100644
+index fd395eb..f56bc78 100644
 --- a/package-lock.json
 +++ b/package-lock.json
-@@ -17875,10 +17875,11 @@
-       }
-     },
+@@ -18274,6 +18274,7 @@
     "node_modules/web-tree-sitter": {
 -      "version": "0.20.8",
 -      "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
@@ -16,20 +14,13 @@ index 7b02996..4642486 100644
 +      "dev": true,
 +      "license": "MIT"
     },
-     "node_modules/webidl-conversions": {
-       "version": "3.0.1",
 diff --git a/package.json b/package.json
-index 7e0de18..4ceaded 100644
+index eb0abcc..40b107a 100644
 --- a/package.json
 +++ b/package.json
-@@ -226,7 +226,10 @@
-     },
-     "@parcel/watcher@2.1.0": {
+@@ -226,2 +226,5 @@
       "node-addon-api": "7.1.0"
 +    },
 +    "@vscode/l10n-dev@0.0.35": {
 +      "web-tree-sitter": "0.23.0"
     }
-   },
-   "repository": {
-     "type": "git",
--- a/patches/merge-user-product.patch
+++ b/patches/merge-user-product.patch
@@ -1,5 +1,5 @@
 diff --git a/src/main.ts b/src/main.ts
-index ff9a5e8..2135d00 100644
+index c132c9b..9684685 100644
 --- a/src/main.ts
 +++ b/src/main.ts
@@ -8,2 +8,3 @@ import * as fs from 'original-fs';
@@ -25,24 +25,26 @@ index ff9a5e8..2135d00 100644
 +}
 +
 /**
-@@ -183,2 +197,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
+@@ -208,2 +222,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
 	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
 +	resolveUserProduct();
 
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 1a2a619..9bf5ac0 100644
+index 1a2a619..3837df0 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
-@@ -29,2 +29,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
+@@ -29,2 +29,38 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
 
-+	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {};
+	const { serviceUrl, publisherUrl, itemUrl, controlUrl, extensionUrlTemplate, resourceUrlTemplate } = product.extensionsGallery || {};
 +
 +	Object.assign(product, {
 +		extensionsGallery: {
 +			serviceUrl: env['VSCODE_GALLERY_SERVICE_URL'] || serviceUrl,
-+			searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
+			publisherUrl: env['VSCODE_GALLERY_PUBLISHER_URL'] || publisherUrl,
 +			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
 +			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
+			extensionUrlTemplate: env['VSCODE_GALLERY_EXTENSION_URL_TEMPLATE'] || extensionUrlTemplate,
+			resourceUrlTemplate: env['VSCODE_GALLERY_RESOURCE_URL_TEMPLATE'] || resourceUrlTemplate,
 +		}
 +	});
 +
--- a/patches/osx/fix-codesign.patch
+++ b/patches/osx/fix-codesign.patch
@@ -1,28 +1,30 @@
 diff --git a/build/darwin/sign.js b/build/darwin/sign.js
-index f5913b7..100b950 100644
+index dff30fd..df48bee 100644
 --- a/build/darwin/sign.js
 +++ b/build/darwin/sign.js
-@@ -53,5 +53,7 @@ async function main(buildDir) {
+@@ -56,5 +56,7 @@ async function main(buildDir) {
         ignore: (filePath) => {
-+						const ext = path.extname(filePath);
+            const ext = path_1.default.extname(filePath);
             return filePath.includes(gpuHelperAppName) ||
                 filePath.includes(rendererHelperAppName) ||
 -                filePath.includes(pluginHelperAppName);
 +                filePath.includes(pluginHelperAppName) ||
-+								ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
+                ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
         }
-@@ -83,3 +85,3 @@ async function main(buildDir) {
-             '-string',
-            'An application in Visual Studio Code wants to use AppleScript.',
-+            'An application in VSCodium wants to use AppleScript.',
-             `${infoPlistPath}`
-@@ -90,3 +92,3 @@ async function main(buildDir) {
-             '-string',
-            'An application in Visual Studio Code wants to use the Microphone.',
-+            'An application in VSCodium wants to use the Microphone.',
-             `${infoPlistPath}`
-@@ -97,3 +99,3 @@ async function main(buildDir) {
-             '-string',
-            'An application in Visual Studio Code wants to use the Camera.',
-+            'An application in VSCodium wants to use the Camera.',
-             `${infoPlistPath}`
+diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
+index ecf1627..a414032 100644
+--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
+@@ -60,6 +60,9 @@ async function main(buildDir?: string): Promise<void> {
+ 		ignore: (filePath: string) => {
+-			return filePath.includes(gpuHelperAppName) ||
+-				filePath.includes(rendererHelperAppName) ||
+-				filePath.includes(pluginHelperAppName);
+			const ext = path.extname(filePath);
+            return filePath.includes(gpuHelperAppName) ||
+                filePath.includes(rendererHelperAppName) ||
+                filePath.includes(pluginHelperAppName) ||
+				ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
+ 		}
+
+ 	};
--- a/patches/remove-mangle.patch
+++ b/patches/remove-mangle.patch
@@ -1,15 +1,15 @@
 diff --git a/build/lib/compilation.js b/build/lib/compilation.js
-index 2270e05..1bd7b90 100644
+index 841dbe1..7cf692a 100644
 --- a/build/lib/compilation.js
 +++ b/build/lib/compilation.js
-@@ -104,24 +104,3 @@ function compileTask(src, out, build, options = {}) {
+@@ -148,24 +148,3 @@ function compileTask(src, out, build, options = {}) {
         }
 -        // mangle: TypeScript to TypeScript
-        let mangleStream = es.through();
+-        let mangleStream = event_stream_1.default.through();
 -        if (build && !options.disableMangle) {
-            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
+-            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
 -            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
-            mangleStream = es.through(async function write(data) {
+-            mangleStream = event_stream_1.default.through(async function write(data) {
 -                const tsNormalPath = ts.normalizePath(data.path);
 -                const newContents = (await newContentsByFileName).get(tsNormalPath);
 -                if (newContents !== undefined) {
@@ -28,10 +28,15 @@ index 2270e05..1bd7b90 100644
 -            .pipe(mangleStream)
             .pipe(generator.stream)
 diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
-index d5da3f1..fa46962 100644
+index 6e1fcab..4e45106 100644
 --- a/build/lib/compilation.ts
 +++ b/build/lib/compilation.ts
-@@ -123,27 +123,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
+@@ -18,4 +18,2 @@ import File from 'vinyl';
+ import * as task from './task';
+-import { Mangler } from './mangle/index';
+-import { RawSourceMap } from 'source-map';
+ import { gulpPostcss } from './postcss';
+@@ -138,27 +136,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 
 -		// mangle: TypeScript to TypeScript
 -		let mangleStream = es.through();
--- a/patches/terminal-suggest.patch
+++ b/patches/terminal-suggest.patch
@@ -0,0 +1,44 @@
+diff --git a/extensions/terminal-suggest/src/completions/codium-insiders.ts b/extensions/terminal-suggest/src/completions/codium-insiders.ts
+new file mode 100644
+index 0000000..a5769b1
+--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/codium-insiders.ts
+@@ -0,0 +1,9 @@
+import code from './code';
+
+const codiumInsidersCompletionSpec: Fig.Spec = {
+	...code,
+	name: 'codium-insiders',
+	description: 'VSCodium Insiders',
+};
+
+export default codiumInsidersCompletionSpec;
+diff --git a/extensions/terminal-suggest/src/completions/codium.ts b/extensions/terminal-suggest/src/completions/codium.ts
+new file mode 100644
+index 0000000..b1fa812
+--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/codium.ts
+@@ -0,0 +1,9 @@
+import code from './code';
+
+const codiumCompletionSpec: Fig.Spec = {
+	...code,
+	name: 'codium',
+	description: 'VSCodium',
+};
+
+export default codiumCompletionSpec;
+diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
+index 3f181bc..34054ed 100644
+--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
+@@ -12,2 +12,4 @@ import codeCompletionSpec from './completions/code';
+ import codeInsidersCompletionSpec from './completions/code-insiders';
+import codiumCompletionSpec from './completions/codium';
+import codiumInsidersCompletionSpec from './completions/codium-insiders';
+ import setLocationSpec from './completions/set-location';
+@@ -52,2 +54,4 @@ export const availableSpecs: Fig.Spec[] = [
+ 	codeCompletionSpec,
+	codiumInsidersCompletionSpec,
+	codiumCompletionSpec,
+ 	setLocationSpec,
--- a/patches/update-electron.patch.no
+++ b/patches/update-electron.patch.no
--- a/patches/version-0-release.patch
+++ b/patches/version-0-release.patch
@@ -1,23 +1,23 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 4f00317..e5d08e5 100644
+index e0df76f..04354d8 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -307,2 +307,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -310,2 +310,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		const name = product.nameShort;
 +		const release = packageJson.release;
 
-@@ -310,3 +311,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -313,3 +314,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
 -			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
 +			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
 			.pipe(es.through(function (file) {
-@@ -318,3 +319,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -321,3 +322,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date: readISODate('out-build'), version }))
 +			.pipe(json({ commit, date: readISODate('out-build'), version, release }))
 			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 030c39a..51772c9 100644
+index a63f693..62e0080 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
@@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
@@ -73,7 +73,7 @@ index 98175f5..afacbe3 100644
 +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
 			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index ac7c552..8cfc209 100644
+index 52c4c94..00fc9f8 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
@@ -58,2 +58,3 @@ export interface IProductConfiguration {
@@ -104,30 +104,30 @@ index 1a2a619..2a8d683 100644
 +			release: pkg.release
 		});
 diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-index 039233d..c8ced77 100644
+index 7563b30..0873839 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -23,2 +23,3 @@ import { ResultKind } from '../../../../platform/keybinding/common/keybindingRes
- import { CancellationToken } from '../../../../base/common/cancellation.js';
+ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 +import { getReleaseString } from '../../../../workbench/common/release.js';
 
-@@ -80,2 +81,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -81,2 +82,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 		const detailString = (useAgo: boolean): string => {
 +			const releaseString = getReleaseString();
 +
 			return localize('aboutDetail',
-@@ -86,3 +89,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -87,3 +90,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
 		};
 diff --git a/src/vs/workbench/common/release.ts b/src/vs/workbench/common/release.ts
 new file mode 100644
-index 0000000..2a8ea57
+index 0000000..82dbe6a
 --- /dev/null
 +++ b/src/vs/workbench/common/release.ts
@@ -0,0 +1,14 @@
-+import { language } from 'vs/base/common/platform';
+import { language } from '../../base/common/platform.js';
 +
 +const DEFAULT_LABEL = 'Release:';
 +const LABELS: { [key: string]: string } = {
@@ -142,12 +142,12 @@ index 0000000..2a8ea57
 +	return LABELS[language] ?? DEFAULT_LABEL;
 +}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index 6c61a59..e76a188 100644
+index 6c61a59..d58f8fc 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
@@ -15,2 +15,3 @@ import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals
 import { getActiveWindow } from '../../../../base/browser/dom.js';
-+import { getReleaseString } from '../../../../workbench/common/release';
+import { getReleaseString } from '../../../../workbench/common/release.js';
 
@@ -80,2 +81,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
 		const osProps = await this.nativeHostService.getOSProperties();
--- a/patches/version-1-update.patch
+++ b/patches/version-1-update.patch
@@ -49,7 +49,7 @@ index 199f433..a6cbb10 100644
 +	| "user";
 \ No newline at end of file
 diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
-index 48638aa..8f738e7 100644
+index a1ec3fe..f954720 100644
 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
 +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -14,6 +14,10 @@ import { IProductService } from '../../product/common/productService.js';
@@ -67,7 +67,7 @@ index 48638aa..8f738e7 100644
 +	}
 }
 diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
-index d3f27d3..8454ff3 100644
+index 57398fb..8e36930 100644
 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts
 +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -15,3 +15,3 @@ import { ILogService } from '../../log/common/log.js';
@@ -76,7 +76,7 @@ index d3f27d3..8454ff3 100644
 +import { IRequestService, asJson } from '../../request/common/request.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -19,2 +19,4 @@ import { IUpdate, State, StateType, UpdateType } from '../common/update.js';
- import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+ import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification } from './abstractUpdateService.js';
 +import { CancellationToken } from '../../../base/common/cancellation.js';
 +import * as semver from 'semver';
 
@@ -123,16 +123,16 @@ index d3f27d3..8454ff3 100644
 +			})
 	}
 diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
-index 6e076c7..81556b6 100644
+index dd18900..920dc10 100644
 --- a/src/vs/platform/update/electron-main/updateService.linux.ts
 +++ b/src/vs/platform/update/electron-main/updateService.linux.ts
-@@ -33,3 +33,3 @@ export class LinuxUpdateService extends AbstractUpdateService {
+@@ -31,3 +31,3 @@ export class LinuxUpdateService extends AbstractUpdateService {
 	protected buildUpdateFeedUrl(quality: string): string {
 -		return createUpdateURL(`linux-${process.arch}`, quality, this.productService);
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch);
 	}
 diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index 61109e5..06981b3 100644
+index db92de2..06981b3 100644
 --- a/src/vs/platform/update/electron-main/updateService.win32.ts
 +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -11,3 +11,2 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
@@ -142,7 +142,7 @@ index 61109e5..06981b3 100644
@@ -25,4 +24,5 @@ import { asJson, IRequestService } from '../../request/common/request.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 -import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification } from './abstractUpdateService.js';
 +import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js';
 +import { AbstractUpdateService, createUpdateURL} from './abstractUpdateService.js';
 +import * as semver from 'semver';
@@ -193,28 +193,27 @@ index 61109e5..06981b3 100644
 -		return createUpdateURL(platform, quality, this.productService);
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch, target);
 	}
-@@ -126,4 +141,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- 				if (!update || !update.url || !update.version || !update.productVersion) {
-					this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: !!context });
+@@ -130,2 +145,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 
+				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
+				const currentVersion = `${this.productService.version}+${this.productService.release}`;
+
+				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
 +					this.setState(State.Idle(updateType));
 +					return Promise.resolve(null);
 +				}
 +
-+				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
-+				const currentVersion = `${this.productService.version}+${this.productService.release}`;
- 
-+				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
- 					this.setState(State.Idle(updateType));
-@@ -158,3 +179,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 				if (updateType === UpdateType.Archive) {
+@@ -156,3 +179,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 
 -						const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
 +						const fastUpdatesEnabled = getUpdateType() == UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
 						if (fastUpdatesEnabled) {
-@@ -170,3 +191,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -168,3 +191,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 			.then(undefined, err => {
 -				this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) });
 				this.logService.error(err);
-@@ -254,6 +274,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -252,6 +274,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		} else {
 -			spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 -				detached: true,
--- a/patches/windows/policies.patch
+++ b/patches/windows/policies.patch
@@ -0,0 +1,258 @@
+diff --git a/build/.moduleignore b/build/.moduleignore
+index 6b7f365..2211e6e 100644
+--- a/build/.moduleignore
+++ b/build/.moduleignore
+@@ -125,9 +125,11 @@ vsda/**
+ 
+-@vscode/policy-watcher/build/**
+-@vscode/policy-watcher/.husky/**
+-@vscode/policy-watcher/src/**
+-@vscode/policy-watcher/binding.gyp
+-@vscode/policy-watcher/README.md
+-@vscode/policy-watcher/index.d.ts
+-!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
+@vscodium/policy-watcher/.github/**
+@vscodium/policy-watcher/.husky/**
+@vscodium/policy-watcher/build/**
+@vscodium/policy-watcher/src/**
+@vscodium/policy-watcher/.release-it.yml
+@vscodium/policy-watcher/binding.gyp
+@vscodium/policy-watcher/README.md
+@vscodium/policy-watcher/index.d.ts
+!@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
+ 
+diff --git a/build/lib/policies.js b/build/lib/policies.js
+index b76d9ff..a84f490 100644
+--- a/build/lib/policies.js
+++ b/build/lib/policies.js
+@@ -64,3 +64,3 @@ class BasePolicy {
+         return [
+-            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
+            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\VSCodium\\${regKey}" presentation="$(presentation.${this.name})">`,
+             `	<parentCategory ref="${this.category.name.nlsKey}" />`,
+@@ -376,3 +376,3 @@ function renderADMX(regKey, versions, categories, policies) {
+ 	<policyNamespaces>
+-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
+		<target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
+ 	</policyNamespaces>
+diff --git a/build/lib/policies.ts b/build/lib/policies.ts
+index 2488920..8b268ce 100644
+--- a/build/lib/policies.ts
+++ b/build/lib/policies.ts
+@@ -80,3 +80,3 @@ abstract class BasePolicy implements Policy {
+ 		return [
+-			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
+			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\VSCodium\\${regKey}" presentation="$(presentation.${this.name})">`,
+ 			`	<parentCategory ref="${this.category.name.nlsKey}" />`,
+@@ -553,3 +553,3 @@ function renderADMX(regKey: string, versions: string[], categories: Category[],
+ 	<policyNamespaces>
+-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
+		<target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
+ 	</policyNamespaces>
+diff --git a/eslint.config.js b/eslint.config.js
+index 8e3d288..1fa7cc3 100644
+--- a/eslint.config.js
+++ b/eslint.config.js
+@@ -793,3 +793,3 @@ export default tseslint.config(
+ 						'@vscode/iconv-lite-umd',
+-						'@vscode/policy-watcher',
+						'@vscodium/policy-watcher',
+ 						'@vscode/proxy-agent',
+diff --git a/package-lock.json b/package-lock.json
+index d4bc1fb..195cbe1 100644
+--- a/package-lock.json
+++ b/package-lock.json
+@@ -18,3 +18,2 @@
+         "@vscode/iconv-lite-umd": "0.7.0",
+-        "@vscode/policy-watcher": "^1.1.10",
+         "@vscode/proxy-agent": "^0.32.0",
+@@ -29,2 +28,3 @@
+         "@vscode/windows-registry": "^1.1.0",
+        "@vscodium/policy-watcher": "^1.1.10-2503041159",
+         "@xterm/addon-clipboard": "^0.2.0-beta.81",
+@@ -2831,22 +2831,2 @@
+     },
+-    "node_modules/@vscode/policy-watcher": {
+-      "version": "1.1.10",
+-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.10.tgz",
+-      "integrity": "sha512-erRJiryjhP//MnRZo+j0LxjVSFa4eZMR9HeAGxIuxlZCQrnvrIG5nv/4qBxiMH0+uE4Z74YY/Ct0wus6l9U/xg==",
+-      "hasInstallScript": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "bindings": "^1.5.0",
+-        "node-addon-api": "^8.2.0"
+-      }
+-    },
+-    "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
+-      "version": "8.2.0",
+-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
+-      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": "^18 || ^20 || >= 21"
+-      }
+-    },
+     "node_modules/@vscode/proxy-agent": {
+@@ -3247,2 +3227,22 @@
+     },
+    "node_modules/@vscodium/policy-watcher": {
+      "version": "1.1.10-2503041159",
+      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.1.10-2503041159.tgz",
+      "integrity": "sha512-Jz8MKbNIB4nJPnr3l3xmyp1VvrkFhOlcjZDoUzQAoVuAfkovedhvPkoZkiB21ygGb4ZxU0ApJXHfzanee0ltWA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^8.2.0"
+      }
+    },
+    "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
+      "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
+      "license": "MIT",
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
+      }
+    },
+     "node_modules/@webassemblyjs/ast": {
+diff --git a/package.json b/package.json
+index 925462f..c4b6304 100644
+--- a/package.json
+++ b/package.json
+@@ -76,3 +76,3 @@
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/policy-watcher": "^1.1.10",
+    "@vscodium/policy-watcher": "^1.1.10-2503041159",
+     "@vscode/proxy-agent": "^0.32.0",
+diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
+index ee0a24b..881ce36 100644
+--- a/src/vs/base/test/node/uri.perf.data.txt
+++ b/src/vs/base/test/node/uri.perf.data.txt
+@@ -14698,48 +14698,48 @@
+ /Users/example/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/LICENSE
+-/Users/example/node_modules/@vscode/policy-watcher/binding.gyp
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/LICENSE.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/conversion.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/except.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/index.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/node_api.gyp
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package.json
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/noexcept.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/common.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/nothing.c
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package-support.json
+-/Users/example/node_modules/@vscode/policy-watcher/index.js
+-/Users/example/node_modules/@vscode/policy-watcher/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/package.json
+-/Users/example/node_modules/@vscode/policy-watcher/build/vscode-policy-watcher.target.mk
+-/Users/example/node_modules/@vscode/policy-watcher/build/gyp-mac-tool
+-/Users/example/node_modules/@vscode/policy-watcher/build/Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/config.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/build/binding.Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/index.d.ts
+-/Users/example/node_modules/@vscode/policy-watcher/src/main.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/macos/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/PolicyWatcher.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/linux/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/Policy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/RegistryPolicy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/LICENSE
+/Users/example/node_modules/@vscodium/policy-watcher/binding.gyp
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/LICENSE.md
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/conversion.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/README.md
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/except.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/index.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/README.md
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.h
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/node_api.gyp
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi.h
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package.json
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/noexcept.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/common.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/nothing.c
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package-support.json
+/Users/example/node_modules/@vscodium/policy-watcher/index.js
+/Users/example/node_modules/@vscodium/policy-watcher/README.md
+/Users/example/node_modules/@vscodium/policy-watcher/package.json
+/Users/example/node_modules/@vscodium/policy-watcher/build/vscode-policy-watcher.target.mk
+/Users/example/node_modules/@vscodium/policy-watcher/build/gyp-mac-tool
+/Users/example/node_modules/@vscodium/policy-watcher/build/Makefile
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
+/Users/example/node_modules/@vscodium/policy-watcher/build/config.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/build/binding.Makefile
+/Users/example/node_modules/@vscodium/policy-watcher/index.d.ts
+/Users/example/node_modules/@vscodium/policy-watcher/src/main.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/macos/PolicyWatcher.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/PolicyWatcher.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/linux/PolicyWatcher.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/Policy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/RegistryPolicy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/PolicyWatcher.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
+ /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
+diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+index e0b99f3..f3af586 100644
+--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+@@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
+ 
+-	test('@vscode/policy-watcher', async () => {
+-		const watcher = await import('@vscode/policy-watcher');
+-		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
+	test('@vscodium/policy-watcher', async () => {
+		const watcher = await import('@vscodium/policy-watcher');
+		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscodium/policy-watcher'));
+ 	});
+diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
+index 67f7892..5b8859c 100644
+--- a/src/vs/platform/policy/node/nativePolicyService.ts
+++ b/src/vs/platform/policy/node/nativePolicyService.ts
+@@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
+ import { Throttler } from '../../../base/common/async.js';
+-import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
+import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
+ import { MutableDisposable } from '../../../base/common/lifecycle.js';
+@@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
+ 
+-		const { createWatcher } = await import('@vscode/policy-watcher');
+		const { createWatcher } = await import('@vscodium/policy-watcher');
+ 
+@@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
+ 			try {
+-				this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
+				this.watcher.value = createWatcher('VSCodium', this.productName, policyDefinitions, update => {
+ 					this._onDidPolicyChange(update);
--- a/prepare_vscode.sh
+++ b/prepare_vscode.sh
@@ -83,6 +83,9 @@ elif [[ "${OS_NAME}" == "windows" ]]; then
  fi
 fi

+mv .npmrc .npmrc.bak
+cp ../npmrc .npmrc
+
 for i in {1..5}; do # try 5 times
  npm ci && break
  if [[ $i == 3 ]]; then
@@ -94,6 +97,8 @@ for i in {1..5}; do # try 5 times
  sleep $(( 15 * (i + 1)))
 done

+mv .npmrc.bak .npmrc
+
 setpath() {
  local jsonTmp
  { set +x; } 2>/dev/null
@@ -115,7 +120,7 @@ cp product.json{,.bak}

 setpath "product" "checksumFailMoreInfoUrl" "https://go.microsoft.com/fwlink/?LinkId=828886"
 setpath "product" "documentationUrl" "https://go.microsoft.com/fwlink/?LinkID=533484#vscode"
-setpath_json "product" "extensionsGallery" '{"serviceUrl": "https://open-vsx.org/vscode/gallery", "itemUrl": "https://open-vsx.org/vscode/item"}'
+setpath_json "product" "extensionsGallery" '{"serviceUrl": "https://open-vsx.org/vscode/gallery", "itemUrl": "https://open-vsx.org/vscode/item", "extensionUrlTemplate": "https://open-vsx.org/vscode/gallery/{publisher}/{name}/latest"}'
 setpath "product" "introductoryVideosUrl" "https://go.microsoft.com/fwlink/?linkid=832146"
 setpath "product" "keyboardShortcutsUrlLinux" "https://go.microsoft.com/fwlink/?linkid=832144"
 setpath "product" "keyboardShortcutsUrlMac" "https://go.microsoft.com/fwlink/?linkid=832143"
--- a/product.json
+++ b/product.json
@@ -49,8 +49,7 @@
  "extensionEnabledApiProposals": {
    "ms-vscode.vscode-selfhost-test-provider": [
      "testObserver",
-      "testRelatedCode",
-      "attributableCoverage"
+      "testRelatedCode"
    ],
    "VisualStudioExptTeam.vscodeintellicode-completions": [
      "inlineCompletionsAdditions"
@@ -87,9 +86,14 @@
      "quickPickItemTooltip",
      "terminalDataWriteEvent",
      "terminalExecuteCommandEvent",
-      "contribIssueReporter",
      "notebookReplDocument",
-      "notebookVariableProvider"
+      "notebookVariableProvider",
+      "terminalShellEnv",
+      "terminalShellType"
+    ],
+    "ms-python.vscode-python-envs": [
+      "terminalShellEnv",
+      "terminalShellType"
    ],
    "ms-dotnettools.dotnet-interactive-vscode": [
      "notebookMessaging"
@@ -194,7 +198,6 @@
      "contribMultiDiffEditorMenus",
      "contribShareMenu",
      "diffCommand",
-      "fileComments",
      "quickDiffProvider",
      "shareProvider",
      "tabInputTextMerge",
@@ -217,7 +220,6 @@
      "defaultChatParticipant",
      "embeddings",
      "chatEditing",
-      "chatVariableResolver",
      "chatProvider",
      "mappedEditsProvider",
      "aiRelatedInformation",
@@ -233,14 +235,20 @@
      "contribCommentsViewThreadMenus",
      "newSymbolNamesProvider",
      "findFiles2",
+      "chatReferenceDiagnostic",
      "extensionsAny",
      "authLearnMore",
      "testObserver",
      "aiTextSearchProvider",
+      "chatReadonlyPromptReference",
      "documentFiltersExclusive",
      "chatParticipantPrivate",
      "contribDebugCreateConfiguration",
-      "inlineEdit"
+      "inlineEdit",
+      "inlineCompletionsAdditions",
+      "chatReferenceBinaryData",
+      "languageModelSystem",
+      "languageModelCapabilities"
    ],
    "GitHub.remotehub": [
      "contribRemoteHelp",
@@ -260,11 +268,8 @@
    "ms-python.gather": [
      "notebookCellExecutionState"
    ],
-    "ms-python.vscode-pylance": [
-      "notebookCellExecutionState"
-    ],
+    "ms-python.vscode-pylance": [],
    "ms-python.debugpy": [
-      "contribIssueReporter",
      "contribViewsWelcome",
      "debugVisualization",
      "portsAttributes"
@@ -276,7 +281,6 @@
      "notebookDeprecated",
      "notebookMessaging",
      "notebookMime",
-      "notebookCellExecutionState",
      "portsAttributes",
      "quickPickSortByLabel",
      "notebookKernelSource",
@@ -289,9 +293,10 @@
      "notebookVariableProvider",
      "notebookReplDocument"
    ],
-    "dbaeumer.vscode-eslint": [
-      "notebookCellExecutionState"
+    "ms-toolsai.tensorboard": [
+      "portsAttributes"
    ],
+    "dbaeumer.vscode-eslint": [],
    "ms-vscode.azure-sphere-tools-ui": [
      "tunnels"
    ],
@@ -302,10 +307,8 @@
      "extensionsAny"
    ],
    "ms-vscode.cpptools": [
-      "terminalDataWriteEvent"
-    ],
-    "redhat.java": [
-      "documentPaste"
+      "terminalDataWriteEvent",
+      "chatParticipantAdditions"
    ],
    "vscjava.vscode-java-pack": [],
    "ms-dotnettools.csdevkit": [
@@ -329,14 +332,13 @@
    "ms-toolsai.datawrangler": [],
    "ms-vscode.vscode-commander": [],
    "ms-vscode.vscode-websearchforcopilot": [],
-    "ms-vscode.vscode-copilot-data-analysis": [
-      "chatVariableResolver",
-      "chatProvider"
-    ],
    "ms-vscode.vscode-copilot-vision": [
      "chatReferenceBinaryData",
      "codeActionAI"
    ],
+    "ms-autodev.vscode-autodev": [
+      "chatParticipantAdditions"
+    ],
    "jeanp413.open-remote-ssh": [
      "resolvers",
      "tunnels",
--- a/src/insider/resources/linux/code.svg
+++ b/src/insider/resources/linux/code.svg
@@ -11,17 +11,11 @@
      <stop offset="1" stop-color="#FFFFFF"/>
    </linearGradient>
  </defs>
-  <symbol id="circle">
+  <g id="circle" transform="translate(1.8 1.8),scale(0.965)">
    <path d="M50,3.642 L50,3.642 C76.608,3.642 98.179,25.213 98.179,51.821 L98.179,51.821 C98.179,78.43 76.608,100 50,100 L50,100 C23.392,100 1.821,78.43 1.821,51.821 L1.821,51.821 C1.821,25.213 23.392,3.642 50,3.642 z" fill="#808080" id="rect6638" opacity="0.5"/>
    <path d="M50,0 L50,0 C76.608,0 98.179,21.57 98.179,48.179 L98.179,48.179 C98.179,74.787 76.608,96.358 50,96.358 L50,96.358 C23.392,96.358 1.821,74.787 1.821,48.179 L1.821,48.179 C1.821,21.57 23.392,0 50,0 z" fill="url(#Gradient_2)" id="rect5668" />
-  </symbol>
-  <symbol id="codium">
-    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
-  </symbol>
-  <g id="Layer_1" transform="translate(1.8 1.8),scale(0.965)">
-    <use href="#circle"/>
  </g>
-  <g id="Layer_2" transform="translate(16.4 14.9),scale(0.67)">
-    <use href="#codium"/>
+  <g id="codium" transform="translate(16.4 14.9),scale(0.67)">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
  </g>
 </svg>
--- a/src/stable/resources/linux/code.svg
+++ b/src/stable/resources/linux/code.svg
@@ -11,17 +11,11 @@
      <stop offset="1" stop-color="#FFFFFF"/>
    </linearGradient>
  </defs>
-  <symbol id="circle">
+  <g id="circle" transform="translate(1.8 1.8),scale(0.965)">
    <path d="M50,3.642 L50,3.642 C76.608,3.642 98.179,25.213 98.179,51.821 L98.179,51.821 C98.179,78.43 76.608,100 50,100 L50,100 C23.392,100 1.821,78.43 1.821,51.821 L1.821,51.821 C1.821,25.213 23.392,3.642 50,3.642 z" fill="#808080" id="rect6638" opacity="0.5"/>
    <path d="M50,0 L50,0 C76.608,0 98.179,21.57 98.179,48.179 L98.179,48.179 C98.179,74.787 76.608,96.358 50,96.358 L50,96.358 C23.392,96.358 1.821,74.787 1.821,48.179 L1.821,48.179 C1.821,21.57 23.392,0 50,0 z" fill="url(#Gradient_2)" id="rect5668" />
-  </symbol>
-  <symbol id="codium">
-    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
-  </symbol>
-  <g id="Layer_1" transform="translate(1.8 1.8),scale(0.965)">
-    <use href="#circle"/>
  </g>
-  <g id="Layer_2" transform="translate(16.4 14.9),scale(0.67)">
-    <use href="#codium"/>
+  <g id="codium" transform="translate(16.4 14.9),scale(0.67)">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
  </g>
 </svg>
--- a/stable.json
+++ b/stable.json
@@ -1,4 +0,0 @@
-{
-  "tag": "1.96.4",
-  "commit": "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba"
-}
--- a/update_qualityjson.sh
+++ b/update_qualityjson.sh
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-  echo "Will not update version JSON because we did not build"
-  exit 0
-fi
-
-if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
-  echo "Will not update ${VSCODE_QUALITY}.json because no GITHUB_TOKEN defined"
-  exit 0
-fi
-
-jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
-echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp
-
-git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
-git config user.name "${GITHUB_USERNAME} CI"
-git add .
-
-CHANGES=$( git status --porcelain )
-
-if [[ -n "${CHANGES}" ]]; then
-  git commit -m "build(${VSCODE_QUALITY}): update to commit ${MS_COMMIT:0:7}"
-
-  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
-
-  if ! git push origin "${BRANCH_NAME}" --quiet; then
-    git pull origin "${BRANCH_NAME}"
-    git push origin "${BRANCH_NAME}" --quiet
-  fi
-fi
--- a/update_upstream.sh
+++ b/update_upstream.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2129
+
+set -e
+
+if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+  echo "Will not update version JSON because we did not build"
+  exit 0
+fi
+
+jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
+echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp
+
+git add .
+
+CHANGES=$( git status --porcelain )
+
+if [[ -n "${CHANGES}" ]]; then
+  git commit -S -m "build(${VSCODE_QUALITY}): update to commit ${MS_COMMIT:0:7}"
+
+  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
+
+  if ! git push origin "${BRANCH_NAME}" --quiet; then
+    git pull origin "${BRANCH_NAME}"
+    git push origin "${BRANCH_NAME}" --quiet
+  fi
+fi
--- a/upstream/insider.json
+++ b/upstream/insider.json
@@ -0,0 +1,4 @@
+{
+  "tag": "1.98.0",
+  "commit": "6609ac3d66f4eade5cf376d1cb76f13985724bcb"
+}
--- a/upstream/stable.json
+++ b/upstream/stable.json
@@ -0,0 +1,4 @@
+{
+  "tag": "1.98.1",
+  "commit": "2fc07b811f760549dab9be9d2bedd06c51dfcb9a"
+}
Author	SHA1	Message	Date
Baptiste Augrain	0af2244d05	build(stable): update to commit 2fc07b8	2025-03-11 18:17:26 +00:00
darkyzhou	27af1a39b3	build(loong64): update electron and build agent (#2249 )	2025-03-09 12:35:27 +01:00
Baptiste Augrain	0de1698e15	feat: update patch and data (#2247 )	2025-03-08 21:31:24 +01:00
Baptiste Augrain	6192957778	Merge branch 'insider'	2025-03-08 19:51:33 +01:00
Manuel Thalmann	03be485c33	feat: add terminal-suggest support (#2233 )	2025-03-08 10:59:59 +01:00
Baptiste Augrain	b9975ba5d2	feat(1.98): update patches (#2244 )	2025-03-08 03:59:27 +01:00
Baptiste Augrain	adaefe4ed5	fix(linux): force remove dependencies before cleanup [skip ci]	2025-02-14 21:40:31 +01:00
Baptiste Augrain	7d6a521838	fix(window): update patch [skip ci]	2025-02-14 19:34:20 +01:00
Baptiste Augrain	3bee276094	build(stable): update to commit e54c774	2025-02-14 18:15:26 +00:00
Baptiste Augrain	803289b688	build: fix snap check [skip ci]	2025-02-13 18:20:38 +01:00
Baptiste Augrain	2a016207cc	fix(snap): remove plugs [skip ci]	2025-02-13 18:04:36 +01:00
Baptiste Augrain	5ef55c6c48	fix(snap): set plugin to nil [skip ci]	2025-02-13 17:14:58 +01:00
Baptiste Augrain	3150c6a9b0	fix(snap): correctly add audio-playback [skip ci]	2025-02-13 16:34:21 +01:00
Baptiste Augrain	ef81b3de3b	build(stable): update to commit e249dad	2025-02-13 14:52:09 +00:00
Baptiste Augrain	05759066e3	fix: update patch	2025-02-13 15:25:47 +01:00
Baptiste Augrain	c773d683f4	fix(1.97): update patches	2025-02-06 20:13:50 +01:00
Baptiste Augrain	8d180a2888	feat(1.97): update api [skip ci]	2025-01-27 15:04:54 +01:00
Baptiste Augrain	b895f72f2c	Merge branch 'master' into insider	2025-01-27 14:51:22 +01:00
Baptiste Augrain	941e4a01a2	fix(linux): checks [skip ci]	2025-01-27 14:11:08 +01:00
Baptiste Augrain	306c01d5cd	fix(linux): checks [skip ci]	2025-01-27 13:54:49 +01:00
Baptiste Augrain	1108d8ef70	fix: check linux tags should also check alpine [skip ci]	2025-01-27 04:19:47 +01:00
Baptiste Augrain	6d7d20d5e7	feat(alpine): enable reh-web (#2219 )	2025-01-27 04:12:13 +01:00
Baptiste Augrain	a755da638b	docs(update): add new variables	2025-01-26 12:24:49 +01:00
Baptiste Augrain	0a2efd96eb	feat(1.97): add new extension endpoint (#2214 )	2025-01-25 15:44:29 +01:00
Baptiste Augrain	94187707d3	fix(update): correct comparison [skip ci]	2025-01-25 14:15:35 +01:00
Baptiste Augrain	5094d6d12d	fix(1.97): update patch [skip ci]	2025-01-24 23:13:15 +01:00
Baptiste Augrain	79dfaf1991	fix(sign): update function call [skip ci]	2025-01-24 19:22:31 +01:00
Baptiste Augrain	30a637eb3f	fix(sign): update varname [skip ci]	2025-01-24 18:16:50 +01:00
Baptiste Augrain	38de66d324	build(insider): update to commit f5782f5	2025-01-24 16:23:28 +00:00
Baptiste Augrain	446d8ebc0e	fix(1.97): add extensions to imports [skip ci]	2025-01-24 17:10:25 +01:00
Baptiste Augrain	11f3d7c371	feat(update): directly use versions repo (#2211 )	2025-01-24 16:00:31 +01:00
Baptiste Augrain	7fab58adba	feat(1.97): update patches	2025-01-24 15:54:56 +01:00
Baptiste Augrain	856c5e3dad	fix(1.97): update patch	2025-01-23 13:43:32 +01:00
Baptiste Augrain	624dc9436d	fix(windows): replace all policy-watcher [slip ci]	2025-01-21 19:35:53 +01:00
Baptiste Augrain	6fdc08b665	build: use node-v20.18.1 [skip ci]	2025-01-21 19:31:52 +01:00
Baptiste Augrain	b17a273e47	feat: add patch to use policies (#2209 )	2025-01-21 18:08:31 +01:00
Baptiste Augrain	62e1bd290b	ci: update version	2025-01-21 18:03:37 +01:00
Baptiste Augrain	a895ded49e	feat(1.97): update patch	2025-01-21 12:45:09 +01:00
Baptiste Augrain	d84b144ea6	fix: undo mistaken moved file [skip ci]	2025-01-09 14:05:36 +01:00
Baptiste Augrain	b5928d7a3c	build(insider): update to commit 2569d71	2025-01-09 10:18:38 +00:00
Baptiste Augrain	50e1085c52	ci: use gpg to sign commit [skip ci]	2025-01-08 12:22:53 +01:00
Baptiste Augrain	7bef72f48b	build(insider): update to commit 9b0b13d	2025-01-08 10:41:35 +00:00
Baptiste Augrain	dae0a9ebce	enhance: update svg to avoid symbol (#2190 )	2025-01-08 04:11:27 +01:00
Baptiste Augrain	13cedd5950	ci: use gpg to sign commit [skip ci]	2025-01-08 04:03:35 +01:00
Baptiste Augrain	6818d7e831	build(insider): update to commit 70866d5	2025-01-07 15:13:11 +01:00
Baptiste Augrain	2b8d91b170	ci: correctly pass values [skip ci]	2025-01-07 15:00:17 +01:00
Baptiste Augrain	092b639253	ci: get hash of commit [skip ci]	2025-01-07 14:40:16 +01:00
Baptiste Augrain	54a977bc14	feat(snap): add audio playback (#2189 )	2025-01-07 13:20:18 +01:00
Baptiste Augrain	097441843d	ci: remove token check [skip ci]	2025-01-06 16:49:04 +01:00
Baptiste Augrain	e82135fa3e	ci: use verified commit (#2186 )	2025-01-06 16:23:34 +01:00
Baptiste Augrain	ddea3c8c24	refactor: move dev files [skip ci]	2025-01-06 15:43:28 +01:00
Baptiste Augrain	fef4a9aa03	refactor: reorganize files (#2185 )	2025-01-06 15:40:23 +01:00
Baptiste Augrain	31f2fa2936	feat(1.97): update patches (#2184 )	2025-01-06 12:49:22 +01:00
Thibaud CANALE	292d2783db	ci: use jq to get gh cli (#2168 ) Signed-off-by: Thibaud CANALE <thican@thican.net>	2025-01-06 10:51:27 +01:00
Baptiste Augrain	1bff9fc2e9	fix(reh): move to nodejs-v20 (#2167 )	2024-12-17 21:16:52 +01:00
Baptiste Augrain	169506fb8d	feat(1.97): update patches (#2166 )	2024-12-17 18:59:47 +01:00
@@ -1 +1 @@
 .18
 .18.1