build(deps-dev): bump lodash from 4.17.23 to 4.18.1 in /font-size (#2774)

Three new patches extending workbench font customization to all areas:
- feat-workbench-zz-area-font-family: fontFamily for sidebar, statusbar,
  tabs, panel, activitybar + global fontSize setting
- feat-workbench-zz-area-font-size-core: fontSize for statusbar,
  activitybar, panel with proportional scaling via FONT object
- feat-workbench-zz-area-font-size-tabs: fontSize for tabs with CSS
  variable scaling for tab heights and widths

Includes fixes from audit review:
- Fix stale CSS var when fontSize reverts to default (cache isUserSet)
- Fix else-if config listener blocking simultaneous updates
- Trigger grid relayout after statusbar font-size change
- Apply activitybar font before show() for correct initial sizing
- Trigger tab relayout after font-size change
- Standardize CSS fallback chains to include global font-size
- Extract inspectFontSize() helper to reduce duplication
- Replace magic 1.833333 ratio with explicit CSS height variable

.github/dependabot.yml

@@ -7,5 +7,6 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: insider
     schedule:
       interval: "weekly"

.github/workflows/insider-linux.yml

@@ -30,7 +30,9 @@ env:
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
   BINARY_NAME: codium-insiders
   DISABLE_UPDATE: 'yes'
+  GH_REPO_PATH: ${{ github.repository }}
   GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -46,7 +48,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -72,7 +74,7 @@ jobs:
   compile:
     needs:
       - check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
@@ -83,7 +85,7 @@ jobs:
       BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
@@ -94,23 +96,19 @@ jobs:
         run: ./get_pr.sh
 
       - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         with:
           version: 10
           platform: x64
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Install Yarn
-        run: npm install -g yarn
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.SHOULD_BUILD == 'yes'
@@ -139,7 +137,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Upload vscode artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: vscode
           path: ./vscode.tar.gz
@@ -174,7 +172,7 @@ jobs:
         - slug: LOONG64
           vscode_arch: loong64
           npm_arch: loong64
-          image: vscodium/vscodium-linux-build-agent:beige-loong64
+          image: vscodium/vscodium-linux-build-agent:crimson-loong64
         - slug: PPC64
           vscode_arch: ppc64le
           npm_arch: ppc64
@@ -196,7 +194,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
@@ -208,7 +206,7 @@ jobs:
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
@@ -219,12 +217,15 @@ jobs:
         run: ./check_tags.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
-      - name: Install libkrb5-dev
-        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+      - name: Install dependencies
+        run: ./build/linux/deps.sh
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
@@ -259,7 +260,7 @@ jobs:
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/
@@ -270,7 +271,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -308,7 +309,7 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.DISABLED != 'yes'
@@ -320,20 +321,20 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         with:
           version: 10
           platform: x64
         if: env.DISABLED != 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
+          node-version-file: '.nvmrc'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.DISABLED != 'yes'
@@ -343,7 +344,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
@@ -354,7 +355,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
@@ -374,7 +375,7 @@ jobs:
         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
+        uses: actions/upload-artifact@v7
         with:
           name: reh-linux-${{ matrix.vscode_arch }}
           path: assets/
@@ -385,7 +386,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -409,7 +410,7 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -419,13 +420,18 @@ jobs:
         run: ./get_pr.sh
 
       - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         with:
           version: 10
           platform: x64
 
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
@@ -439,7 +445,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
@@ -459,7 +465,7 @@ jobs:
         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
+        uses: actions/upload-artifact@v7
         with:
           name: reh-alpine-${{ matrix.vscode_arch }}
           path: assets/
@@ -511,7 +517,7 @@ jobs:
     if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_INSIDER_SNAP != 'yes'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -520,7 +526,7 @@ jobs:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
 
-      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-qemu-action@v4
 
       - uses: diddlesnaps/snapcraft-multiarch-action@v1
         with:
@@ -528,10 +534,10 @@ jobs:
           architecture: ${{ matrix.platform }}
         id: build
 
-      - uses: diddlesnaps/snapcraft-review-action@v1
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-          isClassic: 'true'
+      # - uses: diddlesnaps/snapcraft-review-action@v1
+      #   with:
+      #     snap: ${{ steps.build.outputs.snap }}
+      #     isClassic: 'true'
 
       - uses: svenstaro/upload-release-action@v2
         with:
@@ -539,3 +545,18 @@ jobs:
           repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           file: ${{ steps.build.outputs.snap }}
           tag: ${{ env.RELEASE_VERSION }}
+
+  deploy-repo-dev:
+    needs:
+      - check
+      - build
+    runs-on: ubuntu-latest
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
+
+    steps:
+      - name: Trigger repository rebuild
+        uses: peter-evans/repository-dispatch@v4
+        with:
+          token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          repository: VSCodium/repositories-linux
+          event-type: deploy

.github/workflows/insider-macos.yml

@@ -27,7 +27,10 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
+  BINARY_NAME: codium-insiders
   GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  GH_REPO_PATH: ${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -41,13 +44,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-13
+          - runner: macos-15-intel
             vscode_arch: x64
           - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -57,12 +60,12 @@ jobs:
         run: . get_pr.sh
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
+          node-version-file: '.nvmrc'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.VSCODE_ARCH == 'x64'
@@ -113,7 +116,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/

.github/workflows/insider-spearhead.yml

@@ -20,25 +20,29 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       APP_NAME: VSCodium
       ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+      BINARY_NAME: codium-insiders
+      GH_REPO_PATH: ${{ github.repository }}
+      ORG_NAME: ${{ github.repository_owner }}
       OS_NAME: osx
+      SOURCEMAPS_REPOSITORY: ${{ github.repository_owner }}/sourcemaps
+      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
       VSCODE_ARCH: arm64
       VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
       VSCODE_QUALITY: insider
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: insider
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
+          node-version-file: '.nvmrc'
 
       - name: Clone VSCode repo
         run: . get_repo.sh
@@ -57,7 +61,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v7
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -73,6 +77,13 @@ jobs:
         run: ./prepare_src.sh
         if: env.SHOULD_BUILD == 'yes'
 
+      - name: Upload sourcemaps
+        env:
+          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          GITHUB_USERNAME: ${{ github.repository_owner }}
+        run: ./upload_sourcemaps.sh
+        if: env.SHOULD_BUILD == 'yes'
+
       - name: Release source
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
@@ -81,7 +92,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Dispatch builds
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
-          event-type: 'insider'
+          event-type: insider
         if: github.event.inputs.dont_dispatch != 'true' && (env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true')

.github/workflows/insider-windows.yml

@@ -27,7 +27,10 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
+  BINARY_NAME: codium-insiders
   GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  GH_REPO_PATH: ${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -43,7 +46,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -69,7 +72,10 @@ jobs:
   compile:
     needs:
       - check
-    runs-on: ubuntu-20.04
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: bash
     env:
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
@@ -80,7 +86,7 @@ jobs:
       BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
@@ -90,31 +96,27 @@ jobs:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
 
-      - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
-        with:
-          version: 10
-          platform: x64
+      # - name: Setup GCC
+      #   uses: egor-tensin/setup-gcc@v1
+      #   with:
+      #     version: 10
+      #     platform: x64
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Install Yarn
-        run: npm install -g yarn
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Install libkrb5-dev
-        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
-        if: env.SHOULD_BUILD == 'yes'
+      # - name: Install libkrb5-dev
+      #   run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+      #   if: env.SHOULD_BUILD == 'yes'
 
       - name: Clone VSCode repo
         run: ./get_repo.sh
@@ -136,7 +138,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Upload vscode artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: vscode
           path: ./vscode.tar.gz
@@ -147,7 +149,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -170,7 +172,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
@@ -182,17 +184,13 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Install Yarn
-        run: npm install -g yarn
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.SHOULD_BUILD == 'yes'
@@ -205,7 +203,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.SHOULD_BUILD == 'yes'
@@ -224,7 +222,7 @@ jobs:
 
       - name: Upload unsigned artifacts
         id: upload-unsigned-artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: unsigned-${{ matrix.vscode_arch }}
           path: |
@@ -234,7 +232,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
       - name: Signing
-        uses: signpath/github-action-submit-signing-request@v1
+        uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
           organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
@@ -268,7 +266,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/
@@ -277,7 +275,7 @@ jobs:
 
   winget:
     needs: build
-    runs-on: windows-latest
+    runs-on: windows-2022
     defaults:
       run:
         shell: bash
@@ -287,7 +285,7 @@ jobs:
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 

.github/workflows/lock.yml

@@ -1,4 +1,4 @@
-name: Lock Issues
+name: Lock Closed Threads
 
 on:
   schedule:
@@ -8,9 +8,10 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '90'
           pr-inactive-days: '90'
+          discussion-inactive-days: '90'
           log-output: true

.github/workflows/stable-linux.yml

@@ -9,6 +9,9 @@ on:
       generate_assets:
         type: boolean
         description: Generate assets
+      force_snap:
+        type: boolean
+        description: Force Snap
       checkout_pr:
         type: string
         description: Checkout PR
@@ -30,6 +33,8 @@ env:
   ASSETS_REPOSITORY: ${{ github.repository }}
   BINARY_NAME: codium
   DISABLE_UPDATE: 'yes'
+  GH_REPO_PATH: ${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -45,7 +50,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -66,12 +71,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHECK_ALL: 'yes'
+          FORCE_LINUX_SNAP: ${{ github.event.inputs.force_snap }}
         run: ./check_tags.sh
 
   compile:
     needs:
       - check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
@@ -82,7 +88,7 @@ jobs:
       BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
@@ -94,24 +100,20 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         with:
           version: 10
           platform: x64
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Install Yarn
-        run: npm install -g yarn
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.SHOULD_BUILD == 'yes'
@@ -140,7 +142,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Upload vscode artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: vscode
           path: ./vscode.tar.gz
@@ -175,7 +177,7 @@ jobs:
         - slug: LOONG64
           vscode_arch: loong64
           npm_arch: loong64
-          image: vscodium/vscodium-linux-build-agent:beige-loong64
+          image: vscodium/vscodium-linux-build-agent:crimson-loong64
         - slug: PPC64
           vscode_arch: ppc64le
           npm_arch: ppc64
@@ -197,7 +199,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
@@ -209,7 +211,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
@@ -220,12 +222,15 @@ jobs:
         run: ./check_tags.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
-      - name: Install libkrb5-dev
-        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+      - name: Install dependencies
+        run: ./build/linux/deps.sh
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
@@ -260,7 +265,7 @@ jobs:
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/
@@ -271,7 +276,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -309,7 +314,7 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.DISABLED != 'yes'
@@ -321,20 +326,20 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         with:
           version: 10
           platform: x64
         if: env.DISABLED != 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
+          node-version-file: '.nvmrc'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.DISABLED != 'yes'
@@ -344,7 +349,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
@@ -355,7 +360,7 @@ jobs:
         if: env.DISABLED != 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
@@ -375,7 +380,7 @@ jobs:
         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
+        uses: actions/upload-artifact@v7
         with:
           name: reh-linux-${{ matrix.vscode_arch }}
           path: assets/
@@ -386,7 +391,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -410,7 +415,7 @@ jobs:
     if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -420,13 +425,18 @@ jobs:
         run: ./get_pr.sh
 
       - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         with:
           version: 10
           platform: x64
 
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+
       - name: Install GH
-        run: ./install_gh.sh
+        run: ./build/linux/install_gh.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Check existing VSCodium tags/releases
@@ -440,7 +450,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
@@ -460,7 +470,7 @@ jobs:
         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
+        uses: actions/upload-artifact@v7
         with:
           name: reh-alpine-${{ matrix.vscode_arch }}
           path: assets/
@@ -500,6 +510,7 @@ jobs:
     env:
       RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
       SNAP_NAME: codium
+      SNAP_PUBLISHER: vscodium
     strategy:
       fail-fast: false
       matrix:
@@ -509,7 +520,7 @@ jobs:
     if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_STABLE_SNAP != 'yes'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -526,7 +537,7 @@ jobs:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         run: ./stores/snapcraft/check_version.sh
 
-      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-qemu-action@v4
         if: env.SHOULD_BUILD == 'yes'
 
       - uses: diddlesnaps/snapcraft-multiarch-action@v1
@@ -558,15 +569,30 @@ jobs:
           release: ${{ vars.SNAP_STORE_CHANNEL }}
         if: env.SHOULD_DEPLOY_TO_STORE == 'yes'
 
-  deb-rpm-repo-hook:
+  deploy-repo-rudy:
     needs:
       - check
       - build
     runs-on: ubuntu-latest
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
 
     steps:
       - name: Trigger repository rebuild
         env:
           GL_PAGES_TOKEN: ${{ secrets.GL_PAGES_TOKEN }}
         run: curl -X POST --fail -F token="${GL_PAGES_TOKEN}" -F ref=master https://gitlab.com/api/v4/projects/8762263/trigger/pipeline
+
+  deploy-repo-dev:
+    needs:
+      - check
+      - build
+    runs-on: ubuntu-latest
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
+
+    steps:
+      - name: Trigger repository rebuild
+        uses: peter-evans/repository-dispatch@v4
+        with:
+          token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          repository: VSCodium/repositories-linux
+          event-type: deploy

.github/workflows/stable-macos.yml

@@ -27,6 +27,9 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  GH_REPO_PATH: ${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -40,13 +43,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-13
+          - runner: macos-15-intel
             vscode_arch: x64
           - runner: [self-hosted, macOS, ARM64]
             vscode_arch: arm64
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -56,12 +59,12 @@ jobs:
         run: . get_pr.sh
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
+          node-version-file: '.nvmrc'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.VSCODE_ARCH == 'x64'
@@ -111,7 +114,7 @@ jobs:
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/

.github/workflows/stable-spearhead.yml

@@ -17,23 +17,27 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       APP_NAME: VSCodium
       ASSETS_REPOSITORY: ${{ github.repository }}
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+      BINARY_NAME: codium
+      GH_REPO_PATH: ${{ github.repository }}
+      ORG_NAME: ${{ github.repository_owner }}
       OS_NAME: osx
+      SOURCEMAPS_REPOSITORY: ${{ github.repository_owner }}/sourcemaps
+      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
       VSCODE_ARCH: arm64
       VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
       VSCODE_QUALITY: stable
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
+          node-version-file: '.nvmrc'
 
       - name: Clone VSCode repo
         run: . get_repo.sh
@@ -52,7 +56,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v7
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -68,6 +72,13 @@ jobs:
         run: ./prepare_src.sh
         if: env.SHOULD_BUILD == 'yes'
 
+      - name: Upload sourcemaps
+        env:
+          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
+          GITHUB_USERNAME: ${{ github.repository_owner }}
+        run: ./upload_sourcemaps.sh
+        if: env.SHOULD_BUILD == 'yes'
+
       - name: Release source
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
@@ -76,7 +87,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Dispatch builds
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
-          event-type: 'stable'
+          event-type: stable
         if: env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true'

.github/workflows/stable-windows.yml

@@ -27,6 +27,9 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  GH_REPO_PATH: ${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -42,7 +45,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 
@@ -68,7 +71,10 @@ jobs:
   compile:
     needs:
       - check
-    runs-on: ubuntu-20.04
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: bash
     env:
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
@@ -79,7 +85,7 @@ jobs:
       BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
@@ -89,31 +95,27 @@ jobs:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
 
-      - name: Setup GCC
-        uses: egor-tensin/setup-gcc@v1
-        with:
-          version: 10
-          platform: x64
+      # - name: Setup GCC
+      #   uses: egor-tensin/setup-gcc@v1
+      #   with:
+      #     version: 10
+      #     platform: x64
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Install Yarn
-        run: npm install -g yarn
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Install libkrb5-dev
-        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
-        if: env.SHOULD_BUILD == 'yes'
+      # - name: Install libkrb5-dev
+      #   run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+      #   if: env.SHOULD_BUILD == 'yes'
 
       - name: Clone VSCode repo
         run: ./get_repo.sh
@@ -135,7 +137,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Upload vscode artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: vscode
           path: ./vscode.tar.gz
@@ -146,7 +148,7 @@ jobs:
     needs:
       - check
       - compile
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -169,7 +171,7 @@ jobs:
       SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
         if: env.SHOULD_BUILD == 'yes'
@@ -181,17 +183,13 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.18.2'
-        if: env.SHOULD_BUILD == 'yes'
-
-      - name: Install Yarn
-        run: npm install -g yarn
+          node-version-file: '.nvmrc'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
         if: env.SHOULD_BUILD == 'yes'
@@ -204,7 +202,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Download vscode artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: vscode
         if: env.SHOULD_BUILD == 'yes'
@@ -223,7 +221,7 @@ jobs:
 
       - name: Upload unsigned artifacts
         id: upload-unsigned-artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: unsigned-${{ matrix.vscode_arch }}
           path: |
@@ -233,7 +231,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
       - name: Signing
-        uses: signpath/github-action-submit-signing-request@v1
+        uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
           organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
@@ -242,8 +240,8 @@ jobs:
           github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
           artifact-configuration-slug: ${{ matrix.vscode_arch }}
           wait-for-completion: true
-          # 3h to manually approve the request
-          wait-for-completion-timeout-in-seconds: 10800
+          # 8h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 28800
           output-artifact-directory: assets/
         if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 
@@ -266,7 +264,7 @@ jobs:
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Upload assets
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bin-${{ matrix.vscode_arch }}
           path: assets/
@@ -275,7 +273,7 @@ jobs:
 
   winget:
     needs: build
-    runs-on: windows-latest
+    runs-on: windows-2022
     defaults:
       run:
         shell: bash
@@ -284,7 +282,7 @@ jobs:
     if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ env.GITHUB_BRANCH }}
 

.github/workflows/stale.yml

@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           days-before-stale: 180
           days-before-close: 30

.gitignore

@@ -14,5 +14,8 @@ build/linux/appimage/VSCodium
 build/windows/msi/releasedir
 build/windows/msi/Files*.wxs
 build/windows/msi/Files*.wixobj
+sourcemaps/
 stores/snapcraft/insider/*.snap
 stores/snapcraft/stable/*.snap
+font-size/node_modules/
+font-size/generate-css.js

.nvmrc

@@ -1 +1 @@
-20.18.1
+22.22.0

CONTRIBUTING.md

@@ -36,7 +36,7 @@ If you want to update the existing patches, please follow the section [`Patch Up
 - first, you need to build VSCodium
 - 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 `npm run watch`
 - run `./script/code.sh`
 - make your changes
 - press any key to continue the script `patch.sh`

README.md

@@ -2,7 +2,7 @@
     <br />
     <img src="./icons/stable/codium_cnl.svg" alt="VSCodium Logo" width="200"/>
     <h1>VSCodium</h1>
-    <h3>Free/Libre Open Source Software Binaries of VS Code</h3>
+    <h3>Free/Libre Open Source Software Binaries of Visual Studio Code</h3>
 </div>
 
 <div id="badges" align="center">
@@ -56,12 +56,9 @@ If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 brew install --cask vscodium
 
 # insiders
-brew tap homebrew/cask-versions
-brew install --cask vscodium-insiders
+brew install --cask vscodium@insiders
 ```
 
-*Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md#macos).*
-
 #### <a id="install-with-winget"></a>Install with Windows Package Manager (WinGet)
 
 If you use Windows and have [Windows Package Manager](https://github.com/microsoft/winget-cli) installed:
@@ -134,7 +131,7 @@ Build instructions can be found [here](https://github.com/VSCodium/vscodium/blob
 
 ## <a id="why"></a>Why Does This Exist
 
-This repository contains build files to generate free release binaries of Microsoft's VS Code. When we speak of "free software", we're talking about freedom, not price.
+This repository contains build files to generate free release binaries of Microsoft's Visual Studio Code. When we speak of "free software", we're talking about freedom, not price.
 
 Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer:
 
@@ -144,7 +141,7 @@ Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS li
 
 This repo exists so that you don't have to download+build from source. The build scripts in this repo clone Microsoft's vscode repo, run the build commands, and upload the resulting binaries to [GitHub releases](https://github.com/VSCodium/vscodium/releases). __These binaries are licensed under the MIT license. Telemetry is disabled.__
 
-If you want to build from source yourself, head over to [Microsoft's vscode repo](https://github.com/Microsoft/vscode) and follow their [instructions](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run). This repo exists to make it easier to get the latest version of MIT-licensed VS Code.
+If you want to build from source yourself, head over to [Microsoft's vscode repo](https://github.com/Microsoft/vscode) and follow their [instructions](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run). This repo exists to make it easier to get the latest version of MIT-licensed Visual Studio Code.
 
 Microsoft's build process (which we are running to build the binaries) does download additional files. Those packages downloaded during build are:
 
@@ -168,9 +165,9 @@ If you have any issue, please check [the Troubleshooting page](https://github.co
 
 ### Extensions and the Marketplace
 
-According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace-ToU), _you may only install and use Marketplace Offerings with Visual Studio Products and Services._ For this reason, VSCodium uses [open-vsx.org](https://open-vsx.org/), an open source registry for VS Code extensions. See the [Extensions + Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/index.md#extensions-marketplace) section on the Docs page for more details.
+According to the Visual Studio Marketplace [Terms of Use](https://aka.ms/vsmarketplace-ToU), _you may only install and use Marketplace Offerings with Visual Studio Products and Services._ For this reason, VSCodium uses [open-vsx.org](https://open-vsx.org/), an open source registry for Visual Studio Code extensions. See the [Extensions + Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/index.md#extensions-marketplace) section on the Docs page for more details.
 
-Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/docs/index.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
+Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
 
 ### How are the VSCodium binaries built?
 

announcements-extra.json

@@ -1,7 +1,7 @@
 [
   {
-    "id": "#1227",
-    "title": "Issue(macOS): manual update to `1.90.x`",
-    "url": "https://github.com/VSCodium/vscodium/issues/1917"
+    "id": "#2668",
+    "title": "[Windows] broken update on 1.107, need manual update",
+    "url": "https://github.com/VSCodium/vscodium/issues/2668"
   }
 ]

build.sh

@@ -14,56 +14,77 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
   export NODE_OPTIONS="--max-old-space-size=8192"
 
-  yarn monaco-compile-check
-  yarn valid-layers-check
+  npm run monaco-compile-check
+  npm run valid-layers-check
 
-  yarn gulp compile-build
-  yarn gulp compile-extension-media
-  yarn gulp compile-extensions-build
-  yarn gulp minify-vscode
+  npm run gulp compile-build-without-mangling
+  npm run gulp compile-extension-media
+  npm run gulp compile-extensions-build
+  npm run gulp minify-vscode
 
   if [[ "${OS_NAME}" == "osx" ]]; then
-    yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
+    # remove win32 node modules
+    rm -f .build/extensions/ms-vscode.js-debug/src/win32-app-container-tokens.*.node
+
+    # generate Group Policy definitions
+    npm run copy-policy-dto --prefix build
+    node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc darwin
+
+    npm run gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
 
     find "../VSCode-darwin-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
 
+    . ../build_cli.sh
+
     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
 
-      yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+      # generate Group Policy definitions
+      npm run copy-policy-dto --prefix build
+      node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc win32
+
+      npm run gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
 
       if [[ "${VSCODE_ARCH}" != "x64" ]]; then
         SHOULD_BUILD_REH="no"
         SHOULD_BUILD_REH_WEB="no"
       fi
+
+      . ../build_cli.sh
     fi
 
     VSCODE_PLATFORM="win32"
   else # linux
+    # remove win32 node modules
+    rm -f .build/extensions/ms-vscode.js-debug/src/win32-app-container-tokens.*.node
+
     # in CI, packaging will be done by a different job
     if [[ "${CI_BUILD}" == "no" ]]; then
-      yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
+      # generate Group Policy definitions
+      npm run copy-policy-dto --prefix build
+      node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc linux
+
+      npm run gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
       find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
+
+      . ../build_cli.sh
     fi
 
     VSCODE_PLATFORM="linux"
   fi
 
   if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
-    yarn gulp minify-vscode-reh
-    yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+    npm run gulp minify-vscode-reh
+    npm run gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
   fi
 
   if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
-    yarn gulp minify-vscode-reh-web
-    yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+    npm run gulp minify-vscode-reh-web
+    npm run gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
   fi
 
   cd ..

build/alpine/package_reh.sh

@@ -7,7 +7,8 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
-APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+# include common functions
+. ./utils.sh
 
 mkdir -p assets
 
@@ -26,25 +27,21 @@ export VSCODE_HOST_MOUNT VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 if [[ -d "../patches/alpine/reh/" ]]; then
   for file in "../patches/alpine/reh/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
 
 for i in {1..5}; do # try 5 times
   npm ci && break
-  if [[ $i == 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
   echo "Npm install failed $i, trying again..."
 done
 
-node build/azure-pipelines/distro/mixin-npm
+node build/azure-pipelines/distro/mixin-npm.ts
 
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   PA_NAME="linux-alpine"
@@ -54,8 +51,8 @@ fi
 
 if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
   echo "Building REH"
-  yarn gulp minify-vscode-reh
-  yarn gulp "vscode-reh-${PA_NAME}-min-ci"
+  npm run gulp minify-vscode-reh
+  npm run gulp "vscode-reh-${PA_NAME}-min-ci"
 
   pushd "../vscode-reh-${PA_NAME}"
 
@@ -67,8 +64,8 @@ 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"
+  npm run gulp minify-vscode-reh-web
+  npm run gulp "vscode-reh-web-${PA_NAME}-min-ci"
 
   pushd "../vscode-reh-web-${PA_NAME}"
 

build/linux/appimage/build.sh

@@ -22,19 +22,24 @@ if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   ./pkg2appimage.AppImage --appimage-extract && mv ./squashfs-root ./pkg2appimage.AppDir
 
   # add update's url
-  sed -i 's/generate_type2_appimage/generate_type2_appimage -u "gh-releases-zsync|VSCodium|vscodium|latest|*.AppImage.zsync"/' pkg2appimage.AppDir/AppRun
-
+  if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+    sed -i 's/generate_type2_appimage/generate_type2_appimage -u "gh-releases-zsync|VSCodium|vscodium-insiders|latest|*.AppImage.zsync"/' pkg2appimage.AppDir/AppRun
+  else
+    sed -i 's/generate_type2_appimage/generate_type2_appimage -u "gh-releases-zsync|VSCodium|vscodium|latest|*.AppImage.zsync"/' pkg2appimage.AppDir/AppRun
+  fi
   # remove check so build in docker can succeed
   sed -i 's/grep docker/# grep docker/' pkg2appimage.AppDir/usr/share/pkg2appimage/functions.sh
 
+  APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-    sed -i 's|@@NAME@@|VSCodium-Insiders|g' recipe.yml
-    sed -i 's|@@APPNAME@@|codium-insiders|g' recipe.yml
-    sed -i 's|@@ICON@@|vscodium-insiders|g' recipe.yml
+    sed -i "s|@@NAME@@|${APP_NAME}-Insiders|g" recipe.yml
+    sed -i "s|@@APPNAME@@|${BINARY_NAME}|g" recipe.yml
+    sed -i "s|@@ICON@@|${APP_NAME_LC}-insiders|g" recipe.yml
   else
-    sed -i 's|@@NAME@@|VSCodium|g' recipe.yml
-    sed -i 's|@@APPNAME@@|codium|g' recipe.yml
-    sed -i 's|@@ICON@@|vscodium|g' recipe.yml
+    sed -i "s|@@NAME@@|${APP_NAME}|g" recipe.yml
+    sed -i "s|@@APPNAME@@|${BINARY_NAME}|g" recipe.yml
+    sed -i "s|@@ICON@@|${APP_NAME_LC}|g" recipe.yml
   fi
 
   # workaround that enforces x86 ARCH for pkg2appimage having /__w/vscodium/vscodium/build/linux/appimage/VSCodium/VSCodium.AppDir/usr/share/codium/resources/app/node_modules/rc/index.js is of architecture armhf

build/linux/deps.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -ex
+
+sudo apt-get update -y
+
+sudo apt-get install -y libkrb5-dev
+
+if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
+  sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu crossbuild-essential-arm64
+elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
+  sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf crossbuild-essential-armhf
+fi

build/linux/install_gh.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -ex
+
+GH_ARCH="amd64"
+
+for i in {1..5}; do
+  TAG=$( curl --retry 12 --retry-delay 30 "https://api.github.com/repos/cli/cli/releases/latest" 2>/dev/null | jq --raw-output '.tag_name' )
+
+  if [[ $? == 0 && "${TAG}" != "null" ]]; then
+    break
+  fi
+
+  if [[ $i == 5 ]]; then
+    echo "GH install failed too many times" >&2
+    exit 1
+  fi
+
+  echo "GH install failed $i, trying again..."
+
+  sleep $(( 15 * (i + 1)))
+done
+
+VERSION="${TAG#v}"
+
+curl --retry 12 --retry-delay 120 -sSL "https://github.com/cli/cli/releases/download/${TAG}/gh_${VERSION}_linux_${GH_ARCH}.tar.gz" -o "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
+
+tar xf "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
+
+cp "gh_${VERSION}_linux_${GH_ARCH}/bin/gh" /usr/local/bin/
+
+gh --version

build/linux/install_nodejs.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -ex
+
+NODEJS_VERSION=$( cat .nvmrc )
+
+curl -fsSL "${NODEJS_SITE}${NODEJS_URLROOT}/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}${NODEJS_URLSUFFIX}.tar.xz" -o node.tar.xz
+
+tar -xf node.tar.xz
+
+sudo mv "node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}${NODEJS_URLSUFFIX}" /usr/local/node
+
+echo "/usr/local/node/bin" >> $GITHUB_PATH

build/linux/loong64/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="34.2.0"
+export ELECTRON_VERSION="39.2.3"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

build/linux/loong64/electron.sha256sums

@@ -1,11 +1,9 @@
-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
-
+d26b2189e7466a08c73861d0225c9b28730fdfc30918f3ea70853b43a2581dc4 *chromedriver-v39.2.3-linux-loong64.zip
+8cc36f7468f5b2d98cde3f73c10c535555754c54be43e45c320a382c35b8e466 *electron-v39.2.3-linux-loong64.zip
+f6e7462d6fd795ae2b08344ee0fdca817eba148b62a62717b3f512c845d96a64 *ffmpeg-v39.2.3-linux-loong64.zip
+b122599dc84b81526ba4eecbca4794f3a2d25300242ad3829d1445cb6948f470 *hunspell-dictionaries.zip
+76ef17d2810df5e77c5071863e2a375df914cfb7a362ad0582ee0eedca2441b9 *libcxx-headers.zip
+9b61ba9f0780a57ee2749f7963759395784eadcaccc54af313de1a540240298e *libcxx-objects-v39.2.3-linux-loong64.zip
+9ae64aff9e391eae401142e55654b5b8cf54d0611b1ecb540f2f4e89a2b4f772 *libcxxabi-headers.zip
+7d7e6e08c84aa38b74037f5910534918bc792ffbe2ca6d667067f587f27f5118 *mksnapshot-v39.2.3-linux-loong64.zip
+db48f8a9d2271e8b3a1c3f26ea1ae9bd489deb1b464b6ae424a15d5df7529fdc *node-v39.2.3-headers.tar.gz

build/linux/package_bin.sh

@@ -7,6 +7,9 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
+# include common functions
+. ./utils.sh
+
 tar -xzf ./vscode.tar.gz
 
 chown -R root:root vscode
@@ -15,16 +18,14 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 export VSCODE_PLATFORM='linux'
 export VSCODE_SKIP_NODE_VERSION_CHECK=1
-export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
+export VSCODE_SYSROOT_PREFIX='-glibc-2.28-gcc-10.5.0'
 
 if [[ "${VSCODE_ARCH}" == "arm64" || "${VSCODE_ARCH}" == "armhf" ]]; then
   export VSCODE_SKIP_SYSROOT=1
-  export USE_GNUPP2A=1
+  # export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
   export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
   export VSCODE_SYSROOT_VERSION='20240129-253798'
-  export VSCODE_SYSROOT_PREFIX='-glibc-2.28'
-  export USE_GNUPP2A=1
   export ELECTRON_SKIP_BINARY_DOWNLOAD=1
   export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
   export VSCODE_SKIP_SETUPENV=1
@@ -52,22 +53,26 @@ if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sh" ]]; then
   # shellcheck disable=SC1090
   source "../build/linux/${VSCODE_ARCH}/electron.sh"
 
-  if [[ "${ELECTRON_VERSION}" != "$( yarn config get target )" ]]; then
+  TARGET=$( npm config get target )
+
+  # Only fails at different major versions
+  if [[ "${ELECTRON_VERSION%%.*}" != "${TARGET%%.*}" ]]; then
     # Fail the pipeline if electron target doesn't match what is used.
     echo "Electron ${VSCODE_ARCH} binary version doesn't match target electron version!"
     echo "Releases available at: https://github.com/${VSCODE_ELECTRON_REPOSITORY}/releases"
     exit 1
   fi
+
+  if [[ "${ELECTRON_VERSION}" != "${TARGET}" ]]; then
+    # Force version
+    replace "s|target=\"${TARGET}\"|target=\"${ELECTRON_VERSION}\"|" .npmrc
+  fi
 fi
 
 if [[ -d "../patches/linux/client/" ]]; then
   for file in "../patches/linux/client/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -96,7 +101,7 @@ fi
 
 for i in {1..5}; do # try 5 times
   npm ci --prefix build && break
-  if [[ $i == 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
@@ -113,16 +118,23 @@ fi
 
 for i in {1..5}; do # try 5 times
   npm ci && break
-  if [[ $i -eq 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
   echo "Npm install failed $i, trying again..."
 done
 
-node build/azure-pipelines/distro/mixin-npm
+node build/azure-pipelines/distro/mixin-npm.ts
 
-yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
+# delete native files built in the `compile` step
+find .build/extensions -type f -name '*.node' -print -delete
+
+# generate Group Policy definitions
+npm run copy-policy-dto --prefix build
+node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc linux
+
+npm run gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
 if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
   bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
@@ -130,4 +142,6 @@ fi
 
 find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
 
+. ../build_cli.sh
+
 cd ..

build/linux/package_reh.sh

@@ -7,7 +7,8 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
-APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+# include common functions
+. ./utils.sh
 
 mkdir -p assets
 
@@ -17,20 +18,14 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 GLIBC_VERSION="2.28"
 GLIBCXX_VERSION="3.4.26"
-NODE_VERSION="20.18.2"
+NODE_VERSION="22.21.1"
 
 export VSCODE_NODEJS_URLROOT='/download/release'
 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: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
   EXPECTED_GLIBC_VERSION="2.30"
@@ -47,25 +42,30 @@ elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
   export VSCODE_SKIP_SYSROOT=1
   export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+  GLIBC_VERSION="2.28"
+
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le"
+  VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}"
 
   export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
   export VSCODE_SYSROOT_VERSION='20240129-253798'
-  export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
-  NODE_VERSION="20.16.0"
+  NODE_VERSION="22.21.1"
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64"
 
   export VSCODE_SKIP_SETUPENV=1
   export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
 elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
-  NODE_VERSION="20.16.0"
+  NODE_VERSION="22.21.1"
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:beige-devtoolset-loong64"
 
   export VSCODE_SKIP_SETUPENV=1
   export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
 elif [[ "${VSCODE_ARCH}" == "s390x" ]]; then
+  GLIBC_VERSION="2.28"
+
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-s390x"
+  VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}"
 
   export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
   export VSCODE_SYSROOT_VERSION='20241108'
@@ -75,7 +75,12 @@ 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}"
+
+if [[ -z "${VSCODE_SYSROOT_PREFIX}" ]]; then
+  export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}-gcc-10.5.0"
+else
+  export VSCODE_SYSROOT_PREFIX
+fi
 
 EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION:=GLIBC_VERSION}"
 VSCODE_HOST_MOUNT="$( pwd )"
@@ -83,16 +88,12 @@ VSCODE_HOST_MOUNT="$( pwd )"
 export VSCODE_HOST_MOUNT
 export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 
-sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.npmrc
+sed -i "/target/s/\"22.*\"/\"${NODE_VERSION}\"/" remote/.npmrc
 
 if [[ -d "../patches/linux/reh/" ]]; then
   for file in "../patches/linux/reh/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -100,11 +101,7 @@ fi
 if [[ -d "../patches/linux/reh/${VSCODE_ARCH}/" ]]; then
   for file in "../patches/linux/reh/${VSCODE_ARCH}/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -131,12 +128,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
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
@@ -147,13 +141,28 @@ if [[ -z "${VSCODE_SKIP_SETUPENV}" ]]; then
   if [[ -n "${VSCODE_SKIP_SYSROOT}" ]]; then
     source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
   else
+    cat ./build/checksums/vscode-sysroot.txt
+
     source ./build/azure-pipelines/linux/setup-env.sh
   fi
+
+  export VSCODE_SYSROOT_DIR="${VSCODE_REMOTE_SYSROOT_DIR}"
+else
+  mkdir -p .build/x86_64-linux-gnu/x86_64-linux-gnu/bin
+
+  ln -s $( which objdump ) .build/x86_64-linux-gnu/x86_64-linux-gnu/bin/objdump
+
+  export VSCODE_SYSROOT_DIR=".build"
 fi
 
+node build/npm/preinstall.ts
+
+mv .npmrc .npmrc.bak
+cp ../npmrc .npmrc
+
 for i in {1..5}; do # try 5 times
   npm ci && break
-  if [[ $i == 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
@@ -163,23 +172,44 @@ for i in {1..5}; do # try 5 times
   rm -rf node_modules/@vscode node_modules/node-pty
 done
 
+# if [[ "${VSCODE_ARCH}" == "x64" ]]; then
+#   pushd "remote"
+
+#   for LIB in @parcel/watcher @vscode/spdlog kerberos node-pty
+#   do
+#     pushd "node_modules/${LIB}"
+
+#     CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" npx node-gyp rebuild
+
+#     popd
+#   done
+
+#   popd
+
+#   VERIFY_CXX11=1
+# fi
+
 mv .npmrc.bak .npmrc
 
-node build/azure-pipelines/distro/mixin-npm
+node build/azure-pipelines/distro/mixin-npm.ts
 
 export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
 
 if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
   echo "Building REH"
-  yarn gulp minify-vscode-reh
-  yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+  npm run gulp minify-vscode-reh
+  npm run gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
 
   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
 
+  # if [[ -n "${VERIFY_CXX11}" ]]; then
+  #   SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ../build/linux/verify_cxx11_requirements.sh
+  # fi
+
   pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
 
-  if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
-    bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "node_modules"
+  if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
+    bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "node_modules"
   fi
 
   echo "Archiving REH"
@@ -190,15 +220,19 @@ fi
 
 if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
   echo "Building REH-web"
-  yarn gulp minify-vscode-reh-web
-  yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
+  npm run gulp minify-vscode-reh-web
+  npm run gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
 
   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
 
+  # if [[ -n "${VERIFY_CXX11}" ]]; then
+  #   SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ../build/linux/verify_cxx11_requirements.sh
+  # fi
+
   pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
 
-  if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
-    bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "node_modules"
+  if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
+    bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "node_modules"
   fi
 
   echo "Archiving REH-web"

build/linux/ppc64le/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="34.2.0"
+export ELECTRON_VERSION="39.2.7"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

build/linux/ppc64le/electron.sha256sums

@@ -1,11 +1,10 @@
-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
+bacff46523cea806df9788d9e24f7f53fad2317f18afdcbc596b86863dd40805 *chromedriver-v39.2.7-linux-ppc64le.zip
+b83820b37325c0a6ce0bbb98344b54f70ef7c2a949eea61bcb423b18c623a742 *electron-v39.2.7-linux-ppc64le-debug.zip
+7d3b4ff4320a54572f9e1e0286702a0bed3e1596a2cb34f8fdc455acf3b9234f *electron-v39.2.7-linux-ppc64le-symbols.zip
+6974cf1c8a550019b04762222742b8f1d9d76387594a191d3522cd65da075db1 *electron-v39.2.7-linux-ppc64le.zip
+40c772eb189d100087b75da6c2ad1aeb044f1d661c90543592546a654b0b6d5b *electron.d.ts
+0c923001d08e474d0dcd3b747b4f9a4bfca685d755ec08de8e44556a63f9ad3a *hunspell_dictionaries.zip
+ee57f79e88f50f199a6aeb87fa45c83d1bd0f92eb72e00787cfdf4cf11863562 *libcxx-objects-v39.2.7-linux-ppc64le.zip
+a8709029737d3073758ccb384161a37d91f16e5a3f8110ca8e2c30f83ef8d7e6 *libcxx_headers.zip
+238dcec817528659a86b0cd3d7dabe301e65b4cab25e45c5bbab7642a8849c02 *libcxxabi_headers.zip
+be033ed825bd8be92bb6ca86ff81f0907e60aa999aa011f5ddf1360abb19429b *mksnapshot-v39.2.7-linux-ppc64le.zip

build/linux/riscv64/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="34.2.0"
+export ELECTRON_VERSION="39.2.7"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1"

build/linux/riscv64/electron.sha256sums

@@ -1,11 +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
+6759ef2bd69a2e31a3f0e17c4e4c0bf239b54f08525572201ae7760851168487 *chromedriver-v39.2.7-linux-riscv64.zip
+89562e30982d8ac71fbc1e0f549a4a6e19abd5cb98ea904d5f3cfceb7c61e582 *electron-v39.2.7-linux-riscv64-debug.tar.zst
+71c6f265a2ef065f478ef910a06466a21009c02783dcb7053767549a6dbeb80d *electron-v39.2.7-linux-riscv64-symbols.tar.zst
+136804dbd04f1c6b9a6047c4e7bb648876214ff453b62fb3bdc81505b6f5aab2 *electron-v39.2.7-linux-riscv64.zip
+1059d6cb97b87464b3bd415bb5f96fceaf91d6e3af1c9733724ab9f2e14e2a08 *ffmpeg-v39.2.7-linux-riscv64.zip
+224a84d4aaceb5ed8be3c4f65f8404d492dc86ded8ab336c2562dfdd21752068 *hunspell-dictionaries.zip
+b6cb4f8902aad5de811efd106ddbdbca79e43cb7c8fa67f7eeddaedf2efd82d5 *libcxx-headers.zip
+0664e200ec1eab1ce1957bc6e17ad89f6c0d4d904a9492d64fcf4175cd81e537 *libcxx-objects-v39.2.7-linux-riscv64.zip
+96f9b66be7ff11e79ec2e781a0025938eb5ef97cbab429c05e9b45d24d421abf *libcxxabi-headers.zip
+be0774857454f81b9407f6b941200f8843a0b3ecb86e2bb072209ef9f9bfe74a *mksnapshot-v39.2.7-linux-riscv64.zip
+a8fca541e8f9a18de73c78f6862cbf439723c80c5eb60fe50405dfb751d2ee13 *node-v39.2.7-headers.tar.gz

build/linux/riscv64/ripgrep.sh

@@ -9,7 +9,7 @@ if [ "$#" -ne 1 ]; then
 fi
 
 RG_PATH="$1/@vscode/ripgrep/bin/rg"
-RG_VERSION="14.1.1-3"
+RG_VERSION="14.1.1-4"
 
 echo "Replacing ripgrep binary with riscv64 one"
 

build/linux/verify_abi_requirements.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+FILES=$(
+  find "${SEARCH_PATH}" -type f -executable -name "node"
+  find "${SEARCH_PATH}" -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@parcel/watcher*"
+)
+
+echo "Verifying requirements for files: ${FILES}"
+
+for FILE in ${FILES}; do
+  CXXABI_VERSION="0.0.0"
+
+  while IFS= read -r LINE; do
+    VERSION=${LINE#*_}
+
+    if [[ $( printf "%s\n%s" "${VERSION}" "${CXXABI_VERSION}" | sort -V | tail -n1 ) == "${VERSION}" ]]; then
+      CXXABI_VERSION="${VERSION}"
+    fi
+  done < <( strings "${FILE}" | grep -i ^CXXABI )
+
+  if [[ $( printf "%s\n%s" "${EXPECTED_CXXABI_VERSION}" "${CXXABI_VERSION}" | sort -V | tail -n1 ) == "${EXPECTED_CXXABI_VERSION}" ]]; then
+    echo "File ${FILE} has dependency on ABI ${CXXABI_VERSION} <= ${EXPECTED_CXXABI_VERSION}"
+  else
+    echo "Error: File ${FILE} has dependency on ABI ${CXXABI_VERSION} > ${EXPECTED_CXXABI_VERSION}"
+    exit 1
+  fi
+done

build/linux/verify_cxx11_requirements.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+FILES=$( find "${SEARCH_PATH}" -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@parcel/watcher*" )
+
+echo "Verifying requirements for files: ${FILES}"
+
+for FILE in ${FILES}; do
+  if [[ -n "$( strings "${FILE}" | grep cxx11 | tail -n1 )" ]]; then
+    echo "Error: File ${FILE} has dependency on CXX11"
+    exit 1
+  fi
+done

build/windows/appx/build.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# Add Windows SDK to path
+SDK='/C/Program Files (x86)/Windows Kits/10/bin/10.0.26100.0/x64'
+export PATH="${SDK}:${PATH}"
+
+APPX_NAME="${BINARY_NAME//-/_}"
+
+makeappx pack /d "../../../VSCode-win32-${VSCODE_ARCH}/appx/manifest" /p "../../../VSCode-win32-${VSCODE_ARCH}/appx/${APPX_NAME}_${VSCODE_ARCH}.appx" /nv
+
+# Remove the raw manifest folder
+rm -rf "../../../VSCode-win32-${VSCODE_ARCH}/appx/manifest"

build/windows/package.sh

@@ -13,30 +13,39 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 for i in {1..5}; do # try 5 times
   npm ci && break
-  if [[ $i -eq 3 ]]; then
+  if [[ $i == 5 ]]; then
     echo "Npm install failed too many times" >&2
     exit 1
   fi
   echo "Npm install failed $i, trying again..."
 done
 
-node build/azure-pipelines/distro/mixin-npm
+node build/azure-pipelines/distro/mixin-npm.ts
+
+# delete native files built in the `compile` step
+find .build/extensions -type f -name '*.node' -print -delete
 
 . ../build/windows/rtf/make.sh
 
-yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+# generate Group Policy definitions
+npm run copy-policy-dto --prefix build
+node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc win32
+
+npm run gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
+
+. ../build_cli.sh
 
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
     echo "Building REH"
-    yarn gulp minify-vscode-reh
-    yarn gulp "vscode-reh-win32-${VSCODE_ARCH}-min-ci"
+    npm run gulp minify-vscode-reh
+    npm run gulp "vscode-reh-win32-${VSCODE_ARCH}-min-ci"
   fi
 
   if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
     echo "Building REH-web"
-    yarn gulp minify-vscode-reh-web
-    yarn gulp "vscode-reh-web-win32-${VSCODE_ARCH}-min-ci"
+    npm run gulp minify-vscode-reh-web
+    npm run gulp "vscode-reh-web-win32-${VSCODE_ARCH}-min-ci"
   fi
 fi
 

build_cli.sh

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cd cli
+
+export CARGO_NET_GIT_FETCH_WITH_CLI="true"
+export VSCODE_CLI_APP_NAME="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+export VSCODE_CLI_BINARY_NAME="$( node -p "require(\"../product.json\").serverApplicationName" )"
+export VSCODE_CLI_UPDATE_ENDPOINT="https://raw.githubusercontent.com/VSCodium/versions/refs/heads/master"
+
+if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+  export VSCODE_CLI_DOWNLOAD_ENDPOINT="https://github.com/VSCodium/vscodium-insiders/releases"
+else
+  export VSCODE_CLI_DOWNLOAD_ENDPOINT="https://github.com/VSCodium/vscodium/releases"
+fi
+
+TUNNEL_APPLICATION_NAME="$( node -p "require(\"../product.json\").tunnelApplicationName" )"
+NAME_SHORT="$( node -p "require(\"../product.json\").nameShort" )"
+
+npm pack @vscode/openssl-prebuilt@0.0.11
+mkdir openssl
+tar -xvzf vscode-openssl-prebuilt-0.0.11.tgz --strip-components=1 --directory=openssl
+
+if [[ "${OS_NAME}" == "osx" ]]; then
+  if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
+    VSCODE_CLI_TARGET="aarch64-apple-darwin"
+  else
+    VSCODE_CLI_TARGET="x86_64-apple-darwin"
+  fi
+
+  export OPENSSL_LIB_DIR="$( pwd )/openssl/out/${VSCODE_ARCH}-osx/lib"
+  export OPENSSL_INCLUDE_DIR="$( pwd )/openssl/out/${VSCODE_ARCH}-osx/include"
+
+  rustup target add "${VSCODE_CLI_TARGET}"
+
+  cargo build --release --target "${VSCODE_CLI_TARGET}" --bin=code
+
+  cp "target/${VSCODE_CLI_TARGET}/release/code" "../../VSCode-darwin-${VSCODE_ARCH}/${NAME_SHORT}.app/Contents/Resources/app/bin/${TUNNEL_APPLICATION_NAME}"
+elif [[ "${OS_NAME}" == "windows" ]]; then
+  if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
+    VSCODE_CLI_TARGET="aarch64-pc-windows-msvc"
+    export VSCODE_CLI_RUST="-C target-feature=+crt-static -Clink-args=/guard:cf -Clink-args=/CETCOMPAT:NO"
+  else
+    VSCODE_CLI_TARGET="x86_64-pc-windows-msvc"
+    export VSCODE_CLI_RUSTFLAGS="-Ctarget-feature=+crt-static -Clink-args=/guard:cf -Clink-args=/CETCOMPAT"
+  fi
+
+  export VSCODE_CLI_CFLAGS="/guard:cf /Qspectre"
+  export OPENSSL_LIB_DIR="$( pwd )/openssl/out/${VSCODE_ARCH}-windows-static/lib"
+  export OPENSSL_INCLUDE_DIR="$( pwd )/openssl/out/${VSCODE_ARCH}-windows-static/include"
+
+  rustup target add "${VSCODE_CLI_TARGET}"
+
+  cargo build --release --target "${VSCODE_CLI_TARGET}" --bin=code
+
+  cp "target/${VSCODE_CLI_TARGET}/release/code.exe" "../../VSCode-win32-${VSCODE_ARCH}/bin/${TUNNEL_APPLICATION_NAME}.exe"
+else
+  export OPENSSL_LIB_DIR="$( pwd )/openssl/out/${VSCODE_ARCH}-linux/lib"
+  export OPENSSL_INCLUDE_DIR="$( pwd )/openssl/out/${VSCODE_ARCH}-linux/include"
+  export VSCODE_SYSROOT_DIR="../.build/sysroots"
+
+  if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
+    VSCODE_CLI_TARGET="aarch64-unknown-linux-gnu"
+
+    if [[ "${CI_BUILD}" != "no" ]]; then
+      export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+      export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
+      export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
+      export PKG_CONFIG_ALLOW_CROSS=1
+    fi
+  elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
+    VSCODE_CLI_TARGET="armv7-unknown-linux-gnueabihf"
+
+    export OPENSSL_LIB_DIR="$( pwd )/openssl/out/arm-linux/lib"
+    export OPENSSL_INCLUDE_DIR="$( pwd )/openssl/out/arm-linux/include"
+
+    if [[ "${CI_BUILD}" != "no" ]]; then
+      export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
+      export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc
+      export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
+      export PKG_CONFIG_ALLOW_CROSS=1
+    fi
+  elif [[ "${VSCODE_ARCH}" == "x64" ]]; then
+    VSCODE_CLI_TARGET="x86_64-unknown-linux-gnu"
+  fi
+
+  if [[ -n "${VSCODE_CLI_TARGET}" ]]; then
+    rustup target add "${VSCODE_CLI_TARGET}"
+
+    cargo build --release --target "${VSCODE_CLI_TARGET}" --bin=code
+
+    cp "target/${VSCODE_CLI_TARGET}/release/code" "../../VSCode-linux-${VSCODE_ARCH}/bin/${TUNNEL_APPLICATION_NAME}"
+  fi
+fi
+
+cd ..

check_tags.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2129
 
+# Env Paramaters
+# CHECK_ALL: yes | no
+# CHECK_REH: yes | no
+# CHECK_ONLY_REH: yes | no
+# FORCE_LINUX_SNAP: true
+
 set -e
 
 if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
@@ -22,7 +28,7 @@ else
   LATEST_VERSION=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.tag_name' )
   RECHECK_ASSETS="${SHOULD_BUILD}"
 
-  if [[ "${LATEST_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+) ]]; then
+  if [[ "${LATEST_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-5]) ]]; then
     if [[ "${MS_TAG}" != "${BASH_REMATCH[1]}" ]]; then
       echo "New VSCode version, new build"
       export SHOULD_BUILD="yes"
@@ -105,6 +111,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
       export SHOULD_BUILD_REH_WEB="no"
     fi
 
+    if [[ -z $( contains "${APP_NAME_LC}-cli-darwin-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+      echo "Building on MacOS because we have no CLI archive"
+      export SHOULD_BUILD="yes"
+    else
+      export SHOULD_BUILD_CLI="no"
+    fi
+
     if [[ "${SHOULD_BUILD}" != "yes" ]]; then
       echo "Already have all the MacOS builds"
     fi
@@ -136,67 +149,15 @@ elif [[ "${ASSETS}" != "null" ]]; then
       export SHOULD_BUILD_REH="no"
       export SHOULD_BUILD_REH_WEB="no"
 
-      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-        echo "Already have all the Windows arm64 builds"
-      fi
-
-    # windows-ia32
-    elif [[ "${VSCODE_ARCH}" == "ia32" ]]; then
-      if [[ -z $( contains "${APP_NAME}Setup-${VSCODE_ARCH}-${RELEASE_VERSION}.exe" ) ]]; then
-        echo "Building on Windows ia32 because we have no system setup"
+      if [[ -z $( contains "${APP_NAME_LC}-cli-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Windows arm64 because we have no CLI archive"
         export SHOULD_BUILD="yes"
       else
-        export SHOULD_BUILD_EXE_SYS="no"
-      fi
-
-      if [[ -z $( contains "UserSetup-${VSCODE_ARCH}-${RELEASE_VERSION}.exe" ) ]]; then
-        echo "Building on Windows ia32 because we have no user setup"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_EXE_USR="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME}-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.zip" ) ]]; then
-        echo "Building on Windows ia32 because we have no zip"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_ZIP="no"
-      fi
-
-      if [[ "${DISABLE_MSI}" == "yes" ]]; then
-          export SHOULD_BUILD_MSI="no"
-      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
-        echo "Building on Windows ia32 because we have no msi"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_MSI="no"
-      fi
-
-      if [[ "${DISABLE_MSI}" == "yes" ]]; then
-          export SHOULD_BUILD_MSI_NOUP="no"
-      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
-        echo "Building on Windows ia32 because we have no updates-disabled msi"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_MSI_NOUP="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME_LC}-reh-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Windows ia32 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-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Windows ia32 because we have no REH-web archive"
-        export SHOULD_BUILD="yes"
-      else
-        export SHOULD_BUILD_REH_WEB="no"
+        export SHOULD_BUILD_CLI="no"
       fi
 
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-        echo "Already have all the Windows ia32 builds"
+        echo "Already have all the Windows arm64 builds"
       fi
 
     # windows-x64
@@ -254,6 +215,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
         export SHOULD_BUILD_REH_WEB="no"
       fi
 
+      if [[ -z $( contains "${APP_NAME_LC}-cli-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+        echo "Building on Windows x64 because we have no CLI archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_CLI="no"
+      fi
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows x64 builds"
       fi
@@ -303,7 +271,7 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_TAR="no"
           fi
 
-          if [[ -z $( contains "arm64.snap" ) ]]; then
+          if [[ -z $( contains "arm64.snap" ) || "${FORCE_LINUX_SNAP}" == "true" ]]; then
             echo "Building on Linux arm64 because we have no SNAP"
             export SHOULD_BUILD="yes"
           else
@@ -326,6 +294,14 @@ elif [[ "${ASSETS}" != "null" ]]; then
 
           export SHOULD_BUILD_APPIMAGE="no"
 
+          if [[ -z $( contains "${APP_NAME_LC}-cli-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no CLI archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_CLI="no"
+          fi
+
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux arm64 builds"
           fi
@@ -370,6 +346,14 @@ elif [[ "${ASSETS}" != "null" ]]; then
 
           export SHOULD_BUILD_APPIMAGE="no"
 
+          if [[ -z $( contains "${APP_NAME_LC}-cli-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no CLI archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_CLI="no"
+          fi
+
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux arm builds"
           fi
@@ -377,9 +361,9 @@ elif [[ "${ASSETS}" != "null" ]]; then
 
         # linux-ppc64le
         if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then
-          SHOULD_BUILD_APPIMAGE="no"
-          SHOULD_BUILD_DEB="no"
-          SHOULD_BUILD_RPM="no"
+          export SHOULD_BUILD_APPIMAGE="no"
+          export SHOULD_BUILD_DEB="no"
+          export 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"
@@ -403,6 +387,8 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_REH_WEB="no"
           fi
 
+          export SHOULD_BUILD_CLI="no"
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux PowerPC64LE builds"
           fi
@@ -435,6 +421,8 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_REH_WEB="no"
           fi
 
+          export SHOULD_BUILD_CLI="no"
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux riscv64 builds"
           fi
@@ -467,6 +455,8 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_REH_WEB="no"
           fi
 
+         export SHOULD_BUILD_CLI="no"
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux Loong64 builds"
           fi
@@ -493,6 +483,8 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_REH_WEB="no"
           fi
 
+         export SHOULD_BUILD_CLI="no"
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux s390x builds"
           fi
@@ -530,7 +522,7 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_APPIMAGE="no"
           fi
 
-          if [[ -z $( contains "amd64.snap" ) ]]; then
+          if [[ -z $( contains "amd64.snap" ) || "${FORCE_LINUX_SNAP}" == "true" ]]; then
             echo "Building on Linux x64 because we have no SNAP"
             export SHOULD_BUILD="yes"
           else
@@ -551,6 +543,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_REH_WEB="no"
           fi
 
+          if [[ -z $( contains "${APP_NAME_LC}-cli-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no CLI archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_CLI="no"
+          fi
+
           if [[ "${SHOULD_BUILD}" != "yes" ]]; then
             echo "Already have all the Linux x64 builds"
           fi
@@ -622,12 +621,19 @@ else
       SHOULD_BUILD_DEB="no"
       SHOULD_BUILD_RPM="no"
       SHOULD_BUILD_TAR="no"
+      SHOULD_BUILD_CLI="no"
     elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
       SHOULD_BUILD_DEB="no"
       SHOULD_BUILD_RPM="no"
+      SHOULD_BUILD_CLI="no"
     elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
       SHOULD_BUILD_DEB="no"
       SHOULD_BUILD_RPM="no"
+      SHOULD_BUILD_CLI="no"
+    elif [[ "${VSCODE_ARCH}" == "s390x" ]]; then
+      SHOULD_BUILD_DEB="no"
+      SHOULD_BUILD_RPM="no"
+      SHOULD_BUILD_CLI="no"
     fi
     if [[ "${VSCODE_ARCH}" != "x64" || "${DISABLE_APPIMAGE}" == "yes" ]]; then
       export SHOULD_BUILD_APPIMAGE="no"
@@ -658,6 +664,7 @@ echo "SHOULD_BUILD_MSI=${SHOULD_BUILD_MSI}" >> "${GITHUB_ENV}"
 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_CLI=${SHOULD_BUILD_CLI}" >> "${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}"

dev/build.sh

@@ -6,8 +6,11 @@
 ###
 
 export APP_NAME="VSCodium"
+export ASSETS_REPOSITORY="VSCodium/vscodium"
 export BINARY_NAME="codium"
 export CI_BUILD="no"
+export GH_REPO_PATH="VSCodium/vscodium"
+export ORG_NAME="VSCodium"
 export SHOULD_BUILD="yes"
 export SKIP_ASSETS="yes"
 export SKIP_BUILD="no"
@@ -19,6 +22,7 @@ export VSCODE_SKIP_NODE_VERSION_CHECK="yes"
 while getopts ":ilops" opt; do
   case "$opt" in
     i)
+      export ASSETS_REPOSITORY="VSCodium/vscodium-insiders"
       export BINARY_NAME="codium-insiders"
       export VSCODE_QUALITY="insider"
       ;;
@@ -108,6 +112,10 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
     git add .
     git reset -q --hard HEAD
 
+    while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
+      git reset -q --hard HEAD~
+    done
+
     rm -rf .build out*
 
     cd ..

dev/build_docker.sh

@@ -20,20 +20,13 @@ while getopts ":ilp" opt; do
       export VSCODE_LATEST="yes"
       ;;
     p)
-      export SKIP_ASSETS="no" 
+      export SKIP_ASSETS="no"
       ;;
     *)
       ;;
   esac
 done
 
-if ! exists yarn; then
-  curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
-  sudo apt-get install -y nodejs desktop-file-utils
-
-  npm install -g yarn
-fi
-
 UNAME_ARCH=$( uname -m )
 
 if [[ "${UNAME_ARCH}" == "x86_64" ]]; then

dev/cli.sh

@@ -0,0 +1,12 @@
+export CARGO_NET_GIT_FETCH_WITH_CLI="true"
+export VSCODE_CLI_APP_NAME="vscodium"
+export VSCODE_CLI_BINARY_NAME="codium-server-insiders"
+export VSCODE_CLI_DOWNLOAD_URL="https://github.com/VSCodium/vscodium-insiders/releases"
+export VSCODE_CLI_QUALITY="insider"
+export VSCODE_CLI_UPDATE_URL="https://raw.githubusercontent.com/VSCodium/versions/refs/heads/master"
+
+cargo build --release --target aarch64-apple-darwin --bin=code
+
+cp target/aarch64-apple-darwin/release/code "../../VSCode-darwin-arm64/VSCodium - Insiders.app/Contents/Resources/app/bin/codium-tunnel-insiders"
+
+"../../VSCode-darwin-arm64/VSCodium - Insiders.app/Contents/Resources/app/bin/codium-insiders" serve-web

dev/merge-patches.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+set -e
+
+normalize_file() {
+  if [[ "${1}" == *patch ]]; then
+    FILE="${1}"
+  else
+    FILE="${1}.patch"
+  fi
+
+  if [[ "${FILE}" == patches/* ]]; then
+    FILE="../${FILE}"
+  else
+    FILE="../patches/${FILE}"
+  fi
+}
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+git add .
+git reset -q --hard HEAD
+
+while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
+  git reset -q --hard HEAD~
+done
+
+git apply --reject "../patches/helper/settings.patch"
+git add .
+git commit --no-verify -q -m "VSCODIUM HELPER"
+
+while [ $# -gt 1 ]; do
+  normalize_file "${1}"
+
+  echo "FILE: ${FILE}"
+
+  if [[ -f "${FILE}" ]]; then
+    if [[ -f "${FILE}.bak" ]]; then
+      mv -f $FILE{.bak,}
+    fi
+
+    git apply --reject "${FILE}" || true
+  fi
+
+  while [[ -n "$( find . -name '*.rej' -print )" ]]; do
+    echo
+    read -rp "Press any key when the conflict have been resolved..." -n1 -s
+  done
+
+  shift
+done
+
+normalize_file "${1}"
+
+git add .
+git diff --staged -U1 > "${FILE}"
+
+if [[ "${FILE}" != "../patches/helper/settings.patch" ]]; then
+  git reset -q --hard HEAD
+else
+  git reset -q --hard HEAD~
+fi
+
+echo "The patch has been generated."

dev/patch.sh

@@ -2,7 +2,19 @@
 
 set -e
 
-echo "$#"
+normalize_file() {
+  if [[ "${1}" == *patch ]]; then
+    FILE="${1}"
+  else
+    FILE="${1}.patch"
+  fi
+
+  if [[ "${FILE}" == patches/* ]]; then
+    FILE="../${FILE}"
+  else
+    FILE="../patches/${FILE}"
+  fi
+}
 
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
@@ -13,38 +25,50 @@ while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
   git reset -q --hard HEAD~
 done
 
-git apply --reject "../patches/helper/settings.patch"
+normalize_file "${1}"
 
-while [ $# -gt 1 ]; do
-  echo "Parameter: $1"
-  if [[ "${1}" == *patch ]]; then
-    FILE="../patches/${1}"
-  else
-    FILE="../patches/${1}.patch"
-  fi
+if [[ "${FILE}" != "../patches/helper/settings.patch" ]]; then
+  git apply --reject "../patches/helper/settings.patch"
 
-  git apply --reject "${FILE}"
+  while [ $# -gt 1 ]; do
+    echo "Parameter: $1"
+    normalize_file "${1}"
 
-  shift
-done
+    git apply --reject "${FILE}"
 
-git add .
-git commit --no-verify -q -m "VSCODIUM HELPER"
+    shift
+  done
 
-if [[ "${1}" == *patch ]]; then
-  FILE="../patches/${1}"
-else
-  FILE="../patches/${1}.patch"
+  git add .
+  git commit --no-verify -q -m "VSCODIUM HELPER"
+
+  normalize_file "${1}"
 fi
 
+echo "FILE: ${FILE}"
+
 if [[ -f "${FILE}" ]]; then
-  git apply --reject "${FILE}"
+  if [[ -f "${FILE}.bak" ]]; then
+    mv -f $FILE{.bak,}
+  fi
+
+  git apply --reject "${FILE}" || true
 fi
 
 read -rp "Press any key when the conflict have been resolved..." -n1 -s
 
+while [[ -n "$( find . -name '*.rej' -print )" ]]; do
+  echo
+  read -rp "Press any key when the conflict have been resolved..." -n1 -s
+done
+
 git add .
 git diff --staged -U1 > "${FILE}"
-git reset -q --hard HEAD~
+
+if [[ "${FILE}" != "../patches/helper/settings.patch" ]]; then
+  git reset -q --hard HEAD
+else
+  git reset -q --hard HEAD~
+fi
 
 echo "The patch has been generated."

dev/update_api.sh

@@ -14,7 +14,6 @@ while getopts ":i" opt; do
   esac
 done
 
-
 URL=$( curl -s "https://update.code.visualstudio.com/api/update/win32-x64-archive/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" | jq -c '.url' | sed -E 's/.*"([^"]+)".*/\1/' )
 # echo "url: ${URL}"
 FILE="${URL##*/}"
@@ -30,10 +29,17 @@ if [[ ! -d "${DIRECTORY}" ]]; then
   unzip "${FILE}" -d "${DIRECTORY}"
 fi
 
-APIS=$( jq -r '.extensionEnabledApiProposals' "${DIRECTORY}/resources/app/product.json" )
+BIN_PATH=$(find "${DIRECTORY}/bin" -type f ! -name "*.*")
 
+LINE="$( grep -E '^[[:space:]]*(export[[:space:]]+)?VERSIONFOLDER[[:space:]]*=' "$BIN_PATH" | tail -n1 )"
+VERSIONFOLDER="${LINE#*=}"
+VERSIONFOLDER="${VERSIONFOLDER#\"}"
+VERSIONFOLDER="${VERSIONFOLDER%\"}"
+
+APIS=$( jq -r '.extensionEnabledApiProposals' "${DIRECTORY}/${VERSIONFOLDER}/resources/app/product.json" )
 APIS=$( echo "${APIS}" | jq '. += {"jeanp413.open-remote-ssh": ["resolvers", "tunnels", "terminalDataWriteEvent", "contribRemoteHelp", "contribViewsRemote"]}' )
 APIS=$( echo "${APIS}" | jq '. += {"jeanp413.open-remote-wsl": ["resolvers", "contribRemoteHelp", "contribViewsRemote"]}' )
+echo "$( jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json )" > product.json
 
-jsonTmp=$( jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json )
-echo "${jsonTmp}" > product.json && unset jsonTmp
+APIS=$( jq -r '.extensionsEnabledWithApiProposalVersion' "${DIRECTORY}/${VERSIONFOLDER}/resources/app/product.json" )
+echo "$( jq --argjson v "${APIS}" 'setpath(["extensionsEnabledWithApiProposalVersion"]; $v)' product.json )" > product.json

dev/update_patches.sh

@@ -12,6 +12,75 @@ while getopts ":i" opt; do
   esac
 done
 
+generate_rejects() {
+  local PATCH_FILE="$1"
+
+  if ! command -v python3 >/dev/null 2>&1; then
+    echo "python3 not found; cannot create reject files for ${PATCH_FILE}"
+    return 1
+  fi
+
+  PATCH_FOR_REJECT="${PATCH_FILE}" python3 <<'PY'
+import os
+import pathlib
+import re
+import subprocess
+
+
+def chunk_needs_reject(raw_chunk: str) -> bool:
+    """Return True when a patch chunk cannot be applied nor reversed."""
+
+    chunk = raw_chunk if raw_chunk.endswith("\n") else raw_chunk + "\n"
+
+    def _run_git(extra_args):
+        return subprocess.run(
+            ["git", "apply", "--check", "--ignore-whitespace", *extra_args],
+            input=chunk,
+            text=True,
+            capture_output=True,
+        )
+
+    forward = _run_git([])
+    if forward.returncode == 0:
+        return False
+
+    reverse = _run_git(["--reverse"])
+    if reverse.returncode == 0:
+        return False
+
+    return True
+
+patch_path = os.environ["PATCH_FOR_REJECT"]
+with open(patch_path, "r", encoding="utf-8", errors="ignore") as src:
+    content = src.read()
+
+chunks = re.split(r'(?m)^diff --git ', content)
+for chunk in chunks:
+    chunk = chunk.strip()
+    if not chunk:
+        continue
+    chunk = "diff --git " + chunk
+    match = re.search(r'^diff --git a/(.*?) b/(.*?)$', chunk, re.MULTILINE)
+    if not match:
+        continue
+    a_path, b_path = match.groups()
+    candidate = b_path if b_path != "/dev/null" else a_path
+    if candidate in ("/dev/null", ""):
+        continue
+    if candidate.startswith("../") or candidate.startswith("..\\") or candidate.startswith("/"):
+        continue
+    dest = pathlib.Path(candidate + ".rej")
+    if not chunk_needs_reject(chunk):
+      continue
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    with dest.open("w", encoding="utf-8") as fh:
+      fh.write(chunk)
+      if not chunk.endswith("\n"):
+        fh.write("\n")
+    print(f"generated reject: {dest}")
+PY
+}
+
 check_file() {
   while [ $# -gt 1 ]; do
     git apply --reject "${1}"
@@ -19,22 +88,49 @@ check_file() {
     shift
   done
 
+  if [[ -f "${1}.bak" ]]; then
+    mv -f $1{.bak,}
+  fi
+
   if [[ -f "${1}" ]]; then
+    git apply --reject "../patches/helper/settings.patch"
+    git add .
+    git commit --no-verify -q -m "VSCODIUM HELPER"
+
     echo applying patch: "${1}"
+
     if ! git apply --ignore-whitespace "${1}"; then
       echo failed to apply patch "${1}"
 
-      git apply --reject "${1}"
-      git apply --reject "../patches/helper/settings.patch"
+      git apply --reject --verbose "${1}"
 
-      read -rp "Press any key when the conflict have been resolved..." -n1 -s
+      if [[ -z "$( find . -name '*.rej' -print )" ]]; then
+        echo "no .rej generated by git; creating fallback rejects for ${1}"
+
+        if ! generate_rejects "${1}"; then
+          echo "failed to generate reject files for ${1}"
+          exit 1
+        fi
+
+        if [[ -z "$( find . -name '*.rej' -print )" ]]; then
+          echo "still no .rej after attempting to create them for ${1}"
+          exit 1
+        fi
+      fi
+
+      while [[ -n "$( find . -name '*.rej' -print )" ]]; do
+        find . -name '*.rej' -print
+        read -rp "Press any key when the conflict have been resolved..." -n1 -s
+        echo
+      done
 
       git restore .vscode/settings.json
       git add .
       git diff --staged -U1 > "${1}"
     fi
+
     git add .
-    git reset -q --hard HEAD
+    git reset -q --hard HEAD~
   fi
 }
 
@@ -43,8 +139,16 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 git add .
 git reset -q --hard HEAD
 
+while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
+  git reset -q --hard HEAD~
+done
+
 for FILE in ../patches/*.patch; do
-  check_file "${FILE}"
+  if [[ "${FILE}" == *"/fix-policies.patch" ]]; then
+    check_file "../patches/fix-keymap.patch" "../patches/fix-policies.patch"
+  else
+    check_file "${FILE}"
+  fi
 done
 
 if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
@@ -55,17 +159,23 @@ fi
 
 for ARCH in alpine linux osx windows; do
   for FILE in "../patches/${ARCH}/"*.patch; do
-    if [[ "${FILE}" != *"/arch-"* ]]; then
+    if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "linux" && "${FILE}" == *"/fix-dependencies.patch" ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
+      echo "skip ${FILE}"
+    else
       check_file "${FILE}"
     fi
   done
 
   if [[ "${ARCH}" == "linux" ]]; then
-    check_file "../patches/linux/arch-0-support.patch"
-    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
-    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
-    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch"
-    check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch"
+    check_file "../patches/optional-tree-sitter.patch" "../patches/linux/fix-dependencies.patch"
+
+    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch"
+    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
+    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
+    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch"
+    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch"
+  elif [[ "${ARCH}" == "windows" ]]; then
+    check_file "../patches/cli.patch" "../patches/windows/cli.patch"
   fi
 
   for TARGET in client reh; do

docs/accounts-authentication.md

@@ -1,3 +1,5 @@
+<!-- order: 0 -->
+
 # Accounts authentication
 
 ## GitHub

docs/ext-github-copilot.md

@@ -0,0 +1,22 @@
+<!-- order: 16 -->
+
+# Extension: GitHub Copilot
+
+Unlike Visual Studio Code, in VSCodium, Copilot features are disabled and not configured.
+
+## Update your settings
+
+In your settings, sets:
+```
+"chat.disableAIFeatures": false,
+```
+
+## Configure product.json
+
+You need to create 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`
+- macOS: `~/Library/Application Support/VSCodium`
+- Linux: `$XDG_CONFIG_HOME/VSCodium` or `~/.config/VSCodium`
+
+Then you will need to follow the guide [Running with Code OSS](https://github.com/microsoft/vscode-copilot-chat/blob/main/CONTRIBUTING.md#running-with-code-oss) with the `product.json` file created previously.
+You will need to add the properties: `trustedExtensionAuthAccess` and `defaultChatAgent`.

docs/extensions-compatibility.md

@@ -1,29 +1,44 @@
+<!-- order: 0 -->
+
 # Extensions compatibility
 
-## Partial Compatibility
+## Table of Contents
 
-- [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
-> [Since May 2021](https://devblogs.microsoft.com/python/python-in-visual-studio-code-may-2021-release/), Python is using a closed source language server ([Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance))
+- [Incompatibility](#incompatibility)
+- [Replacements](#replacements)
+  - [C/C++](#cc)
+  - [Python](#python)
+  - [Remote](#remote)
 
-## Incompatibility
+## <a id="incompatibility"></a>Incompatibility
 
-- [LaTeX Workshop](https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop)
-> It's officially unsupported: https://github.com/James-Yu/LaTeX-Workshop/wiki/FAQ#vscodium-is-not-officially-supported
-
-## Incompatibility due to licensing
-
-The following extensions are not compatible with VSCodium due to their licensing:
+Most Microsoft extensions are limited to run on only MS products by their license and by running additional checks in their proprietary code.
 
+Extensions incompatible with VSCodium **include**:
+- [C/C++](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)
+- [LaTeX Workshop](https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop) (explicitly unsupported, as [indicated in the FAQ](https://github.com/James-Yu/LaTeX-Workshop/wiki/FAQ#vscodium-is-not-officially-supported))
 - [Live Share](https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare)
+- [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
 - [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
 - [Remote - SSH](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh)
 - [Remote - SSH: Editing Configuration Files](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh-edit)
 - [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl)
 
-## Replacements
+## <a id="replacements"></a>Replacements
 
 The following extensions are functional replacements for incompatible extensions:
 
-- [Open Remote - SSH](https://open-vsx.org/extension/jeanp413/open-remote-ssh)
+### <a id="cc"></a>C/C++
+
+- [clangd](https://open-vsx.org/extension/llvm-vs-code-extensions/vscode-clangd) for full featured editing (including IntelliSense)
+- [Native Debug](https://open-vsx.org/extension/webfreak/debug) for Debugging with GDB + LLDB  
+  Note that there are many working debugging extensions and specialized ones including for microcontrollers.
+
+### <a id="python"></a>Python
+
+- [BasedPyright](https://open-vsx.org/extension/detachhead/basedpyright)
+
+### <a id="remote"></a>Remote Development
+
+- [Open Remote - SSH](https://open-vsx.org/extension/jeanp413/open-remote-ssh) (SSH server must be configured with the setting `AllowTcpForwarding yes`.)
 - [Open Remote - WSL](https://open-vsx.org/extension/jeanp413/open-remote-wsl)
-- [BasedPyright](https://open-vsx.org/extension/detachhead/basedpyright) (open-source alternative to Pylance)

docs/extensions.md

@@ -0,0 +1,136 @@
+<!-- order: 15 -->
+
+# Extensions + Marketplace
+
+## Table of Contents
+
+- [Marketplace](#marketplace)
+- [How to use the OpenVSX Marketplace](#howto-openvsx-marketplace)
+- [How to use a different extension gallery](#howto-switch-marketplace)
+- [How to self host your own extension gallery](#howto-selfhost-marketplace)
+- [Visual Studio Marketplace](#visual-studio-marketplace)
+- [Proprietary Debugging Tools](#proprietary-debugging-tools)
+- [Proprietary Extensions](#proprietary-extensions)
+- [Using the "VSIX Manager" Extension](#vsix-manager)
+- [Extensions compatibility](https://github.com/VSCodium/vscodium/blob/master/docs/extensions-compatibility.md)
+
+## <a id="marketplace"></a>Marketplace
+
+Being a vscode based editor, VSCodium gets additional features by installing Visual Studio Code extensions.
+Unfortunately, as Microsoft [prohibits usages of the Microsoft marketplace by any other products](https://github.com/microsoft/vscode/issues/31168) or redistribution of `.vsix` files from it, in order to use Visual Studio Code extensions in non-Microsoft products those need to be installed differently.
+
+By default, the `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by Visual Studio Code. Since that is a rather new project, you will likely miss some extensions you know from the Visual Studio Marketplace. You have the following options to obtain such missing extensions:
+
+* Ask the extension maintainers to publish to [open-vsx.org](https://open-vsx.org/) in addition to the Visual Studio Marketplace. The publishing process is documented in the [Open VSX Wiki](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions).
+* Create a pull request to [this repository](https://github.com/open-vsx/publish-extensions) to have the [@open-vsx](https://github.com/open-vsx) service account publish the extensions for you.
+* Download and [install the vsix files](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix), for example from the release page in their source repository.
+
+## <a id="howto-openvsx-marketplace"></a>How to use the Open VSX Registry
+
+As noted above, the [Open VSX Registry](https://open-vsx.org/) is the pre-set extension gallery in VSCodium. Using the extension view in VSCodium will therefore by default use it.
+See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on the motivation behind Open VSX.
+
+## <a id="howto-switch-marketplace"></a>How to use a different extension gallery
+
+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` ***(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`
+- macOS: `~/Library/Application Support/VSCodium`
+- Linux: `$XDG_CONFIG_HOME/VSCodium` or `~/.config/VSCodium`
+
+with the content like:
+
+```jsonc
+{
+  "extensionsGallery": {
+    "serviceUrl": "", // required
+    "itemUrl": "", // required
+    "cacheUrl": "",
+    "controlUrl": "",
+    "extensionUrlTemplate": "", // required
+    "resourceUrlTemplate": "",
+  }
+}
+```
+
+## <a id="howto-selfhost-marketplace"></a>How to self-host your own extension gallery
+
+Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own extension gallery.
+
+There are likely other options, but the following were reported to work:
+
+* [Open VSX](https://github.com/eclipse/openvsx) eclipse open-source project
+  While the public instance which is run by the Eclipse Foundation is the pre-set endpoint in VSCodium, you can host your own instance.
+
+    > Open VSX is a [vendor-neutral](https://projects.eclipse.org/projects/ecd.openvsx) open-source alternative to the [Visual Studio Marketplace](https://marketplace.visualstudio.com/vscode). It provides a server application that manages [Visual Studio Code extensions](https://code.visualstudio.com/api) in a database, a web application similar to the Visual Studio Marketplace, and a command-line tool for publishing extensions similar to [vsce](https://code.visualstudio.com/api/working-with-extensions/publishing-extension#vsce).
+
+* [code-marketplace](https://coder.com/blog/running-a-private-vs-code-extension-marketplace) open-source project
+
+    > `code-marketplace` is a self-contained go binary that does not have a frontend or any mechanisms for extension authors to add or update extensions in the marketplace. It simply reads extensions from file storage and provides an API for VSCode compatible editors to consume.
+
+## <a id="visual-studio-marketplace"></a>Visual Studio Marketplace
+
+As with any online service, ensure you've understood [its terms of use](https://aka.ms/vsmarketplace-ToU) which include:
+> Marketplace Offerings are intended for use only with Visual Studio Products and Services and you may only install and use Marketplace Offerings with Visual Studio Products and Services.
+
+So, we can't provide any help if you intend to infringe their terms of use.
+
+Also note that this extension gallery hosts multiple extensions that are non-free and have license-agreements that explicitly forbid using them in non-Microsoft products, along with using telemetry.
+
+## <a id="proprietary-debugging-tools"></a>Proprietary Debugging Tools
+
+The debugger provided with Microsoft's [C# extension](https://github.com/OmniSharp/omnisharp-vscode) as well as the (Windows) debugger provided with their [C++ extension](https://github.com/Microsoft/vscode-cpptools) are very restrictively licensed to only work with the official Visual Studio Code build. See [this comment in the C# extension repo](https://github.com/OmniSharp/omnisharp-vscode/issues/2491#issuecomment-418811364) and [this comment in the C++ extension repo](https://github.com/Microsoft/vscode-cpptools/issues/21#issuecomment-248349017).
+
+A workaround exists to get debugging working in C# projects, by using Samsung's opensource [netcoredbg](https://github.com/Samsung/netcoredbg) package. See [this comment](https://github.com/VSCodium/vscodium/issues/82#issue-409806641) for instructions on how to set that up.
+
+## <a id="proprietary-extensions"></a>Proprietary Extensions
+
+Like the debuggers mentioned above, some extensions you may find in the marketplace (like the [Remote Development Extensions](https://code.visualstudio.com/docs/remote/remote-overview)) only function with the official Visual Studio Code build. You can work around this by adding the extension's internal ID (found on the extension's page) to the `extensionAllowedProposedApi` property of the product.json in your VSCodium installation. For example:
+
+```jsonc
+  "extensionAllowedProposedApi": [
+    // ...
+    "ms-vscode-remote.vscode-remote-extensionpack",
+    "ms-vscode-remote.remote-wsl",
+    // ...
+  ],
+```
+
+In some cases, the above change won't help because the extension is hard-coded to only work with the official Visual Studio Code product.
+
+## <a id="vsix-manager"></a>Using the "VSIX Manager" Extension
+
+The [**VSIX Manager**](https://github.com/zokugun/vscode-vsix-manager) extension provides a powerful and user-friendly interface for managing `.vsix` files directly within VSCodium. Its author is the main maintainer of VSCodium ;)
+
+It is particularly beneficial for:
+- **Support for Multiple Marketplaces**: Seamlessly install and manage extensions from several marketplaces at the same time, allowing access to a broader range of extensions.
+- **Local Files**: Manage a collection of `.vsix` files stored locally.
+- **GitHub/Forgejo Release**: Install the extension directly from its GitHub/Forgejo release pages.
+- **Fallback Options**
+
+### <a id="use-cases"></a>Use Cases
+
+- Developers working offline can easily manage `.vsix` files.
+- Teams can distribute specific versions of extensions across systems.
+- Enterprises with restricted environments can maintain control over installed extensions.
+- Users can connect to multiple marketplaces and access a wider range of extensions or switch seamlessly between them.
+
+### <a id="marketplace-support"></a>Marketplace Support
+
+The **VSIX Manager** extension supports managing extensions from several marketplaces simultaneously. This feature enables:
+- **Access to Diverse Extensions**: Install extensions from different sources like Open VSX or private repositories.
+- **Fallback Options**: Ensure extension availability even if one marketplace is temporarily inaccessible.
+- **Enterprise Flexibility**: Use private or self-hosted marketplaces alongside public ones to meet security and compliance requirements.
+- **Custom Configurations**: Prioritize specific marketplaces for particular needs while keeping access to others.
+
+## [Extensions compatibility](https://github.com/VSCodium/vscodium/blob/master/docs/extensions-compatibility.md)
+

docs/getting-started.md

@@ -0,0 +1,50 @@
+<!-- order: 5 -->
+
+# Getting Started with VSCodium
+
+This guide will help you get started with VSCodium.
+
+## Table of Contents
+
+- [Installation](#installation)
+- [First Steps](#first-steps)
+- [Basic Usage](#basic-usage)
+- [Keyboard Shortcuts](#keyboard-shortcuts)
+- [Next Steps](#next-steps)
+
+## <a id="installation"></a>Installation
+
+VSCodium can be installed on Windows, macOS, and Linux. Visit the [download page](https://vscodium.com/#install) for installation instructions.
+
+## <a id="first-steps"></a>First Steps
+
+After installing VSCodium, here are some first steps to get started:
+
+1. **Open a folder**: Use File > Open Folder to open your project
+2. **Install extensions**: Click on the Extensions icon in the sidebar to browse and install extensions
+3. **Configure settings**: Use File > Preferences > Settings to customize your editor
+
+## <a id="basic-usage"></a>Basic Usage
+
+VSCodium works just like Visual Studio Code, with a few differences:
+
+- It uses Open VSX for extensions by default instead of the Visual Studio Marketplace
+- It doesn't include Microsoft telemetry or branding
+- Some proprietary features may not be available
+
+## <a id="keyboard-shortcuts"></a>Keyboard Shortcuts
+
+Here are some essential keyboard shortcuts to get you started:
+
+- `Ctrl+P` (Windows/Linux) or `Cmd+P` (macOS): Quick Open, Go to File
+- `Ctrl+Shift+P` (Windows/Linux) or `Cmd+Shift+P` (macOS): Show Command Palette
+- `Ctrl+,` (Windows/Linux) or `Cmd+,` (macOS): User Settings
+- `Ctrl+K Ctrl+S` (Windows/Linux) or `Cmd+K Cmd+S` (macOS): Keyboard Shortcuts
+
+## <a id="next-steps"></a>Next Steps
+
+Once you're comfortable with the basics, you might want to:
+
+- Explore the [documentation](https://github.com/VSCodium/vscodium/blob/master/docs/index.md) for more details
+- Join the [community](https://github.com/VSCodium/vscodium/discussions) to ask questions and share tips
+- Contribute to the [project](https://github.com/VSCodium/vscodium/blob/master/CONTRIBUTING.md) if you're interested

docs/howto-build.md

@@ -1,3 +1,5 @@
+<!-- order: 35 -->
+
 # How to build VSCodium
 
 ## Table of Contents
@@ -6,7 +8,8 @@
   - [Linux](#dependencies-linux)
   - [MacOS](#dependencies-macos)
   - [Windows](#dependencies-windows)
-- [Build Scripts](#build-scripts)
+- [Build for Development](#build-dev)
+- [Build for CI/Downstream](#build-ci)
 - [Build Snap](#build-snap)
 - [Patch Update Process](#patch-update-process)
   - [Semi-Automated](#patch-update-process-semiauto)
@@ -14,11 +17,11 @@
 
 ## <a id="dependencies"></a>Dependencies
 
-- node 20.14
-- yarn
+- node (check [.nvmrc](../.nvmrc) for version)
 - jq
 - git
 - python3 3.11
+- rustup
 
 ### <a id="dependencies-linux"></a>Linux
 
@@ -43,19 +46,85 @@ see [the common dependencies](#dependencies)
 
 ### <a id="dependencies-windows"></a>Windows
 
-- powershell
-- sed
-- 7z
-- [WiX Toolset](http://wixtoolset.org/releases/)
-- 'Tools for Native Modules' from the official Node.js installer
+The build scripts are written in Bash, so on Windows you must run them inside **Git Bash** (bundled with [Git for Windows](https://gitforwindows.org/)) or **WSL2**.
 
-## <a id="build-scripts"></a>Build Scripts
+#### Required tools
+
+- **Git for Windows** — provides Git Bash, `sed`, and POSIX utilities used by the build scripts:
+
+  ```cmd
+  winget install --id Git.Git -e
+  ```
+
+- **Node.js** — exact version is specified in [`.nvmrc`](../.nvmrc). Use [nvm-windows](https://github.com/coreybutler/nvm-windows) to manage versions:
+
+  ```cmd
+  nvm install <version-from-.nvmrc>
+  nvm use <version-from-.nvmrc>
+  ```
+
+  Alternatively, download directly from [nodejs.org](https://nodejs.org/). During installation, enable **"Automatically install the necessary tools"** to get the C++ build tools (required for native Node addons).
+
+- **jq** — JSON processor used throughout the build scripts:
+
+  ```cmd
+  winget install --id jqlang.jq -e
+  ```
+
+- **7-Zip** — used to package `.zip` archives:
+
+  ```cmd
+  winget install --id 7zip.7zip -e
+  ```
+
+- **Python 3.11** — required by the VS Code build system:
+
+  ```cmd
+  winget install --id Python.Python.3.11 -e
+  ```
+
+  Ensure `python` / `python3` is on your `PATH` after installation.
+
+- **Rustup** — required to compile some native VS Code modules:
+
+  ```cmd
+  winget install --id Rustlang.Rustup -e
+  ```
+
+  Restart your shell afterwards so `cargo` and `rustc` are on your `PATH`.
+
+#### Optional tools
+
+- **WiX Toolset v3** _(only needed for `.msi` installer packaging, i.e., the `-p` flag)_:
+
+  Download from [wixtoolset.org](https://wixtoolset.org/releases/) and ensure `candle.exe` / `light.exe` are on your `PATH`.
+
+#### PATH verification
+
+After installing all tools, verify each is discoverable from Git Bash:
+
+```bash
+node --version    # should match .nvmrc
+npm --version
+jq --version
+python3 --version # should be 3.11.x
+cargo --version
+7z i 2>&1 | head -1
+git --version
+```
+
+If any command is not found, add its install directory to your `PATH` via **System Properties → Environment Variables → Path**.
+
+## <a id="build-dev"></a>Build for Development
 
 A build helper script can be found at `dev/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`
+- Windows (Git Bash — **recommended**): `"C:\Program Files\Git\bin\bash.exe" ./dev/build.sh`
+- Windows (PowerShell): `powershell -ExecutionPolicy ByPass -File .\dev\build.ps1`
+
+> **Note for Windows users**: Git Bash is the recommended shell because the build scripts rely on POSIX utilities (`sed`, `grep`, `find`, etc.) bundled with Git for Windows. If you use WSL2, follow the Linux dependencies section instead.
 
 ### Insider
 
@@ -73,6 +142,32 @@ The script `dev/build.sh` provides several flags:
 - `-p`: generate the packages/assets/installers
 - `-s`: do not retrieve the source code of Visual Studio Code, it won't delete the existing build
 
+## <a id="build-ci"></a>Build for CI/Downstream
+
+Here is the base script to build VSCodium:
+
+```bash
+# Export necessary environment variables
+export SHOULD_BUILD="yes"
+export SHOULD_BUILD_REH="no"
+export CI_BUILD="no"
+export OS_NAME="linux"
+export VSCODE_ARCH="${vscode_arch}"
+export VSCODE_QUALITY="stable"
+export RELEASE_VERSION="${version}"
+
+. get_repo.sh
+. build.sh
+```
+
+To go further, you should look at how we build it:
+
+- Linux: https://github.com/VSCodium/vscodium/blob/master/.github/workflows/stable-linux.yml
+- macOS: https://github.com/VSCodium/vscodium/blob/master/.github/workflows/stable-macos.yml
+- Windows: https://github.com/VSCodium/vscodium/blob/master/.github/workflows/stable-windows.yml
+
+The `./dev/build.sh` script is for development purpose and must be avoided for a packaging purpose.
+
 ## <a id="build-snap"></a>Build Snap
 
 ```
@@ -97,20 +192,19 @@ review-tools.snap-review --allow-classic codium*.snap
 - 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`
+- run `npm run watch`
 - run `./script/code.sh` until everything is ok
 - press any key to continue the script `update_patches.sh`
 
 ## <a id="patch-update-process-manual"></a>Manual
 
 - 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`
+- run `./dev/patch.sh <name>.patch` where `<name>.patch` is the failed patch
+- open `vscode` directory in a new **VSCodium**'s window
 - fix all the `*.rej` files
-- run `yarn watch`
+- run `npm run watch`
 - run `./script/code.sh` until everything is ok
-- run `git diff > ../patches/<name>.patch`
+- go back to the command line running `./dev/patch.sh`, press `enter` to validate the changes and it will update the patch
 
 ### <a id="icons"></a>icons/build_icons.sh
 

docs/index.md

@@ -1,227 +1,44 @@
-# More Info
+# Documentation
 
 ## Table of Contents
 
-- [Getting all the Telemetry Out](#disable-telemetry)
-  - [Replacements to Microsoft Online Services](#replacement-online-services)
-- [Extensions + Marketplace](#extensions-marketplace)
-  - [How to use the OpenVSX Marketplace](#howto-openvsx-marketplace)
-  - [How to use a different extension gallery](#howto-switch-marketplace)
-  - [How to self host your own VS Code Marketplace](#howto-selfhost-marketplace)
-  - [Visual Studio Marketplace](#visual-studio-marketplace)
-  - [Proprietary Debugging Tools](#proprietary-debugging-tools)
-  - [Proprietary Extensions](#proprietary-extensions)
-- [Extensions compatibility](https://github.com/VSCodium/vscodium/blob/master/docs/extensions-compatibility.md)
-- [Migrating from Visual Studio Code to VSCodium](#migrating)
-- [Sign in with GitHub](#signin-github)
-- [Accounts authentication](https://github.com/VSCodium/vscodium/blob/master/docs/accounts-authentication.md)
-- [How do I run VSCodium in portable mode?](#portable)
-- [How do I fix the default file manager?](#file-manager)
-- [How do I press and hold a key and have it repeat in VSCodium?](#press-and-hold)
-- [How do I open VSCodium from the terminal?](#terminal-support)
-  - [From Linux .tar.gz](#from-linux-targz)
+- [Getting Started with VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/getting-started.md)
+  - [Installation](https://github.com/VSCodium/vscodium/blob/master/docs/getting-started.md#installation)
+  - [First Steps](https://github.com/VSCodium/vscodium/blob/master/docs/getting-started.md#first-steps)
+  - [Basic Usage](https://github.com/VSCodium/vscodium/blob/master/docs/getting-started.md#basic-usage)
+  - [Keyboard Shortcuts](https://github.com/VSCodium/vscodium/blob/master/docs/getting-started.md#keyboard-shortcuts)
+  - [Next Steps](https://github.com/VSCodium/vscodium/blob/master/docs/getting-started.md#next-steps)
+- [Getting all the Telemetry Out](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md)
+  - [Telemetry in VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md#telemetry)
+  - [Replacements to Microsoft Online Services](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md#replacements)
+  - [Checking for Telemetry](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md#checking)
+  - [Additional Privacy Settings](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md#additional-settings)
+  - [VSCodium Announcements](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md#announcements)
+  - [Malicious & Deprecated Extensions](https://github.com/VSCodium/vscodium/blob/master/docs/telemetry.md#malicious-extensions)
+- [Extensions and Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md)
+  - [Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#marketplace)
+  - [How to use the OpenVSX Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#howto-openvsx-marketplace)
+  - [How to use a different extension gallery](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#howto-switch-marketplace)
+  - [How to self host your own extension gallery](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#howto-selfhost-marketplace)
+  - [Visual Studio Marketplace](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#visual-studio-marketplace)
+  - [Proprietary Debugging Tools](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#proprietary-debugging-tools)
+  - [Proprietary Extensions](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#proprietary-extensions)
+  - [Using the "VSIX Manager" Extension](https://github.com/VSCodium/vscodium/blob/master/docs/extensions.md#vsix-manager)
+  - [Extensions compatibility](https://github.com/VSCodium/vscodium/blob/master/docs/extensions-compatibility.md)
+  - [Ext: GitHub Copilot](https://github.com/VSCodium/vscodium/blob/master/docs/ext-github-copilot.md)
+- [Migration](https://github.com/VSCodium/vscodium/blob/master/docs/migration.md)
+  - [Manual Migration from Visual Studio Code to VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/migration.md#manual-migration)
+  - [Semi-Automatic Migration with "Sync Settings" Extension](https://github.com/VSCodium/vscodium/blob/master/docs/migration.md#semi-automatic-migration)
+- [Usage](https://github.com/VSCodium/vscodium/blob/master/docs/usage.md)
+  - [Sign in with GitHub](https://github.com/VSCodium/vscodium/blob/master/docs/usage.md#signin-github)
+  - [Accounts authentication](https://github.com/VSCodium/vscodium/blob/master/docs/accounts-authentication.md)
+  - [How do I run VSCodium in portable mode?](https://github.com/VSCodium/vscodium/blob/master/docs/usage.md#portable)
+  - [How do I fix the default file manager?](https://github.com/VSCodium/vscodium/blob/master/docs/usage.md#file-manager)
+  - [How do I press and hold a key and have it repeat in VSCodium?](https://github.com/VSCodium/vscodium/blob/master/docs/usage.md#press-and-hold)
+  - [How do I open VSCodium from the terminal?](https://github.com/VSCodium/vscodium/blob/master/docs/usage.md#terminal-support)
 - [Troubleshooting](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md)
-- [Contributing](https://github.com/VSCodium/vscodium/blob/master/CONTRIBUTING.md)
-- [How to build VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/howto-build.md)
-
-## <a id="disable-telemetry"></a>Getting all the Telemetry Out
-
-Even though we do not pass the telemetry build flags (and go out of our way to cripple the baked-in telemetry), Microsoft will still track usage by default.
-
-We do however set the `telemetry.enableTelemetry` setting's default value to `false`. You can see those by viewing your VSCodium `settings.json` and searching for `telemetry`.
-
-The instructions [here](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting) help with explaining and toggling telemetry.
-
-It is also highly recommended that you review all the settings that "use online services" by following [these instructions](https://code.visualstudio.com/docs/getstarted/telemetry#_managing-online-services). The `@tag:usesOnlineServices` filter on the settings page will show that by default:
-
-- Extensions auto check for updates and auto install updates
-- Searches within the app are sent to an online service for "natural language processing"
-- Updates to the app are fetched in the background
-
-These can all be disabled.
-
-__Please note that some extensions send telemetry data to Microsoft as well. We have no control over this and can only recommend removing the extension.__ _(For example, the C# extension `ms-vscode.csharp` sends tracking data to Microsoft.)_
-
-### <a id="replacement-online-services"></a>Replacements to Microsoft Online Services
-
-When searching the `@tag:usesOnlineServices` filter, note that while the "Update: Mode" setting description still says "The updates are fetched from a Microsoft online service", VSCodium's build script [sets the `updateUrl` field](https://github.com/VSCodium/vscodium/blob/master/prepare_vscode.sh#L36) in `product.json` to that of VSCodium's own small [update server](https://github.com/VSCodium/update-api), so enabling that setting won't actually result in any calls to Microsoft servers.
-
-Likewise, while the descriptions for "Extensions: Auto Check Updates" and "Extensions: Auto Update" include the same phrase, VSCodium [replaces](https://github.com/VSCodium/vscodium/blob/master/prepare_vscode.sh#L42) the Visual Studio Marketplace with Open VSX, so these settings won't call Microsoft, either.
-
-## <a id="extensions-marketplace"></a>Extensions + Marketplace
-
-Being a vscode based editor, VSCodium gets additional features by installing VS Code extensions.
-Unfortunately, as Microsoft [prohibits usages of the Microsoft marketplace by any other products](https://github.com/microsoft/vscode/issues/31168) or redistribution of `.vsix` files from it, in order to use VS Code extensions in non-Microsoft products those need to be installed differently.
-
-By default, the `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by VS Code. Since that is a rather new project, you will likely miss some extensions you know from the VS Code Marketplace. You have the following options to obtain such missing extensions:
-
-* Ask the extension maintainers to publish to [open-vsx.org](https://open-vsx.org/) in addition to the VS Code Marketplace. The publishing process is documented in the [Open VSX Wiki](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions).
-* Create a pull request to [this repository](https://github.com/open-vsx/publish-extensions) to have the [@open-vsx](https://github.com/open-vsx) service account publish the extensions for you.
-* Download and [install the vsix files](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix), for example from the release page in their source repository.
-
-### <a id="howto-openvsx-marketplace"></a>How to use the Open VSX Registry
-
-As noted above, the [Open VSX Registry](https://open-vsx.org/) is the pre-set extension gallery in VSCodium. Using the extension view in VSCodium will therefore by default use it.
-See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on the motivation behind Open VSX.
-
-### <a id="howto-switch-marketplace"></a>How to use a different extension gallery
-
-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` ***(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`
-- macOS: `~/Library/Application Support/VSCodium`
-- Linux: `$XDG_CONFIG_HOME/VSCodium` or `~/.config/VSCodium`
-
-with the content like:
-
-```jsonc
-{
-  "extensionsGallery": {
-    "serviceUrl": "", // required
-    "itemUrl": "", // required
-    "cacheUrl": "",
-    "controlUrl": "",
-    "extensionUrlTemplate": "", // required
-    "resourceUrlTemplate": "",
-  }
-}
-```
-
-### <a id="howto-selfhost-marketplace"></a>How to self-host your own extension gallery
-
-Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own extension gallery.
-
-There are likely other options, but the following were reported to work:
-
-* [Open VSX](https://github.com/eclipse/openvsx) eclipse open-source project
-  While the public instance which is run by the Eclipse Foundation is the pre-set endpoint in VSCodium, you can host your own instance.
-
-    > Open VSX is a [vendor-neutral](https://projects.eclipse.org/projects/ecd.openvsx) open-source alternative to the [Visual Studio Marketplace](https://marketplace.visualstudio.com/vscode). It provides a server application that manages [VS Code extensions](https://code.visualstudio.com/api) in a database, a web application similar to the VS Code Marketplace, and a command-line tool for publishing extensions similar to [vsce](https://code.visualstudio.com/api/working-with-extensions/publishing-extension#vsce).
-
-* [code-marketplace](https://coder.com/blog/running-a-private-vs-code-extension-marketplace) open-source project
-
-    > `code-marketplace` is a self-contained go binary that does not have a frontend or any mechanisms for extension authors to add or update extensions in the marketplace. It simply reads extensions from file storage and provides an API for VSCode compatible editors to consume.
-
-### <a id="visual-studio-marketplace"></a>Visual Studio Marketplace
-
-As with any online service, ensure you've understood [its terms of use](https://aka.ms/vsmarketplace-ToU) which include:
-> Marketplace Offerings are intended for use only with Visual Studio Products and Services and you may only install and use Marketplace Offerings with Visual Studio Products and Services.
-
-So, we can't provide any help if you intend to infringe their terms of use.
-
-Also note that this extension gallery hosts multiple extensions that are non-free and have license-agreements that explicitly forbid using them in non-Microsoft products, along with using telemetry.
-
-### <a id="proprietary-debugging-tools"></a>Proprietary Debugging Tools
-
-The debugger provided with Microsoft's [C# extension](https://github.com/OmniSharp/omnisharp-vscode) as well as the (Windows) debugger provided with their [C++ extension](https://github.com/Microsoft/vscode-cpptools) are very restrictively licensed to only work with the official Visual Studio Code build. See [this comment in the C# extension repo](https://github.com/OmniSharp/omnisharp-vscode/issues/2491#issuecomment-418811364) and [this comment in the C++ extension repo](https://github.com/Microsoft/vscode-cpptools/issues/21#issuecomment-248349017).
-
-A workaround exists to get debugging working in C# projects, by using Samsung's opensource [netcoredbg](https://github.com/Samsung/netcoredbg) package. See [this comment](https://github.com/VSCodium/vscodium/issues/82#issue-409806641) for instructions on how to set that up.
-
-### <a id="proprietary-extensions"></a>Proprietary Extensions
-
-Like the debuggers mentioned above, some extensions you may find in the marketplace (like the [Remote Development Extensions](https://code.visualstudio.com/docs/remote/remote-overview)) only function with the official Visual Studio Code build. You can work around this by adding the extension's internal ID (found on the extension's page) to the `extensionAllowedProposedApi` property of the product.json in your VSCodium installation. For example:
-
-```jsonc
-  "extensionAllowedProposedApi": [
-    // ...
-    "ms-vscode-remote.vscode-remote-extensionpack",
-    "ms-vscode-remote.remote-wsl",
-    // ...
-  ],
-```
-
-In some cases, the above change won't help because the extension is hard-coded to only work with the official Visual Studio Code product.
-
-## <a id="migrating"></a>Migrating from Visual Studio Code to VSCodium
-
-VSCodium (and a freshly cloned copy of vscode built from source) stores its extension files in `~/.vscode-oss`. So if you currently have Visual Studio Code installed, your extensions won't automatically populate. You can reinstall your extensions from the Marketplace in VSCodium, or copy the `extensions` from `~/.vscode/extensions` to `~/.vscode-oss/extensions`.
-
-Visual Studio Code stores its `keybindings.json` and `settings.json` file in these locations:
-
-- __Windows__: `%APPDATA%\Code\User`
-- __macOS__: `$HOME/Library/Application Support/Code/User`
-- __Linux__: `$HOME/.config/Code/User`
-
-You can copy these files to the VSCodium user settings folder:
-
-- __Windows__: `%APPDATA%\VSCodium\User`
-- __macOS__: `$HOME/Library/Application Support/VSCodium/User`
-- __Linux__: `$HOME/.config/VSCodium/User`
-
-To copy your settings manually:
-
-- In Visual Studio Code, go to Settings (Command+, if on a Mac)
-- Click the three dots `...` and choose 'Open settings.json'
-- Copy the contents of settings.json into the same place in VSCodium
-
-## <a id="signin-github"></a>Sign in with GitHub
-
-In VSCodium, `Sign in with GitHub` is using a Personal Access Token.<br />
-Follow the documentation https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token to create your token.<br />
-Select the scopes dependending on the extension which needs access to GitHub. (GitLens requires the `repo` scope.)
-
-### Linux
-
-If you are getting the error `Writing login information to the keychain failed with error 'The name org.freedesktop.secrets was not provided by any .service files'.`, you need to install the package `gnome-keyring`.
-
-## <a id="portable"></a>How do I run VSCodium in portable mode?
-You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website.
-- **Windows** / **Linux** : the instructions can be followed as written.
-- **macOS** : portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `codium-portable-data`. So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the [link above](https://code.visualstudio.com/docs/editor/portable), but create a folder named `codium-portable-data` instead of `code-portable-data`.
-
-## <a id="file-manager"></a>How do I fix the default file manager (Linux)?
-
-In some cases, VSCodium becomes the file manager used to open directories (instead of apps like Dolphin or Nautilus).<br />
-It's due to that no application was defined as the default file manager and so the system is using the latest capable application.
-
-To set the default app, create the file `~/.config/mimeapps.list` with the content like:
-```
-[Default Applications]
-inode/directory=org.gnome.Nautilus.desktop;
-```
-
-You can find your regular file manager with the command:
-```
-> grep directory /usr/share/applications/mimeinfo.cache
-inode/directory=codium.desktop;org.gnome.Nautilus.desktop;
-```
-
-## <a id="press-and-hold"></a>How do I press and hold a key and have it repeat in VSCodium (Mac)?
-
-This is a common question for Visual Studio Code and the procedure is slightly different in VSCodium because the `defaults` path is different.
-
-```bash
-$ defaults write com.vscodium ApplePressAndHoldEnabled -bool false
-```
-
-## <a id="terminal-support"></a>How do I open VSCodium from the terminal?
-
-For macOS and Windows:
-- Go to the command palette (View | Command Palette...)
-- Choose `Shell command: Install 'codium' command in PATH`.
-
-![](https://user-images.githubusercontent.com/2707340/60140295-18338a00-9766-11e9-8fda-b525b6f15c13.png)
-
-This allows you to open files or directories in VSCodium directly from your terminal:
-
-```bash
-~/in-my-project $ codium . # open this directory
-~/in-my-project $ codium file.txt # open this file
-```
-
-Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=codium`).
-
-On Linux, when installed with a package manager, `codium` has been installed in your `PATH`.
-
-### <a id="from-linux-targz"></a>From Linux .tar.gz
-
-When the archive `VSCodium-linux-<arch>-<version>.tar.gz` is extracted, the main entry point for VSCodium is `./bin/codium`.
+  - [Linux](https://github.com/VSCodium/vscodium/blob/master/docs/troubleshooting.md#linux)
+- [Other Resources](https://github.com/VSCodium/vscodium/blob/master/docs/others.md)
+  - [What are reh and reh-web archives?](https://github.com/VSCodium/vscodium/blob/master/docs/others.md#reh)
+- [Contributing Guidelines](https://github.com/VSCodium/vscodium/blob/master/CONTRIBUTING.md)
+- [Building VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/howto-build.md)

docs/migration.md

@@ -0,0 +1,54 @@
+<!-- order: 20 -->
+
+# Migration
+
+## Table of Contents
+
+- [Manual Migration from Visual Studio Code to VSCodium](#manual-migration)
+- [Semi-Automatic Migration with "Sync Settings" Extension](#semi-automatic-migration)
+
+## <a id="manual-migration"></a>Manual Migration from Visual Studio Code to VSCodium
+
+VSCodium (and a freshly cloned copy of vscode built from source) stores its extension files in `~/.vscode-oss`. So if you currently have Visual Studio Code installed, your extensions won't automatically populate. You can copy the `extensions` from `~/.vscode/extensions` to `~/.vscode-oss/extensions`.
+
+Visual Studio Code stores its `keybindings.json` and `settings.json` file in these locations:
+
+- __Windows__: `%APPDATA%\Code\User`
+- __macOS__: `$HOME/Library/Application Support/Code/User`
+- __Linux__: `$HOME/.config/Code/User`
+
+You can copy these files to the VSCodium user settings folder:
+
+- __Windows__: `%APPDATA%\VSCodium\User`
+- __macOS__: `$HOME/Library/Application Support/VSCodium/User`
+- __Linux__: `$HOME/.config/VSCodium/User`
+
+To copy your settings manually:
+
+- In Visual Studio Code, go to Settings (`Meta+,`)
+- Click the three dots `...` and choose 'Open settings.json'
+- Copy the contents of settings.json into the same place in VSCodium
+
+## <a id="semi-automatic-migration"></a>Semi-Automatic Migration with "Sync Settings" Extension
+
+The [**Sync Settings**](https://github.com/zokugun/vscode-sync-settings) extension can simplify the migration process by enabling synchronization of settings, keybindings, extensions, and more between Visual Studio Code and VSCodium. Its author is the main maintainer of VSCodium ;)
+
+The extension is available in the Visual Studio Marketplace, OpenVSX or directly in its GitHub repository.
+
+### Steps:
+
+1. Install the **Sync Settings** extension in both Visual Studio Code and VSCodium.
+2. Configure the extension on both Visual Studio Code and VSCodium:
+  - Open Command Palette (`Meta+Shift+P`).
+  - Search for `Sync Settings: Open the repository settings` and execute the command.
+  - Configure the repository
+3. Export your current settings from Visual Studio Code:
+  - Open Command Palette (`Meta+Shift+P`).
+  - Search for `Sync Settings: Upload (user -> repository)` and execute the command.
+4. Import the settings into VSCodium:
+  - I recommend the setting `"syncSettings.openOutputOnActivity": true,`.
+  - Open Command Palette (`Meta+Shift+P`).
+  - Search for `Sync Settings: Download (repository -> user)` and execute the command.
+  - Wait for all the extensions to be downloaded and installed (follow logs in the `Output` panel) before restarting VSCodium.
+
+This method ensures that all supported configurations are seamlessly transferred.

docs/others.md

@@ -0,0 +1,12 @@
+<!-- order: 30 -->
+
+# Other Resources
+
+## Table of Contents
+
+- [What are reh and reh-web archives?](#reh)
+
+## <a id="reh"></a>What are reh and reh-web archives?
+
+- Remote Host (`reh`) is the server component for remote ssh/wsl which runs it on a "remote" computer and makes that remote computer accessible via VSCodium.
+- Web Host (`reh-web`) is the server component of the command `codium serve-web` which runs it locally and makes VSCodium accessible via a browser.

docs/patches.md

@@ -0,0 +1,43 @@
+# Patches
+
+Documentation for VSCodium patches applied on top of VS Code.
+
+---
+
+## fix-policies
+
+**Replace `@vscode/policy-watcher` with `@vscodium/policy-watcher`**
+
+VS Code uses `@vscode/policy-watcher` to enforce Group Policy Objects (GPOs) on
+Windows. That package reads from:
+
+```
+HKLM\SOFTWARE\Policies\Microsoft\<productName>
+```
+
+VSCodium forks this into `@vscodium/policy-watcher`, which takes a separate
+`vendorName` argument. The `createWatcher()` call becomes:
+
+```ts
+createWatcher('VSCodium', this.productName, ...)
+```
+
+Because VSCodium sets `product.nameLong = 'VSCodium'` (via `prepare_vscode.sh`),
+`this.productName` resolves to `'VSCodium'` at runtime. Therefore, the final
+Windows registry key that VSCodium reads policies from is:
+
+```
+HKLM\SOFTWARE\Policies\VSCodium\VSCodium\<PolicyName>
+```
+
+(or `HKCU\SOFTWARE\Policies\VSCodium\VSCodium\<PolicyName>` for per-user policies)
+
+This differs from VS Code's path (`Microsoft\VSCode`) and is the root cause of
+[issue #2714](https://github.com/VSCodium/vscodium/issues/2714) where users mirror
+VS Code's registry structure and find their GPOs ignored. Enterprise admins must
+use the VSCodium-specific registry path.
+
+### References
+
+- [VSCodium issue #2714](https://github.com/VSCodium/vscodium/issues/2714)
+- [VSCodium/policy-watcher — RegistryPolicy.hh](https://github.com/VSCodium/policy-watcher/blob/main/src/windows/RegistryPolicy.hh)

docs/telemetry.md

@@ -0,0 +1,87 @@
+<!-- order: 10 -->
+
+# Getting all telemetry out
+
+This page explains how VSCodium handles telemetry and how it enhances your privacy.
+
+## Table of contents
+
+- [Telemetry in VSCodium](#telemetry)
+- [Replacements to Microsoft Online Services](#replacements)
+- [Checking for telemetry](#checking)
+- [VSCodium announcements](#announcements)
+- [Malicious & deprecated extensions](#malicious-extensions)
+
+## <a id="telemetry"></a>Telemetry in VSCodium
+
+Even though we do not pass the telemetry build flags and go out of our way to cripple the baked-in telemetry, Microsoft still can track usage by default depending on your settings.
+
+We disable all the following telemetry-related settings by default to enhance your privacy:
+
+```
+telemetry.telemetryLevel
+telemetry.enableCrashReporter
+telemetry.enableTelemetry
+telemetry.editStats.enabled
+workbench.enableExperiments
+workbench.settings.enableNaturalLanguageSearch
+workbench.commandPalette.experimental.enableNaturalLanguageSearch
+```
+
+It is also recommended that you review all the settings that "use online services" by following [these instructions](https://code.visualstudio.com/docs/getstarted/telemetry#_managing-online-services). You can use the search filter `@tag:usesOnlineServices` to show such settings and review what to change.
+
+**Please note that some extensions send telemetry data to Microsoft as well. We have no control over this and can only recommend removing the extension.**  
+For example, the C# extension `ms-vscode.csharp` sends tracking data to Microsoft. Be sure to check each extension's settings page to disable their telemetry if applicable.
+
+### Update services
+
+By default, the app periodically fetches connections to check for the latest version available to download and install.  
+Extensions are also checked for updates automatically from time to time.
+
+If you want to prevent such behaviors, modify the following preferences:
+
+For the app itself:
+
+- `update.mode` -> `manual` (or `none`)
+- `update.enableWindowsBackgroundUpdates` -> `false` (only applicable for Microsoft Windows)
+
+For extensions:
+
+- `extensions.autoUpdate` -> `false`
+- `extensions.autoCheckUpdates` -> `false`
+
+_Note: on Linux, the app update service is disabled completely at build-time even if the `update.mode` preference is configured. This is because users will more likely use their package managers to update the app rather than updating via the app itself._
+
+### Feedback telemetry
+
+By default, we keep the preference `telemetry.feedback.enabled` enabled. It's used to allow the button `Report Issue...` to be used on the app depending on the context. It does not send any data by having it enabled (other options already cover it). If you want, you can disable this behavior by toggling the preference value.
+
+## <a id="replacements"></a>Replacements to Microsoft Online Services
+
+When searching the `@tag:usesOnlineServices` filter, note that while the "Update: Mode" setting description still says "The updates are fetched from a Microsoft online service", VSCodium's build script [sets the `updateUrl` field](https://github.com/VSCodium/vscodium/blob/8cc366bb76d6c0ddb64374f9530b42094646a660/prepare_vscode.sh#L132-L133) in `product.json` directly to the GitHub page, so enabling that setting won't actually result in any calls to the Microsoft online service.
+
+Likewise, while the descriptions for "Extensions: Auto Check Updates" and "Extensions: Auto Update" include the same phrase, VSCodium [replaces](https://github.com/VSCodium/vscodium/blob/8cc366bb76d6c0ddb64374f9530b42094646a660/prepare_vscode.sh#L119) the Visual Studio Marketplace with Open VSX, so these settings won't call Microsoft either.
+
+## <a id="checking"></a>Checking for telemetry
+
+If you want to verify that no telemetry is being sent, you can use network monitoring tools like:
+
+- Wireshark
+- Little Snitch (macOS)
+- GlassWire (Windows)
+
+Look for connections to Microsoft domains and telemetry endpoints.
+
+## <a id="announcements"></a>VSCodium announcements
+
+The welcome page in VSCodium displays announcements that are fetched via the internet from the project's GitHub repository.
+
+If you prefer to disable this feature, you can disable the preference `workbench.welcomePage.extraAnnouncements`.
+
+## <a id="malicious-extensions"></a>Malicious & deprecated extensions
+
+The definitions for malicious and deprecated extensions are dynamically loaded from the following URL:
+https://raw.githubusercontent.com/EclipseFdn/publish-extensions/refs/heads/master/extension-control/extensions.json
+
+If you prefer to avoid any external connections, you can disable the preference `extensions.excludeUnsafes`.
+However, this is not recommended as it may reduce the safety of your environment.

docs/troubleshooting.md

@@ -1,3 +1,5 @@
+<!-- order: 25 -->
+
 # Troubleshooting
 
 ## Table of Contents
@@ -8,14 +10,15 @@
   - [Global menu workaround for KDE](#linux-kde-global-menu)
   - [Flatpak most common issues](#linux-flatpak-most-common-issues)
   - [Remote SSH doesn't work](#linux-remote-ssh)
-- [macOS](#macos)
-  - [App can't be opened because Apple cannot check it for malicious software](#macos-unidentified-developer)
-  - ["VSCodium.app" is damaged and can’t be opened. You should move it to the Bin](#macos-quarantine)
-
+  - [The window doesn't show up](#linux-no-window)
+- [Windows](#windows)
+  - [Group Policy Objects (GPOs) are ignored](#windows-gpo)
+  - ["Open with VSCodium" missing from context menu](#windows-context-menu)
+  - [Windows Defender flags the installer as malware](#windows-defender)
 
 ## <a id="linux"></a>Linux
 
-#### <a id="linux-fonts-rectangle"></a>*Fonts showing up as rectangles*
+### <a id="linux-fonts-rectangle"></a>_Fonts showing up as rectangles_
 
 The following command should help:
 
@@ -25,27 +28,27 @@ rm -rf ~/snap/codium/common/.cache
 fc-cache -r
 ```
 
-#### <a id="linux-rendering-glitches"></a>*Text and/or the entire interface not appearing*
+### <a id="linux-rendering-glitches"></a>_Text and/or the entire interface not appearing_
 
-You have likely encountered [a bug in Chromium and Electron](microsoft/vscode#190437) when compiling Mesa shaders, which has affected all Visual Studio Code and VSCodium versions for Linux distributions since 1.82.  The current workaround (see microsoft/vscode#190437) is to delete the GPU cache as follows:
+You have likely encountered [a bug in Chromium and Electron](microsoft/vscode#190437) when compiling Mesa shaders, which has affected all Visual Studio Code and VSCodium versions for Linux distributions since 1.82. The current workaround (see microsoft/vscode#190437) is to delete the GPU cache as follows:
 
 ```bash
 rm -rf ~/.config/VSCodium/GPUCache
 ```
 
-#### <a id="linux-kde-global-menu"></a>*Global menu workaround for KDE*
+### <a id="linux-kde-global-menu"></a>_Global menu workaround for KDE_
 
 Install these packages on Fedora:
 
-* libdbusmenu-devel
-* dbus-glib-devel
-* libdbusmenu
+- libdbusmenu-devel
+- dbus-glib-devel
+- libdbusmenu
 
 On Ubuntu this package is called `libdbusmenu-glib4`.
 
 Credits: [Gerson](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/issues/91)
 
-#### <a id="linux-flatpak-most-common-issues"></a>*Flatpak most common issues*
+### <a id="linux-flatpak-most-common-issues"></a>_Flatpak most common issues_
 
 - blurry screen with HiDPI on wayland run:
   ```bash
@@ -65,26 +68,87 @@ Credits: [Gerson](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/issues/
 
 - If you have any other problems with the flatpak package try to look on the [FAQ](https://github.com/flathub/com.vscodium.codium?tab=readme-ov-file#faq) maybe the solution is already there or open an [issue](https://github.com/flathub/com.vscodium.codium/issues).
 
-##### <a id="linux-remote-ssh"></a>*Remote SSH doesn't work*
+### <a id="linux-remote-ssh"></a>_Remote SSH doesn't work_
 
 Use the VSCodium's compatible extension [Open Remote - SSH](https://open-vsx.org/extension/jeanp413/open-remote-ssh).
 
 On the server, in the `sshd` config, `AllowTcpForwarding` need to be set to `yes`.
 
-It might requires additional dependeincies due to the OS/distro (alpine).
+It might requires additional dependencies due to the OS/distro (alpine).
 
-## <a id="macos"></a>macOS
+### <a id="linux-no-window"></a>_The window doesn't show up_
 
-Since the App is signed with a self-signed certificate, on the first launch, you might see the following messages:
+If you are under Wayland:
 
-#### <a id="macos-unidentified-developer"></a>*App can't be opened because Apple cannot check it for malicious software*
+- try the command `codium --verbose`
+- if you see an error like `:ERROR:ui/gl/egl_util.cc:92] EGL Driver message (Error) eglCreateContext: Requested version is not supported`
+- try `codium --ozone-platform=x11`
 
-You can right-click the App and choose `Open`.
+## <a id="windows"></a>Windows
 
-#### <a id="macos-quarantine"></a>*"VSCodium.app" is damaged and can’t be opened. You should move it to the Bin.*
+### <a id="windows-gpo"></a>_Group Policy Objects (GPOs) are ignored_
 
-The following command will remove the quarantine attribute.
+VSCodium uses its own policy-watcher library (`@vscodium/policy-watcher`) which reads GPO values from a **different registry path** than VS Code.
+
+**VSCodium reads policies from:**
 
 ```
-xattr -r -d com.apple.quarantine /Applications/VSCodium.app
+HKLM\SOFTWARE\Policies\VSCodium\VSCodium
 ```
+
+**VS Code reads policies from:**
+
+```
+HKLM\SOFTWARE\Policies\Microsoft\VSCode
+```
+
+If you are deploying VSCodium in an enterprise environment via Group Policy:
+
+1. Copy the `.admx` template file to `C:\Windows\PolicyDefinitions\`
+2. Copy the `.adml` language file to `C:\Windows\PolicyDefinitions\en-US\`
+3. Open `gpedit.msc` and configure policies under the VSCodium group
+4. Verify the resulting registry key exists at `HKLM\SOFTWARE\Policies\VSCodium\VSCodium` (not `Microsoft\VSCodium`)
+
+If you set policies manually via Registry Editor, make sure you create the key at the correct path:
+
+```
+HKLM\SOFTWARE\Policies\VSCodium\VSCodium\<PolicyName>  (REG_SZ or REG_DWORD)
+```
+
+For example, to set `Update: Mode` to `none`:
+
+```
+Registry key: HKLM\SOFTWARE\Policies\VSCodium\VSCodium
+Value name:   update.mode
+Value type:   REG_SZ
+Value data:   none
+```
+
+Per-user policies are also supported under `HKCU\SOFTWARE\Policies\VSCodium\VSCodium` (machine policies take precedence).
+
+### <a id="windows-context-menu"></a>_"Open with VSCodium" missing from context menu_
+
+If the **"Open with VSCodium"** option does not appear after installation (even with the checkbox checked during setup):
+
+1. **Run the installer again** and ensure _"Add 'Open with VSCodium' action to Windows Explorer file context menu"_ is checked.
+2. **Windows 11 note**: Windows 11 hides most context menu entries behind **Shift + Right-click** ("Show more options"). VSCodium's entry may be present but hidden in the new condensed menu. Try Shift + Right-click to see the classic context menu.
+3. If the entry still does not appear, you can add it manually via Registry Editor:
+
+   ```
+   Key:   HKEY_CLASSES_ROOT\*\shell\Open with VSCodium
+   Value: (Default) = "Open with VSCodium"
+
+   Key:   HKEY_CLASSES_ROOT\*\shell\Open with VSCodium\command
+   Value: (Default) = "C:\Program Files\VSCodium\VSCodium.exe" "%1"
+   ```
+
+   Adjust the install path to match your actual installation directory.
+
+### <a id="windows-defender"></a>_Windows Defender flags the installer as malware_
+
+Some users report Windows Defender detecting the VSCodium installer as `Cinjo` or another threat. This is a **false positive** caused by the unsigned nature of certain build artifacts.
+
+- Download VSCodium **only from the official [GitHub Releases page](https://github.com/VSCodium/vscodium/releases)**.
+- Verify the SHA256/SHA512 checksum of the downloaded file against the `.sha256` or `.sha512` file published alongside each release.
+- If Defender blocks the installer, add an exclusion for the downloaded file, run the install, then remove the exclusion.
+- You can also report the false positive directly to Microsoft via the [Windows Defender Security Intelligence submission portal](https://www.microsoft.com/en-us/wdsi/filesubmission).

docs/usage.md

@@ -0,0 +1,76 @@
+<!-- order: 25 -->
+
+# Usage
+
+## Table of Contents
+
+- [Sign in with GitHub](#signin-github)
+- [Accounts authentication](https://github.com/VSCodium/vscodium/blob/master/docs/accounts-authentication.md)
+- [How do I run VSCodium in portable mode?](#portable)
+- [How do I fix the default file manager?](#file-manager)
+- [How do I press and hold a key and have it repeat in VSCodium?](#press-and-hold)
+- [How do I open VSCodium from the terminal?](#terminal-support)
+  - [From Linux .tar.gz](#from-linux-targz)
+
+## <a id="signin-github"></a>Sign in with GitHub
+
+In VSCodium, `Sign in with GitHub` is using a Personal Access Token.<br />
+Follow the documentation https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token to create your token.<br />
+Select the scopes dependending on the extension which needs access to GitHub. (GitLens requires the `repo` scope.)
+
+### Linux
+
+If you are getting the error `Writing login information to the keychain failed with error 'The name org.freedesktop.secrets was not provided by any .service files'.`, you need to install the package `gnome-keyring`.
+
+## <a id="portable"></a>How do I run VSCodium in portable mode?
+You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website.
+- **Windows** / **Linux** : the instructions can be followed as written.
+- **macOS** : portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `codium-portable-data`. So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the [link above](https://code.visualstudio.com/docs/editor/portable), but create a folder named `codium-portable-data` instead of `code-portable-data`.
+
+## <a id="file-manager"></a>How do I fix the default file manager (Linux)?
+
+In some cases, VSCodium becomes the file manager used to open directories (instead of apps like Dolphin or Nautilus).<br />
+It's due to that no application was defined as the default file manager and so the system is using the latest capable application.
+
+To set the default app, create the file `~/.config/mimeapps.list` with the content like:
+```
+[Default Applications]
+inode/directory=org.gnome.Nautilus.desktop;
+```
+
+You can find your regular file manager with the command:
+```
+> grep directory /usr/share/applications/mimeinfo.cache
+inode/directory=codium.desktop;org.gnome.Nautilus.desktop;
+```
+
+## <a id="press-and-hold"></a>How do I press and hold a key and have it repeat in VSCodium (Mac)?
+
+This is a common question for Visual Studio Code and the procedure is slightly different in VSCodium because the `defaults` path is different.
+
+```bash
+$ defaults write com.vscodium ApplePressAndHoldEnabled -bool false
+```
+
+## <a id="terminal-support"></a>How do I open VSCodium from the terminal?
+
+For macOS and Windows:
+- Go to the command palette (View | Command Palette...)
+- Choose `Shell command: Install 'codium' command in PATH`.
+
+![](https://user-images.githubusercontent.com/2707340/60140295-18338a00-9766-11e9-8fda-b525b6f15c13.png)
+
+This allows you to open files or directories in VSCodium directly from your terminal:
+
+```bash
+~/in-my-project $ codium . # open this directory
+~/in-my-project $ codium file.txt # open this file
+```
+
+Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=codium`).
+
+On Linux, when installed with a package manager, `codium` has been installed in your `PATH`.
+
+### <a id="from-linux-targz"></a>From Linux .tar.gz
+
+When the archive `VSCodium-linux-<arch>-<version>.tar.gz` is extracted, the main entry point for VSCodium is `./bin/codium`.

font-size/.artifactrc.yml

@@ -0,0 +1,7 @@
+artifacts:
+  "@daiyam/artifact-lang-js":
+    version: 0.9.3
+    requires:
+      - "22"
+  "@daiyam/artifact-lang-ts":
+    version: 0.6.3

font-size/.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+indent_style = tab
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.yml,*.yaml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+indent_style = space
+indent_size = 4

font-size/.fixpackrc

@@ -0,0 +1,29 @@
+{
+	"sortToTop": [
+		"name",
+		"displayName",
+		"description",
+		"version",
+		"private",
+		"author",
+		"publisher",
+		"license",
+		"homepage",
+		"repository",
+		"bugs",
+		"engines",
+		"type",
+		"bin",
+		"exports",
+		"main",
+		"module",
+		"types",
+		"typesVersions",
+		"scripts",
+		"dependencies",
+		"devDependencies",
+		"optionalDependencies",
+		"keywords"
+	],
+	"finalNewLine": true
+}

font-size/.gitignore

@@ -0,0 +1,2 @@
+/node_modules/
+/lib/

font-size/.nvmrc

@@ -0,0 +1 @@
+v22.21.1

font-size/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+	"search.exclude": {
+		"package-lock.json": true,
+		"lib/**": true,
+	},
+	"taskExplorer.exclude": [
+		".husky",
+	],
+}

font-size/.xo-config.json

@@ -0,0 +1,153 @@
+{
+	"ignores": [
+		"*.config.js",
+		"*.config.ts"
+	],
+	"rules": {
+		"@typescript-eslint/ban-types": "off",
+		"@typescript-eslint/brace-style": [
+			"error",
+			"stroustrup"
+		],
+		"@typescript-eslint/class-literal-property-style": [
+			"error",
+			"fields"
+		],
+		"@typescript-eslint/keyword-spacing": [
+			"error",
+			{
+				"overrides": {
+					"if": {
+						"after": false
+					},
+					"for": {
+						"after": false
+					},
+					"switch": {
+						"after": false
+					},
+					"while": {
+						"after": false
+					}
+				}
+			}
+		],
+		"@typescript-eslint/member-ordering": [
+			"error",
+			{
+				"default": [
+					"field",
+					"constructor",
+					"get",
+					"set",
+					"method"
+				]
+			}
+		],
+		"@typescript-eslint/naming-convention": [
+			"error",
+			{
+				"selector": "variable",
+				"modifiers": ["const", "global"],
+				"format": ["camelCase", "UPPER_CASE"],
+				"filter": {
+					"regex": "^(__filename|__dirname)$",
+					"match": false
+				}
+			},
+			{
+				"selector": "variable",
+				"format": ["camelCase"],
+				"filter": {
+					"regex": "^(__filename|__dirname)$",
+					"match": false
+				}
+			}
+		],
+		"@typescript-eslint/no-confusing-void-expression": "off",
+		"@typescript-eslint/no-dynamic-delete": "off",
+		"@typescript-eslint/no-inferrable-types": "off",
+		"@typescript-eslint/no-namespace": "off",
+		"@typescript-eslint/object-curly-spacing": [
+			"error",
+			"always"
+		],
+		"@typescript-eslint/parameter-properties": "off",
+		"@typescript-eslint/prefer-promise-reject-errors": "off",
+		"@typescript-eslint/return-await": "off",
+		"arrow-parens": [
+			"error",
+			"always"
+		],
+		"capitalized-comments": "off",
+		"complexity": "off",
+		"default-case": "off",
+		"import/extensions":  [
+			"error",
+			"never"
+		],
+		"import/order": [
+			"error",
+			{
+				"groups": [
+					"builtin",
+					"external",
+					"internal",
+					"parent",
+					"sibling",
+					"index",
+					"object"
+				],
+				"alphabetize": {
+					"order": "asc",
+					"caseInsensitive": true
+				}
+			}
+		],
+		"max-depth": [
+			"error",
+			8
+		],
+		"max-params": [
+			"error",
+			12
+		],
+		"no-await-in-loop": "off",
+		"no-else-return": "off",
+		"no-lonely-if": "off",
+		"no-negated-condition": "off",
+		"object-curly-newline": "off",
+		"one-var": [
+			"error",
+			"never"
+		],
+		"unicorn/empty-brace-spaces": "off",
+		"unicorn/no-array-callback-reference": "off",
+		"unicorn/no-length-as-slice-end": "off",
+		"unicorn/no-object-as-default-parameter": "off",
+		"unicorn/prefer-json-parse-buffer": "off",
+		"unicorn/prefer-module": "off",
+		"unicorn/prefer-node-protocol": "off",
+		"unicorn/prefer-switch": "off",
+		"unicorn/prefer-ternary": "off",
+		"unicorn/prevent-abbreviations": [
+			"error",
+			{
+				"replacements": {
+					"arg": false,
+					"args": false,
+					"dir": false,
+					"err": false,
+					"fn": false,
+					"func": false,
+					"i": false,
+					"j": false,
+					"mod": false,
+					"num": false,
+					"pkg": false,
+					"str": false
+				}
+			}
+		]
+	}
+}

font-size/generate-css.ts

@@ -0,0 +1,270 @@
+#!/usr/bin/env node
+
+import path from 'node:path';
+import process from 'node:process';
+import fse from '@zokugun/fs-extra-plus/async';
+import { err, OK, type Result, stringifyError, xtry } from '@zokugun/xtry';
+import postcss, { Root, type Rule } from 'postcss';
+
+type Area = {
+	name: string;
+	defaultSize: number;
+	files: string[];
+	prefixes: string[];
+};
+
+const PX_REGEX = /(-?\d+(\.\d+)?)px\b/g;
+const COEFF_PRECISION = 6;
+const HEADER = '/*** Generated for Custom Font Size ***/';
+const ZEROS = ['margin', 'padding'];
+
+const AREAS: Record<string, Area> = {
+	activitybar: {
+		name: 'activitybar',
+		defaultSize: 16,
+		files: ['src/vs/workbench/browser/parts/activitybar/media/activityaction.css'],
+		prefixes: ['.monaco-workbench .activitybar'],
+	},
+	bottompane: {
+		name: 'bottompane',
+		defaultSize: 13,
+		files: ['src/vs/workbench/browser/parts/panel/media/panelpart.css', 'src/vs/base/browser/ui/actionbar/actionbar.css', 'src/vs/workbench/browser/parts/media/paneCompositePart.css'],
+		prefixes: ['.monaco-workbench .part.panel'],
+	},
+	statusbar: {
+		name: 'statusbar',
+		defaultSize: 12,
+		files: ['src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css'],
+		prefixes: ['.monaco-workbench .part.statusbar'],
+	},
+	sidebar: {
+		name: 'sidebar',
+		defaultSize: 13,
+		files: [
+			'src/vs/base/browser/ui/actionbar/actionbar.css',
+			'src/vs/base/browser/ui/button/button.css',
+			'src/vs/base/browser/ui/inputbox/inputBox.css',
+			'src/vs/workbench/contrib/debug/browser/media/debugToolBar.css',
+			'src/vs/workbench/contrib/debug/browser/media/debugViewlet.css',
+			'src/vs/workbench/contrib/extensions/browser/media/extension.css',
+			'src/vs/workbench/contrib/extensions/browser/media/extensionActions.css',
+			'src/vs/workbench/contrib/search/browser/media/searchview.css',
+			'src/vs/workbench/contrib/scm/browser/media/scm.css',
+		],
+		prefixes: ['.monaco-workbench .part.sidebar', '.monaco-workbench .part.auxiliarybar'],
+	},
+	tabs: {
+		name: 'tabs',
+		defaultSize: 13,
+		files: [
+			'src/vs/workbench/browser/parts/editor/media/editortabscontrol.css',
+			'src/vs/workbench/browser/parts/editor/media/editortitlecontrol.css',
+			'src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css'
+		],
+		prefixes: ['.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs'],
+	},
+};
+
+function formatCoefficient(n: number): string { // {{{
+	const fixed = n.toFixed(COEFF_PRECISION);
+	return fixed.replace(/\.?0+$/, '');
+} // }}}
+
+function replacePx(area: Area) { // {{{
+	return (match: string, numStr: string): string => {
+		const pxValue = Number.parseFloat(numStr);
+
+		if(pxValue === 1) {
+			return match;
+		}
+
+		const coeff = formatCoefficient(pxValue / area.defaultSize);
+
+		return `calc(var(--vscode-workbench-${area.name}-font-size) * ${coeff})`;
+	};
+} // }}}
+
+function transformPxValue(value: string, area: Area): string { // {{{
+	return value.replaceAll(PX_REGEX, replacePx(area));
+} // }}}
+
+async function processFile(filePath: string, areas: Area[]): Promise<Result<void, string>> { // {{{
+	const readResult = await fse.readFile(filePath, 'utf8');
+	if(readResult.fails) {
+		return err(stringifyError(readResult.error));
+	}
+
+	const content = extractOriginal(readResult.value);
+
+	const postcssResult = xtry(() => postcss.parse(content, { from: filePath }));
+	if(postcssResult.fails) {
+		return err(`Failed to parse ${filePath}: ${stringifyError(postcssResult.error)}`);
+	}
+
+	const generatedRoot = postcss.root();
+
+	for(const area of areas) {
+		processFileArea(postcssResult.value, generatedRoot, area)
+	}
+
+	if(generatedRoot.nodes && generatedRoot.nodes.length > 0) {
+		const writeResult = await fse.writeFile(filePath, content + `\n\n\n${HEADER}\n\n` + generatedRoot.toString(), 'utf8');
+		if(writeResult.fails) {
+			return err(stringifyError(readResult.error));
+		}
+
+		console.log(`Generated: ${filePath}`);
+	}
+	else {
+		console.log(`No px sizes found in: ${filePath}`);
+	}
+
+	return OK;
+} // }}}
+
+function processFileArea(postcssResult: Root, generatedRoot: Root, area: Area): void { // {{{
+	postcssResult.walkRules((rule: Rule) => {
+		const declarationsToAdd: Array<{ prop: string; value: string }> = [];
+
+		rule.walkDecls((declaration) => {
+			if(PX_REGEX.test(declaration.value)) {
+				const newValue = transformPxValue(declaration.value, area);
+
+				declarationsToAdd.push({ prop: declaration.prop, value: newValue });
+			}
+			else if(declaration.value === 'auto' && (declaration.prop === 'height' || declaration.prop === 'width')) {
+				declarationsToAdd.push({ prop: declaration.prop, value: 'auto' });
+			}
+			else if(declaration.value === '0' && ZEROS.includes(declaration.prop)) {
+				declarationsToAdd.push({ prop: declaration.prop, value: '0' });
+			}
+		});
+
+		if(declarationsToAdd.length > 0) {
+			const selectors = (rule.selectors && rule.selectors.length > 0)	? rule.selectors : [rule.selector];
+			const prefixeds: string[] = [];
+
+			for(const prefix of area.prefixes) {
+				const parts = prefix.split(' ');
+				const prefixed = selectors.map((s) => prefixSelector(s, parts)).join(', ');
+
+				prefixeds.push(prefixed);
+			}
+
+			const newRule = postcss.rule({ selector: `${prefixeds.join(', ')}` });
+
+			let length = 0;
+
+			for(const declaration of declarationsToAdd) {
+				if(!declaration.prop.startsWith('border')) {
+					newRule.append({ ...declaration });
+					length += 1;
+				}
+			}
+
+			if(length > 0) {
+				generatedRoot.append(newRule);
+			}
+		}
+	});
+} // }}}
+
+function extractOriginal(content: string): string { // {{{
+	const index = content.indexOf(HEADER);
+
+	if(index === -1) {
+		return content;
+	}
+
+	return content.slice(0, Math.max(0, index - 3));
+} // }}}
+
+function extractStyle(selector: string): string { // {{{
+	const match = /^(\.[\w-]+)/.exec(selector);
+
+	return match?.[1] ?? '';
+} // }}}
+
+function mergeSelector(selectors: string[], prefixes: string[], index: number): void { // {{{
+	if(index >= prefixes.length) {
+		return;
+	}
+
+	const prefix = prefixes[index];
+	const selector = selectors[index];
+	const style = extractStyle(prefix);
+
+	if(selector === style) {
+		if(prefix.length > style.length) {
+			selectors[index] = prefix;
+		}
+
+		mergeSelector(selectors, prefixes, index + 1);
+	}
+	else if(selector.startsWith(style)) {
+		mergeSelector(selectors, prefixes, index + 1);
+	}
+	else if(index === 0) {
+		selectors.unshift(...prefixes)
+	}
+	else {
+		selectors.splice(index + 1, 0, ...prefixes.slice(index));
+	}
+} // }}}
+
+function prefixSelector(selector: string, prefixParts: string[]): string { // {{{
+	const parts = selector.split(' ');
+
+	if(parts[0] === '.mac' || parts[0] === '.linux' || parts[0] === '.windows') {
+		parts[0] = `${prefixParts[0]}${parts[0]}`;
+
+		parts.splice(1, 0, ...prefixParts.slice(1));
+	}
+	else {
+		mergeSelector(parts, prefixParts, 0);
+	}
+
+	return parts.join(' ');
+} // }}}
+
+async function main(): Promise<void> { // {{{
+	const name = process.argv[2];
+	const area = AREAS[name];
+
+	if(area) {
+		for(const file of area.files) {
+			const result = await processFile(path.join('..', 'vscode', file), [area]);
+			if(result.fails) {
+				console.error(`Error processing ${file}:`, result.error);
+			}
+		}
+	}
+	else if(name === 'all') {
+		const files: Record<string, Area[]> = {};
+
+		for(const area of Object.values(AREAS)) {
+			for(const file of area.files) {
+				if(files[file]) {
+					files[file].push(area)
+				}
+				else {
+					files[file] = [area]
+				}
+			}
+		}
+
+		for(const [file, areas] of Object.entries(files)) {
+			const result = await processFile(path.join('..', 'vscode', file), areas);
+			if(result.fails) {
+				console.error(`Error processing ${file}:`, result.error);
+			}
+		}
+	}
+	else {
+		console.log(`No area found for ${name}`);
+		console.log(`\nAvailable areas:\n- ${Object.keys(AREAS).join('\n- ')}`);
+		return;
+	}
+} // }}}
+
+await main();

font-size/package.json

@@ -0,0 +1,30 @@
+{
+	"name": "font-size",
+	"description": "",
+	"version": "1.0.0",
+	"author": {
+		"name": "Baptiste Augrain",
+		"email": "daiyam@zokugun.org"
+	},
+	"license": "MIT",
+	"type": "module",
+	"main": "generate-css.ts",
+	"scripts": {
+		"clean": "rimraf lib",
+		"lint": "xo",
+		"lint:fix": "xo --fix",
+		"prepare": "fixpack || true"
+	},
+	"dependencies": {
+		"@zokugun/fs-extra-plus": "^0.3.3",
+		"@zokugun/xtry": "^0.10.1",
+		"fast-glob": "^3.3.3",
+		"postcss": "^8.5.6"
+	},
+	"devDependencies": {
+		"@types/node": "^22.9.0",
+		"fixpack": "^4.0.0",
+		"xo": "0.60.0"
+	},
+	"keywords": []
+}

font-size/tsconfig.base.json

@@ -0,0 +1,78 @@
+{
+	"compilerOptions": {
+		/* Language and Environment */
+		"target": "ES2022",								/* Specify ECMAScript target version. */
+		"lib": [										/* Specify library files to be included in the compilation. */
+			"ES2022",
+		],
+
+		/* Modules */
+		"module": "node16",								/* Specify what module code is generated. */
+
+		/* Basic Options */
+		// "allowJs": false,							/* Allow javascript files to be compiled. */
+		// "checkJs": false,							/* Report errors in '.js' files. */
+		// "jsx": undefined,							/* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
+		// "declaration": false,						/* Generates corresponding '.d.ts' file. */
+		// "declarationDir": ""							/* Specify the output directory for generated declaration files. */
+		// "declarationMap": false,						/* Generates a sourcemap for each corresponding '.d.ts' file. */
+		// "outFile": "",								/* Specify a file that bundles all outputs into one JavaScript file. */
+		// "outDir": "",								/* Specify an output folder for all emitted files. */
+		// "rootDir": "",								/* Specify the root directory of input files. */
+		// "incremental": false,						/* Save '.tsbuildinfo' files to allow for incremental compilation of projects. */
+		// "composite": false,							/* Enable constraints that allow a TypeScript project to be used with project references. */
+		// "tsBuildInfoFile": ".tsbuildinfo",			/* Specify the folder for '.tsbuildinfo' incremental compilation files. */
+		// "removeComments": false,						/* Disable emitting comments. */
+		// "noEmit": true,								/* Disable emitting file from a compilation. */
+		// "importHelpers": false,						/* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+		// "downlevelIteration": false,					/* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+		// "isolatedModules": false,					/* Ensure that each file can be safely transpiled without relying on other imports. */
+
+		/* Strict Type-Checking Options */
+		"strict": true,									/* Enable all strict type-checking options. */
+		"strictNullChecks": true,						/* When type checking, take into account null and undefined. */
+		// "strictFunctionTypes": false,				/* Enable strict checking of function types. */
+		// "strictBindCallApply": false,				/* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+		// "strictPropertyInitialization": false,		/* Enable strict checking of property initialization in classes. */
+		// "noImplicitThis": false,						/* Enable error reporting when 'this' is given the type 'any'. */
+		"alwaysStrict": true,							/* Parse in strict mode and emit "use strict" for each source file. */
+
+		/* Additional Checks */
+		"noUnusedLocals": true,							/* Report errors on unused locals. */
+		// "noUnusedParameters": false,					/* Report errors on unused parameters. */
+		"noImplicitAny": false,							/* Report error for expressions and declarations with an implied any type.. */
+		"noImplicitReturns": false,						/* Report error when not all code paths in function return a value. */
+		// "noFallthroughCasesInSwitch": false,			/* Report errors for fallthrough cases in switch statement. */
+		// "noUncheckedIndexedAccess": false,			/* Include 'undefined' in index signature results */
+		// "noImplicitOverride": false,					/* Ensure overriding members in derived classes are marked with an 'override' modifier. */
+		// "noPropertyAccessFromIndexSignature": false,	/* Require undeclared properties from index signatures to use element accesses. */
+
+		/* Module Resolution Options */
+		// "moduleResolution": "node",					/* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+		// "baseUrl": "",								/* Specify the base directory to resolve non-relative module names. */
+		// "paths": {},									/* Specify a set of entries that re-map imports to additional lookup locations. */
+		// "rootDirs": [],								/* Allow multiple folders to be treated as one when resolving modules. */
+		// "typeRoots": [],								/* List of folders to include type definitions from. */
+		// "types": [],									/* Specify type package names to be included without being referenced in a source file. */
+		"esModuleInterop": true,						/* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+		"allowSyntheticDefaultImports": true,			/* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+		// "preserveSymlinks": false,					/* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+		// "allowUmdGlobalAccess": false,				/* Allow accessing UMD globals from modules. */
+		// "resolveJsonModule": false,					/* Enable importing .json files */
+
+		/* Source Map Options */
+		// "sourceMap": false,							/* Create source map files for emitted JavaScript files. */
+		// "sourceRoot": "",							/* Specify the root path for debuggers to find the reference source code. */
+		// "mapRoot": "",								/* Specify the location where debugger should locate map files instead of generated locations. */
+		// "inlineSourceMap": false,					/* Include sourcemap files inside the emitted JavaScript. */
+		// "inlineSources": false,						/* Include source code in the sourcemaps inside the emitted JavaScript. */
+
+		/* Experimental Options */
+		// "experimentalDecorators": false,				/* Enables experimental support for ES7 decorators. */
+		// "emitDecoratorMetadata": false,				/* Emit design-type metadata for decorated declarations in source files. */
+
+		/* Advanced Options */
+		"skipLibCheck": true,							/* Skip type checking all .d.ts files. */
+		"forceConsistentCasingInFileNames": true,		/* Ensure that casing is correct in imports. */
+	},
+}

font-size/tsconfig.json

@@ -0,0 +1,15 @@
+{
+	"extends": "./tsconfig.base.json",
+	"compilerOptions": {
+		/* Basic Options */
+		"outDir": ".",
+		"rootDir": ".",
+		"declaration": true,
+
+		/* Module Resolution Options */
+		"resolveJsonModule": true,						/* Enable importing .json files */
+	},
+	"files": [
+		"package.json",
+	],
+}

get_repo.sh

@@ -27,16 +27,16 @@ if [[ -z "${RELEASE_VERSION}" ]]; then
     fi
   fi
 
-  date=$( date +%Y%j )
+  TIME_PATCH=$( printf "%04d" $(($(date +%-j) * 24 + $(date +%-H))) )
 
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-    RELEASE_VERSION="${MS_TAG}.${date: -5}-insider"
+    RELEASE_VERSION="${MS_TAG}${TIME_PATCH}-insider"
   else
-    RELEASE_VERSION="${MS_TAG}.${date: -5}"
+    RELEASE_VERSION="${MS_TAG}${TIME_PATCH}"
   fi
 else
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-    if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+-insider$ ]];
+    if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-5])[0-9]+-insider$ ]];
     then
       MS_TAG="${BASH_REMATCH[1]}"
     else
@@ -44,7 +44,7 @@ else
       exit 1
     fi
   else
-    if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$ ]];
+    if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-5])[0-9]+$ ]];
     then
       MS_TAG="${BASH_REMATCH[1]}"
     else
