chore: bump picomatch from 4.0.3 to 4.0.4

Bumps [picomatch](https://github.com/micromatch/picomatch) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/4.0.3...4.0.4)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 4.0.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/build.yaml

@@ -90,10 +90,9 @@ jobs:
     if: needs.changes.outputs.helm == 'true'
     steps:
       - uses: actions/checkout@v6
-      - uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
+      - uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          version: "v3.19.2"
       - run: helm plugin install https://github.com/instrumenta/helm-kubeval
       - run: helm kubeval ci/helm-chart
 
@@ -144,7 +143,7 @@ jobs:
             test/package-lock.json
       - run: SKIP_SUBMODULE_DEPS=1 npm ci
       - run: npm run test:unit
-      - uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
+      - uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5
         if: success()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -158,12 +157,10 @@ jobs:
       VERSION: 0.0.0
       VSCODE_TARGET: linux-x64
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
 
     steps:
       - run: sudo apt update && sudo apt install -y libkrb5-dev
-      - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest
+      - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest
         with:
           packages: quilt
           version: 1.0
@@ -213,8 +210,6 @@ jobs:
   test-e2e:
     name: Run e2e tests
     runs-on: ubuntu-22.04
-    env:
-      LOG_LEVEL: debug
     needs: [changes, build]
     if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
 
@@ -250,7 +245,6 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      LOG_LEVEL: debug
     needs: [changes, build]
     if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
 

.github/workflows/publish.yaml

@@ -41,15 +41,14 @@ jobs:
       - uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
         with:
           repository: "coder/code-server"
-          tag: ${{ env.TAG }}
+          tag: ${{ inputs.version || github.ref_name }}
           fileName: "package.tar.gz"
           out-file-path: "release-npm-package"
 
       - run: tar -xzf release-npm-package/package.tar.gz
       - run: |
-          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
           pushd release
-          npm publish --tag latest --access public
+          npm publish --access public
 
   aur:
     runs-on: ubuntu-latest
@@ -108,8 +107,8 @@ jobs:
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
       - uses: actions/checkout@v6
-      - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
+      - uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
-      - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
 
       - uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
         with:

.github/workflows/release.yaml

@@ -19,50 +19,75 @@ concurrency:
 
 jobs:
   package-linux:
-    name: ${{ format('linux-{0}', matrix.vscode_arch) }}
+    name: ${{ matrix.vscode_target }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
-
+    container: "python:3.8-slim-buster"
     strategy:
       matrix:
         include:
-          - npm_arch: x64
+          - prefix: x86_64-linux-gnu
-            vscode_arch: x64
+            npm_arch: x64
+            apt_arch: amd64
             package_arch: amd64
-          - npm_arch: arm64
+            vscode_target: linux-x64
-            vscode_arch: arm64
+          - prefix: aarch64-linux-gnu
+            npm_arch: arm64
+            apt_arch: arm64
             package_arch: arm64
-          - npm_arch: arm
+            vscode_target: linux-arm64
-            vscode_arch: armhf
+          - prefix: arm-linux-gnueabihf
+            npm_arch: armv7l
+            apt_arch: armhf
             package_arch: armv7l
+            vscode_target: linux-armhf
 
     env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      AR: ${{ format('{0}-ar', matrix.prefix) }}
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      AS: ${{ format('{0}-as', matrix.prefix) }}
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      CC: ${{ format('{0}-gcc', matrix.prefix) }}
-      TAG: ${{ inputs.version || github.ref_name }}
+      CPP: ${{ format('{0}-cpp', matrix.prefix) }}
-      # Set release package name.
+      CXX: ${{ format('{0}-g++', matrix.prefix) }}
-      ARCH: ${{ matrix.package_arch }}
+      FC: ${{ format('{0}-gfortran', matrix.prefix) }}
-      # Cross-compile target.
+      LD: ${{ format('{0}-ld', matrix.prefix) }}
-      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+      STRIP: ${{ format('{0}-strip', matrix.prefix) }}
+      PKG_CONFIG_PATH: ${{ format('/usr/lib/{0}/pkgconfig', matrix.prefix) }}
+      # Set cross-compiler package arch.
+      APT_ARCH: ${{ matrix.apt_arch }}
+      # For downloading the right Node.
       npm_config_arch: ${{ matrix.npm_arch }}
-      # Ensure native modules are built from source to avoid prebuilds and use
+      # Overrides package architecture.
-      # the correct version of glibc.
+      ARCH: ${{ matrix.package_arch }}
+      # Not building from source results in an x86_64 argon2, as if
+      # npm_config_arch is being ignored.
       npm_config_build_from_source: true
-      # Gulp target name.
+      # Overrides VS Code gulp build target.
-      # TODO: Pull from VSCODE_ARCH instead.
+      VSCODE_TARGET: ${{ matrix.vscode_target }}
-      VSCODE_TARGET: ${{ format('linux-{0}', matrix.vscode_arch) }}
+      TAG: ${{ inputs.version || github.ref_name }}
 
     steps:
-      - run: sudo apt update && sudo apt install -y libkrb5-dev
+      - name: Install cross-compiler and system dependencies
-      - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest
+        run: |
-        with:
+          sed -i 's/deb\.debian\.org/archive.debian.org/g' /etc/apt/sources.list
-          packages: quilt
+          dpkg --add-architecture $APT_ARCH
-          version: 1.0
+          apt update && apt install -y --no-install-recommends \
+            crossbuild-essential-$APT_ARCH \
+            libx11-dev:$APT_ARCH \
+            libx11-xcb-dev:$APT_ARCH \
+            libxkbfile-dev:$APT_ARCH \
+            libsecret-1-dev:$APT_ARCH \
+            libkrb5-dev:$APT_ARCH \
+            ca-certificates \
+            curl wget rsync gettext-base
       - name: Install nfpm
         run: |
           mkdir -p ~/.local/bin
           curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm
           echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - run: sudo apt update && sudo apt install -y libkrb5-dev
+      - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest
+        with:
+          packages: quilt
+          version: 1.0
 
       - name: Set version to tag without leading v
         run: |
@@ -79,28 +104,17 @@ jobs:
           cache-dependency-path: |
             package-lock.json
             test/package-lock.json
-
+      - run: npm ci
-      - name: Build
+      - run: npm run build
-        run: |
+      - run: npm run build:vscode
-          cd lib/vscode/build
-          npm ci
-          cd ..
-          source ./build/azure-pipelines/linux/setup-env.sh
-          # Run preinstall script before root dependencies are installed
-          # so that v8 headers are patched correctly for native modules.
-          node build/npm/preinstall.ts
-          cd ../..
-          npm ci
-          npm run build
-          npm run build:vscode
 
       # Platform-agnostic NPM package.
       - run: npm run release
-        if: ${{ matrix.vscode_arch == 'x64' }}
+        if: ${{ matrix.vscode_target == 'linux-x64' }}
       - run: tar -czf package.tar.gz release
-        if: ${{ matrix.vscode_arch == 'x64' }}
+        if: ${{ matrix.vscode_target == 'linux-x64' }}
       - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-        if: ${{ matrix.vscode_arch == 'x64' }}
+        if: ${{ matrix.vscode_target == 'linux-x64' }}
         with:
           draft: true
           discussion_category_name: "📣 Announcements"
@@ -108,6 +122,13 @@ jobs:
 
       # Platform-specific release.
       - run: KEEP_MODULES=1 npm run release
+      - name: Replace node with cross-compile equivalent
+        run: |
+          node_version=$(node --version)
+          wget https://nodejs.org/dist/${node_version}/node-${node_version}-linux-${npm_config_arch}.tar.xz
+          tar -xf node-${node_version}-linux-${npm_config_arch}.tar.xz node-${node_version}-linux-${npm_config_arch}/bin/node --strip-components=2
+          mv ./node ./release/lib/node
+
       - run: npm run package
       - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
         with:
@@ -129,8 +150,6 @@ jobs:
       VSCODE_TARGET: ${{ matrix.vscode_target }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       TAG: ${{ inputs.version || github.ref_name }}
-      # Ensure native modules are built from source to avoid prebuilds.
-      npm_config_build_from_source: true
 
     steps:
       # The version of node-gyp we use depends on distutils but it was removed
@@ -159,7 +178,6 @@ jobs:
           cache-dependency-path: |
             package-lock.json
             test/package-lock.json
-
       - run: npm ci
       - run: npm run build
       - run: npm run build:vscode

CHANGELOG.md

@@ -22,88 +22,6 @@ Code v99.99.999
 
 ## Unreleased
 
-## [4.116.0](https://github.com/coder/code-server/releases/tag/v4.116.0) - 2026-04-16
-
-Code v1.116.0
-
-### Changed
-
-- Update to Code 1.116.0
-
-## [4.115.0](https://github.com/coder/code-server/releases/tag/v4.115.0) - 2026-04-08
-
-Code v1.115.0
-
-### Changed
-
-- Update to Code 1.115.0
-
-## [4.114.1](https://github.com/coder/code-server/releases/tag/v4.114.1) - 2026-04-06
-
-Code v1.114.0
-
-### Changed
-
-- Ensure native modules are built from source so they use the correct version of
-  glibc. This should bring down the requirement from 2.34 back down to 2.28.
-
-## [4.114.0](https://github.com/coder/code-server/releases/tag/v4.114.0) - 2026-04-04
-
-Code v1.114.0
-
-### Changed
-
-- Update to Code 1.114.0.
-
-## [4.113.1](https://github.com/coder/code-server/releases/tag/v4.113.1) - 2026-04-03
-
-Code v1.113.0
-
-This is a re-release of v4.113.0 but with the correct Node binaries for arm64
-and armv7l. Previously they were packaging the amd64 Node binary due to a
-mistake while refactoring CI to use more of the upstream build scripts.
-
-## [4.113.0](https://github.com/coder/code-server/releases/tag/v4.113.0) - 2026-04-02
-
-Code v1.113.0
-
-### Changed
-
-- Update to Code 1.113.0
-
-## [4.112.0](https://github.com/coder/code-server/releases/tag/v4.112.0) - 2026-03-19
-
-Code v1.112.0
-
-### Changed
-
-- Update to Code 1.112.0
-
-## [4.111.0](https://github.com/coder/code-server/releases/tag/v4.111.0) - 2026-03-11
-
-Code v1.111.0
-
-### Changed
-
-- Update to Code 1.111.0
-- `--app-name` now affects the error page title.
-
-## [4.110.1](https://github.com/coder/code-server/releases/tag/v4.110.1) - 2026-03-10
-
-Code v1.110.1
-
-### Changed
-
-- Update to Code 1.110.1
-
-## [4.110.0](https://github.com/coder/code-server/releases/tag/v4.110.0) - 2026-03-09
-
-Code v1.110.0
-
-### Changed
-
-- Update to Code 1.110.0
-
 ## [4.109.5](https://github.com/coder/code-server/releases/tag/v4.109.5) - 2026-03-02
 
 Code v1.109.5

ci/build/build-packages.sh

@@ -26,7 +26,7 @@ main() {
 release_archive() {
   local release_name="code-server-$VERSION-$OS-$ARCH"
   if [[ $OS == "linux" ]]; then
-    tar -czf "release-packages/$release_name.tar.gz" --owner=0 --group=0 --transform "s/^$RELEASE_PATH/$release_name/" "$RELEASE_PATH"
+    tar -czf "release-packages/$release_name.tar.gz" --owner=0 --group=0 --transform "s/^\.\/$RELEASE_PATH/$release_name/" "$RELEASE_PATH"
   else
     tar -czf "release-packages/$release_name.tar.gz" -s "/^$RELEASE_PATH/$release_name/" "$RELEASE_PATH"
   fi

ci/build/build-release.sh

@@ -36,6 +36,13 @@ main() {
   rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
 
   if [ "$KEEP_MODULES" = 1 ]; then
+    # Copy Node.  Package managers may shim their own "node" wrapper into the
+    # PATH, so run node and ask it for its true path.
+    local node_path
+    node_path="$(node -p process.execPath)"
+    rsync "$node_path" "$RELEASE_PATH/lib/node"
+    chmod 755 "$RELEASE_PATH/lib/node"
+
     # Copy the code-server launcher.
     mkdir -p "$RELEASE_PATH/bin"
     rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
@@ -68,7 +75,6 @@ bundle_code_server() {
   jq --slurp '(.[0] | del(.scripts,.jest,.devDependencies)) * .[1]' package.json <(
     cat << EOF
   {
-    "version": "$(jq -r .codeServerVersion "./lib/vscode-reh-web-$VSCODE_TARGET/product.json")",
     "commit": "$(git rev-parse HEAD)",
     "scripts": {
       "postinstall": "sh ./postinstall.sh"
@@ -78,29 +84,17 @@ EOF
   ) > "$RELEASE_PATH/package.json"
   mv npm-shrinkwrap.json "$RELEASE_PATH"
 
-  if [ "$KEEP_MODULES" = 1 ]; then
-    local rsync_opts=(-a)
-    if [[ ${DEBUG-} = 1 ]]; then
-      rsync_opts+=(-vh)
-    fi
-    # If we build from source, exclude the prebuilds.
-    if [[ ${npm_config_build_from_source-} = true ]]; then
-      rsync_opts+=(--exclude /argon2/prebuilds)
-    fi
-    rsync "${rsync_opts[@]}" node_modules/ "$RELEASE_PATH/node_modules"
-    # Remove dev dependencies.
-    pushd "$RELEASE_PATH"
-    npm prune --production
-    popd
-  fi
-
   rsync ci/build/npm-postinstall.sh "$RELEASE_PATH/postinstall.sh"
+
+  if [ "$KEEP_MODULES" = 1 ]; then
+    rsync node_modules/ "$RELEASE_PATH/node_modules"
+  fi
 }
 
 bundle_vscode() {
   mkdir -p "$VSCODE_OUT_PATH"
 
-  local rsync_opts=(-a)
+  local rsync_opts=()
   if [[ ${DEBUG-} = 1 ]]; then
     rsync_opts+=(-vh)
   fi
@@ -109,23 +103,17 @@ bundle_vscode() {
   # npm package so exclude any .gitignore files.
   rsync_opts+=(--exclude .gitignore)
 
-  # Exclude Node since we want to place it in a directory above.
+  # Exclude Node as we will add it ourselves for the standalone and will not
+  # need it for the npm package.
   rsync_opts+=(--exclude /node)
 
-  # Exclude Node modules.  Note that these will already only include production
+  # Exclude Node modules.
-  # dependencies, so if we do keep them there is no need to do any
-  # post-processing to remove dev dependencies.
   if [[ $KEEP_MODULES = 0 ]]; then
     rsync_opts+=(--exclude node_modules)
   fi
 
   rsync "${rsync_opts[@]}" "./lib/vscode-reh-web-$VSCODE_TARGET/" "$VSCODE_OUT_PATH"
 
-  # Copy the Node binary.
-  if [[ $KEEP_MODULES = 1 ]]; then
-    cp "./lib/vscode-reh-web-$VSCODE_TARGET/node" "$RELEASE_PATH/lib"
-  fi
-
   # Merge the package.json for the web/remote server so we can include
   # dependencies, since we want to ship this via NPM.
   jq --slurp '.[0] * .[1]' \

ci/build/build-vscode.sh

@@ -107,9 +107,6 @@ main() {
 EOF
   ) > product.json
 
-
-  VSCODE_QUALITY=stable npm run gulp compile-copilot-extension-full-build
-
   npm run gulp core-ci
   npm run gulp "vscode-reh-web-$VSCODE_TARGET${MINIFY:+-min}-ci"
 

ci/helm-chart/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.35.0
+version: 3.33.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.116.0
+appVersion: 4.109.5

ci/helm-chart/templates/deployment.yaml

@@ -8,9 +8,7 @@ metadata:
   annotations: {{- toYaml .Values.annotations | nindent 4 }}
   {{- end }}
 spec:
-  {{- if ne .Values.replicaCount nil }}
+  replicas: {{ .Values.replicaCount | default 1 }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
   strategy:
     type: Recreate
   selector:

ci/helm-chart/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: codercom/code-server
-  tag: '4.116.0'
+  tag: '4.109.5'
   pullPolicy: Always
 
 # Specifies one or more secrets to be used when pulling images from a

ci/release-image/docker-bake.hcl

@@ -20,7 +20,6 @@ group "default" {
         "code-server-debian-12",
         "code-server-ubuntu-focal",
         "code-server-ubuntu-noble",
-        "code-server-ubuntu-resolute",
         "code-server-fedora-39",
         "code-server-opensuse-tumbleweed",
     ]
@@ -74,6 +73,7 @@ target "code-server-debian-12" {
 target "code-server-ubuntu-focal" {
     dockerfile = "ci/release-image/Dockerfile"
     tags = concat(
+        gen_tags_for_docker_and_ghcr("ubuntu"),
         gen_tags_for_docker_and_ghcr("focal"),
     )
     args = {
@@ -86,7 +86,6 @@ target "code-server-ubuntu-noble" {
     dockerfile = "ci/release-image/Dockerfile"
     tags = concat(
         gen_tags_for_docker_and_ghcr("noble"),
-        gen_tags_for_docker_and_ghcr("ubuntu"),
     )
     args = {
         BASE = "ubuntu:noble"
@@ -94,17 +93,6 @@ target "code-server-ubuntu-noble" {
     platforms = ["linux/amd64", "linux/arm64"]
 }
 
-target "code-server-ubuntu-resolute" {
-    dockerfile = "ci/release-image/Dockerfile"
-    tags = concat(
-        gen_tags_for_docker_and_ghcr("resolute"),
-    )
-    args = {
-        BASE = "ubuntu:resolute"
-    }
-    platforms = ["linux/amd64", "linux/arm64"]
-}
-
 target "code-server-fedora-39" {
     dockerfile = "ci/release-image/Dockerfile.fedora"
     tags = concat(

package-lock.json

@@ -968,9 +968,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.5",
+      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1639,9 +1639,9 @@
       "license": "MIT"
     },
     "node_modules/basic-ftp": {
-      "version": "5.3.1",
+      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.2.0.tgz",
-      "integrity": "sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==",
+      "integrity": "sha512-VoMINM2rqJwJgfdHq6RiUudKt2BV+FY5ZFezP/ypmwayk68+NzzAQy4XXLlqsGD4MCzq3DrmNFD/uUmBJuGoXw==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -1672,9 +1672,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.14",
+      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3102,9 +3102,9 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.16.0",
+      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
       "funding": [
         {
           "type": "individual",
@@ -5042,9 +5042,9 @@
       "license": "MIT"
     },
     "node_modules/path-to-regexp": {
-      "version": "8.4.2",
+      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
-      "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==",
+      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",

patches/base-path.diff

@@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -265,7 +265,9 @@ export class WebClientServer {
+@@ -246,7 +246,9 @@ export class WebClientServer {
  		};
  
  		// Prefix routes with basePath for clients
@@ -122,7 +122,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  
  		const queryConnectionToken = parsedUrl.query[connectionTokenQueryName];
  		if (typeof queryConnectionToken === 'string') {
-@@ -304,10 +306,14 @@ export class WebClientServer {
+@@ -285,10 +287,14 @@ export class WebClientServer {
  		};
  
  		const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
@@ -138,7 +138,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  		);
  		if (!remoteAuthority) {
  			return serveError(req, res, 400, `Bad request.`);
-@@ -354,6 +360,7 @@ export class WebClientServer {
+@@ -335,6 +341,7 @@ export class WebClientServer {
  
  		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
  			codeServerVersion: this._productService.codeServerVersion,
@@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
  				...this._productService.extensionsGallery,
-@@ -407,7 +414,9 @@ export class WebClientServer {
+@@ -388,7 +395,9 @@ export class WebClientServer {
  			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
  			WORKBENCH_WEB_BASE_URL: staticRoute,
  			WORKBENCH_NLS_URL,
@@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  		};
  
  		// DEV ---------------------------------------------------------------------------------------
-@@ -444,7 +453,7 @@ export class WebClientServer {
+@@ -425,7 +434,7 @@ export class WebClientServer {
  			'default-src \'self\';',
  			'img-src \'self\' https: data: blob:;',
  			'media-src \'self\';',
@@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  			'child-src \'self\';',
  			`frame-src 'self' https://*.vscode-cdn.net data:;`,
  			'worker-src \'self\' data: blob:;',
-@@ -517,3 +526,70 @@ export class WebClientServer {
+@@ -498,3 +507,70 @@ export class WebClientServer {
  		return void res.end(data);
  	}
  }

patches/clipboard.diff

@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
 +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
-@@ -149,6 +149,7 @@ export interface NativeParsedArgs {
+@@ -143,6 +143,7 @@ export interface NativeParsedArgs {
  	'disable-chromium-sandbox'?: boolean;
  	sandbox?: boolean;
  	'enable-coi'?: boolean;

patches/copilot.diff

@@ -1,163 +0,0 @@
-Index: code-server/lib/vscode/build/gulpfile.extensions.ts
-===================================================================
---- code-server.orig/lib/vscode/build/gulpfile.extensions.ts
-+++ code-server/lib/vscode/build/gulpfile.extensions.ts
-@@ -293,6 +293,29 @@ export const compileCopilotExtensionBuil
- gulp.task(compileCopilotExtensionBuildTask);
- 
- /**
-+ * Compiles the built-in copilot extension with proper `.vscodeignore` filtering
-+ * and materializes native dependency shims (`node-pty`, `ripgrep`).
-+ * Produces output equivalent to what CI ships from the pre-built VSIX.
-+ *
-+ * The result is placed in `.build/extensions/copilot/` and can be copied
-+ * directly into a VS Code Insiders installation at:
-+ *   `<insiders>/resources/app/extensions/copilot/`
-+ */
-+export const compileCopilotExtensionFullBuildTask = task.define('compile-copilot-extension-full-build', task.series(
-+	// Step 1: Clean previous copilot build output
-+	task.define('clean-copilot-build', util.rimraf('.build/extensions/copilot')),
-+	// Step 2: Build and package with proper `.vscodeignore` filtering
-+	task.define('package-copilot-extension-full', () => ext.packageCopilotExtensionFullStream().pipe(gulp.dest('.build'))),
-+	// Step 3: Materialize native dependency shims (`node-pty`, `ripgrep`)
-+	task.define('copilot-extension-native-shims', () => {
-+		const copilotExtDir = path.join(root, '.build', 'extensions', 'copilot');
-+		ext.prepareCopilotExtensionNativeShims(copilotExtDir);
-+		return Promise.resolve();
-+	})
-+));
-+gulp.task(compileCopilotExtensionFullBuildTask);
-+
-+/**
-  * Compiles the extensions for the build.
-  * This is essentially a helper task that combines {@link cleanExtensionsBuildTask}, {@link compileNonNativeExtensionsBuildTask} and {@link compileNativeExtensionsBuildTask}
-  */
-Index: code-server/lib/vscode/build/lib/extensions.ts
-===================================================================
---- code-server.orig/lib/vscode/build/lib/extensions.ts
-+++ code-server/lib/vscode/build/lib/extensions.ts
-@@ -24,6 +24,7 @@ import { getProductionDependencies } fro
- import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts';
- import { fetchUrls, fetchGithub } from './fetch.ts';
- import { createTsgoStream, spawnTsgo } from './tsgo.ts';
-+import { prepareBuiltInCopilotRipgrepShim } from './copilot.ts';
- import vzip from 'gulp-vinyl-zip';
- 
- import { createRequire } from 'module';
-@@ -482,6 +483,116 @@ export function packageCopilotExtensionS
- 	).pipe(util2.setExecutableBit(['**/*.sh']));
- }
- 
-+/**
-+ * Package the built-in copilot extension as a properly filtered VSIX-equivalent.
-+ * Unlike {@link packageCopilotExtensionStream}, this uses vsce.listFiles with
-+ * PackageManager.Npm so that .vscodeignore is respected for dependency filtering,
-+ * producing output equivalent to what CI ships from the pre-built VSIX.
-+ */
-+export function packageCopilotExtensionFullStream(): Stream {
-+	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
-+	const extensionPath = path.join(root, 'extensions', 'copilot');
-+	if (!fs.existsSync(extensionPath)) {
-+		return es.readArray([]);
-+	}
-+
-+	const esbuildConfigFileName = '.esbuild.ts';
-+	const esbuildScript = path.join(extensionPath, esbuildConfigFileName);
-+	if (!fs.existsSync(esbuildScript)) {
-+		throw new Error(`Copilot esbuild script not found at ${esbuildScript}`);
-+	}
-+
-+	const result = es.through();
-+
-+	// Step 1: Run esbuild to compile the extension
-+	new Promise<void>((resolve, reject) => {
-+		const proc = cp.execFile(process.argv[0], [esbuildScript], { cwd: extensionPath }, (error, _stdout, stderr) => {
-+			if (error) {
-+				return reject(error);
-+			}
-+			const matches = (stderr || '').match(/\> (.+): error: (.+)?/g);
-+			fancyLog(`Bundled extension: ${ansiColors.yellow(path.join('copilot', esbuildConfigFileName))} with ${matches ? matches.length : 0} errors.`);
-+			for (const match of matches || []) {
-+				fancyLog.error(match);
-+			}
-+			return resolve();
-+		});
-+		proc.stdout!.on('data', (data) => {
-+			fancyLog(`${ansiColors.green('esbuilding copilot')}: ${data.toString('utf8')}`);
-+		});
-+	}).then(() => {
-+		// Step 2: Use `vsce.listFiles` with Npm package manager so `.vscodeignore`
-+		// is applied to both source files AND `node_modules` dependencies.
-+		// This is the key difference from `packageCopilotExtensionStream` which
-+		// uses `PackageManager.None` and then blindly merges all production deps.
-+		return vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Npm });
-+	}).then(fileNames => {
-+		const files = fileNames
-+			.map(fileName => path.join(extensionPath, fileName))
-+			.map(filePath => new File({
-+				path: filePath,
-+				stat: fs.statSync(filePath),
-+				base: extensionPath,
-+				contents: fs.createReadStream(filePath)
-+			}));
-+
-+		es.readArray(files).pipe(result);
-+	}).catch(err => {
-+		console.error('Failed to package copilot extension:', err);
-+		result.emit('error', err);
-+	});
-+
-+	// Apply the same package.json cleanup as bundled extensions get
-+	const cleaned = updateExtensionPackageJSON(
-+		result.pipe(rename(p => p.dirname = `extensions/copilot/${p.dirname}`)),
-+		(data: any) => {
-+			delete data.scripts;
-+			delete data.dependencies;
-+			delete data.devDependencies;
-+			if (data.main) {
-+				data.main = data.main.replace('/out/', '/dist/');
-+			}
-+			return data;
-+		}
-+	);
-+
-+	return minifyExtensionResources(cleaned)
-+		.pipe(util2.setExecutableBit(['**/*.sh']));
-+}
-+
-+/**
-+ * Materializes native dependency shims (`node-pty`, `ripgrep`) into the copilot
-+ * extension output at {@link outputDir}. Uses the root `node_modules` as the
-+ * source for native binaries, targeting the current platform/arch.
-+ *
-+ * This is the equivalent of what {@link copyCopilotNativeDepsTask} in
-+ * `gulpfile.vscode.ts` does during a full product build, but scoped to
-+ * just the standalone copilot extension output.
-+ *
-+ * Failures are logged as warnings rather than throwing, since the copilot
-+ * extension can still create shims at runtime if they are missing.
-+ */
-+export function prepareCopilotExtensionNativeShims(outputDir: string): void {
-+	const platform = process.platform;
-+	const arch = process.arch;
-+	const appNodeModulesDir = path.join(root, 'node_modules');
-+
-+	if (!fs.existsSync(outputDir)) {
-+		fancyLog.warn('[prepareCopilotExtensionNativeShims] Copilot extension not found at', outputDir, '- skipping shims');
-+		return;
-+	}
-+
-+	try {
-+		prepareBuiltInCopilotRipgrepShim(platform, arch, outputDir, appNodeModulesDir);
-+		fancyLog(`[prepareCopilotExtensionNativeShims] Materialized native shims for ${platform}-${arch}`);
-+	} catch (err) {
-+		// Downgrade to a warning for local builds since the extension
-+		// can still function without shims (it creates them at runtime).
-+		fancyLog.warn(`[prepareCopilotExtensionNativeShims] Failed to materialize shims: ${err}`);
-+		fancyLog.warn('[prepareCopilotExtensionNativeShims] The extension will still work but will create shims at runtime.');
-+	}
-+}
-+
- export function packageMarketplaceExtensionsStream(forWeb: boolean): Stream {
- 	const marketplaceExtensionsDescriptions = [
- 		...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)),

patches/disable-builtin-ext-update.diff

@@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 @@ -342,6 +342,10 @@ export class Extension implements IExten
- 			if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) {
+ 			if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
  				return false;
  			}
 +			// Do not update builtin extensions.

patches/display-language.diff

@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
  import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
  import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
  import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
-@@ -301,6 +301,9 @@ export async function setupServerService
+@@ -297,6 +297,9 @@ export async function setupServerService
  
  		socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
  
@@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  import { CharCode } from '../../base/common/charCode.js';
  import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
  import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
-@@ -405,14 +406,22 @@ export class WebClientServer {
+@@ -386,14 +387,22 @@ export class WebClientServer {
  		};
  
  		const cookies = cookie.parse(req.headers.cookie || '');
@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  		}
  
  		// Prefers to run on UI
-@@ -2284,17 +2281,6 @@ export class SetLanguageAction extends E
+@@ -2072,17 +2069,6 @@ export class SetLanguageAction extends E
  	update(): void {
  		this.enabled = false;
  		this.class = SetLanguageAction.DisabledClass;
@@ -309,7 +309,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  	}
  
  	override async run(): Promise<any> {
-@@ -2311,7 +2297,6 @@ export class ClearLanguageAction extends
+@@ -2099,7 +2085,6 @@ export class ClearLanguageAction extends
  	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
  
  	constructor(
@@ -317,7 +317,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  		@ILocaleService private readonly localeService: ILocaleService,
  	) {
  		super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
-@@ -2321,17 +2306,6 @@ export class ClearLanguageAction extends
+@@ -2109,17 +2094,6 @@ export class ClearLanguageAction extends
  	update(): void {
  		this.enabled = false;
  		this.class = ClearLanguageAction.DisabledClass;

patches/external-file-actions.diff

@@ -27,7 +27,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-@@ -312,6 +312,16 @@ export interface IWorkbenchConstructionO
+@@ -303,6 +303,16 @@ export interface IWorkbenchConstructionO
  	 */
  	readonly userDataPath?: string
  
@@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -389,6 +389,8 @@ export class WebClientServer {
+@@ -370,6 +370,8 @@ export class WebClientServer {
  			serverBasePath: basePath,
  			webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
  			userDataPath: this._environmentService.userDataPath,
@@ -230,7 +230,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
  import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
  import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
  import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js';
-@@ -161,7 +161,7 @@ export class SimpleFileDialog extends Di
+@@ -152,7 +152,7 @@ export class SimpleFileDialog extends Di
  		@IFileDialogService private readonly fileDialogService: IFileDialogService,
  		@IModelService private readonly modelService: IModelService,
  		@ILanguageService private readonly languageService: ILanguageService,
@@ -239,7 +239,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
  		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
  		@IPathService protected readonly pathService: IPathService,
  		@IKeybindingService private readonly keybindingService: IKeybindingService,
-@@ -392,21 +392,23 @@ export class SimpleFileDialog extends Di
+@@ -362,21 +362,23 @@ export class SimpleFileDialog extends Di
  			this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path");
  			this.filePickBox.ok = true;
  			this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;

patches/getting-started.diff

@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
  import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
  import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
  import './gettingStartedColors.js';
-@@ -925,6 +925,72 @@ export class GettingStartedPage extends
+@@ -924,6 +924,72 @@ export class GettingStartedPage extends
  			$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
  		);
  
@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
  		const leftColumn = $('.categories-column.categories-column-left', {},);
  		const rightColumn = $('.categories-column.categories-column-right', {},);
  
-@@ -974,6 +1040,9 @@ export class GettingStartedPage extends
+@@ -959,6 +1025,9 @@ export class GettingStartedPage extends
  				recentList.setLimit(5);
  				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
  			}
@@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-@@ -322,6 +322,11 @@ export interface IWorkbenchConstructionO
+@@ -313,6 +313,11 @@ export interface IWorkbenchConstructionO
  	 */
  	readonly isEnabledFileUploads?: boolean
  
@@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -393,6 +393,7 @@ export class WebClientServer {
+@@ -374,6 +374,7 @@ export class WebClientServer {
  			userDataPath: this._environmentService.userDataPath,
  			isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
  			isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],

patches/integration.diff

@@ -251,7 +251,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -353,6 +353,7 @@ export class WebClientServer {
+@@ -334,6 +334,7 @@ export class WebClientServer {
  		} : undefined;
  
  		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {

patches/local-storage.diff

@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -384,6 +384,7 @@ export class WebClientServer {
+@@ -365,6 +365,7 @@ export class WebClientServer {
  			remoteAuthority,
  			serverBasePath: basePath,
  			webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
@@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-@@ -307,6 +307,11 @@ export interface IWorkbenchConstructionO
+@@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO
  	 */
  	readonly configurationDefaults?: Record<string, unknown>;
  

patches/logout.diff

@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -361,6 +361,7 @@ export class WebClientServer {
+@@ -342,6 +342,7 @@ export class WebClientServer {
  			codeServerVersion: this._productService.codeServerVersion,
  			rootEndpoint: rootBase,
  			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,

patches/marketplace.diff

@@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -346,7 +346,6 @@ export class WebClientServer {
+@@ -327,7 +327,6 @@ export class WebClientServer {
  
  		const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH);
  		const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH);
@@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  
  		const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
  
-@@ -362,14 +361,7 @@ export class WebClientServer {
+@@ -343,14 +342,7 @@ export class WebClientServer {
  			codeServerVersion: this._productService.codeServerVersion,
  			rootEndpoint: rootBase,
  			embedderIdentifier: 'server-distro',

patches/proxy-uri.diff

@@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -362,6 +362,7 @@ export class WebClientServer {
+@@ -343,6 +343,7 @@ export class WebClientServer {
  			rootEndpoint: rootBase,
  			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
  			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,

patches/series

@@ -22,4 +22,3 @@ clipboard.diff
 display-language.diff
 trusted-domains.diff
 signature-verification.diff
-copilot.diff

patches/service-worker.diff

@@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -363,6 +363,10 @@ export class WebClientServer {
+@@ -344,6 +344,10 @@ export class WebClientServer {
  			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
  			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
  			proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/',

patches/sourcemaps.diff

@@ -1,25 +1,43 @@
-Remove sourcemaps URL
+Make sourcemaps self-hosted
 
-These will not work since we patch VS Code.
+Normally source maps get removed as part of the build process so prevent that
+from happening.  Also avoid using the windows.net host since obviously we can
+not host our source maps there and want them to be self-hosted even if we could.
+
+To test try debugging/browsing the source of a build in a browser.
 
 Index: code-server/lib/vscode/build/gulpfile.reh.ts
 ===================================================================
 --- code-server.orig/lib/vscode/build/gulpfile.reh.ts
 +++ code-server/lib/vscode/build/gulpfile.reh.ts
-@@ -261,10 +261,15 @@ function packageTask(type: string, platf
+@@ -263,8 +263,7 @@ function packageTask(type: string, platf
- 	const destination = path.join(BUILD_ROOT, destinationFolderName);
- 
  	return () => {
-+		const jsFilterMain = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
-+
  		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
  			.pipe(rename(function (path) { path.dirname = path.dirname!.replace(new RegExp('^' + sourceFolderName), 'out'); }))
- 			.pipe(util.setExecutableBit(['**/*.sh']))
+-			.pipe(util.setExecutableBit(['**/*.sh']))
 -			.pipe(filter(['**', '!**/*.{js,css}.map']));
-+			.pipe(filter(['**', '!**/*.{js,css}.map']))
++			.pipe(util.setExecutableBit(['**/*.sh']));
-+			.pipe(jsFilterMain)
-+			.pipe(util.stripSourceMappingURL())
-+			.pipe(jsFilterMain.restore);
  
  		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
  		const isUIExtension = (manifest: { extensionKind?: string; main?: string; contributes?: Record<string, unknown> }) => {
+@@ -304,9 +303,9 @@ function packageTask(type: string, platf
+ 			.map(name => `.build/extensions/${name}/**`);
+ 
+ 		const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
+-		const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true });
+-		const sources = es.merge(src, extensions, extensionsCommonDependencies)
++		const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true })
+ 			.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
++		const sources = es.merge(src, extensions, extensionsCommonDependencies);
+ 
+ 		let version = packageJson.version;
+ 		const quality = (product as typeof product & { quality?: string }).quality;
+@@ -501,7 +500,7 @@ function tweakProductForServerWeb(produc
+ 	const minifyTask = task.define(`minify-vscode-${type}`, task.series(
+ 		bundleTask,
+ 		util.rimraf(`out-vscode-${type}-min`),
+-		optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
++		optimize.minifyTask(`out-vscode-${type}`, ``)
+ 	));
+ 	gulp.task(minifyTask);
+ 

patches/telemetry.diff

@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
  import { NullPolicyService } from '../../platform/policy/common/policy.js';
  import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
  import { LoggerService } from '../../platform/log/node/loggerService.js';
-@@ -174,11 +176,23 @@ export async function setupServerService
+@@ -172,11 +174,23 @@ export async function setupServerService
  	const requestService = new RequestService('remote', configurationService, environmentService, logService);
  	services.set(IRequestService, requestService);
  
@@ -134,7 +134,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -367,6 +367,8 @@ export class WebClientServer {
+@@ -348,6 +348,8 @@ export class WebClientServer {
  				scope: vscodeBase + '/',
  				path: rootBase + '/_static/out/browser/serviceWorker.js',
  			},

patches/trusted-domains.diff

@@ -24,7 +24,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -358,6 +358,14 @@ export class WebClientServer {
+@@ -339,6 +339,14 @@ export class WebClientServer {
  			scopes: [['user:email'], ['repo']]
  		} : undefined;
  
@@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
  			codeServerVersion: this._productService.codeServerVersion,
  			rootEndpoint: rootBase,
-@@ -372,6 +380,7 @@ export class WebClientServer {
+@@ -353,6 +361,7 @@ export class WebClientServer {
  			telemetryEndpoint: this._productService.telemetryEndpoint,
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._productService.extensionsGallery,

patches/unique-db.diff

@@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS
  
  export class BrowserStorageService extends AbstractStorageService {
  
-@@ -328,7 +329,11 @@ export class IndexedDBStorageDatabase ex
+@@ -300,7 +301,11 @@ export class IndexedDBStorageDatabase ex
  	}
  
  	static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise<IIndexedDBStorageDatabase> {

patches/update-check.diff

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
  
  	readonly version: string;
  	readonly date?: string;
-@@ -119,6 +120,7 @@ export interface IProductConfiguration {
+@@ -115,6 +116,7 @@ export interface IProductConfiguration {
  		readonly resourceUrlTemplate: string;
  		readonly nlsBaseUrl: string;
  		readonly accessSKUs?: string[];
@@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -360,6 +360,7 @@ export class WebClientServer {
+@@ -341,6 +341,7 @@ export class WebClientServer {
  		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
  			codeServerVersion: this._productService.codeServerVersion,
  			rootEndpoint: rootBase,

patches/webview.diff

@@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
-@@ -223,7 +223,7 @@ export class BrowserWorkbenchEnvironment
+@@ -220,7 +220,7 @@ export class BrowserWorkbenchEnvironment
  
  	@memoize
  	get webviewExternalEndpoint(): string {
@@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -380,6 +380,7 @@ export class WebClientServer {
+@@ -361,6 +361,7 @@ export class WebClientServer {
  		const workbenchWebConfiguration = {
  			remoteAuthority,
  			serverBasePath: basePath,
@@ -70,21 +70,21 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
  	<meta charset="UTF-8">
  
  	<meta http-equiv="Content-Security-Policy"
--		content="default-src 'none'; script-src 'sha256-q+WTr+fBXpLLE3++yWNaxT6BTWQtsKscoeIlynBRk4E=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+-		content="default-src 'none'; script-src 'sha256-TaWGDzV7c9rUH2q/5ygOyYUHSyHIqBMYfucPh3lnKvU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
-+		content="default-src 'none'; script-src 'sha256-m1DlJtsIJd46QuWYNcsaYIG1xI+9FyjKQu+cfp+zq5Q=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
++		content="default-src 'none'; script-src 'sha256-nQZh+9dHKZP2cHbhYlCbWDtqxxJtGjRGBx57zNP2DZM=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
  
  	<!-- Disable pinch zooming -->
  	<meta name="viewport"
-@@ -253,7 +253,7 @@
+@@ -256,7 +256,7 @@
  			}
  
  			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
--			navigator.serviceWorker.register(swPath, { type: 'module', updateViaCache: 'none' })
+-			navigator.serviceWorker.register(swPath, { type: 'module' })
 +			navigator.serviceWorker.register(swPath)
  				.then(async registration => {
- 					if (navigator.serviceWorker.controller) {
+ 					/**
- 						// A previous SW is already controlling. Force an update
+ 					 * @param {MessageEvent} event
-@@ -332,6 +332,12 @@
+@@ -370,6 +370,12 @@
  
  				const hostname = location.hostname;
  

test/e2e/models/CodeServer.ts

@@ -77,14 +77,11 @@ export class CodeServer {
    */
   private async createWorkspace(): Promise<string> {
     const dir = await this.workspaceDir
-    await fs.mkdir(path.join(dir, "User"), { recursive: true })
+    await fs.mkdir(path.join(dir, "Machine"), { recursive: true })
     await fs.writeFile(
-      path.join(dir, "User/settings.json"),
+      path.join(dir, "Machine/settings.json"),
       JSON.stringify({
         "workbench.startupEditor": "none",
-        // Disable the welcome popup so we can avoid having to click through it
-        // on every test.
-        "workbench.welcomePage.experimentalOnboarding": false,
       }),
       "utf8",
     )

test/package-lock.json

@@ -18,7 +18,7 @@
         "jest-fetch-mock": "^3.0.3",
         "jsdom": "^16.4.0",
         "node-fetch": "^2.6.7",
-        "playwright": "^1.59.1",
+        "playwright": "^1.56.1",
         "ts-jest": "^27.0.7",
         "wtfnode": "^0.9.1"
       }
@@ -1013,53 +1013,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@playwright/test/node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/@playwright/test/node_modules/playwright": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
-      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright-core": "1.56.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
-    },
-    "node_modules/@playwright/test/node_modules/playwright-core": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
-      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@sinonjs/commons": {
       "version": "1.8.6",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
@@ -3692,9 +3645,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.18.1",
+      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "dev": true,
       "license": "MIT"
     },
@@ -4078,9 +4031,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.2",
+      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4114,13 +4067,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.59.1",
+      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
-      "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==",
+      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.59.1"
+        "playwright-core": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4133,9 +4086,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.59.1",
+      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
-      "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==",
+      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {

test/package.json

@@ -14,7 +14,7 @@
     "jest-fetch-mock": "^3.0.3",
     "jsdom": "^16.4.0",
     "node-fetch": "^2.6.7",
-    "playwright": "^1.59.1",
+    "playwright": "^1.56.1",
     "ts-jest": "^27.0.7",
     "wtfnode": "^0.9.1"
   },