@@ -80,7 +80,7 @@ elif [[ -z "${MS_COMMIT}" ]]; then
   if [[ -z "${REFERENCE}" ]]; then
     echo "Error: The following tag can't be found: ${MS_TAG}"
     exit 1
-  elif [[ "${REFERENCE}" =~ ^([[:alnum:]]+)[[:space:]]+refs\/tags\/([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+  elif [[ "${REFERENCE}" =~ ^([[:alnum:]]+)[[:space:]]+refs\/tags\/([0-9]+\.[0-9]+\.[0-5])$ ]]; then
     MS_COMMIT="${BASH_REMATCH[1]}"
     MS_TAG="${BASH_REMATCH[2]}"
   else

icons/build_icons.sh

@@ -6,20 +6,22 @@ set -e
 # DEBUG
 # set -o xtrace
 
-QUALITY="stable"
-COLOR="blue1"
-
 while getopts ":i" opt; do
   case "$opt" in
     i)
-      export QUALITY="insider"
-      export COLOR="orange1"
+      QUALITY="insider"
+      [[ -z "${COLOR}" ]] && COLOR="orange1"
       ;;
     *)
       ;;
   esac
 done
 
+[[ -z "${COLOR}" ]] && COLOR="blue1"
+[[ -z "${QUALITY}" ]] && QUALITY="stable"
+[[ -z "${SRC_PREFIX}" ]] && SRC_PREFIX=""
+[[ -z "${VSCODE_PREFIX}" ]] && VSCODE_PREFIX=""
+
 check_programs() { # {{{
   for arg in "$@"; do
     if ! command -v "${arg}" &> /dev/null; then
@@ -31,27 +33,47 @@ check_programs() { # {{{
 
 check_programs "icns2png" "composite" "convert" "png2icns" "icotool" "rsvg-convert" "sed"
 
-. ./utils.sh
+. "./${VSCODE_PREFIX}utils.sh"
 
-SRC_PREFIX=""
-VSCODE_PREFIX=""
+if ! declare -F load_linux_png &>/dev/null; then
+  load_linux_png() {
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/linux/circle1/${COLOR}/paulo22s.png" -O "$1"
+  }
+fi
+
+if ! declare -F load_windows_ico &>/dev/null; then
+  load_windows_ico() {
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/win32/nobg/${COLOR}/paulo22s.ico" -O "$1"
+  }
+fi
 
 build_darwin_main() { # {{{
   if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" ]]; then
-    rsvg-convert -w 655 -h 655 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
-    composite "code_logo.png" -gravity center "icons/template_macos.png" "code_1024.png"
+    mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/darwin"
+
+    if [[ "$1" == "no-template" ]]; then
+      rsvg-convert -w 1024 -h 1024 "icons/${QUALITY}/codium_cnl.svg" -o "code_1024.png"
+    else
+      rsvg-convert -w 655 -h 655 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+      composite "code_logo.png" -gravity center "${VSCODE_PREFIX}icons/template_macos.png" "code_1024.png"
+    fi
+
     convert "code_1024.png" -resize 512x512 code_512.png
     convert "code_1024.png" -resize 256x256 code_256.png
     convert "code_1024.png" -resize 128x128 code_128.png
 
-    png2icns "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" code_512.png code_256.png code_128.png
+    png2icns "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" code_1024.png code_512.png code_256.png code_128.png
 
-    rm code_1024.png code_512.png code_256.png code_128.png code_logo.png
+    rm -f code_1024.png code_512.png code_256.png code_128.png code_logo.png
   fi
 } # }}}
 
 build_darwin_types() { # {{{
-  rsvg-convert -w 128 -h 128 "icons/${QUALITY}/codium_cnl_w80_b8.svg" -o "code_logo.png"
+  if [[ "$1" == "no-border" ]]; then
+    rsvg-convert -w 128 -h 128 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+  else
+    rsvg-convert -w 128 -h 128 "icons/${QUALITY}/codium_cnl_w80_b8.svg" -o "code_logo.png"
+  fi
 
   for file in "${VSCODE_PREFIX}"vscode/resources/darwin/*; do
     if [[ -f "${file}" ]]; then
@@ -60,7 +82,7 @@ build_darwin_types() { # {{{
       if [[ "${name}" != 'code' ]] && [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/darwin/${name}.icns" ]]; then
         icns2png -x -s 512x512 "${file}" -o .
 
-        composite -blend 100% -geometry +323+365 "icons/corner_512.png" "${name}_512x512x32.png" "${name}.png"
+        composite -blend 100% -geometry +323+365 "${VSCODE_PREFIX}icons/corner_512.png" "${name}_512x512x32.png" "${name}.png"
         composite -geometry +359+374 "code_logo.png" "${name}.png" "${name}.png"
 
         convert "${name}.png" -resize 256x256 "${name}_256.png"
@@ -77,30 +99,52 @@ build_darwin_types() { # {{{
 
 build_linux_main() { # {{{
   if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" ]]; then
-    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/linux/circle1/${COLOR}/paulo22s.png" -O "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
+    mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/linux"
+
+    load_linux_png "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
   fi
 
-  mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm"
-
   if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm/code.xpm" ]]; then
+    mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm"
+
     convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm/code.xpm"
   fi
 } # }}}
 
 build_media() { # {{{
   if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media/code-icon.svg" ]]; then
+    mkdir -p "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media"
+
     cp "icons/${QUALITY}/codium_clt.svg" "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media/code-icon.svg"
     gsed -i 's|width="100" height="100"|width="1024" height="1024"|' "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media/code-icon.svg"
   fi
 } # }}}
 
-build_windows_main() { # {{{
-  if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]]; then
-    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/win32/nobg/${COLOR}/paulo22s.ico" -O "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
+build_server() { # {{{
+  mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/server"
+
+  if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/server/favicon.ico" ]]; then
+    load_windows_ico "${SRC_PREFIX}src/${QUALITY}/resources/server/favicon.ico"
+  fi
+
+  if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/server/code-192.png" ]]; then
+    convert -size "192x192" "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" "${SRC_PREFIX}src/${QUALITY}/resources/server/code-192.png"
+  fi
+
+  if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/server/code-512.png" ]]; then
+    convert -size "512x512" "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" "${SRC_PREFIX}src/${QUALITY}/resources/server/code-512.png"
   fi
 } # }}}
 
-build_windows_type() {
+build_windows_main() { # {{{
+  if [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]]; then
+    mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/win32"
+
+    load_windows_ico "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
+  fi
+} # }}}
+
+build_windows_type() { # {{{
   local FILE_PATH IMG_SIZE IMG_BG_COLOR LOGO_SIZE GRAVITY
 
   FILE_PATH="$1"
@@ -118,12 +162,16 @@ build_windows_type() {
 
     rsvg-convert -w "${LOGO_SIZE}" -h "${LOGO_SIZE}" "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
 
-    composite -gravity "${GRAVITY}" "code_logo.png" "${FILE_PATH}" "${FILE_PATH}"
+    if [[ "${GRAVITY}" == "center" ]]; then
+      composite -gravity "${GRAVITY}" "code_logo.png" "${FILE_PATH}" "${FILE_PATH}"
+    else
+      composite -gravity NorthWest -geometry "${GRAVITY}" "code_logo.png" "${FILE_PATH}" "${FILE_PATH}"
+    fi
   fi
-}
+} # }}}
 
 build_windows_types() { # {{{
-  mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/win32"
+  mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/win32" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}"
 
   rsvg-convert -b "#F5F6F7" -w 64 -h 64 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
 
@@ -134,11 +182,11 @@ build_windows_types() { # {{{
       if [[ "${name}" != 'code' ]] && [[ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/${name}.ico" ]]; then
         icotool -x -w 256 "${file}"
 
-        composite -geometry +150+185 "code_logo.png" "${name}_9_256x256x32.png" "${name}.png"
+        composite -geometry +150+185 "code_logo.png" "${name}_1_256x256x32.png" "${name}.png"
 
         convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/${name}.ico"
 
-        rm "${name}_9_256x256x32.png" "${name}.png"
+        rm "${name}_1_256x256x32.png" "${name}.png"
       fi
     fi
   done
@@ -174,4 +222,5 @@ if [[ "${0}" == "${BASH_SOURCE[0]}" ]]; then
   build_windows_types
 
   build_media
+  build_server
 fi

install_gh.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-GH_ARCH="amd64"
-
-TAG=$( curl --retry 12 --retry-delay 30 "https://api.github.com/repos/cli/cli/releases/latest" | jq --raw-output '.tag_name' )
-VERSION=${TAG#v}
-
-curl --retry 12 --retry-delay 120 -sSL "https://github.com/cli/cli/releases/download/${TAG}/gh_${VERSION}_linux_${GH_ARCH}.tar.gz" -o "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
-
-tar xf "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
-
-cp "gh_${VERSION}_linux_${GH_ARCH}/bin/gh" /usr/local/bin/
-
-gh --version

patches/add-remote-url.patch

@@ -0,0 +1,18 @@
+diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts
+index b935764..68067db 100644
+--- a/build/gulpfile.reh.ts
++++ b/build/gulpfile.reh.ts
+@@ -323,3 +323,3 @@ function packageTask(type: string, platform: string, arch: string, sourceFolderN
+ 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+-			.pipe(jsonEditor({ commit, date: readISODate(sourceFolderName), version }))
++			.pipe(jsonEditor({ commit, date: readISODate(sourceFolderName), version, serverDownloadUrlTemplate: 'https://github.com/!!ASSETS_REPOSITORY!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' }))
+ 			.pipe(es.through(function (file) {
+diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
+index a103f11..82142a1 100644
+--- a/build/gulpfile.vscode.ts
++++ b/build/gulpfile.vscode.ts
+@@ -374,3 +374,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
+ 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+-			.pipe(jsonEditor({ commit, date: readISODate(out), checksums, version }))
++			.pipe(jsonEditor({ commit, date: readISODate(out), checksums, version, serverDownloadUrlTemplate: 'https://github.com/!!ASSETS_REPOSITORY!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' }))
+ 			.pipe(es.through(function (file) {

patches/alpine/reh/fix-node-docker.patch

@@ -1,9 +1,9 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index e12a33e..9300d62 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -188,5 +188,16 @@ function getNodeChecksum(expectedName) {
- function extractAlpinefromDocker(nodeVersion, platform, arch) {
+diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts
+index cb1a0a5..375851e 100644
+--- a/build/gulpfile.reh.ts
++++ b/build/gulpfile.reh.ts
+@@ -159,5 +159,16 @@ function getNodeChecksum(expectedName: string): string | undefined {
+ function extractAlpinefromDocker(nodeVersion: string, platform: string, arch: string) {
 -	const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
 +	let imageName = 'node';
 +	let dockerPlatform = '';
@@ -19,5 +19,5 @@ index e12a33e..9300d62 100644
 +
  	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
 -	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
-+	const contents = cp.execSync(`docker run --rm ${dockerPlatform} ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
- 	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
++	const contents = cp.execSync(`docker run --rm ${dockerPlatform} ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 200 * 1024 * 1024, encoding: 'buffer' });
+ 	// eslint-disable-next-line local/code-no-dangerous-type-assertions

patches/binary-name.patch

@@ -1,35 +1,23 @@
-diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 2686509..4fedec2 100644
---- a/build/gulpfile.vscode.js
-+++ b/build/gulpfile.vscode.js
-@@ -289,7 +289,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 		} else if (platform === 'darwin') {
- 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
- 				.pipe(replace('@@APPNAME@@', product.applicationName))
+diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
+index a103f11..cc95785 100644
+--- a/build/gulpfile.vscode.ts
++++ b/build/gulpfile.vscode.ts
+@@ -466,3 +466,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
+ 				.pipe(replace('@@NAME@@', product.nameShort))
 -				.pipe(rename('bin/code'));
 +				.pipe(rename('bin/' + product.applicationName));
- 
- 			all = es.merge(all, shortcut);
- 		}
+ 			const policyDest = gulp.src('.build/policies/darwin/**', { base: '.build/policies/darwin' })
 diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-index f7bd477..a489ae4 100644
+index 93d0008..a04d296 100644
 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
 +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-@@ -351,7 +351,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
- 	}
- 
+@@ -539,3 +539,3 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
  	private async getShellCommandLink(): Promise<{ readonly source: string; readonly target: string }> {
 -		const target = resolve(this.environmentMainService.appRoot, 'bin', 'code');
 +		const target = resolve(this.environmentMainService.appRoot, 'bin', this.productService.applicationName);
  		const source = `/usr/local/bin/${this.productService.applicationName}`;
- 
- 		// Ensure source exists
-@@ -545,7 +545,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
- 
- 		// macOS
+@@ -808,3 +808,3 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
  		if (this.environmentMainService.isBuilt) {
 -			return join(this.environmentMainService.appRoot, 'bin', 'code');
 +			return join(this.environmentMainService.appRoot, 'bin', `${this.productService.applicationName}`);
  		}
- 
- 		return join(this.environmentMainService.appRoot, 'scripts', 'code-cli.sh');

patches/cli.patch

@@ -0,0 +1,313 @@
+diff --git a/cli/src/commands/serve_web.rs b/cli/src/commands/serve_web.rs
+index d3f7db8..988024b 100644
+--- a/cli/src/commands/serve_web.rs
++++ b/cli/src/commands/serve_web.rs
+@@ -756,3 +756,3 @@ impl ConnectionManager {
+ 		let dir_fut = cache.create(&args.release.commit, |target_dir| async move {
+-			info!(log_for_fut, "Downloading server {}", release_for_fut.commit);
++			info!(log_for_fut, "Downloading server {}/{}", release_for_fut.commit, release_for_fut.name);
+ 			let tmpdir = tempfile::tempdir().unwrap();
+@@ -784,3 +784,3 @@ impl ConnectionManager {
+ 			.join("bin")
+-			.join(args.release.quality.server_entrypoint());
++			.join(args.release.quality.server_entrypoint().unwrap());
+ 
+diff --git a/cli/src/constants.rs b/cli/src/constants.rs
+index 1e277a8..97f17d3 100644
+--- a/cli/src/constants.rs
++++ b/cli/src/constants.rs
+@@ -35,3 +35,6 @@ pub const DOCUMENTATION_URL: Option<&'static str> = option_env!("VSCODE_CLI_DOCU
+ pub const VSCODE_CLI_COMMIT: Option<&'static str> = option_env!("VSCODE_CLI_COMMIT");
+-pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_URL");
++pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_ENDPOINT");
++pub const VSCODE_CLI_DOWNLOAD_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_DOWNLOAD_ENDPOINT");
++pub const VSCODE_CLI_APP_NAME: Option<&'static str> = option_env!("VSCODE_CLI_APP_NAME");
++pub const VSCODE_CLI_BINARY_NAME: Option<&'static str> = option_env!("VSCODE_CLI_BINARY_NAME");
+ 
+diff --git a/cli/src/options.rs b/cli/src/options.rs
+index 7d152c0..c0f2fb2 100644
+--- a/cli/src/options.rs
++++ b/cli/src/options.rs
+@@ -9,3 +9,3 @@ use serde::{Deserialize, Serialize};
+ 
+-use crate::constants::SERVER_NAME_MAP;
++use crate::{constants::VSCODE_CLI_BINARY_NAME, util::errors::CodeError};
+ 
+@@ -21,2 +21,6 @@ pub enum Quality {
+ 
++fn get_binary_name() -> Result<&'static str, CodeError> {
++	VSCODE_CLI_BINARY_NAME.ok_or_else(|| CodeError::UpdatesNotConfigured("no binary name"))
++}
++
+ impl Quality {
+@@ -41,9 +45,4 @@ impl Quality {
+ 	/// Server application name
+-	pub fn server_entrypoint(&self) -> String {
+-		let mut server_name = SERVER_NAME_MAP
+-			.as_ref()
+-			.and_then(|m| m.get(self))
+-			.map(|s| s.server_application_name.as_str())
+-			.unwrap_or("code-server-oss")
+-			.to_string();
++	pub fn server_entrypoint(&self) -> Result<String, CodeError> {
++		let mut server_name = get_binary_name()?.to_string();
+ 
+@@ -53,3 +52,3 @@ impl Quality {
+ 
+-		server_name
++		Ok(server_name)
+ 	}
+diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
+index bbabadc..b454d0e 100644
+--- a/cli/src/tunnels/code_server.rs
++++ b/cli/src/tunnels/code_server.rs
+@@ -462,3 +462,3 @@ impl<'a> ServerBuilder<'a> {
+ 							.join("bin")
+-							.join(self.server_params.release.quality.server_entrypoint()),
++							.join(self.server_params.release.quality.server_entrypoint().unwrap()),
+ 						&["--version"],
+diff --git a/cli/src/tunnels/paths.rs b/cli/src/tunnels/paths.rs
+index 3d7d718..98529bc 100644
+--- a/cli/src/tunnels/paths.rs
++++ b/cli/src/tunnels/paths.rs
+@@ -100,3 +100,3 @@ impl InstalledServer {
+ 					.join("bin")
+-					.join(self.quality.server_entrypoint())
++					.join(self.quality.server_entrypoint().unwrap())
+ 			},
+diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
+index 55f1dad..3b7ef5c 100644
+--- a/cli/src/update_service.rs
++++ b/cli/src/update_service.rs
+@@ -10,3 +10,3 @@ use serde::{Deserialize, Serialize};
+ use crate::{
+-	constants::VSCODE_CLI_UPDATE_ENDPOINT,
++	constants::{VSCODE_CLI_APP_NAME, VSCODE_CLI_DOWNLOAD_ENDPOINT, VSCODE_CLI_UPDATE_ENDPOINT},
+ 	debug, log, options, spanf,
+@@ -18,3 +18,3 @@ use crate::{
+ 		zipper,
+-	},
++	}
+ };
+@@ -58,2 +58,10 @@ fn quality_download_segment(quality: options::Quality) -> &'static str {
+ 
++fn get_app_name() -> Result<&'static str, CodeError> {
++	VSCODE_CLI_APP_NAME.ok_or_else(|| CodeError::UpdatesNotConfigured("no app name"))
++}
++
++fn get_download_endpoint() -> Result<&'static str, CodeError> {
++	VSCODE_CLI_DOWNLOAD_ENDPOINT.ok_or_else(|| CodeError::UpdatesNotConfigured("no download url"))
++}
++
+ fn get_update_endpoint() -> Result<String, CodeError> {
+@@ -66,3 +74,3 @@ fn get_update_endpoint() -> Result<String, CodeError> {
+ 		.map(|s| s.to_string())
+-		.ok_or_else(|| CodeError::UpdatesNotConfigured("no service url"))
++		.ok_or_else(|| CodeError::UpdatesNotConfigured("no update url"))
+ }
+@@ -74,3 +82,4 @@ impl UpdateService {
+ 
+-	pub async fn get_release_by_semver_version(
++	/// Gets the latest commit for the target of the given quality.
++	pub async fn get_latest_commit(
+ 		&self,
+@@ -79,14 +88,10 @@ impl UpdateService {
+ 		quality: options::Quality,
+-		version: &str,
+ 	) -> Result<Release, AnyError> {
+ 		let update_endpoint = get_update_endpoint()?;
+-		let download_segment = target
+-			.download_segment(platform)
+-			.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
+ 		let download_url = format!(
+-			"{}/api/versions/{}/{}/{}",
++			"{}/{}/{}/{}/latest.json",
+ 			&update_endpoint,
+-			version,
+-			download_segment,
+ 			quality_download_segment(quality),
++			platform.os(),
++			platform.arch(),
+ 		);
+@@ -104,3 +109,3 @@ impl UpdateService {
+ 		let res = response.json::<UpdateServerVersion>().await?;
+-		debug!(self.log, "Resolved version {} to {}", version, res.version);
++		debug!(self.log, "Resolved quality {} to {}", quality, res.version);
+ 
+@@ -115,40 +120,17 @@ impl UpdateService {
+ 
+-	/// Gets the latest commit for the target of the given quality.
+-	pub async fn get_latest_commit(
+-		&self,
+-		platform: Platform,
+-		target: TargetKind,
+-		quality: options::Quality,
+-	) -> Result<Release, AnyError> {
+-		let update_endpoint = get_update_endpoint()?;
+-		let download_segment = target
+-			.download_segment(platform)
+-			.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
++	pub fn get_download_url(&self, release: &Release) -> Result<String, AnyError> {
++		let app_name = get_app_name()?;
++		let download_endpoint = get_download_endpoint()?;
++
+ 		let download_url = format!(
+-			"{}/api/latest/{}/{}",
+-			&update_endpoint,
+-			download_segment,
+-			quality_download_segment(quality),
++			"{}/download/{}/{}-reh-web-{}-{}-{}.tar.gz",
++			download_endpoint,
++			release.name,
++			app_name,
++			release.platform.os(),
++			release.platform.arch(),
++			release.name,
+ 		);
+ 
+-		let mut response = spanf!(
+-			self.log,
+-			self.log.span("server.version.resolve"),
+-			self.client.make_request("GET", download_url)
+-		)?;
+-
+-		if !response.status_code.is_success() {
+-			return Err(response.into_err().await.into());
+-		}
+-
+-		let res = response.json::<UpdateServerVersion>().await?;
+-		debug!(self.log, "Resolved quality {} to {}", quality, res.version);
+-
+-		Ok(Release {
+-			target,
+-			platform,
+-			quality,
+-			name: res.name,
+-			commit: res.version,
+-		})
++		Ok(download_url)
+ 	}
+@@ -157,15 +139,3 @@ impl UpdateService {
+ 	pub async fn get_download_stream(&self, release: &Release) -> Result<SimpleResponse, AnyError> {
+-		let update_endpoint = get_update_endpoint()?;
+-		let download_segment = release
+-			.target
+-			.download_segment(release.platform)
+-			.ok_or_else(|| CodeError::UnsupportedPlatform(release.platform.to_string()))?;
+-
+-		let download_url = format!(
+-			"{}/commit:{}/{}/{}",
+-			&update_endpoint,
+-			release.commit,
+-			download_segment,
+-			quality_download_segment(release.quality),
+-		);
++		let download_url = self.get_download_url(release)?;
+ 
+@@ -203,13 +173,2 @@ pub enum TargetKind {
+ 
+-impl TargetKind {
+-	fn download_segment(&self, platform: Platform) -> Option<String> {
+-		match *self {
+-			TargetKind::Server => Some(platform.headless()),
+-			TargetKind::Archive => platform.archive(),
+-			TargetKind::Web => Some(platform.web()),
+-			TargetKind::Cli => Some(platform.cli()),
+-		}
+-	}
+-}
+-
+ #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+@@ -232,30 +191,17 @@ pub enum Platform {
+ impl Platform {
+-	pub fn archive(&self) -> Option<String> {
+-		match self {
+-			Platform::LinuxX64 => Some("linux-x64".to_owned()),
+-			Platform::LinuxARM64 => Some("linux-arm64".to_owned()),
+-			Platform::LinuxARM32 => Some("linux-armhf".to_owned()),
+-			Platform::DarwinX64 => Some("darwin".to_owned()),
+-			Platform::DarwinARM64 => Some("darwin-arm64".to_owned()),
+-			Platform::WindowsX64 => Some("win32-x64-archive".to_owned()),
+-			Platform::WindowsX86 => Some("win32-archive".to_owned()),
+-			Platform::WindowsARM64 => Some("win32-arm64-archive".to_owned()),
+-			_ => None,
+-		}
+-	}
+-	pub fn headless(&self) -> String {
++	pub fn arch(&self) -> String {
+ 		match self {
+-			Platform::LinuxAlpineARM64 => "server-alpine-arm64",
+-			Platform::LinuxAlpineX64 => "server-linux-alpine",
+-			Platform::LinuxX64 => "server-linux-x64",
+-			Platform::LinuxX64Legacy => "server-linux-legacy-x64",
+-			Platform::LinuxARM64 => "server-linux-arm64",
+-			Platform::LinuxARM64Legacy => "server-linux-legacy-arm64",
+-			Platform::LinuxARM32 => "server-linux-armhf",
+-			Platform::LinuxARM32Legacy => "server-linux-legacy-armhf",
+-			Platform::DarwinX64 => "server-darwin",
+-			Platform::DarwinARM64 => "server-darwin-arm64",
+-			Platform::WindowsX64 => "server-win32-x64",
+-			Platform::WindowsX86 => "server-win32",
+-			Platform::WindowsARM64 => "server-win32-arm64",
++			Platform::LinuxAlpineARM64 => "arm64",
++			Platform::LinuxAlpineX64 => "x64",
++			Platform::LinuxX64 => "x64",
++			Platform::LinuxX64Legacy => "x64",
++			Platform::LinuxARM64 => "arm64",
++			Platform::LinuxARM64Legacy => "arm64",
++			Platform::LinuxARM32 => "armhf",
++			Platform::LinuxARM32Legacy => "armhf",
++			Platform::DarwinX64 => "x64",
++			Platform::DarwinARM64 => "arm64",
++			Platform::WindowsX64 => "x64",
++			Platform::WindowsX86 => "ia42",
++			Platform::WindowsARM64 => "arm64",
+ 		}
+@@ -264,17 +210,17 @@ impl Platform {
+ 
+-	pub fn cli(&self) -> String {
++	pub fn os(&self) -> String {
+ 		match self {
+-			Platform::LinuxAlpineARM64 => "cli-alpine-arm64",
+-			Platform::LinuxAlpineX64 => "cli-alpine-x64",
+-			Platform::LinuxX64 => "cli-linux-x64",
+-			Platform::LinuxX64Legacy => "cli-linux-x64",
+-			Platform::LinuxARM64 => "cli-linux-arm64",
+-			Platform::LinuxARM64Legacy => "cli-linux-arm64",
+-			Platform::LinuxARM32 => "cli-linux-armhf",
+-			Platform::LinuxARM32Legacy => "cli-linux-armhf",
+-			Platform::DarwinX64 => "cli-darwin-x64",
+-			Platform::DarwinARM64 => "cli-darwin-arm64",
+-			Platform::WindowsARM64 => "cli-win32-arm64",
+-			Platform::WindowsX64 => "cli-win32-x64",
+-			Platform::WindowsX86 => "cli-win32",
++			Platform::LinuxAlpineARM64 => "alpine",
++			Platform::LinuxAlpineX64 => "alpine",
++			Platform::LinuxX64 => "linux",
++			Platform::LinuxX64Legacy => "linux",
++			Platform::LinuxARM64 => "linux",
++			Platform::LinuxARM64Legacy => "linux",
++			Platform::LinuxARM32 => "linux",
++			Platform::LinuxARM32Legacy => "linux",
++			Platform::DarwinX64 => "darwin",
++			Platform::DarwinARM64 => "darwin",
++			Platform::WindowsX64 => "win32",
++			Platform::WindowsX86 => "win32",
++			Platform::WindowsARM64 => "win32",
+ 		}
+@@ -283,6 +229,2 @@ impl Platform {
+ 
+-	pub fn web(&self) -> String {
+-		format!("{}-web", self.headless())
+-	}
+-
+ 	pub fn env_default() -> Option<Platform> {
+diff --git a/extensions/tunnel-forwarding/src/extension.ts b/extensions/tunnel-forwarding/src/extension.ts
+index 2f71999..e689f62 100644
+--- a/extensions/tunnel-forwarding/src/extension.ts
++++ b/extensions/tunnel-forwarding/src/extension.ts
+@@ -37,3 +37,3 @@ if (process.env.VSCODE_FORWARDING_IS_DEV) {
+ 
+-	const cliName = vscode.env.appQuality === 'stable' ? 'code-tunnel' : 'code-tunnel-insiders';
++	const cliName = '!!TUNNEL_APP_NAME!!';
+ 	const extension = process.platform === 'win32' ? '.exe' : '';

patches/disable-copilot.patch

@@ -0,0 +1,133 @@
+diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+index 1998414..cdc533b 100644
+--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
++++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+@@ -206,3 +206,4 @@ abstract class OpenChatGlobalAction extends Action2 {
+ 				ChatContextKeys.Setup.hidden.negate(),
+-				ChatContextKeys.Setup.disabled.negate()
++				ChatContextKeys.Setup.disabled.negate(),
++				ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
+ 			)
+@@ -1142,3 +1143,3 @@ export function registerChatActions() {
+ 				precondition: ContextKeyExpr.and(
+-					ChatContextKeys.Setup.installed,
++					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 					ChatContextKeys.Setup.disabled.negate(),
+@@ -1715,3 +1716,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
+ 		ChatContextKeys.Setup.hidden.negate(),
+-		ChatContextKeys.Setup.disabled.negate()
++		ChatContextKeys.Setup.disabled.negate(),
++		ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
+ 	)
+diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+index b8c8e03..512e40f 100644
+--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
++++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+@@ -314,3 +314,4 @@ class AttachSelectionToChatAction extends Action2 {
+ 						ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData)
+-					)
++					),
++					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 				)
+diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+index be62dda..7b5f1ed 100644
+--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
++++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+@@ -1237,3 +1237,3 @@ configurationRegistry.registerConfiguration({
+ 			description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."),
+-			default: false,
++			default: true,
+ 			scope: ConfigurationScope.WINDOW
+diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+index ddb5df4..7831288 100644
+--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
++++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+@@ -70,10 +70,9 @@ const chatViewDescriptor: IViewDescriptor = {
+ 	ctorDescriptor: new SyncDescriptor(ChatViewPane),
+-	when: ContextKeyExpr.or(
+-		ContextKeyExpr.or(
+-			ChatContextKeys.Setup.hidden,
+-			ChatContextKeys.Setup.disabled
+-		)?.negate(),
+-		ChatContextKeys.panelParticipantRegistered,
+-		ChatContextKeys.extensionInvalid
+-	)
++	when: ContextKeyExpr.and(
++		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
++		ChatContextKeys.Setup.disabled.negate(),
++		ChatContextKeys.Setup.hidden.negate(),
++ 		ChatContextKeys.panelParticipantRegistered,
++		ChatContextKeys.extensionInvalid.negate()
++ 	)
+ };
+diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
+index 4a71579..f8b3e83 100644
+--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
++++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
+@@ -228,2 +228,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
+ 						ChatContextKeys.Setup.untrusted,
++						ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 						ChatContextKeys.Setup.installed.negate(),
+@@ -346,2 +347,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
+ 							ChatContextKeys.Setup.hidden.negate(),
++							ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 							ChatContextKeys.Setup.installed.negate(),
+@@ -518,2 +520,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
+ 			ChatContextKeys.Setup.disabled.negate(),
++			ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 			ChatContextKeys.Setup.installed.negate(),
+diff --git a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
+index c8fc17b..fbd2afd 100644
+--- a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
++++ b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
+@@ -163,3 +163,3 @@ export namespace ChatContextKeyExprs {
+ 	export const chatSetupTriggerContext = ContextKeyExpr.or(
+-		ChatContextKeys.Setup.installed.negate(),
++		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 		ChatContextKeys.Entitlement.canSignUp
+diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+index e9b4077..b33d6f2 100644
+--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
++++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+@@ -133,3 +133,9 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
+ 	order: 1,
+-	when: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), ChatEntitlementContextKeys.Setup.hidden.negate()),
++	when: ContextKeyExpr.and(
++		EditorContextKeys.writable,
++		EditorContextKeys.hasNonEmptySelection,
++		CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(),
++		ChatEntitlementContextKeys.Setup.hidden.negate(),
++		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
++	),
+ 	command: {
+diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
+index 864cc4f..b877a8e 100644
+--- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
++++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
+@@ -554,3 +554,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
+ 				ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{}]),
+-				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
++				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
+ 				weight: 40,
+@@ -569,3 +569,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
+ 				ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{ showWelcome: true }]),
+-				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
++				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
+ 				weight: 40,
+diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+index 8f2ea73..429e28f 100644
+--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
++++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+@@ -705,3 +705,3 @@ registerAction2(class extends Action2 {
+ 					ChatContextKeys.Setup.disabled.negate(),
+-					ChatContextKeys.Setup.installed.negate(),
++					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 					ContextKeyExpr.in(ResourceContextKey.Resource.key, 'git.mergeChanges'),
+diff --git a/src/vs/workbench/contrib/scm/browser/scmInput.ts b/src/vs/workbench/contrib/scm/browser/scmInput.ts
+index a35d479..da5a449 100644
+--- a/src/vs/workbench/contrib/scm/browser/scmInput.ts
++++ b/src/vs/workbench/contrib/scm/browser/scmInput.ts
+@@ -850,2 +850,3 @@ registerAction2(class extends Action2 {
+ 					ChatContextKeys.Setup.disabled.negate(),
++					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+ 					ChatContextKeys.Setup.installed.negate(),

patches/disable-missing-vsda.patch

@@ -0,0 +1,128 @@
+diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts
+index c288b2e..8303040 100644
+--- a/src/vs/platform/sign/browser/signService.ts
++++ b/src/vs/platform/sign/browser/signService.ts
+@@ -5,6 +5,2 @@
+ 
+-import { importAMDNodeModule, resolveAmdNodeModulePath } from '../../../amdX.js';
+-import { WindowIntervalTimer } from '../../../base/browser/dom.js';
+-import { mainWindow } from '../../../base/browser/window.js';
+-import { memoize } from '../../../base/common/decorators.js';
+ import { IProductService } from '../../product/common/productService.js';
+@@ -13,30 +9,4 @@ import { ISignService } from '../common/sign.js';
+ 
+-declare namespace vsdaWeb {
+-	export function sign(salted_message: string): string;
+-
+-	// eslint-disable-next-line @typescript-eslint/naming-convention
+-	export class validator {
+-		free(): void;
+-		constructor();
+-		createNewMessage(original: string): string;
+-		validate(signed_message: string): 'ok' | 'error';
+-	}
+-
+-	export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
+-	export function init(module_or_path?: InitInput | Promise<InitInput>): Promise<unknown>;
+-}
+-
+-// Initialized if/when vsda is loaded
+-declare const vsda_web: {
+-	default: typeof vsdaWeb.init;
+-	sign: typeof vsdaWeb.sign;
+-	validator: typeof vsdaWeb.validator;
+-};
+-
+-const KEY_SIZE = 32;
+-const IV_SIZE = 16;
+-const STEP_SIZE = KEY_SIZE + IV_SIZE;
+-
+ export class SignService extends AbstractSignService implements ISignService {
+-	constructor(@IProductService private readonly productService: IProductService) {
++	constructor(@IProductService _productService: IProductService) {
+ 		super();
+@@ -44,53 +14,7 @@ export class SignService extends AbstractSignService implements ISignService {
+ 	protected override getValidator(): Promise<IVsdaValidator> {
+-		return this.vsda().then(vsda => {
+-			const v = new vsda.validator();
+-			return {
+-				createNewMessage: arg => v.createNewMessage(arg),
+-				validate: arg => v.validate(arg),
+-				dispose: () => v.free(),
+-			};
+-		});
+-	}
+-
+-	protected override signValue(arg: string): Promise<string> {
+-		return this.vsda().then(vsda => vsda.sign(arg));
+-	}
+-
+-	@memoize
+-	private async vsda(): Promise<typeof vsda_web> {
+-		const checkInterval = new WindowIntervalTimer();
+-		let [wasm] = await Promise.all([
+-			this.getWasmBytes(),
+-			new Promise<void>((resolve, reject) => {
+-				importAMDNodeModule('vsda', 'rust/web/vsda.js').then(() => resolve(), reject);
+-
+-				// todo@connor4312: there seems to be a bug(?) in vscode-loader with
+-				// require() not resolving in web once the script loads, so check manually
+-				checkInterval.cancelAndSet(() => {
+-					if (typeof vsda_web !== 'undefined') {
+-						resolve();
+-					}
+-				}, 50, mainWindow);
+-			}).finally(() => checkInterval.dispose()),
+-		]);
+-
+-		const keyBytes = new TextEncoder().encode(this.productService.serverLicense?.join('\n') || '');
+-		for (let i = 0; i + STEP_SIZE < keyBytes.length; i += STEP_SIZE) {
+-			const key = await crypto.subtle.importKey('raw', keyBytes.slice(i + IV_SIZE, i + IV_SIZE + KEY_SIZE), { name: 'AES-CBC' }, false, ['decrypt']);
+-			wasm = await crypto.subtle.decrypt({ name: 'AES-CBC', iv: keyBytes.slice(i, i + IV_SIZE) }, key, wasm);
+-		}
+-
+-		await vsda_web.default(wasm);
+-
+-		return vsda_web;
++		throw new Error('error loading vsda');
+ 	}
+ 
+-	private async getWasmBytes(): Promise<ArrayBuffer> {
+-		const url = resolveAmdNodeModulePath('vsda', 'rust/web/vsda_bg.wasm');
+-		const response = await fetch(url);
+-		if (!response.ok) {
+-			throw new Error('error loading vsda');
+-		}
+-
+-		return response.arrayBuffer();
++	protected override signValue(_arg: string): Promise<string> {
++		throw new Error('error loading vsda');
+ 	}
+diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
+index 269cc38..a53fca9 100644
+--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
++++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
+@@ -8,3 +8,2 @@ import type * as http from 'http';
+ import * as net from 'net';
+-import { createRequire } from 'node:module';
+ import { performance } from 'perf_hooks';
+@@ -41,3 +40,2 @@ import { setupServerServices, SocketServer } from './serverServices.js';
+ import { CacheControl, serveError, serveFile, WebClientServer } from './webClientServer.js';
+-const require = createRequire(import.meta.url);
+ 
+@@ -736,14 +734,3 @@ export async function createServer(address: string | net.AddressInfo | null, arg
+ 
+-	const vsdaMod = instantiationService.invokeFunction((accessor) => {
+-		const logService = accessor.get(ILogService);
+-		const hasVSDA = fs.existsSync(join(FileAccess.asFileUri('').fsPath, '../node_modules/vsda'));
+-		if (hasVSDA) {
+-			try {
+-				return require('vsda');
+-			} catch (err) {
+-				logService.error(err);
+-			}
+-		}
+-		return null;
+-	});
++	const vsdaMod = instantiationService.invokeFunction(() => null);
+ 

patches/disable-signature-verification.patch

@@ -1,14 +1,18 @@
 diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-index 680e0dd..0b04279 100644
+index 0a50a2e..5ee6782 100644
 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
 +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -86,2 +86,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
+@@ -36,3 +36,2 @@ import {
+ 	IAllowedExtensionsService,
+-	VerifyExtensionSignatureConfigKey,
+ 	shouldRequireRepositorySignatureFor,
+@@ -89,2 +88,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
  		@IFileService private readonly fileService: IFileService,
 +		// @ts-expect-error no-unused-variable
  		@IConfigurationService private readonly configurationService: IConfigurationService,
-@@ -347,4 +348,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
+@@ -333,4 +333,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
  		if (verifySignature) {
--			const value = this.configurationService.getValue('extensions.verifySignature');
+-			const value = this.configurationService.getValue(VerifyExtensionSignatureConfigKey);
 -			verifySignature = isBoolean(value) ? value : true;
 +			verifySignature = false;
  		}

patches/disable-update.patch.yet

@@ -0,0 +1,9 @@
+diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts
+index d96926b..43f5d90 100644
+--- a/src/vs/platform/update/common/update.config.contribution.ts
++++ b/src/vs/platform/update/common/update.config.contribution.ts
+@@ -20,3 +20,3 @@ configurationRegistry.registerConfiguration({
+ 			enum: ['none', 'manual', 'start', 'default'],
+-			default: 'default',
++			default: 'none',
+ 			scope: ConfigurationScope.APPLICATION,

patches/disable-vscodedev.patch

@@ -0,0 +1,187 @@
+diff --git a/extensions/github/package.json b/extensions/github/package.json
+index bce90fe..73debf7 100644
+--- a/extensions/github/package.json
++++ b/extensions/github/package.json
+@@ -45,19 +45,2 @@
+       },
+-      {
+-        "command": "github.copyVscodeDevLink",
+-        "title": "%command.copyVscodeDevLink%"
+-      },
+-      {
+-        "command": "github.copyVscodeDevLinkFile",
+-        "title": "%command.copyVscodeDevLink%"
+-      },
+-      {
+-        "command": "github.copyVscodeDevLinkWithoutRange",
+-        "title": "%command.copyVscodeDevLink%"
+-      },
+-      {
+-        "command": "github.openOnVscodeDev",
+-        "title": "%command.openOnVscodeDev%",
+-        "icon": "$(globe)"
+-      },
+       {
+@@ -83,11 +66,2 @@
+     ],
+-    "continueEditSession": [
+-      {
+-        "command": "github.openOnVscodeDev",
+-        "when": "github.hasGitHubRepo",
+-        "qualifiedName": "Continue Working in vscode.dev",
+-        "category": "Remote Repositories",
+-        "remoteGroup": "virtualfs_44_vscode-vfs_2_web@2"
+-      }
+-    ],
+     "menus": {
+@@ -110,18 +84,2 @@
+         },
+-        {
+-          "command": "github.copyVscodeDevLink",
+-          "when": "false"
+-        },
+-        {
+-          "command": "github.copyVscodeDevLinkFile",
+-          "when": "false"
+-        },
+-        {
+-          "command": "github.copyVscodeDevLinkWithoutRange",
+-          "when": "false"
+-        },
+-        {
+-          "command": "github.openOnVscodeDev",
+-          "when": "false"
+-        },
+         {
+@@ -131,42 +89,2 @@
+       ],
+-      "file/share": [
+-        {
+-          "command": "github.copyVscodeDevLinkFile",
+-          "when": "github.hasGitHubRepo && remoteName != 'codespaces'",
+-          "group": "0_vscode@0"
+-        }
+-      ],
+-      "editor/context/share": [
+-        {
+-          "command": "github.copyVscodeDevLink",
+-          "when": "github.hasGitHubRepo && resourceScheme != untitled && !isInEmbeddedEditor && remoteName != 'codespaces'",
+-          "group": "0_vscode@0"
+-        }
+-      ],
+-      "explorer/context/share": [
+-        {
+-          "command": "github.copyVscodeDevLinkWithoutRange",
+-          "when": "github.hasGitHubRepo && resourceScheme != untitled && !isInEmbeddedEditor && remoteName != 'codespaces'",
+-          "group": "0_vscode@0"
+-        }
+-      ],
+-      "editor/lineNumber/context": [
+-        {
+-          "command": "github.copyVscodeDevLink",
+-          "when": "github.hasGitHubRepo && resourceScheme != untitled && activeEditor == workbench.editors.files.textFileEditor && config.editor.lineNumbers == on && remoteName != 'codespaces'",
+-          "group": "1_cutcopypaste@2"
+-        },
+-        {
+-          "command": "github.copyVscodeDevLink",
+-          "when": "github.hasGitHubRepo && resourceScheme != untitled && activeEditor == workbench.editor.notebook && remoteName != 'codespaces'",
+-          "group": "1_cutcopypaste@2"
+-        }
+-      ],
+-      "editor/title/context/share": [
+-        {
+-          "command": "github.copyVscodeDevLinkWithoutRange",
+-          "when": "github.hasGitHubRepo && resourceScheme != untitled && remoteName != 'codespaces'",
+-          "group": "0_vscode@0"
+-        }
+-      ],
+       "scm/historyItem/context": [
+diff --git a/extensions/github/src/commands.ts b/extensions/github/src/commands.ts
+index 33acf5a..107e94a 100644
+--- a/extensions/github/src/commands.ts
++++ b/extensions/github/src/commands.ts
+@@ -9,30 +9,5 @@ import { publishRepository } from './publish.js';
+ import { DisposableStore, getRepositoryFromUrl } from './util.js';
+-import { LinkContext, getCommitLink, getLink, getVscodeDevHost } from './links.js';
++import { getCommitLink } from './links.js';
+ import { getOctokit } from './auth.js';
+ 
+-async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean, context: LinkContext, includeRange = true) {
+-	try {
+-		const permalink = await getLink(gitAPI, useSelection, true, getVscodeDevHost(), 'headlink', context, includeRange);
+-		if (permalink) {
+-			return vscode.env.clipboard.writeText(permalink);
+-		}
+-	} catch (err) {
+-		if (!(err instanceof vscode.CancellationError)) {
+-			vscode.window.showErrorMessage(err.message);
+-		}
+-	}
+-}
+-
+-async function openVscodeDevLink(gitAPI: GitAPI): Promise<vscode.Uri | undefined> {
+-	try {
+-		const headlink = await getLink(gitAPI, true, false, getVscodeDevHost(), 'headlink');
+-		return headlink ? vscode.Uri.parse(headlink) : undefined;
+-	} catch (err) {
+-		if (!(err instanceof vscode.CancellationError)) {
+-			vscode.window.showErrorMessage(err.message);
+-		}
+-		return undefined;
+-	}
+-}
+-
+ interface ResolvedSessionRepo {
+@@ -210,14 +185,2 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
+ 
+-	disposables.add(vscode.commands.registerCommand('github.copyVscodeDevLink', async (context: LinkContext) => {
+-		return copyVscodeDevLink(gitAPI, true, context);
+-	}));
+-
+-	disposables.add(vscode.commands.registerCommand('github.copyVscodeDevLinkFile', async (context: LinkContext) => {
+-		return copyVscodeDevLink(gitAPI, false, context);
+-	}));
+-
+-	disposables.add(vscode.commands.registerCommand('github.copyVscodeDevLinkWithoutRange', async (context: LinkContext) => {
+-		return copyVscodeDevLink(gitAPI, true, context, false);
+-	}));
+-
+ 	disposables.add(vscode.commands.registerCommand('github.openOnGitHub', async (url: string, historyItemId: string) => {
+@@ -253,6 +216,2 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
+ 
+-	disposables.add(vscode.commands.registerCommand('github.openOnVscodeDev', async () => {
+-		return openVscodeDevLink(gitAPI);
+-	}));
+-
+ 	disposables.add(vscode.commands.registerCommand('github.createPullRequest', async (sessionResource: vscode.Uri | undefined, sessionMetadata: { worktreePath?: string } | undefined) => {
+diff --git a/extensions/github/src/extension.ts b/extensions/github/src/extension.ts
+index 17906c5..86a0ca8 100644
+--- a/extensions/github/src/extension.ts
++++ b/extensions/github/src/extension.ts
+@@ -17,3 +17,2 @@ import { GitHubBranchProtectionProviderManager } from './branchProtection.js';
+ import { GitHubCanonicalUriProvider } from './canonicalUriProvider.js';
+-import { VscodeDevShareProvider } from './shareProviders.js';
+ import { GitHubSourceControlHistoryItemDetailsProvider } from './historyItemDetailsProvider.js';
+@@ -109,3 +108,2 @@ function initializeGitExtension(context: ExtensionContext, octokitService: Octok
+ 						disposables.add(new GitHubCanonicalUriProvider(gitAPI));
+-						disposables.add(new VscodeDevShareProvider(gitAPI));
+ 						setGitHubContext(gitAPI, disposables);
+diff --git a/extensions/github/src/remoteSourceProvider.ts b/extensions/github/src/remoteSourceProvider.ts
+index bed2bb1..2880f97 100644
+--- a/extensions/github/src/remoteSourceProvider.ts
++++ b/extensions/github/src/remoteSourceProvider.ts
+@@ -10,3 +10,3 @@ import { Octokit } from '@octokit/rest';
+ import { getRepositoryFromQuery, getRepositoryFromUrl } from './util.js';
+-import { getBranchLink, getVscodeDevHost } from './links.js';
++import { getBranchLink } from './links.js';
+ 
+@@ -137,9 +137,2 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider {
+ 			}
+-		}, {
+-			label: l10n.t('Checkout on vscode.dev'),
+-			icon: 'globe',
+-			run(branch: string) {
+-				const link = getBranchLink(url, branch, getVscodeDevHost());
+-				env.openExternal(Uri.parse(link));
+-			}
+ 		}];

patches/ext-from-gh.patch

@@ -1,15 +1,5 @@
-diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
-index 249777c..129af8a 100644
---- a/build/lib/builtInExtensions.js
-+++ b/build/lib/builtInExtensions.js
-@@ -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 e9a1180..b8348e3 100644
+index d52567b..fe5b988 100644
 --- a/build/lib/builtInExtensions.ts
 +++ b/build/lib/builtInExtensions.ts
 @@ -75,4 +75,2 @@ function getExtensionDownloadStream(extension: IExtensionDefinition) {

patches/extensions-disable-mangler.patch

@@ -1,11 +0,0 @@
---- vscode-1.80.1/extensions/mangle-loader.js.old	2023-07-12 18:45:52.000000000 +0200
-+++ vscode-1.80.1/extensions/mangle-loader.js	2023-07-28 11:55:01.177444702 +0200
-@@ -37,7 +37,7 @@ function getMangledFileContents(projectP
-  * @type {webpack.LoaderDefinitionFunction}
-  */
- module.exports = async function (source, sourceMap, meta) {
--	if (this.mode !== 'production') {
-+	if (true) {
- 		// Only enable mangling in production builds
- 		return source;
- 	}

patches/feat-announcements.patch

@@ -1,21 +1,22 @@
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-index c581ac0..f11c0f0 100644
+index e025130..f42db8d 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-@@ -319,2 +319,8 @@ configurationRegistry.registerConfiguration({
+@@ -343,2 +343,9 @@ configurationRegistry.registerConfiguration({
  		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
 +			type: 'boolean',
 +			default: true,
-+			description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from VSCodium's repository.")
++			description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from !!APP_NAME!!'s repository."),
++			tags: ['usesOnlineServices']
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index 664c55b..43f9e2e 100644
+index 01778b2..615828d 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -113,4 +113,8 @@ type GettingStartedActionEvent = {
+@@ -117,4 +117,8 @@ type GettingStartedActionEvent = {
  type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
  
@@ -24,26 +25,26 @@ index 664c55b..43f9e2e 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
  export class GettingStartedPage extends EditorPane {
-@@ -149,2 +153,4 @@ export class GettingStartedPage extends EditorPane {
+@@ -154,2 +158,4 @@ export class GettingStartedPage extends EditorPane {
  	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
 +	private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
 +	private announcementData?: AnnouncementEntry[];
  
-@@ -812,2 +818,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -880,2 +886,3 @@ export class GettingStartedPage extends EditorPane {
  		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
  
-@@ -822,3 +829,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -890,3 +897,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.remove('noWalkthroughs');
 -				reset(rightColumn, gettingStartedList.getDomElement());
 +				reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
  			}
-@@ -826,3 +833,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -894,3 +901,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.add('noWalkthroughs');
 -				reset(rightColumn);
 +				reset(rightColumn, announcementList.getDomElement());
  			}
-@@ -978,2 +985,55 @@ export class GettingStartedPage extends EditorPane {
+@@ -1047,2 +1054,55 @@ export class GettingStartedPage extends EditorPane {
  
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {
@@ -62,7 +63,7 @@ index 664c55b..43f9e2e 100644
 +		if (this.announcementList) { this.announcementList.dispose(); }
 +
 +		const announcementList = this.announcementList = new GettingStartedIndexList({
-+			title: localize('announcements', "VSCodium Announcements"),
++			title: localize('announcements', "!!APP_NAME!! Announcements"),
 +			klass: 'announcements',
 +			limit: 5,
 +			empty: $('.empty-recent', {}, localize('noAnnouncements', "There are no current announcements.")),
@@ -75,7 +76,7 @@ index 664c55b..43f9e2e 100644
 +
 +			if (showExtras) {
 +				const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
-+				await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`)
++				await fetch(`https://raw.githubusercontent.com/!!GH_REPO_PATH!!/${branch}/announcements-extra.json`)
 +					.then(async res => {
 +						if (res.ok) {
 +							var extraAnnouncements = await res.json() as AnnouncementEntry[];

patches/feat-command-filter.patch

@@ -0,0 +1,167 @@
+diff --git a/src/vs/workbench/contrib/commands/common/commands.contribution.ts b/src/vs/workbench/contrib/commands/common/commands.contribution.ts
+index 3fd6b59..97a0e04 100644
+--- a/src/vs/workbench/contrib/commands/common/commands.contribution.ts
++++ b/src/vs/workbench/contrib/commands/common/commands.contribution.ts
+@@ -9,2 +9,3 @@ import { Action2, registerAction2 } from '../../../../platform/actions/common/ac
+ import { ICommandService } from '../../../../platform/commands/common/commands.js';
++import { ConfigurationScope, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+ import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+@@ -12,2 +13,3 @@ import { ILogService } from '../../../../platform/log/common/log.js';
+ import { INotificationService } from '../../../../platform/notification/common/notification.js';
++import { Registry } from '../../../../platform/registry/common/platform.js';
+ 
+@@ -156,2 +158,30 @@ class RunCommands extends Action2 {
+ 
++Registry.as<IConfigurationRegistry>('base.contributions.configuration')
++	.registerConfiguration({
++		id: 'commands',
++		order: 30,
++		title: nls.localize('commandsConfigurationTitle', "Commands"),
++		type: 'object',
++		properties: {
++			'commands.filters': {
++				additionalProperties: {
++					type: 'string',
++					enum: ['ask', 'off', 'on'],
++					enumDescriptions: [
++						nls.localize('commands.filters.ask', 'Ask the user before executing the command.'),
++						nls.localize('commands.filters.off', 'The command is never authorized.'),
++						nls.localize('commands.filters.on', 'The command is always authorized.'),
++					],
++					description: nls.localize('commands.filters.value', "Authorization for the command."),
++				},
++				description: nls.localize('commands.filters', "Controls which commands are authorized to be executed."),
++				default: {
++					'workbench.action.terminal.newLocal': 'off'
++				},
++				scope: ConfigurationScope.APPLICATION,
++				tags: []
++			},
++		}
++	});
++
+ registerAction2(RunCommands);
+diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts
+index 93d1631..0533cf0 100644
+--- a/src/vs/workbench/services/commands/common/commandService.ts
++++ b/src/vs/workbench/services/commands/common/commandService.ts
+@@ -8,3 +8,6 @@ import { Emitter, Event } from '../../../../base/common/event.js';
+ import { Disposable } from '../../../../base/common/lifecycle.js';
++import Severity from '../../../../base/common/severity.js';
+ import { CommandsRegistry, ICommandEvent, ICommandService } from '../../../../platform/commands/common/commands.js';
++import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
++import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+ import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+@@ -20,2 +23,3 @@ export class CommandService extends Disposable implements ICommandService {
+ 	private _starActivation: CancelablePromise<void> | null;
++	private _commandFilters: Record<string, "ask" | "off" | "on">
+ 
+@@ -30,3 +34,5 @@ export class CommandService extends Disposable implements ICommandService {
+ 		@IExtensionService private readonly _extensionService: IExtensionService,
+-		@ILogService private readonly _logService: ILogService
++		@ILogService private readonly _logService: ILogService,
++		@IConfigurationService private readonly _configurationService: IConfigurationService,
++		@IDialogService private readonly _dialogService: IDialogService
+ 	) {
+@@ -35,2 +41,9 @@ export class CommandService extends Disposable implements ICommandService {
+ 		this._starActivation = null;
++		this._commandFilters = this._configurationService.getValue('commands.filters') ?? { 'workbench.action.terminal.newLocal': 'off' };
++
++		this._configurationService.onDidChangeConfiguration(async (event) => {
++			if (event.affectsConfiguration('commands.filters')) {
++				this._commandFilters = this._configurationService.getValue('commands.filters') ?? { 'workbench.action.terminal.newLocal': 'off' };
++			}
++		})
+ 	}
+@@ -57,2 +70,27 @@ export class CommandService extends Disposable implements ICommandService {
+ 
++		const filter = this._commandFilters[id];
++		if (filter === 'off') {
++			return Promise.reject(new Error(`command '${id}' not authorized`));
++		}
++		else if (filter === 'ask') {
++			const { result } = await this._dialogService.prompt({
++				type: Severity.Error,
++				message: `Are you sure you want to execute the command "${id}"?`,
++				buttons: [
++					{
++						label: 'Yes',
++						run: () => true
++					},
++					{
++						label: 'No',
++						run: () => false
++					}
++				],
++			});
++
++			if (!result) {
++				return Promise.reject(new Error(`command '${id}' not authorized`));
++			}
++		}
++
+ 		if (commandIsRegistered) {
+diff --git a/src/vs/workbench/services/commands/test/common/commandService.test.ts b/src/vs/workbench/services/commands/test/common/commandService.test.ts
+index ca3be11..fb456a3 100644
+--- a/src/vs/workbench/services/commands/test/common/commandService.test.ts
++++ b/src/vs/workbench/services/commands/test/common/commandService.test.ts
+@@ -12,2 +12,7 @@ import { NullExtensionService } from '../../../extensions/common/extensions.js';
+ import { CommandService } from '../../common/commandService.js';
++import { NullPolicyService } from '../../../../../platform/policy/common/policy.js';
++import { FileService } from '../../../../../platform/files/common/fileService.js';
++import { URI } from '../../../../../base/common/uri.js';
++import { ConfigurationService } from '../../../../../platform/configuration/common/configurationService.js';
++import { TestDialogService } from '../../../../../platform/dialogs/test/common/testDialogService.js';
+ 
+@@ -16,4 +21,16 @@ suite('CommandService', function () {
+ 	const store = ensureNoDisposablesAreLeakedInTestSuite();
++	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
++	let nullConfigService: ConfigurationService
+ 
+ 	setup(function () {
++		const nullPolicyService = new NullPolicyService();
++		const nullLogService = testDisposables.add(new NullLogService());
++		const nullFileService = testDisposables.add(new FileService(nullLogService));
++		nullConfigService = testDisposables.add(new ConfigurationService(
++			URI.file('/config.json'),
++			nullFileService,
++			nullPolicyService,
++			nullLogService,
++		));
++
+ 		store.add(CommandsRegistry.registerCommand('foo', function () { }));
+@@ -30,3 +47,3 @@ suite('CommandService', function () {
+ 			}
+-		}, new NullLogService()));
++		}, new NullLogService(), nullConfigService, new TestDialogService()));
+ 
+@@ -50,3 +67,3 @@ suite('CommandService', function () {
+ 
+-		const service = store.add(new CommandService(new InstantiationService(), extensionService, new NullLogService()));
++		const service = store.add(new CommandService(new InstantiationService(), extensionService, new NullLogService(), nullConfigService, new TestDialogService()));
+ 
+@@ -68,3 +85,3 @@ suite('CommandService', function () {
+ 			}
+-		}, new NullLogService()));
++		}, new NullLogService(), nullConfigService, new TestDialogService()));
+ 
+@@ -85,3 +102,3 @@ suite('CommandService', function () {
+ 			}
+-		}, new NullLogService()));
++		}, new NullLogService(), nullConfigService, new TestDialogService()));
+ 
+@@ -125,3 +142,3 @@ suite('CommandService', function () {
+ 
+-		}, new NullLogService()));
++		}, new NullLogService(), nullConfigService, new TestDialogService()));
+ 
+@@ -166,3 +183,3 @@ suite('CommandService', function () {
+ 
+-		}, new NullLogService()));
++		}, new NullLogService(), nullConfigService, new TestDialogService()));
+ 
+@@ -187,3 +204,3 @@ suite('CommandService', function () {
+ 		};
+-		const service = store.add(new CommandService(new InstantiationService(), extensionService, new NullLogService()));
++		const service = store.add(new CommandService(new InstantiationService(), extensionService, new NullLogService(), nullConfigService, new TestDialogService()));
+ 

patches/feat-ext-unsafe.patch

@@ -0,0 +1,27 @@
+diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+index 5974768..876f779 100644
+--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
++++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+@@ -1788,2 +1788,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
+ 
++		const excludeUnsafes = this.configurationService.getValue('extensions.excludeUnsafes') ?? true;
++
++		if (!excludeUnsafes) {
++			return { malicious: [], deprecated: {}, search: [] };
++		}
++
+ 		const context = await this.requestService.request({
+diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+index 4c44d3b..fe989e0 100644
+--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
++++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+@@ -294,2 +294,9 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
+ 			},
++			'extensions.excludeUnsafes': {
++				scope: ConfigurationScope.MACHINE,
++				type: 'boolean',
++				default: true,
++				description: localize('extensionsExcludeUnsafes', "When enabled, it will download and cache the list of malicious and deprecated extensions. It's recommended to leave it enabled."),
++				tags: ['usesOnlineServices']
++			},
+ 		}

patches/feat-user-product.patch

@@ -0,0 +1,107 @@
+diff --git a/src/cli.ts b/src/cli.ts
+index b643e34..2f228ef 100644
+--- a/src/cli.ts
++++ b/src/cli.ts
+@@ -5,2 +5,4 @@
+ 
++import * as path from 'node:path';
++import { createRequire } from 'node:module';
+ import './bootstrap-cli.js'; // this MUST come before other imports as it changes global state
+@@ -10,3 +12,5 @@ import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+ import { product } from './bootstrap-meta.js';
++import { getUserDataPath } from './vs/platform/environment/node/userDataPath.js';
+ 
++const require = createRequire(import.meta.url);
+ // NLS
+@@ -21,2 +25,4 @@ process.env['VSCODE_CLI'] = '1';
+ 
++resolveUserProduct();
++
+ // Bootstrap ESM
+@@ -26 +32,14 @@ await bootstrapESM();
+ await import('./vs/code/node/cli.js');
++
++function resolveUserProduct() {
++	const userDataPath = getUserDataPath({_:[]}, product.nameShort ?? 'code-oss-dev');
++	const userProductPath = path.join(userDataPath, 'product.json');
++
++	try {
++		// Assign the product configuration to the global scope
++		const productJson = require(userProductPath);
++
++		globalThis._VSCODE_USER_PRODUCT_JSON = productJson;
++	} catch (ex) {
++	}
++}
+\ No newline at end of file
+diff --git a/src/main.ts b/src/main.ts
+index ec188d0..0160be6 100644
+--- a/src/main.ts
++++ b/src/main.ts
+@@ -8,2 +8,3 @@ import * as fs from 'original-fs';
+ import * as os from 'node:os';
++import { createRequire } from 'node:module';
+ import { performance } from 'node:perf_hooks';
+@@ -22,2 +23,4 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
+ 
++const require = createRequire(import.meta.url);
++
+ perf.mark('code/didStartMain');
+@@ -109,2 +112,14 @@ registerListeners();
+ 
++function resolveUserProduct() {
++	const userProductPath = path.join(userDataPath, 'product.json');
++
++	try {
++		// Assign the product configuration to the global scope
++		const productJson = require(userProductPath);
++
++		globalThis._VSCODE_USER_PRODUCT_JSON = productJson;
++	} catch (ex) {
++	}
++}
++
+ /**
+@@ -205,2 +220,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
+ 	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
++	resolveUserProduct();
+ 
+diff --git a/src/typings/vscode-globals-product.d.ts b/src/typings/vscode-globals-product.d.ts
+index ab169bd..2155f5c 100644
+--- a/src/typings/vscode-globals-product.d.ts
++++ b/src/typings/vscode-globals-product.d.ts
+@@ -43,2 +43,4 @@ declare global {
+ 	var _VSCODE_USE_RELATIVE_IMPORTS: boolean | undefined;
++
++	var _VSCODE_USER_PRODUCT_JSON: Record<string, any>;
+ }
+diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
+index 6f093e9..b63af55 100644
+--- a/src/vs/platform/product/common/product.ts
++++ b/src/vs/platform/product/common/product.ts
+@@ -31,2 +31,25 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
+ 
++	// Merge user-customized product.json
++	try {
++		const merge = (...objects: any[]) =>
++			objects.reduce((result, current) => {
++				Object.keys(current).forEach((key) => {
++					if (Array.isArray(result[key]) && Array.isArray(current[key])) {
++						result[key] = current[key];
++					} else if (typeof result[key] === 'object' && typeof current[key] === 'object') {
++						result[key] = merge(result[key], current[key]);
++					} else {
++						result[key] = current[key];
++					}
++				});
++
++				return result;
++			}, {}) as any;
++
++		const userProduct = globalThis._VSCODE_USER_PRODUCT_JSON || {};
++
++		product = merge(product, userProduct);
++	} catch (ex) {
++	}
++
+ 	// Running out of sources

patches/fix-build-vsce.patch

@@ -0,0 +1,364 @@
+diff --git a/build/.moduleignore b/build/.moduleignore
+index ed36151..022d6ed 100644
+--- a/build/.moduleignore
++++ b/build/.moduleignore
+@@ -82,7 +82,7 @@ native-is-elevated/deps/**
+ 
+-@vscode/vsce-sign/**
+-!@vscode/vsce-sign/src/main.d.ts
+-!@vscode/vsce-sign/src/main.js
+-!@vscode/vsce-sign/package.json
+-!@vscode/vsce-sign/bin/**
++@vscodium/vsce-sign/**
++!@vscodium/vsce-sign/src/main.d.ts
++!@vscodium/vsce-sign/src/main.js
++!@vscodium/vsce-sign/package.json
++!@vscodium/vsce-sign/bin/**
+ 
+diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
+index 187726c..076f08b 100644
+--- a/build/gulpfile.vscode.ts
++++ b/build/gulpfile.vscode.ts
+@@ -449,3 +449,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
+ 				'**/*.wasm',
+-				'**/@vscode/vsce-sign/bin/*',
++				'**/@vscodium/vsce-sign/bin/*',
+ 			], [
+diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
+index aacf25c..c4b0391 100644
+--- a/build/lib/extensions.ts
++++ b/build/lib/extensions.ts
+@@ -116,3 +116,3 @@ export function typeCheckExtensionStream(extensionPath: string, forWeb: boolean)
+ function fromLocalNormal(extensionPath: string): Stream {
+-	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
++	const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
+ 	const result = es.through();
+@@ -138,3 +138,3 @@ function fromLocalNormal(extensionPath: string): Stream {
+ function fromLocalEsbuild(extensionPath: string, esbuildConfigFileName: string): Stream {
+-	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
++	const vsce = require('@vscodium/vsce') as typeof import('@vscodium/vsce');
+ 	const result = es.through();
+diff --git a/build/package-lock.json b/build/package-lock.json
+index 644e16f..fac5de0 100644
+--- a/build/package-lock.json
++++ b/build/package-lock.json
+@@ -51,3 +51,3 @@
+         "@vscode/ripgrep": "^1.17.1",
+-        "@vscode/vsce": "3.6.1",
++        "@vscodium/vsce": "3.6.1-258428",
+         "ansi-colors": "^3.2.3",
+@@ -1941,6 +1941,45 @@
+     },
+-    "node_modules/@vscode/vsce": {
+-      "version": "3.6.1",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.6.1.tgz",
+-      "integrity": "sha512-UXtMgeCBl/t5zjn1TX1v1sl5L/oIv3Xc3pkKPGzaqeFCIkp5+wfFFDBXTWDt3d5uUulHnZKORHkMIsKNe9+k5A==",
++    "node_modules/@vscode/vsce/node_modules/balanced-match": {
++      "version": "4.0.4",
++      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
++      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
++      "extraneous": true,
++      "license": "MIT",
++      "engines": {
++        "node": "18 || 20 || >=22"
++      }
++    },
++    "node_modules/@vscode/vsce/node_modules/brace-expansion": {
++      "version": "5.0.4",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
++      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
++      "extraneous": true,
++      "license": "MIT",
++      "dependencies": {
++        "balanced-match": "^4.0.2"
++      },
++      "engines": {
++        "node": "18 || 20 || >=22"
++      }
++    },
++    "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
++      "version": "10.2.4",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
++      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
++      "extraneous": true,
++      "license": "BlueOak-1.0.0",
++      "dependencies": {
++        "brace-expansion": "^5.0.2"
++      },
++      "engines": {
++        "node": "18 || 20 || >=22"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/@vscodium/vsce": {
++      "version": "3.6.1-258428",
++      "resolved": "https://registry.npmjs.org/@vscodium/vsce/-/vsce-3.6.1-258428.tgz",
++      "integrity": "sha512-B2uys5YU5MGNmzQPHsMsRXxzlQvZanhxE8Sfkd4Sr/LBN9BaV5yhMCppV7jyLUOQajj9K3YZThLqUYm4CCBy3A==",
+       "dev": true,
+@@ -1953,3 +1992,2 @@
+         "@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
+-        "@vscode/vsce-sign": "^2.0.0",
+         "azure-devops-node-api": "^12.5.0",
+@@ -1988,148 +2026,3 @@
+     },
+-    "node_modules/@vscode/vsce-sign": {
+-      "version": "2.0.7",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign/-/vsce-sign-2.0.7.tgz",
+-      "integrity": "sha512-cz0GFW8qCxpypOy3y509u26K1FIPMlDIHBwGmDyvEbgoma2v3y5YIHHuijr8zCYBp9kzCCOJd28s/0PG7cA7ew==",
+-      "dev": true,
+-      "hasInstallScript": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optionalDependencies": {
+-        "@vscode/vsce-sign-alpine-arm64": "2.0.6",
+-        "@vscode/vsce-sign-alpine-x64": "2.0.6",
+-        "@vscode/vsce-sign-darwin-arm64": "2.0.6",
+-        "@vscode/vsce-sign-darwin-x64": "2.0.6",
+-        "@vscode/vsce-sign-linux-arm": "2.0.6",
+-        "@vscode/vsce-sign-linux-arm64": "2.0.6",
+-        "@vscode/vsce-sign-linux-x64": "2.0.6",
+-        "@vscode/vsce-sign-win32-arm64": "2.0.6",
+-        "@vscode/vsce-sign-win32-x64": "2.0.6"
+-      }
+-    },
+-    "node_modules/@vscode/vsce-sign-alpine-arm64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.6.tgz",
+-      "integrity": "sha512-wKkJBsvKF+f0GfsUuGT0tSW0kZL87QggEiqNqK6/8hvqsXvpx8OsTEc3mnE1kejkh5r+qUyQ7PtF8jZYN0mo8Q==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "alpine"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-alpine-x64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-alpine-x64/-/vsce-sign-alpine-x64-2.0.6.tgz",
+-      "integrity": "sha512-YoAGlmdK39vKi9jA18i4ufBbd95OqGJxRvF3n6ZbCyziwy3O+JgOpIUPxv5tjeO6gQfx29qBivQ8ZZTUF2Ba0w==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "alpine"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-darwin-arm64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-darwin-arm64/-/vsce-sign-darwin-arm64-2.0.6.tgz",
+-      "integrity": "sha512-5HMHaJRIQuozm/XQIiJiA0W9uhdblwwl2ZNDSSAeXGO9YhB9MH5C4KIHOmvyjUnKy4UCuiP43VKpIxW1VWP4tQ==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "darwin"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-darwin-x64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-darwin-x64/-/vsce-sign-darwin-x64-2.0.6.tgz",
+-      "integrity": "sha512-25GsUbTAiNfHSuRItoQafXOIpxlYj+IXb4/qarrXu7kmbH94jlm5sdWSCKrrREs8+GsXF1b+l3OB7VJy5jsykw==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "darwin"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-linux-arm": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm/-/vsce-sign-linux-arm-2.0.6.tgz",
+-      "integrity": "sha512-UndEc2Xlq4HsuMPnwu7420uqceXjs4yb5W8E2/UkaHBB9OWCwMd3/bRe/1eLe3D8kPpxzcaeTyXiK3RdzS/1CA==",
+-      "cpu": [
+-        "arm"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-linux-arm64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm64/-/vsce-sign-linux-arm64-2.0.6.tgz",
+-      "integrity": "sha512-cfb1qK7lygtMa4NUl2582nP7aliLYuDEVpAbXJMkDq1qE+olIw/es+C8j1LJwvcRq1I2yWGtSn3EkDp9Dq5FdA==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-linux-x64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-x64/-/vsce-sign-linux-x64-2.0.6.tgz",
+-      "integrity": "sha512-/olerl1A4sOqdP+hjvJ1sbQjKN07Y3DVnxO4gnbn/ahtQvFrdhUi0G1VsZXDNjfqmXw57DmPi5ASnj/8PGZhAA==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-win32-arm64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-win32-arm64/-/vsce-sign-win32-arm64-2.0.6.tgz",
+-      "integrity": "sha512-ivM/MiGIY0PJNZBoGtlRBM/xDpwbdlCWomUWuLmIxbi1Cxe/1nooYrEQoaHD8ojVRgzdQEUzMsRbyF5cJJgYOg==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "win32"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce-sign-win32-x64": {
+-      "version": "2.0.6",
+-      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-win32-x64/-/vsce-sign-win32-x64-2.0.6.tgz",
+-      "integrity": "sha512-mgth9Kvze+u8CruYMmhHw6Zgy3GRX2S+Ed5oSokDEK5vPEwGGKnmuXua9tmFhomeAnhgJnL4DCna3TiNuGrBTQ==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "SEE LICENSE IN LICENSE.txt",
+-      "optional": true,
+-      "os": [
+-        "win32"
+-      ]
+-    },
+-    "node_modules/@vscode/vsce/node_modules/ansi-styles": {
++    "node_modules/@vscodium/vsce/node_modules/ansi-styles": {
+       "version": "4.3.0",
+@@ -2149,3 +2042,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/balanced-match": {
++    "node_modules/@vscodium/vsce/node_modules/balanced-match": {
+       "version": "4.0.4",
+@@ -2159,3 +2052,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/brace-expansion": {
++    "node_modules/@vscodium/vsce/node_modules/brace-expansion": {
+       "version": "5.0.4",
+@@ -2172,3 +2065,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/chalk": {
++    "node_modules/@vscodium/vsce/node_modules/chalk": {
+       "version": "4.1.2",
+@@ -2189,3 +2082,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/color-convert": {
++    "node_modules/@vscodium/vsce/node_modules/color-convert": {
+       "version": "2.0.1",
+@@ -2202,3 +2095,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/color-name": {
++    "node_modules/@vscodium/vsce/node_modules/color-name": {
+       "version": "1.1.4",
+@@ -2209,3 +2102,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/glob": {
++    "node_modules/@vscodium/vsce/node_modules/glob": {
+       "version": "11.1.0",
+@@ -2233,3 +2126,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
++    "node_modules/@vscodium/vsce/node_modules/glob/node_modules/minimatch": {
+       "version": "10.2.4",
+@@ -2249,3 +2142,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/has-flag": {
++    "node_modules/@vscodium/vsce/node_modules/has-flag": {
+       "version": "4.0.0",
+@@ -2259,3 +2152,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/jsonc-parser": {
++    "node_modules/@vscodium/vsce/node_modules/jsonc-parser": {
+       "version": "3.3.1",
+@@ -2263,9 +2156,11 @@
+       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+-      "dev": true
++      "dev": true,
++      "license": "MIT"
+     },
+-    "node_modules/@vscode/vsce/node_modules/semver": {
+-      "version": "7.6.3",
+-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
++    "node_modules/@vscodium/vsce/node_modules/semver": {
++      "version": "7.7.3",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
++      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+       "dev": true,
++      "license": "ISC",
+       "bin": {
+@@ -2277,3 +2172,3 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/supports-color": {
++    "node_modules/@vscodium/vsce/node_modules/supports-color": {
+       "version": "7.2.0",
+@@ -2290,12 +2185,2 @@
+     },
+-    "node_modules/@vscode/vsce/node_modules/yazl": {
+-      "version": "2.5.1",
+-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+-      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+-      "dev": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "buffer-crc32": "~0.2.3"
+-      }
+-    },
+     "node_modules/@xmldom/xmldom": {
+@@ -7001,2 +6886,12 @@
+     },
++    "node_modules/yazl": {
++      "version": "2.5.1",
++      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
++      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
++      "dev": true,
++      "license": "MIT",
++      "dependencies": {
++        "buffer-crc32": "~0.2.3"
++      }
++    },
+     "node_modules/yocto-queue": {
+diff --git a/build/package.json b/build/package.json
+index 8a65120..a36d5c4 100644
+--- a/build/package.json
++++ b/build/package.json
+@@ -45,3 +45,3 @@
+     "@vscode/ripgrep": "^1.17.1",
+-    "@vscode/vsce": "3.6.1",
++    "@vscodium/vsce": "3.6.1-258428",
+     "ansi-colors": "^3.2.3",
+diff --git a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
+index 98535c5..cc37d7b 100644
+--- a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
++++ b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
+@@ -69,3 +69,3 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
+ 	private async resolveVsceSign(): Promise<typeof vsceSign> {
+-		const mod = '@vscode/vsce-sign';
++		const mod = '@vscodium/vsce-sign';
+ 		return import(mod);

patches/fix-extensions-control-connection.patch

@@ -0,0 +1,20 @@
+diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+index 6414a46..0bdc5a2 100644
+--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
++++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+@@ -1944,3 +1944,3 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
+ 
+-		const context = await this.requestService.request({
++		const requestOptions: IRequestOptions = {
+ 			type: 'GET',
+@@ -1949,3 +1949,9 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
+ 			callSite: 'extensionGalleryService.getExtensionsControlManifest'
+-		}, CancellationToken.None);
++		};
++
++		if (!isWeb) {
++			requestOptions.headers = { Connection: 'close' };
++		}
++
++		const context = await this.requestService.request(requestOptions, CancellationToken.None);
+ 

patches/fix-gallery.patch

@@ -0,0 +1,42 @@
+diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
+index 3954823..f8026cd 100644
+--- a/src/vs/base/common/product.ts
++++ b/src/vs/base/common/product.ts
+@@ -112,2 +112,4 @@ export interface IProductConfiguration {
+ 		readonly accessSKUs?: string[];
++		readonly itemUrl: string;
++		readonly latestUrlTemplate?: string;
+ 	};
+diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
+index 658219e..d1bf7a9 100644
+--- a/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
++++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
+@@ -19,2 +19,3 @@ type ExtensionGalleryConfig = {
+ 	readonly nlsBaseUrl: string;
++	readonly latestUrlTemplate?: string;
+ };
+@@ -49,3 +50,3 @@ export class ExtensionGalleryManifestService extends Disposable implements IExte
+ 			{
+-				id: `${extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
++				id: extensionsGallery.latestUrlTemplate ?? `${extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
+ 				type: ExtensionGalleryResourceType.ExtensionLatestVersionUri
+diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
+index 5a6c171..112b31b 100644
+--- a/src/vs/platform/product/common/product.ts
++++ b/src/vs/platform/product/common/product.ts
+@@ -31,2 +31,15 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
+ 
++	const { serviceUrl, controlUrl, itemUrl, latestUrlTemplate, extensionUrlTemplate, resourceUrlTemplate } = product.extensionsGallery || {};
++
++	Object.assign(product, {
++		extensionsGallery: {
++			serviceUrl: env['VSCODE_GALLERY_SERVICE_URL'] || serviceUrl,
++			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
++			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
++			latestUrlTemplate: env['VSCODE_GALLERY_LATEST_URL_TEMPLATE'] || latestUrlTemplate,
++			extensionUrlTemplate: env['VSCODE_GALLERY_EXTENSION_URL_TEMPLATE'] || extensionUrlTemplate,
++			resourceUrlTemplate: env['VSCODE_GALLERY_RESOURCE_URL_TEMPLATE'] || resourceUrlTemplate,
++		}
++	});
++
+ 	// Running out of sources

patches/fix-keymap.patch

@@ -0,0 +1,131 @@
+diff --git a/.npmrc b/.npmrc
+index a275846..87f881f 100644
+--- a/.npmrc
++++ b/.npmrc
+@@ -6,2 +6,3 @@ ignore-scripts=false
+ build_from_source="true"
++build_from_source_native_keymap="no"
+ legacy-peer-deps="true"
+diff --git a/build/.moduleignore b/build/.moduleignore
+index ed36151..5b040cc 100644
+--- a/build/.moduleignore
++++ b/build/.moduleignore
+@@ -65,7 +65,7 @@ fsevents/test/**
+ 
+-native-keymap/binding.gyp
+-native-keymap/build/**
+-native-keymap/src/**
+-native-keymap/deps/**
+-!native-keymap/build/Release/*.node
++@vscodium/native-keymap/binding.gyp
++@vscodium/native-keymap/build/**
++@vscodium/native-keymap/src/**
++@vscodium/native-keymap/deps/**
++!@vscodium/native-keymap/build/Release/*.node
+ 
+diff --git a/eslint.config.js b/eslint.config.js
+index 73f062a..f008259 100644
+--- a/eslint.config.js
++++ b/eslint.config.js
+@@ -1481,3 +1481,3 @@ export default tseslint.config(
+ 						'node:module',
+-						'native-keymap',
++						'@vscodium/native-keymap',
+ 						'net',
+diff --git a/package-lock.json b/package-lock.json
+index bc72a21..ae566c1 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -32,2 +32,3 @@
+         "@vscode/windows-registry": "^1.2.0",
++        "@vscodium/native-keymap": "3.3.7-258424",
+         "@xterm/addon-clipboard": "^0.3.0-beta.191",
+@@ -49,3 +50,2 @@
+         "native-is-elevated": "0.9.0",
+-        "native-keymap": "^3.3.5",
+         "node-pty": "^1.2.0-beta.10",
+@@ -4862,2 +4862,9 @@
+     },
++    "node_modules/@vscodium/native-keymap": {
++      "version": "3.3.7-258424",
++      "resolved": "https://registry.npmjs.org/@vscodium/native-keymap/-/native-keymap-3.3.7-258424.tgz",
++      "integrity": "sha512-HZ20QfExV0kE2l939yE3wn0LezSV7BcpxOFmlUMUHBQbdANMSLkwzo6Zw1xOEZDoYm3VTDHt8/+WwLBR2MpA3A==",
++      "hasInstallScript": true,
++      "license": "MIT"
++    },
+     "node_modules/@wdio/config": {
+@@ -15159,5 +15166,6 @@
+     "node_modules/napi-build-utils": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
++      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
++      "license": "MIT"
+     },
+@@ -15170,9 +15178,2 @@
+     },
+-    "node_modules/native-keymap": {
+-      "version": "3.3.9",
+-      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-3.3.9.tgz",
+-      "integrity": "sha512-d/ydQ5x+GM5W0dyAjFPwexhtc9CDH1g/xWZESS5CXk16ThyFzSBLvlBJq1+FyzUIFf/F2g1MaHdOpa6G9150YQ==",
+-      "hasInstallScript": true,
+-      "license": "MIT"
+-    },
+     "node_modules/natural-compare": {
+@@ -16693,5 +16694,6 @@
+     "node_modules/prebuild-install": {
+-      "version": "7.1.2",
+-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
+-      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
++      "version": "7.1.3",
++      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
++      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
++      "license": "MIT",
+       "dependencies": {
+@@ -16702,3 +16704,3 @@
+         "mkdirp-classic": "^0.5.3",
+-        "napi-build-utils": "^1.0.1",
++        "napi-build-utils": "^2.0.0",
+         "node-abi": "^3.3.0",
+diff --git a/package.json b/package.json
+index d727d5a..54d14ad 100644
+--- a/package.json
++++ b/package.json
+@@ -119,3 +119,3 @@
+     "native-is-elevated": "0.9.0",
+-    "native-keymap": "^3.3.5",
++    "@vscodium/native-keymap": "3.3.7-258424",
+     "node-pty": "^1.2.0-beta.10",
+diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+index c30c6da..ca6cea2 100644
+--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
++++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+@@ -44,8 +44,8 @@ flakySuite('Native Modules (all platforms)', () => {
+ 	test('native-keymap', async () => {
+-		const keyMap = await import('native-keymap');
+-		assert.ok(typeof keyMap.onDidChangeKeyboardLayout === 'function', testErrorMessage('native-keymap'));
+-		assert.ok(typeof keyMap.getCurrentKeyboardLayout === 'function', testErrorMessage('native-keymap'));
++		const keyMap = await import('@vscodium/native-keymap');
++		assert.ok(typeof keyMap.onDidChangeKeyboardLayout === 'function', testErrorMessage('@vscodium/native-keymap'));
++		assert.ok(typeof keyMap.getCurrentKeyboardLayout === 'function', testErrorMessage('@vscodium/native-keymap'));
+ 
+ 		const result = keyMap.getCurrentKeyboardLayout();
+-		assert.ok(result, testErrorMessage('native-keymap'));
++		assert.ok(result, testErrorMessage('@vscodium/native-keymap'));
+ 	});
+diff --git a/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts b/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
+index 8950ce2..f31cea6 100644
+--- a/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
++++ b/src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
+@@ -5,3 +5,3 @@
+ 
+-import type * as nativeKeymap from 'native-keymap';
++import type * as nativeKeymap from '@vscodium/native-keymap';
+ import * as platform from '../../../base/common/platform.js';
+@@ -48,3 +48,3 @@ export class KeyboardLayoutMainService extends Disposable implements INativeKeyb
+ 	private async _doInitialize(): Promise<void> {
+-		const nativeKeymapMod = await import('native-keymap');
++		const nativeKeymapMod = await import('@vscodium/native-keymap');
+ 

patches/fix-npm-preinstall.patch

@@ -0,0 +1,14 @@
+diff --git a/build/npm/preinstall.ts b/build/npm/preinstall.ts
+index 3476fca..e23329f 100644
+--- a/build/npm/preinstall.ts
++++ b/build/npm/preinstall.ts
+@@ -129,3 +129,3 @@ function installHeaders() {
+ 	// Refs https://chromium-review.googlesource.com/c/v8/v8/+/6879784
+-	if (process.platform === 'linux') {
++	if (process.platform === 'linux' && local) {
+ 		const homedir = os.homedir();
+@@ -133,3 +133,3 @@ function installHeaders() {
+ 		const nodeGypCache = path.join(cachePath, 'node-gyp');
+-		const localHeaderPath = path.join(nodeGypCache, local!.target, 'include', 'node');
++		const localHeaderPath = path.join(nodeGypCache, local.target, 'include', 'node');
+ 		if (fs.existsSync(localHeaderPath)) {

patches/fix-policies.patch

@@ -1,8 +1,10 @@
+# Fix: Replace @vscode/policy-watcher with @vscodium/policy-watcher
+# Documentation: docs/patches.md#fix-policies
 diff --git a/build/.moduleignore b/build/.moduleignore
-index 6b7f365..2211e6e 100644
+index 5b040cc..8d5fd71 100644
 --- a/build/.moduleignore
 +++ b/build/.moduleignore
-@@ -125,9 +125,11 @@ vsda/**
+@@ -128,9 +128,11 @@ vsda/**
  
 -@vscode/policy-watcher/build/**
 -@vscode/policy-watcher/.husky/**
@@ -19,63 +21,78 @@ index 6b7f365..2211e6e 100644
 +@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
++!@vscodium/policy-watcher/build/Release/vscodium-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 {
+diff --git a/build/lib/policies/basePolicy.ts b/build/lib/policies/basePolicy.ts
+index 7f650ba..db927cb 100644
+--- a/build/lib/policies/basePolicy.ts
++++ b/build/lib/policies/basePolicy.ts
+@@ -38,3 +38,3 @@ export 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})">`,
++			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\!!ORG_NAME!!\\${regKey}" presentation="$(presentation.${this.name})">`,
  			`	<parentCategory ref="${this.category.name.nlsKey}" />`,
-@@ -553,3 +553,3 @@ function renderADMX(regKey: string, versions: string[], categories: Category[],
+diff --git a/build/lib/policies/render.ts b/build/lib/policies/render.ts
+index 47b485d..8437fd4 100644
+--- a/build/lib/policies/render.ts
++++ b/build/lib/policies/render.ts
+@@ -49,3 +49,3 @@ export function renderADMX(regKey: string, versions: string[], categories: Categ
  	<policyNamespaces>
 -		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
-+		<target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
++		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
  	</policyNamespaces>
+@@ -167,3 +167,3 @@ export function renderProfileManifest(appName: string, bundleIdentifier: string,
+ 			<key>pfm_default</key>
+-			<string>Microsoft</string>
++			<string>!!ORG_NAME!!</string>
+ 			<key>pfm_name</key>
+@@ -185,3 +185,3 @@ export function renderProfileManifest(appName: string, bundleIdentifier: string,
+     <key>pfm_app_url</key>
+-    <string>https://code.visualstudio.com/</string>
++    <string>https://github.com/VSCodium/vscodium</string>
+     <key>pfm_description</key>
+@@ -189,3 +189,3 @@ export function renderProfileManifest(appName: string, bundleIdentifier: string,
+     <key>pfm_documentation_url</key>
+-    <string>https://code.visualstudio.com/docs/setup/enterprise</string>
++    <string>https://github.com/VSCodium/vscodium</string>
+     <key>pfm_domain</key>
+@@ -255,3 +255,3 @@ ${policyEntries}
+ 		<key>PayloadDescription</key>
+-		<string>This profile manages ${appName}. For more information see https://code.visualstudio.com/docs/setup/enterprise</string>
++		<string>This profile manages ${appName}. For more information see https://github.com/VSCodium/vscodium</string>
+ 		<key>PayloadDisplayName</key>
+@@ -261,3 +261,3 @@ ${policyEntries}
+ 		<key>PayloadOrganization</key>
+-		<string>Microsoft</string>
++		<string>!!ORG_NAME!!</string>
+ 		<key>PayloadType</key>
 diff --git a/eslint.config.js b/eslint.config.js
-index 8e3d288..1fa7cc3 100644
+index f008259..f87fda1 100644
 --- a/eslint.config.js
 +++ b/eslint.config.js
-@@ -793,3 +793,3 @@ export default tseslint.config(
- 						'@vscode/iconv-lite-umd',
+@@ -1464,3 +1464,3 @@ export default tseslint.config(
+ 						'@vscode/native-watchdog',
 -						'@vscode/policy-watcher',
 +						'@vscodium/policy-watcher',
  						'@vscode/proxy-agent',
 diff --git a/package-lock.json b/package-lock.json
-index d4bc1fb..195cbe1 100644
+index ae566c1..3b3a5dd 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 @@
+@@ -21,3 +21,2 @@
+         "@vscode/native-watchdog": "^1.4.6",
+-        "@vscode/policy-watcher": "^1.3.2",
+         "@vscode/proxy-agent": "^0.39.1",
+@@ -33,2 +32,3 @@
+         "@vscodium/native-keymap": "3.3.7-258424",
++        "@vscodium/policy-watcher": "^1.3.2-252465",
+         "@xterm/addon-clipboard": "^0.3.0-beta.191",
+@@ -4538,22 +4538,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==",
+-      "version": "1.3.7",
+-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.7.tgz",
+-      "integrity": "sha512-OvIczTbtGLZs7YU0ResbjM0KEB2ORBnlJ4ICxaB9fKHNVBwNVp4i2qIkDQGp3UBGtu7P8/+eg4/ZKk2oJGFcug==",
 -      "hasInstallScript": true,
 -      "license": "MIT",
 -      "dependencies": {
@@ -93,12 +110,12 @@ index d4bc1fb..195cbe1 100644
 -      }
 -    },
      "node_modules/@vscode/proxy-agent": {
-@@ -3247,2 +3227,22 @@
+@@ -4869,2 +4849,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==",
++      "version": "1.3.2-255408",
++      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.2-255408.tgz",
++      "integrity": "sha512-0KERmB+VkSz9hvFWEDGalCpxQ9+qjLaUazXMBkzWQ9SjKPaD6zU9u6wA4/OUu816JnvCFEeJYEe9WcDZPnKQ1w==",
 +      "hasInstallScript": true,
 +      "license": "MIT",
 +      "dependencies": {
@@ -107,24 +124,24 @@ index d4bc1fb..195cbe1 100644
 +      }
 +    },
 +    "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==",
++      "version": "8.6.0",
++      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.6.0.tgz",
++      "integrity": "sha512-gBVjCaqDlRUk0EwoPNKzIr9KkS9041G/q31IBShPs1Xz6UTA+EXdZADbzqAJQrpDRq71CIMnOP5VMut3SL0z5Q==",
 +      "license": "MIT",
 +      "engines": {
 +        "node": "^18 || ^20 || >= 21"
 +      }
 +    },
-     "node_modules/@webassemblyjs/ast": {
+     "node_modules/@wdio/config": {
 diff --git a/package.json b/package.json
-index 925462f..c4b6304 100644
+index 54d14ad..47778c2 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",
+@@ -91,3 +91,3 @@
+     "@vscode/native-watchdog": "^1.4.6",
+-    "@vscode/policy-watcher": "^1.3.2",
++    "@vscodium/policy-watcher": "^1.3.2-252465",
+     "@vscode/proxy-agent": "^0.39.1",
 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
@@ -225,7 +242,7 @@ index ee0a24b..881ce36 100644
 +/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
+index ca6cea2..32b22fe 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)', () => {
@@ -238,7 +255,7 @@ index e0b99f3..f3af586 100644
 +		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
+index feb4ba1..4d9e0c3 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';

patches/fix-remote-libs.patch

@@ -1,12 +1,8 @@
 diff --git a/remote/package-lock.json b/remote/package-lock.json
-index f0ed1cc..a973af3 100644
+index 30a7391..94f839a 100644
 --- a/remote/package-lock.json
 +++ b/remote/package-lock.json
-@@ -40,2 +40,3 @@
-         "tas-client-umd": "0.2.0",
-+        "tslib": "^2.6.3",
-         "vscode-oniguruma": "1.7.0",
-@@ -1109,2 +1110,8 @@
+@@ -1155,2 +1155,8 @@
      },
 +    "node_modules/tslib": {
 +      "version": "2.7.0",
@@ -16,10 +12,10 @@ index f0ed1cc..a973af3 100644
 +    },
      "node_modules/tunnel-agent": {
 diff --git a/remote/package.json b/remote/package.json
-index 33afee9..525ed07 100644
+index 119d62c..9ef9624 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -35,2 +35,3 @@
-     "tas-client-umd": "0.2.0",
+@@ -37,2 +37,3 @@
+     "tas-client": "0.3.1",
 +    "tslib": "^2.6.3",
      "vscode-oniguruma": "1.7.0",

patches/fix-tunnel-extension-recommendation.patch

@@ -0,0 +1,10 @@
+diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts
+index 0eaa650..43eeee6 100644
+--- a/src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts
++++ b/src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts
+@@ -152,2 +152,5 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
+ 		const shouldRecommend = async () => {
++			if (!Boolean(remoteExtension)) {
++				return false;
++			}
+ 			if (this.storageService.getBoolean(REMOTE_TUNNEL_EXTENSION_RECOMMENDED_KEY, StorageScope.APPLICATION)) {

patches/helper/settings.patch

@@ -1,37 +1,25 @@
 diff --git a/.vscode/settings.json b/.vscode/settings.json
-index 99e495a..996044a 100644
+index 7434345..f870f59 100644
 --- a/.vscode/settings.json
 +++ b/.vscode/settings.json
-@@ -10,5 +10,5 @@
- 		"build/**/*.js.map": true,
--		"build/**/*.js": {
--			"when": "$(basename).ts"
--		}
-+		// "build/**/*.js": {
-+		// 	"when": "$(basename).ts"
-+		// }
- 	},
-@@ -59,2 +59,3 @@
- 		"build/npm/*.js": true,
-+		"build/**/*.js": true,
- 		"build/*.js": true
-@@ -108,3 +109,3 @@
- 	"gulp.autoDetect": "off",
--	"files.insertFinalNewline": true,
-+	// "files.insertFinalNewline": true,
- 	"[plaintext]": {
-@@ -114,3 +115,3 @@
- 		"editor.defaultFormatter": "vscode.typescript-language-features",
+@@ -29,6 +29,6 @@
+ 	"[typescript]": {
 -		"editor.formatOnSave": true
 +		// "editor.formatOnSave": true
  	},
-@@ -118,3 +119,3 @@
- 		"editor.defaultFormatter": "vscode.typescript-language-features",
+ 	"[javascript]": {
 -		"editor.formatOnSave": true
 +		// "editor.formatOnSave": true
  	},
-@@ -122,3 +123,3 @@
+@@ -36,3 +36,3 @@
  		"editor.defaultFormatter": "rust-lang.rust-analyzer",
 -		"editor.formatOnSave": true,
 +		// "editor.formatOnSave": true,
  	},
+@@ -42,4 +42,4 @@
+ 	// --- Files ---
+-	"files.trimTrailingWhitespace": true,
+-	"files.insertFinalNewline": true,
++	// "files.trimTrailingWhitespace": true,
++	// "files.insertFinalNewline": true,
+ 	"files.exclude": {

patches/insider/add-remote-url.patch

@@ -1,18 +0,0 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 7d58861..cefb8ad 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -306,3 +306,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
--			.pipe(json({ commit, date: readISODate('out-build'), version, release }))
-+			.pipe(json({ commit, date: readISODate('out-build'), version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
- 			.pipe(es.through(function (file) {
-diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 4af4067..1bac2cc 100644
---- a/build/gulpfile.vscode.js
-+++ b/build/gulpfile.vscode.js
-@@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
--			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release }))
-+			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
- 			.pipe(es.through(function (file) {

patches/insider/disable-windows-appx.patch

@@ -1,15 +0,0 @@
-diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 5adfdfb..dfdb2af 100644
---- a/build/gulpfile.vscode.win32.js
-+++ b/build/gulpfile.vscode.win32.js
-@@ -115,6 +115,6 @@ function buildWin32Setup(arch, target) {
- 
--		if (quality === 'insider') {
--			definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
--			definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
--		}
-+		// if (quality === 'insider') {
-+		// 	definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
-+		// 	definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
-+		// }
-