.eslintrc.yaml

@@ -0,0 +1,43 @@
+parser: "@typescript-eslint/parser"
+env:
+  browser: true
+  es6: true # Map, etc.
+  jest: true
+  node: true
+
+parserOptions:
+  ecmaVersion: 2018
+  sourceType: module
+
+extends:
+  - eslint:recommended
+  - plugin:@typescript-eslint/recommended
+  - plugin:import/recommended
+  - plugin:import/typescript
+  - plugin:prettier/recommended
+  # Prettier should always be last
+  # Removes eslint rules that conflict with prettier.
+  - prettier
+
+rules:
+  # Sometimes you need to add args to implement a function signature even
+  # if they are unused.
+  "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }]
+  # For overloads.
+  no-dupe-class-members: off
+  "@typescript-eslint/no-use-before-define": off
+  "@typescript-eslint/no-non-null-assertion": off
+  "@typescript-eslint/ban-types": off
+  "@typescript-eslint/no-var-requires": off
+  "@typescript-eslint/explicit-module-boundary-types": off
+  "@typescript-eslint/no-explicit-any": off
+  "@typescript-eslint/no-extra-semi": off
+  eqeqeq: error
+  import/order:
+    [error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }]
+  no-async-promise-executor: off
+
+settings:
+  import/resolver:
+    typescript:
+      alwaysTryTypes: true

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Prettier 3.4.2
-9b0340a09276f93c054d705d1b9a5f24cc5dbc97

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -20,8 +20,6 @@ body:
           - **Remote OS**: Ubuntu
           - **Remote Architecture**: amd64
           - **`code-server --version`**: 4.0.1
-
-        Please do not just put "latest" for the version.
       value: |
         - Web Browser:
         - Local OS:
@@ -64,7 +62,7 @@ body:
     id: logs
     attributes:
       label: Logs
-      description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `npm install -g code-server`).
+      description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `yarn global add code-server`).
       render: shell
 
   - type: textarea
@@ -86,18 +84,6 @@ body:
     validations:
       required: true
 
-  - type: dropdown
-    attributes:
-      label: Does this bug reproduce in VS Code web?
-      description: If the bug reproduces in VS Code web, submit the issue upstream instead (https://github.com/microsoft/vscode). You can run VS Code web with `code serve-web`.
-      options:
-        - Yes, this is also broken in VS Code web
-        - No, this works as expected in VS Code web
-        - This cannot be tested in VS Code web
-        - I did not test VS Code web
-    validations:
-      required: true
-
   - type: dropdown
     attributes:
       label: Does this bug reproduce in GitHub Codespaces?

.github/PULL_REQUEST_TEMPLATE/release_template.md

@@ -0,0 +1,17 @@
+<!-- Note: this variable $CODE_SERVER_VERSION_TO_UPDATE will be set when you run the release-prep.sh script with `yarn release:prep` -->
+
+This PR is to generate a new release of `code-server` at `$CODE_SERVER_VERSION_TO_UPDATE`
+
+## Screenshot
+
+TODO
+
+## TODOs
+
+Follow "Publishing a release" steps in `ci/README.md`
+
+<!-- Note some of these steps below are redundant since they're listed in the "Publishing a release" docs -->
+
+- [ ] update `CHANGELOG.md`
+- [ ] manually run "Draft release" workflow after merging this PR
+- [ ] merge PR opened in [code-server-aur](https://github.com/coder/code-server-aur)

.github/ranger.yml

@@ -0,0 +1,29 @@
+# Configuration for the repo ranger bot
+# See docs: https://www.notion.so/Documentation-8d7627bb1f3c42b7b1820e8d6f157a57#9879d1374fab4d1f9c607c230fd5123d
+default:
+  close:
+    # Default time to wait before closing the label. Can either be a number in milliseconds
+    # or a string specified by the `ms` package (https://www.npmjs.com/package/ms)
+    delay: "2 days"
+
+    # Default comment to post when an issue is first marked with a closing label
+    comment: "⚠️ This issue has been marked $LABEL and will be closed in $DELAY."
+
+labels:
+  duplicate: close
+  wontfix: close
+  "squash when passing": merge
+  "rebase when passing": merge
+  "merge when passing": merge
+  "new contributor":
+    action: comment
+    delay: 5s
+    message: "Thanks for making your first contribution! :slightly_smiling_face:"
+  "upstream:vscode":
+    action: close
+    delay: 5s
+    comment: >
+      This issue has been marked as 'upstream:vscode'.
+      Please file this upstream: [link to open issue](https://github.com/microsoft/vscode/issues/new/choose)
+
+      This issue will automatically close in $DELAY.

.github/workflows/build.yaml

@@ -19,181 +19,241 @@ concurrency:
 # this ensures that it only executes if all previous jobs succeeded.
 
 # if: steps.cache-node-modules.outputs.cache-hit != 'true'
-# will skip running `npm install` if it successfully fetched from cache
+# will skip running `yarn install` if it successfully fetched from cache
 
 jobs:
-  changes:
-    runs-on: ubuntu-latest
-    outputs:
-      ci: ${{ steps.filter.outputs.ci }}
-      code: ${{ steps.filter.outputs.code }}
-      deps: ${{ steps.filter.outputs.deps }}
-      docs: ${{ steps.filter.outputs.docs }}
-      helm: ${{ steps.filter.outputs.helm }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v6
-      - name: Check changed files
-        uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            ci:
-              - ".github/**"
-              - "ci/**"
-            docs:
-              - "docs/**"
-              - "README.md"
-              - "CHANGELOG.md"
-            helm:
-              - "ci/helm-chart/**"
-            code:
-              - "src/**"
-              - "test/**"
-            deps:
-              - "lib/**"
-              - "patches/**"
-              - "package-lock.json"
-              - "test/package-lock.json"
-      - id: debug
-        run: |
-          echo "${{ toJSON(steps.filter )}}"
-
   prettier:
-    name: Run prettier check
+    name: Format with Prettier
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - uses: actions/setup-node@v6
+        uses: actions/checkout@v4
+
+      - name: Run prettier with actionsx/prettier
+        uses: actionsx/prettier@v3
         with:
-          node-version-file: .node-version
+          args: --check --loglevel=warn .
-          cache: npm
-          cache-dependency-path: |
-            package-lock.json
-            test/package-lock.json
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
-      - run: npx prettier --check .
 
   doctoc:
     name: Doctoc markdown files
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 5
-    needs: changes
-    if: needs.changes.outputs.docs == 'true'
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - uses: actions/setup-node@v6
+        uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files: |
+            docs/**
+
+      - name: Install Node.js
+        if: steps.changed-files.outputs.any_changed == 'true'
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
+          cache: "yarn"
-          cache-dependency-path: |
+
-            package-lock.json
+      - name: Install doctoc
-            test/package-lock.json
+        run: yarn global add doctoc@2.2.1
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+
-      - run: npm run doctoc
+      - name: Run doctoc
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: yarn doctoc
 
   lint-helm:
     name: Lint Helm chart
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 5
-    needs: changes
-    if: needs.changes.outputs.helm == 'true'
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - uses: azure/setup-helm@v4
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files: |
+            ci/helm-chart/**
+
+      - name: Install helm
+        if: steps.changed-files.outputs.any_changed == 'true'
+        uses: azure/setup-helm@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      - run: helm plugin install https://github.com/instrumenta/helm-kubeval
+
-      - run: helm kubeval ci/helm-chart
+      - name: Install helm kubeval plugin
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: helm plugin install https://github.com/instrumenta/helm-kubeval
+
+      - name: Lint Helm chart
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: helm kubeval ci/helm-chart
 
   lint-ts:
     name: Lint TypeScript files
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 5
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - uses: actions/setup-node@v6
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files: |
+            **/*.ts
+            **/*.js
+          files_ignore: |
+            lib/vscode/**
+
+      - name: Install Node.js
+        if: steps.changed-files.outputs.any_changed == 'true'
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
+
-          cache-dependency-path: |
+      - name: Fetch dependencies from cache
-            package-lock.json
+        if: steps.changed-files.outputs.any_changed == 'true'
-            test/package-lock.json
+        id: cache-node-modules
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+        uses: actions/cache@v4
-      - run: npm run lint:ts
+        with:
+          path: "**/node_modules"
+          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            yarn-build-
+
+      - name: Install dependencies
+        if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+      - name: Lint TypeScript files
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: yarn lint:ts
 
   lint-actions:
     name: Lint GitHub Actions
     runs-on: ubuntu-latest
-    needs: changes
-    if: needs.changes.outputs.ci == 'true'
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Check workflow files
         run: |
-          bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9
+          bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/7fdc9630cc360ea1a469eed64ac6d78caeda1234/scripts/download-actionlint.bash)
-          ./actionlint -color -shellcheck= -ignore "softprops/action-gh-release"
+          ./actionlint -color -shellcheck= -ignore "set-output"
         shell: bash
 
   test-unit:
     name: Run unit tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 5
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - uses: actions/setup-node@v6
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files: |
+            **/*.ts
+          files_ignore: |
+            lib/vscode/**
+
+      - name: Install Node.js
+        if: steps.changed-files.outputs.any_changed == 'true'
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
+
-          cache-dependency-path: |
+      - name: Fetch dependencies from cache
-            package-lock.json
+        if: steps.changed-files.outputs.any_changed == 'true'
-            test/package-lock.json
+        id: cache-node-modules
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+        uses: actions/cache@v4
-      - run: npm run test:unit
+        with:
-      - uses: codecov/codecov-action@v5
+          path: "**/node_modules"
-        if: success()
+          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            yarn-build-
+
+      - name: Install dependencies
+        if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+      - name: Run unit tests
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: yarn test:unit
+
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+        if: success()
 
   build:
     name: Build code-server
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
-    timeout-minutes: 70
+    timeout-minutes: 60
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       DISABLE_V8_COMPILE_CACHE: 1
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
+        uses: actions/checkout@v4
         with:
           submodules: true
-      - run: sudo apt update && sudo apt install -y libkrb5-dev
+
-      - uses: awalsh128/cache-apt-pkgs-action@latest
+      - name: Install system dependencies
+        run: sudo apt update && sudo apt install -y libkrb5-dev
+
+      - name: Install quilt
+        uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: quilt
           version: 1.0
-      - run: quilt push -a
+
-      - uses: actions/setup-node@v6
+      - name: Patch Code
+        run: quilt push -a
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
+
-          cache-dependency-path: |
+      - name: Fetch dependencies from cache
-            package-lock.json
+        id: cache-node-modules
-            test/package-lock.json
+        uses: actions/cache@v4
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+        with:
-      - run: npm run build
+          path: "**/node_modules"
+          key: yarn-build-code-server-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            yarn-build-code-server-
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn --frozen-lockfile
+
+      - name: Build code-server
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: yarn build
+
       # Get Code's git hash.  When this changes it means the content is
       # different and we need to rebuild.
       - name: Get latest lib/vscode rev
         id: vscode-rev
         run: echo "rev=$(git rev-parse HEAD:./lib/vscode)" >> $GITHUB_OUTPUT
+
       # We need to rebuild when we have a new version of Code, when any of
       # the patches changed, or when the code-server version changes (since
       # it gets embedded into the code).  Use VSCODE_CACHE_VERSION to
@@ -204,86 +264,134 @@ jobs:
         with:
           path: lib/vscode-reh-web-*
           key: vscode-reh-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }}
+
       - name: Build vscode
         env:
           VERSION: "0.0.0"
         if: steps.cache-vscode.outputs.cache-hit != 'true'
-        run: |
+        run: yarn build:vscode
-          pushd lib/vscode
+
-          npm ci
-          popd
-          npm run build:vscode
       # The release package does not contain any native modules
       # and is neutral to architecture/os/libc version.
-      - run: npm run release
+      - name: Create release package
+        run: yarn release
         if: success()
+
       # https://github.com/actions/upload-artifact/issues/38
-      - run: tar -czf package.tar.gz release
+      - name: Compress release package
-      - uses: actions/upload-artifact@v4
+        run: tar -czf package.tar.gz release
+
+      - name: Upload npm package artifact
+        uses: actions/upload-artifact@v4
         with:
           name: npm-package
           path: ./package.tar.gz
 
   test-e2e:
     name: Run e2e tests
-    runs-on: ubuntu-22.04
+    needs: build
+    runs-on: ubuntu-20.04
     timeout-minutes: 25
-    needs: [changes, build]
-    if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true'
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - run: sudo apt update && sudo apt install -y libkrb5-dev
+        uses: actions/checkout@v4
-      - uses: actions/setup-node@v6
+
+      - name: Install system dependencies
+        run: sudo apt update && sudo apt install -y libkrb5-dev
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
+
-          cache-dependency-path: |
+      - name: Fetch dependencies from cache
-            package-lock.json
+        id: cache-node-modules
-            test/package-lock.json
+        uses: actions/cache@v4
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+        with:
-      - uses: actions/download-artifact@v5
+          path: "**/node_modules"
+          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            yarn-build-
+
+      - name: Download npm package
+        uses: actions/download-artifact@v4
         with:
           name: npm-package
-      - run: tar -xzf package.tar.gz
+
-      - run: cd release && npm install --unsafe-perm --omit=dev
+      - name: Decompress npm package
+        run: tar -xzf package.tar.gz
+
+      - name: Install release package dependencies
+        run: cd release && npm install --unsafe-perm --omit=dev
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
       - name: Install Playwright OS dependencies
         run: |
           ./test/node_modules/.bin/playwright install-deps
           ./test/node_modules/.bin/playwright install
-      - run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e
+
-      - uses: actions/upload-artifact@v4
+      - name: Run end-to-end tests
+        run: CODE_SERVER_TEST_ENTRY=./release yarn test:e2e
+
+      - name: Upload test artifacts
         if: always()
+        uses: actions/upload-artifact@v4
         with:
           name: failed-test-videos
           path: ./test/test-results
-      - run: rm -rf ./release ./test/test-results
+
+      - name: Remove release packages and test artifacts
+        run: rm -rf ./release ./test/test-results
 
   test-e2e-proxy:
     name: Run e2e tests behind proxy
-    runs-on: ubuntu-22.04
+    needs: build
+    runs-on: ubuntu-20.04
     timeout-minutes: 25
-    needs: [changes, build]
-    if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true'
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repo
-      - run: sudo apt update && sudo apt install -y libkrb5-dev
+        uses: actions/checkout@v4
-      - uses: actions/setup-node@v6
+
+      - name: Install system dependencies
+        run: sudo apt update && sudo apt install -y libkrb5-dev
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
+
-          cache-dependency-path: |
+      - name: Fetch dependencies from cache
-            package-lock.json
+        id: cache-node-modules
-            test/package-lock.json
+        uses: actions/cache@v4
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+        with:
-      - uses: actions/download-artifact@v5
+          path: "**/node_modules"
+          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            yarn-build-
+
+      - name: Download npm package
+        uses: actions/download-artifact@v4
         with:
           name: npm-package
-      - run: tar -xzf package.tar.gz
+
-      - run: cd release && npm install --unsafe-perm --omit=dev
+      - name: Decompress npm package
+        run: tar -xzf package.tar.gz
+
+      - name: Install release package dependencies
+        run: cd release && npm install --unsafe-perm --omit=dev
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
       - name: Install Playwright OS dependencies
         run: |
           ./test/node_modules/.bin/playwright install-deps
           ./test/node_modules/.bin/playwright install
+
       - name: Cache Caddy
         uses: actions/cache@v4
         id: caddy-cache
@@ -291,6 +399,7 @@ jobs:
           path: |
             ~/.cache/caddy
           key: cache-caddy-2.5.2
+
       - name: Install Caddy
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -299,13 +408,23 @@ jobs:
           gh release download v2.5.2 --repo caddyserver/caddy --pattern "caddy_2.5.2_linux_amd64.tar.gz"
           mkdir -p ~/.cache/caddy
           tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy
-      - run: ~/.cache/caddy/caddy start --config ./ci/Caddyfile
-      - run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e:proxy
-      - run: ~/.cache/caddy/caddy stop --config ./ci/Caddyfile
-        if: always()
 
-      - uses: actions/upload-artifact@v4
+      - name: Start Caddy
+        run: sudo ~/.cache/caddy/caddy start --config ./ci/Caddyfile
+
+      - name: Run end-to-end tests
+        run: CODE_SERVER_TEST_ENTRY=./release yarn test:e2e:proxy --global-timeout 840000
+
+      - name: Stop Caddy
         if: always()
+        run: sudo ~/.cache/caddy/caddy stop --config ./ci/Caddyfile
+
+      - name: Upload test artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
         with:
           name: failed-test-videos-proxy
           path: ./test/test-results
+
+      - name: Remove release packages and test artifacts
+        run: rm -rf ./release ./test/test-results

.github/workflows/installer.yaml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install code-server
         run: ./install.sh
@@ -44,7 +44,7 @@ jobs:
     container: "alpine:3.17"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install curl
         run: apk add curl
@@ -67,7 +67,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install code-server
         run: ./install.sh

.github/workflows/publish.yaml

@@ -21,39 +21,78 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  # NOTE: this job requires curl, jq and yarn
+  # All of them are included in ubuntu-latest.
   npm:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code-server
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+          cache: "yarn"
 
       - name: Download npm package from release artifacts
-        uses: robinraju/release-downloader@v1.12
+        uses: robinraju/release-downloader@v1.10
         with:
           repository: "coder/code-server"
           tag: ${{ github.event.inputs.version || github.ref_name }}
           fileName: "package.tar.gz"
           out-file-path: "release-npm-package"
 
-      # Strip out the v (v4.9.1 -> 4.9.1).
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
       - name: Get and set VERSION
         run: |
           TAG="${{ github.event.inputs.version || github.ref_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
-      - run: npm run publish:npm
+      - name: Publish npm package and tag with "latest"
+        run: yarn publish:npm
         env:
           VERSION: ${{ env.VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_ENVIRONMENT: "production"
 
+  homebrew:
+    needs: npm
+    runs-on: ubuntu-latest
+    steps:
+      # Ensure things are up to date
+      # Suggested by homebrew maintainers
+      # https://github.com/Homebrew/discussions/discussions/1532#discussioncomment-782633
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
+      - name: Checkout code-server
+        uses: actions/checkout@v4
+
+      - name: Configure git
+        run: |
+          git config --global user.name cdrci
+          git config --global user.email opensource@coder.com
+
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
+      - name: Get and set VERSION
+        run: |
+          TAG="${{ github.event.inputs.version || github.ref_name }}"
+          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
+
+      - name: Bump code-server homebrew version
+        env:
+          VERSION: ${{ env.VERSION }}
+          HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
+
+        run: ./ci/steps/brew-bump.sh
+
   aur:
+    needs: npm
     runs-on: ubuntu-latest
     timeout-minutes: 10
     env:
@@ -62,13 +101,13 @@ jobs:
     steps:
       # We need to checkout code-server so we can get the version
       - name: Checkout code-server
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           path: "./code-server"
 
       - name: Checkout code-server-aur repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           repository: "cdrci/code-server-aur"
           token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
@@ -85,14 +124,15 @@ jobs:
           git config --global user.name cdrci
           git config --global user.email opensource@coder.com
 
-      # Strip out the v (v4.9.1 -> 4.9.1).
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
       - name: Get and set VERSION
         run: |
           TAG="${{ github.event.inputs.version || github.ref_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
       - name: Validate package
-        uses: heyhusen/archlinux-package-action@v2.4.0
+        uses: heyhusen/archlinux-package-action@v2.2.1
         env:
           VERSION: ${{ env.VERSION }}
         with:
@@ -111,12 +151,11 @@ jobs:
           git commit -m "chore: updating version to ${{ env.VERSION }}"
           git push -u origin $(git branch --show)
           gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR
-
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code-server
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -137,14 +176,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Strip out the v (v4.9.1 -> 4.9.1).
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
       - name: Get and set VERSION
         run: |
           TAG="${{ github.event.inputs.version || github.ref_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
       - name: Download deb artifacts
-        uses: robinraju/release-downloader@v1.12
+        uses: robinraju/release-downloader@v1.10
         with:
           repository: "coder/code-server"
           tag: v${{ env.VERSION }}
@@ -152,7 +192,7 @@ jobs:
           out-file-path: "release-packages"
 
       - name: Download rpm artifacts
-        uses: robinraju/release-downloader@v1.12
+        uses: robinraju/release-downloader@v1.10
         with:
           repository: "coder/code-server"
           tag: v${{ env.VERSION }}

.github/workflows/release.yaml

@@ -19,27 +19,103 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  package-linux-cross:
+  # TODO: cache building yarn --production
-    name: ${{ matrix.prefix }}
+  # possibly 2m30s of savings(?)
+  # this requires refactoring our release scripts
+  package-linux-amd64:
+    name: x86-64 Linux build
     runs-on: ubuntu-latest
     timeout-minutes: 15
     needs: npm-version
-    container: "python:3.8-slim-buster"
+    container: "centos:8"
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .node-version
+
+      - name: Install development tools
+        run: |
+          cd /etc/yum.repos.d/
+          sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+          sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+          yum install -y gcc-c++ make jq rsync python3 libsecret-devel krb5-devel
+
+      - name: Install nfpm and envsubst
+        run: |
+          mkdir -p ~/.local/bin
+          curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.22.2/nfpm_2.22.2_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm
+          curl -sSfL https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m` -o envsubst
+          chmod +x envsubst
+          mv envsubst ~/.local/bin
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install yarn
+        run: npm install -g yarn
+
+      - name: Download npm package
+        uses: actions/download-artifact@v4
+        with:
+          name: npm-release-package
+
+      - name: Decompress npm package
+        run: tar -xzf package.tar.gz
+
+      - name: Build standalone release
+        run: npm run release:standalone
+
+      - name: Install test dependencies
+        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+      - name: Run integration tests on standalone release
+        run: yarn test:integration
+
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+        if: success()
+        continue-on-error: true
+
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
+      - name: Get and set VERSION
+        run: |
+          TAG="${{ inputs.version || github.ref_name }}"
+          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
+
+      - name: Build packages with nfpm
+        env:
+          VERSION: ${{ env.VERSION }}
+        run: yarn package
+
+      - uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          discussion_category_name: "📣 Announcements"
+          files: ./release-packages/*
+
+  package-linux-cross:
+    name: Linux cross-compile builds
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    needs: npm-version
+    container: "debian:buster"
     strategy:
       matrix:
         include:
-          - prefix: x86_64-linux-gnu
-            npm_arch: x64
-            apt_arch: amd64
-            package_arch: amd64
           - prefix: aarch64-linux-gnu
             npm_arch: arm64
             apt_arch: arm64
-            package_arch: arm64
           - prefix: arm-linux-gnueabihf
             npm_arch: armv7l
             apt_arch: armhf
-            package_arch: armv7l
 
     env:
       AR: ${{ format('{0}-ar', matrix.prefix) }}
@@ -53,29 +129,23 @@ jobs:
       PKG_CONFIG_PATH: ${{ format('/usr/lib/{0}/pkgconfig', matrix.prefix) }}
       TARGET_ARCH: ${{ matrix.apt_arch }}
       npm_config_arch: ${{ matrix.npm_arch }}
-      PKG_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
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
-          cache-dependency-path: |
-            package-lock.json
-            test/package-lock.json
 
       - name: Install cross-compiler and system dependencies
         run: |
-          sed -i 's/deb\.debian\.org/archive.debian.org/g' /etc/apt/sources.list
           dpkg --add-architecture $TARGET_ARCH
-          apt update && apt install -y --no-install-recommends \
+          apt-get update && apt-get install -y --no-install-recommends \
             crossbuild-essential-$TARGET_ARCH \
             libx11-dev:$TARGET_ARCH \
             libx11-xcb-dev:$TARGET_ARCH \
@@ -85,8 +155,6 @@ jobs:
             ca-certificates \
             curl wget rsync gettext-base
 
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
-
       - name: Install nfpm
         run: |
           mkdir -p ~/.local/bin
@@ -94,12 +162,15 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Download npm package
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: npm-release-package
 
-      - run: tar -xzf package.tar.gz
+      - name: Decompress npm package
-      - run: npm run release:standalone
+        run: tar -xzf package.tar.gz
+
+      - name: Build standalone release
+        run: npm run release:standalone
 
       - name: Replace node with cross-compile equivalent
         run: |
@@ -108,17 +179,19 @@ jobs:
           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-standalone/lib/node
 
-      # Strip out the v (v4.9.1 -> 4.9.1).
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
       - name: Get and set VERSION
         run: |
           TAG="${{ inputs.version || github.ref_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
-      - env:
+      - name: Build packages with nfpm
+        env:
           VERSION: ${{ env.VERSION }}
-        run: npm run package $PKG_ARCH
+        run: npm run package ${npm_config_arch}
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           draft: true
           discussion_category_name: "📣 Announcements"
@@ -126,87 +199,17 @@ jobs:
 
   package-macos-amd64:
     name: x86-64 macOS build
-    runs-on: macos-15-intel
-    timeout-minutes: 15
-    needs: npm-version
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v6
-
-      - name: Install Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .node-version
-          cache: npm
-          cache-dependency-path: |
-            package-lock.json
-            test/package-lock.json
-
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
-
-      - 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
-
-      # The version of node-gyp we use depends on distutils but it was removed
-      # in Python 3.12.  It seems to be fixed in the latest node-gyp so when we
-      # next update Node we can probably remove this.  For now, install
-      # setuptools since it contains distutils.
-      - run: brew install python-setuptools
-
-      - name: Download npm package
-        uses: actions/download-artifact@v5
-        with:
-          name: npm-release-package
-
-      - run: tar -xzf package.tar.gz
-      - run: npm run release:standalone
-      - run: npm run test:native
-
-      # Strip out the v (v4.9.1 -> 4.9.1).
-      - name: Get and set VERSION
-        run: |
-          TAG="${{ inputs.version || github.ref_name }}"
-          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
-
-      - name: Build packages with nfpm
-        env:
-          VERSION: ${{ env.VERSION }}
-        run: npm run package
-
-      - uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          discussion_category_name: "📣 Announcements"
-          files: ./release-packages/*
-
-  package-macos-arm64:
-    name: arm64 macOS build
     runs-on: macos-latest
     timeout-minutes: 15
     needs: npm-version
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: npm
-          cache-dependency-path: |
-            package-lock.json
-            test/package-lock.json
-
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
 
       - name: Install nfpm
         run: |
@@ -218,18 +221,28 @@ jobs:
       # in Python 3.12.  It seems to be fixed in the latest node-gyp so when we
       # next update Node we can probably remove this.  For now, install
       # setuptools since it contains distutils.
-      - run: brew install python-setuptools
+      - name: Install Python utilities
+        run: brew install python-setuptools
 
       - name: Download npm package
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: npm-release-package
 
-      - run: tar -xzf package.tar.gz
+      - name: Decompress npm package
-      - run: npm run release:standalone
+        run: tar -xzf package.tar.gz
-      - run: npm run test:native
 
-      # Strip out the v (v4.9.1 -> 4.9.1).
+      - name: Build standalone release
+        run: npm run release:standalone
+
+      - name: Install test dependencies
+        run: SKIP_SUBMODULE_DEPS=1 yarn install
+
+      - name: Run native module tests on standalone release
+        run: yarn test:native
+
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
       - name: Get and set VERSION
         run: |
           TAG="${{ inputs.version || github.ref_name }}"
@@ -238,9 +251,9 @@ jobs:
       - name: Build packages with nfpm
         env:
           VERSION: ${{ env.VERSION }}
-        run: npm run package
+        run: yarn package
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           draft: true
           discussion_category_name: "📣 Announcements"
@@ -253,11 +266,11 @@ jobs:
     needs: npm-version
     steps:
       - name: Download npm package
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: npm-release-package
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           draft: true
           discussion_category_name: "📣 Announcements"
@@ -269,7 +282,7 @@ jobs:
     timeout-minutes: 15
     steps:
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v11
+        uses: dawidd6/action-download-artifact@v3
         id: download
         with:
           branch: ${{ github.ref }}
@@ -279,9 +292,11 @@ jobs:
           check_artifacts: false
           if_no_artifact_found: fail
 
-      - run: tar -xzf package.tar.gz
+      - name: Decompress npm package
+        run: tar -xzf package.tar.gz
 
-      # Strip out the v (v4.9.1 -> 4.9.1).
+      # NOTE@jsjoeio - we do this so we can strip out the v
+      # i.e. v4.9.1 -> 4.9.1
       - name: Get and set VERSION
         run: |
           TAG="${{ inputs.version || github.ref_name }}"
@@ -300,7 +315,8 @@ jobs:
           # Ensure it has the same permissions as before
           chmod 644 release/lib/vscode/product.json
 
-      - run: tar -czf package.tar.gz release
+      - name: Compress release package
+        run: tar -czf package.tar.gz release
 
       - name: Upload npm package artifact
         uses: actions/upload-artifact@v4

.github/workflows/scripts.yaml

@@ -41,7 +41,7 @@ jobs:
     container: "alpine:3.17"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install test utilities
         run: apk add bats checkbashisms
@@ -58,7 +58,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install lint utilities
         run: sudo apt install shellcheck

.github/workflows/security.yaml

@@ -19,23 +19,27 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  audit:
+  audit-ci:
     name: Audit node modules
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Install Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
 
+      - name: Audit yarn for vulnerabilities
+        run: yarn audit
+        if: success()
+
       - name: Audit npm for vulnerabilities
-        run: npm audit
+        run: npm shrinkwrap && npm audit
         if: success()
 
   trivy-scan-repo:
@@ -43,15 +47,15 @@ jobs:
     permissions:
       contents: read # for actions/checkout to fetch code
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8
+        uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2
         with:
           scan-type: "fs"
           scan-ref: "."
@@ -72,11 +76,11 @@ jobs:
       contents: read # for actions/checkout to fetch code
       security-events: write # for github/codeql-action/autobuild to send a status report
     name: Analyze with CodeQL
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/trivy-docker.yaml

@@ -44,14 +44,14 @@ concurrency:
 
 jobs:
   trivy-scan-image:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Run Trivy vulnerability scanner in image mode
-        uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8
+        uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2
         with:
           image-ref: "docker.io/codercom/code-server:latest"
           ignore-unfixed: true

.node-version

@@ -1 +1 @@
-22.20.0
+20.11.1

.prettierignore

@@ -7,4 +7,3 @@ helm-chart
 test/scripts
 test/e2e/extensions/test-extension
 .pc
-package-lock.json

.tours/start-development.tour

@@ -5,7 +5,7 @@
     {
       "file": "package.json",
       "line": 31,
-      "description": "## Commands\n\nTo start developing, make sure you have Node 16+ and the [required dependencies](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites) installed. Then, run the following commands:\n\n1. Install dependencies:\n>> npm\n\n3. Start development mode (and watch for changes):\n>> npm run watch"
+      "description": "## Commands\n\nTo start developing, make sure you have Node 16+ and the [required dependencies](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites) installed. Then, run the following commands:\n\n1. Install dependencies:\n>> yarn\n\n3. Start development mode (and watch for changes):\n>> yarn watch"
     },
     {
       "file": "src/node/app.ts",
@@ -20,7 +20,7 @@
     {
       "file": "src/node/app.ts",
       "line": 62,
-      "description": "## That's it!\n\n\nThat's all there is to it! When this tour ends, your terminal session may stop, but just use `npm run watch` to start developing from here on out!\n\n\nIf you haven't already, be sure to check out these resources:\n- [Tour: Contributing](command:codetour.startTourByTitle?[\"Contributing\"])\n- [Docs: FAQ.md](https://github.com/coder/code-server/blob/main/docs/FAQ.md)\n- [Docs: CONTRIBUTING.md](https://github.com/coder/code-server/blob/main/docs/CONTRIBUTING.md)\n- [Community: GitHub Discussions](https://github.com/coder/code-server/discussions)\n- [Community: Slack](https://community.coder.com)"
+      "description": "## That's it!\n\n\nThat's all there is to it! When this tour ends, your terminal session may stop, but just use `yarn watch` to start developing from here on out!\n\n\nIf you haven't already, be sure to check out these resources:\n- [Tour: Contributing](command:codetour.startTourByTitle?[\"Contributing\"])\n- [Docs: FAQ.md](https://github.com/coder/code-server/blob/main/docs/FAQ.md)\n- [Docs: CONTRIBUTING.md](https://github.com/coder/code-server/blob/main/docs/CONTRIBUTING.md)\n- [Community: GitHub Discussions](https://github.com/coder/code-server/discussions)\n- [Community: Slack](https://community.coder.com)"
     }
   ]
-}
+}

CHANGELOG.md

@@ -22,313 +22,6 @@ Code v99.99.999
 
 ## Unreleased
 
-## [4.104.2](https://github.com/coder/code-server/releases/tag/v4.104.2) - 2025-09-26
-
-Code v1.104.2
-
-### Changed
-
-- Update to Code 1.104.2.
-
-## [4.104.1](https://github.com/coder/code-server/releases/tag/v4.104.1) - 2025-09-19
-
-Code v1.104.1
-
-### Changed
-
-- Update to Code 1.104.1.
-
-## [4.104.0](https://github.com/coder/code-server/releases/tag/v4.104.0) - 2025-09-15
-
-Code v1.104.0
-
-### Fixed
-
-- Fix "extension not found" errors from Open VSX when trying to install the
-  latest version of an extension.
-
-### Changed
-
-- Update to Code 1.104.0.
-
-## [4.103.2](https://github.com/coder/code-server/releases/tag/v4.103.2) - 2025-08-25
-
-Code v1.103.2
-
-### Changed
-
-- Update to Code 1.103.2.
-
-## [4.103.1](https://github.com/coder/code-server/releases/tag/v4.103.1) - 2025-08-15
-
-Code v1.103.1
-
-### Changed
-
-- Update to Code 1.103.1.
-
-## [4.103.0](https://github.com/coder/code-server/releases/tag/v4.103.0) - 2025-08-12
-
-Code v1.103.0
-
-### Changed
-
-- Update to Code 1.103.0.
-
-## [4.102.2](https://github.com/coder/code-server/releases/tag/v4.102.2) - 2025-07-24
-
-Code v1.102.2
-
-### Changed
-
-- Update to Code 1.102.2.
-
-## [4.102.1](https://github.com/coder/code-server/releases/tag/v4.102.1) - 2025-07-17
-
-Code v1.102.1
-
-### Changed
-
-- Update to Code 1.102.1.
-
-## [4.102.0](https://github.com/coder/code-server/releases/tag/v4.102.0) - 2025-07-16
-
-Code v1.102.0
-
-### Changed
-
-- Update to Code 1.102.0.
-
-### Added
-
-- Custom strings can be configured using the `--i18n` flag set to a JSON
-  file. This can be used for either translation (and can be used alongside
-  `--locale`) or for customizing the strings. See
-  [./src/node/i18n/locales/en.json](./src/node/i18n/locales/en.json) for the
-  available keys.
-
-## [4.101.2](https://github.com/coder/code-server/releases/tag/v4.101.2) - 2025-06-25
-
-Code v1.101.2
-
-### Changed
-
-- Update to Code 1.101.2.
-
-### Fixed
-
-- Fix web views not loading due to 401 when requesting the service worker.
-
-## [4.101.1](https://github.com/coder/code-server/releases/tag/v4.101.1) - 2025-06-20
-
-Code v1.101.1
-
-### Changed
-
-- Update to Code 1.101.1.
-
-## [4.101.0](https://github.com/coder/code-server/releases/tag/v4.101.0) - 2025-06-20
-
-Code v1.101.0
-
-### Changed
-
-- Update to Code 1.101.0.
-
-## [4.100.3](https://github.com/coder/code-server/releases/tag/v4.100.3) - 2025-06-03
-
-Code v1.100.3
-
-### Changed
-
-- Update to Code 1.100.3.
-
-## [4.100.2](https://github.com/coder/code-server/releases/tag/v4.100.2) - 2025-05-15
-
-Code v1.100.2
-
-### Changed
-
-- Update to Code 1.100.2.
-
-## [4.100.1](https://github.com/coder/code-server/releases/tag/v4.100.1) - 2025-05-13
-
-Code v1.100.1
-
-### Changed
-
-- Update to Code 1.100.1.
-
-## [4.100.0](https://github.com/coder/code-server/releases/tag/v4.100.0) - 2025-05-12
-
-Code v1.100.0
-
-### Added
-
-- Trusted domains for links can now be set at run-time by configuring
-  `linkProtectionTrustedDomains` in the `lib/vscode/product.json` file or via
-  the `--link-protection-trusted-domains` flag.
-
-### Changed
-
-- Update to Code 1.100.0.
-- Disable extension signature verification, which previously was skipped by
-  default (the package used for verification is not available to OSS builds of
-  VS Code) but now reportedly throws hard errors making it impossible to install
-  extensions.
-
-### Fixed
-
-- Flags with repeatable options now work via the config file.
-
-## [4.99.4](https://github.com/coder/code-server/releases/tag/v4.99.4) - 2025-05-02
-
-Code v1.99.3
-
-### Security
-
-- Validate that ports in the path proxy are numbers, to prevent proxying to
-  arbitrary domains.
-
-## [4.99.3](https://github.com/coder/code-server/releases/tag/v4.99.3) - 2025-04-17
-
-Code v1.99.3
-
-### Added
-
-- Added `--skip-auth-preflight` flag to let preflight requests through the
-  proxy.
-
-### Changed
-
-- Update to Code 1.99.3.
-
-## [4.99.2](https://github.com/coder/code-server/releases/tag/v4.99.2) - 2025-04-10
-
-Code v1.99.2
-
-### Changed
-
-- Update to Code 1.99.2.
-
-## [4.99.1](https://github.com/coder/code-server/releases/tag/v4.99.1) - 2025-04-08
-
-Code v1.99.1
-
-### Changed
-
-- Update to Code 1.99.1.
-
-## [4.99.0](https://github.com/coder/code-server/releases/tag/v4.99.0) - 2025-04-07
-
-Code v1.99.0
-
-### Changed
-
-- Update to Code 1.99.0.
-
-## [4.98.0](https://github.com/coder/code-server/releases/tag/v4.98.0) - 2025-03-07
-
-Code v1.98.0
-
-### Changed
-
-- Update to Code 1.98.0.
-
-## [4.97.2](https://github.com/coder/code-server/releases/tag/v4.96.4) - 2025-02-18
-
-Code v1.97.2
-
-### Added
-
-- Added back macOS amd64 builds.
-
-### Changed
-
-- Update to Code 1.97.2.
-- Softened dark mode login page colors.
-
-## [4.96.4](https://github.com/coder/code-server/releases/tag/v4.96.4) - 2025-01-20
-
-Code v1.96.4
-
-### Changed
-
-- Update to Code 1.96.4.
-
-## [4.96.2](https://github.com/coder/code-server/releases/tag/v4.96.2) - 2024-12-20
-
-Code v1.96.2
-
-### Changed
-
-- Update to Code 1.96.2.
-
-## [4.96.1](https://github.com/coder/code-server/releases/tag/v4.96.1) - 2024-12-18
-
-Code v1.96.1
-
-### Added
-
-- Dark color scheme for login and error pages.
-
-### Changed
-
-- Update to Code 1.96.1.
-
-## [4.95.3](https://github.com/coder/code-server/releases/tag/v4.95.3) - 2024-11-18
-
-Code v1.95.3
-
-### Changed
-
-- Update to Code 1.95.3.
-
-## [4.95.2](https://github.com/coder/code-server/releases/tag/v4.95.2) - 2024-11-12
-
-Code v1.95.2
-
-### Changed
-
-- Update to Code 1.95.2.
-
-## [4.95.1](https://github.com/coder/code-server/releases/tag/v4.95.1) - 2024-11-06
-
-Code v1.95.1
-
-### Changed
-
-- Update to Code 1.95.1.
-
-## [4.93.1](https://github.com/coder/code-server/releases/tag/v4.93.1) - 2024-09-23
-
-Code v1.93.1
-
-### Changed
-
-- Updated to Code 1.93.1.
-
-### Added
-
-- Added `--abs-proxy-base-path` flag for when code-server is not at the root.
-
-## [4.92.2](https://github.com/coder/code-server/releases/tag/v4.92.2) - 2024-08-19
-
-Code v1.92.2
-
-### Breaking changes
-
-- Dropped a patch that changed the compile target from es2022 to es2020 because
-  it no longer works with the way VS Code uses static properties. This may break
-  older browsers, so those browsers will either have to be updated or use an
-  older version of code-server.
-
-### Changed
-
-- Updated to Code 1.92.2.
-
-## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10
-
 Code v1.91.0
 
 ### Changed
@@ -863,6 +556,7 @@ Code v1.68.1
   would be accessible at `my.domain/proxy/8000/` without any authentication.
 
   If all of the following apply to you please update as soon as possible:
+
   - You run code-server with the built-in password authentication.
   - You run unprotected HTTP services on ports accessible by code-server.
 

ci/README.md

@@ -16,18 +16,20 @@ This directory contains scripts used for the development of code-server.
 
 - [./ci/dev/image](./dev/image)
   - See [./docs/CONTRIBUTING.md](../docs/CONTRIBUTING.md) for docs on the development container.
-- [./ci/dev/fmt.sh](./dev/fmt.sh) (`npm run fmt`)
+- [./ci/dev/fmt.sh](./dev/fmt.sh) (`yarn fmt`)
   - Runs formatters.
-- [./ci/dev/lint.sh](./dev/lint.sh) (`npm run lint`)
+- [./ci/dev/lint.sh](./dev/lint.sh) (`yarn lint`)
   - Runs linters.
-- [./ci/dev/test-unit.sh](./dev/test-unit.sh) (`npm run test:unit`)
+- [./ci/dev/test-unit.sh](./dev/test-unit.sh) (`yarn test:unit`)
   - Runs unit tests.
-- [./ci/dev/test-e2e.sh](./dev/test-e2e.sh) (`npm run test:e2e`)
+- [./ci/dev/test-e2e.sh](./dev/test-e2e.sh) (`yarn test:e2e`)
   - Runs end-to-end tests.
-- [./ci/dev/watch.ts](./dev/watch.ts) (`npm run watch`)
+- [./ci/dev/ci.sh](./dev/ci.sh) (`yarn ci`)
+  - Runs `yarn fmt`, `yarn lint` and `yarn test`.
+- [./ci/dev/watch.ts](./dev/watch.ts) (`yarn watch`)
   - Starts a process to build and launch code-server and restart on any code changes.
   - Example usage in [./docs/CONTRIBUTING.md](../docs/CONTRIBUTING.md).
-- [./ci/dev/gen_icons.sh](./dev/gen_icons.sh) (`npm run icons`)
+- [./ci/dev/gen_icons.sh](./dev/gen_icons.sh) (`yarn icons`)
   - Generates the various icons from a single `.svg` favicon in
     `src/browser/media/favicon.svg`.
   - Requires [imagemagick](https://imagemagick.org/index.php)
@@ -37,20 +39,20 @@ This directory contains scripts used for the development of code-server.
 This directory contains the scripts used to build and release code-server.
 You can disable minification by setting `MINIFY=`.
 
-- [./ci/build/build-code-server.sh](./build/build-code-server.sh) (`npm run build`)
+- [./ci/build/build-code-server.sh](./build/build-code-server.sh) (`yarn build`)
   - Builds code-server into `./out` and bundles the frontend into `./dist`.
-- [./ci/build/build-vscode.sh](./build/build-vscode.sh) (`npm run build:vscode`)
+- [./ci/build/build-vscode.sh](./build/build-vscode.sh) (`yarn build:vscode`)
   - Builds vscode into `./lib/vscode/out-vscode`.
-- [./ci/build/build-release.sh](./build/build-release.sh) (`npm run release`)
+- [./ci/build/build-release.sh](./build/build-release.sh) (`yarn release`)
   - Bundles the output of the above two scripts into a single node module at `./release`.
-- [./ci/build/clean.sh](./build/clean.sh) (`npm run clean`)
+- [./ci/build/clean.sh](./build/clean.sh) (`yarn clean`)
   - Removes all build artifacts.
   - Useful to do a clean build.
 - [./ci/build/code-server.sh](./build/code-server.sh)
   - Copied into standalone releases to run code-server with the bundled node binary.
-- [./ci/build/test-standalone-release.sh](./build/test-standalone-release.sh) (`npm run test:standalone-release`)
+- [./ci/build/test-standalone-release.sh](./build/test-standalone-release.sh) (`yarn test:standalone-release`)
   - Ensures code-server in the `./release-standalone` directory works by installing an extension.
-- [./ci/build/build-packages.sh](./build/build-packages.sh) (`npm run package`)
+- [./ci/build/build-packages.sh](./build/build-packages.sh) (`yarn package`)
   - Packages `./release-standalone` into a `.tar.gz` archive in `./release-packages`.
   - If on linux, [nfpm](https://github.com/goreleaser/nfpm) is used to generate `.deb` and `.rpm`.
 - [./ci/build/nfpm.yaml](./build/nfpm.yaml)
@@ -59,15 +61,15 @@ You can disable minification by setting `MINIFY=`.
   - Entrypoint script for code-server for `.deb` and `.rpm`.
 - [./ci/build/code-server.service](./build/code-server.service)
   - systemd user service packaged into the `.deb` and `.rpm`.
-- [./ci/build/release-github-draft.sh](./build/release-github-draft.sh) (`npm run release:github-draft`)
+- [./ci/build/release-github-draft.sh](./build/release-github-draft.sh) (`yarn release:github-draft`)
   - Uses [gh](https://github.com/cli/cli) to create a draft release with a template description.
-- [./ci/build/release-github-assets.sh](./build/release-github-assets.sh) (`npm run release:github-assets`)
+- [./ci/build/release-github-assets.sh](./build/release-github-assets.sh) (`yarn release:github-assets`)
   - Downloads the release-package artifacts for the current commit from CI.
   - Uses [gh](https://github.com/cli/cli) to upload the artifacts to the release
     specified in `package.json`.
 - [./ci/build/npm-postinstall.sh](./build/npm-postinstall.sh)
   - Post install script for the npm package.
-  - Bundled by`npm run release`.
+  - Bundled by`yarn release`.
 
 ## release-image
 
@@ -87,15 +89,15 @@ This directory contains the scripts used in CI.
 Helps avoid clobbering the CI configuration.
 
 - [./steps/fmt.sh](./steps/fmt.sh)
-  - Runs `npm run fmt`.
+  - Runs `yarn fmt`.
 - [./steps/lint.sh](./steps/lint.sh)
-  - Runs `npm run lint`.
+  - Runs `yarn lint`.
 - [./steps/test-unit.sh](./steps/test-unit.sh)
-  - Runs `npm run test:unit`.
+  - Runs `yarn test:unit`.
 - [./steps/test-integration.sh](./steps/test-integration.sh)
-  - Runs `npm run test:integration`.
+  - Runs `yarn test:integration`.
 - [./steps/test-e2e.sh](./steps/test-e2e.sh)
-  - Runs `npm run test:e2e`.
+  - Runs `yarn test:e2e`.
 - [./steps/release.sh](./steps/release.sh)
   - Runs the release process.
   - Generates the npm package at `./release`.

ci/build/build-packages.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Given a platform-specific release found in ./release-standalone, generate an
+# Packages code-server for the current OS and architecture into ./release-packages.
-# compressed archives and bundles (as appropriate for the platform) named after
+# This script assumes that a standalone release is built already into ./release-standalone
-# the platform's architecture and OS and place them in ./release-packages and
-# ./release-gcp.
 
 main() {
   cd "$(dirname "${0}")/../.."
@@ -52,6 +50,11 @@ release_nfpm() {
 
   export NFPM_ARCH
 
+  # Code deletes some files from the extension node_modules directory which
+  # leaves broken symlinks in the corresponding .bin directory.  nfpm will fail
+  # on these broken symlinks so clean them up.
+  rm -fr "./release-standalone/lib/vscode/extensions/node_modules/.bin"
+
   PKG_FORMAT="deb"
   NFPM_ARCH="$(get_nfpm_arch $PKG_FORMAT "$ARCH")"
   nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"

ci/build/build-release.sh

@@ -1,16 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Once both code-server and VS Code have been built, use this script to copy
+# This script requires vscode to be built with matching MINIFY.
-# them into a single directory (./release), prepare the package.json and
-# product.json, and add shrinkwraps.  This results in a generic NPM package that
-# we published to NPM and also use to compile platform-specific packages.
 
-# MINIFY controls whether minified VS Code is bundled. It must match the value
+# MINIFY controls whether minified vscode is bundled.
-# used when VS Code was built.
 MINIFY="${MINIFY-true}"
 
-# node_modules are not copied by default.  Set KEEP_MODULES=1 to copy them.
+# KEEP_MODULES controls whether the script cleans all node_modules requiring a yarn install
+# to run first.
 KEEP_MODULES="${KEEP_MODULES-0}"
 
 main() {
@@ -44,8 +41,12 @@ bundle_code_server() {
   rsync src/browser/pages/*.css "$RELEASE_PATH/src/browser/pages"
   rsync src/browser/robots.txt "$RELEASE_PATH/src/browser"
 
+  # Add typings for plugins
+  mkdir -p "$RELEASE_PATH/typings"
+  rsync typings/pluginapi.d.ts "$RELEASE_PATH/typings"
+
   # Adds the commit to package.json
-  jq --slurp '(.[0] | del(.scripts,.jest,.devDependencies)) * .[1]' package.json <(
+  jq --slurp '.[0] * .[1]' package.json <(
     cat << EOF
   {
     "commit": "$(git rev-parse HEAD)",
@@ -87,50 +88,49 @@ bundle_vscode() {
 
   rsync "${rsync_opts[@]}" ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH"
 
-  # Merge the package.json for the web/remote server so we can include
+  # Use the package.json for the web/remote server.  It does not have the right
-  # dependencies, since we want to ship this via NPM.
+  # version though so pull that from the main package.json.
-  jq --slurp '.[0] * .[1]' \
+  jq --slurp '.[0] * {version: .[1].version}' \
     "$VSCODE_SRC_PATH/remote/package.json" \
-    "$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged"
+    "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
-  mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json"
+
-  cp "$VSCODE_SRC_PATH/remote/npm-shrinkwrap.json" "$VSCODE_OUT_PATH/npm-shrinkwrap.json"
+  mv "$VSCODE_SRC_PATH/remote/npm-shrinkwrap.json" "$VSCODE_OUT_PATH/npm-shrinkwrap.json"
 
   # Include global extension dependencies as well.
   rsync "$VSCODE_SRC_PATH/extensions/package.json" "$VSCODE_OUT_PATH/extensions/package.json"
-  cp "$VSCODE_SRC_PATH/extensions/npm-shrinkwrap.json" "$VSCODE_OUT_PATH/extensions/npm-shrinkwrap.json"
+  mv "$VSCODE_SRC_PATH/extensions/npm-shrinkwrap.json" "$VSCODE_OUT_PATH/extensions/npm-shrinkwrap.json"
   rsync "$VSCODE_SRC_PATH/extensions/postinstall.mjs" "$VSCODE_OUT_PATH/extensions/postinstall.mjs"
 }
 
 create_shrinkwraps() {
-  # package-lock.json files (used to ensure deterministic versions of
+  # yarn.lock or package-lock.json files (used to ensure deterministic versions of dependencies) are
-  # dependencies) are not packaged when publishing to the NPM registry.
+  # not packaged when publishing to the NPM registry.
-  #
+  # To ensure deterministic dependency versions (even when code-server is installed with NPM), we create
-  # To ensure deterministic dependency versions (even when code-server is
+  # an npm-shrinkwrap.json file from the currently installed node_modules. This ensures the versions used
-  # installed with NPM), we create an npm-shrinkwrap.json file from the
+  # from development (that the yarn.lock guarantees) are also the ones installed by end-users.
-  # currently installed node_modules. This ensures the versions used from
+  # These will include devDependencies, but those will be ignored when installing globally (for code-server), and
-  # development (that the package-lock.json guarantees) are also the ones
+  # because we use --omit=dev when installing vscode.
-  # installed by end-users.  These will include devDependencies, but those will
-  # be ignored when installing globally (for code-server), and because we use
-  # --omit=dev (for VS Code).
 
-  # We first generate the shrinkwrap file for code-server itself - which is the
+  # We first generate the shrinkwrap file for code-server itself - which is the current directory
-  # current directory.
+  create_shrinkwrap_keeping_yarn_lock
-  cp package-lock.json package-lock.json.temp
-  npm shrinkwrap
-  mv package-lock.json.temp package-lock.json
 
-  # Then the shrinkwrap files for the bundled VS Code.
+  # Then the shrinkwrap files for the bundled VSCode
   pushd "$VSCODE_SRC_PATH/remote/"
-  cp package-lock.json package-lock.json.temp
+  create_shrinkwrap_keeping_yarn_lock
-  npm shrinkwrap
-  mv package-lock.json.temp package-lock.json
   popd
 
   pushd "$VSCODE_SRC_PATH/extensions/"
-  cp package-lock.json package-lock.json.temp
+  create_shrinkwrap_keeping_yarn_lock
-  npm shrinkwrap
-  mv package-lock.json.temp package-lock.json
   popd
 }
 
+create_shrinkwrap_keeping_yarn_lock() {
+  # HACK@edvincent: Generating a shrinkwrap alters the yarn.lock which we don't want (with NPM URLs rather than the Yarn URLs)
+  # But to generate a valid shrinkwrap, it has to exist... So we copy it to then restore it
+  cp yarn.lock yarn.lock.temp
+  npm shrinkwrap
+  cp yarn.lock.temp yarn.lock
+  rm yarn.lock.temp
+}
+
 main "$@"

ci/build/build-standalone-release.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Once we have an NPM package, use this script to copy it to a separate
-# directory (./release-standalone) and install the dependencies.  This new
-# directory can then be packaged as a platform-specific release.
-
 main() {
   cd "$(dirname "${0}")/../.."
 
@@ -13,10 +9,11 @@ main() {
   rsync "$RELEASE_PATH/" "$RELEASE_PATH-standalone"
   RELEASE_PATH+=-standalone
 
-  # Package managers may shim their own "node" wrapper into the PATH, so run
+  # We cannot get the path to Node from $PATH (for example via `which node`)
-  # node and ask it for its true path.
+  # because Yarn shims a script called `node` and we would end up just copying
+  # that script.  Instead we run Node and have it print its actual path.
   local node_path
-  node_path="$(node -p process.execPath)"
+  node_path="$(node <<< 'console.info(process.execPath)')"
 
   mkdir -p "$RELEASE_PATH/bin"
   mkdir -p "$RELEASE_PATH/lib"
@@ -27,10 +24,6 @@ main() {
 
   pushd "$RELEASE_PATH"
   npm install --unsafe-perm --omit=dev
-  # Code deletes some files from the extension node_modules directory which
-  # leaves broken symlinks in the corresponding .bin directory.  nfpm will fail
-  # on these broken symlinks so clean them up.
-  rm -fr "./lib/vscode/extensions/node_modules/.bin"
   popd
 }
 

ci/build/build-vscode.sh

@@ -54,7 +54,7 @@ main() {
 
   if [[ ! ${VERSION-} ]]; then
     echo "VERSION not set. Please set before running this script:"
-    echo "VERSION='0.0.0' npm run build:vscode"
+    echo "VERSION='0.0.0' yarn build:vscode"
     exit 1
   fi
 
@@ -112,9 +112,7 @@ EOF
   # this because we have an NPM package that could be installed on any platform.
   # The correct platform dependencies and scripts will be installed as part of
   # the post-install during `npm install` or when building a standalone release.
-  node --max-old-space-size=16384 --optimize-for-size \
+  yarn gulp "vscode-reh-web-linux-x64${MINIFY:+-min}"
-       ./node_modules/gulp/bin/gulp.js \
-       "vscode-reh-web-linux-x64${MINIFY:+-min}"
 
   # Reset so if you develop after building you will not be stuck with the wrong
   # commit (the dev client will use `oss-dev` but the dev server will still use

ci/build/npm-postinstall.sh

@@ -76,8 +76,8 @@ main() {
     echo "USE AT YOUR OWN RISK!"
   fi
 
-  if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-22}" ]; then
+  if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-20}" ]; then
-    echo "ERROR: code-server currently requires node v22."
+    echo "ERROR: code-server currently requires node v20."
     if [ -n "$FORCE_NODE_VERSION" ]; then
       echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION."
     fi
@@ -117,11 +117,14 @@ main() {
 
 install_with_yarn_or_npm() {
   echo "User agent: ${npm_config_user_agent-none}"
-  # For development we enforce npm, but for installing the package as an
+  # NOTE@edvincent: We want to keep using the package manager that the end-user was using to install the package.
-  # end-user we want to keep using whatever package manager is in use.
+  # This also ensures that when *we* run `yarn` in the development process, the yarn.lock file is used.
   case "${npm_config_user_agent-}" in
     npm*)
-      if ! npm install --unsafe-perm --omit=dev; then
+      # HACK: NPM's use of semver doesn't like resolving some peerDependencies that vscode (upstream) brings in the form of pre-releases.
+      # The legacy behavior doesn't complain about pre-releases being used, falling back to that for now.
+      # See https://github.com//pull/5071
+      if ! npm install --unsafe-perm --legacy-peer-deps --omit=dev; then
         return 1
       fi
       ;;

ci/dev/audit.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+  cd "$(dirname "$0")/../.."
+
+  # Prevents integration with moderate or higher vulnerabilities
+  # Docs: https://github.com/IBM/audit-ci#options
+  yarn audit-ci --moderate
+}
+
+main "$@"

ci/dev/ci.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+  cd "$(dirname "$0")/../.."
+
+  yarn fmt
+  yarn lint
+  yarn _audit
+  yarn test:unit
+}
+
+main "$@"

ci/dev/doctoc.sh

@@ -18,7 +18,7 @@ main() {
     echo "Files need generation or are formatted incorrectly:"
     git -c color.ui=always status | grep --color=no '\[31m'
     echo "Please run the following locally:"
-    echo "  npm run doctoc"
+    echo "  yarn doctoc"
     exit 1
   fi
 }

ci/dev/gen_icons.sh

@@ -1,50 +1,44 @@
 #!/bin/sh
 set -eu
 
-# Generate icons from a single favicon.svg.  favicon.svg should have no fill
-# colors set.
 main() {
   cd src/browser/media
 
-  # We need .ico for backwards compatibility.  The other two are the only icon
+  # We need .ico for backwards compatibility.
-  # sizes required by Chrome and we use them for stuff like apple-touch-icon as
+  # The other two are the only icon sizes required by Chrome and
-  # well.  https://web.dev/add-manifest/
+  # we use them for stuff like apple-touch-icon as well.
+  # https://web.dev/add-manifest/
   #
   # This should be enough and we can always add more if there are problems.
-  #
+
-  # -quiet to avoid https://github.com/ImageMagick/ImageMagick/issues/884
   # -background defaults to white but we want it transparent.
-  # -density somehow makes the image both sharper and smaller in file size.
-  #
   # https://imagemagick.org/script/command-line-options.php#background
-  convert -quiet -background transparent \
+  convert -quiet -background transparent -resize 256x256 favicon.svg favicon.ico
-          -resize 256x256 -density 256x256 \
+  # We do not generate the pwa-icon from the favicon as they are slightly different
-          favicon.svg favicon.ico
+  # designs and sizes.
+  # See favicon.afdesign and #2401 for details on the differences.
+  convert -quiet -background transparent -resize 192x192 pwa-icon.png pwa-icon-192.png
+  convert -quiet -background transparent -resize 512x512 pwa-icon.png pwa-icon-512.png
 
-  # Generate PWA icons.  There should be enough padding to support masking.
+  # We use -quiet above to avoid https://github.com/ImageMagick/ImageMagick/issues/884
-  convert -quiet -border 60x60 -bordercolor white -background white \
-          -resize 192x192 -density 192x192 \
-          favicon.svg pwa-icon-maskable-192.png
-  convert -quiet -border 160x160 -bordercolor white -background white \
-          -resize 512x512 -density 512x512 \
-          favicon.svg pwa-icon-maskable-512.png
 
-  # Generate non-maskable PWA icons.
+  # The following adds dark mode support for the favicon as favicon-dark-support.svg
-  magick pwa-icon-maskable-192.png \
+  # There is no similar capability for pwas or .ico so we can only add support to the svg.
-         \( +clone -threshold 101% -fill white -draw "roundRectangle 0,0 %[fx:int(w)],%[fx:int(h)] 50,50" \) \
+  favicon_dark_style="<style>
-         -channel-fx "| gray=>alpha" \
+@media (prefers-color-scheme: dark) {
-         pwa-icon-192.png
+  * {
-  magick pwa-icon-maskable-512.png \
+    fill: white;
-         \( +clone -threshold 101% -fill white -draw "roundRectangle 0,0 %[fx:int(w)],%[fx:int(h)] 100,100" \) \
+  }
-         -channel-fx "| gray=>alpha" \
+}
-         pwa-icon-512.png
+</style>"
-
+  # See https://stackoverflow.com/a/22901380/4283659
-  # The following adds dark mode support for the favicon as
+  # This escapes all newlines so that sed will accept them.
-  # favicon-dark-support.svg There is no similar capability for pwas or .ico so
+  favicon_dark_style="$(printf "%s\n" "$favicon_dark_style" | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/\\n/g')"
-  # we can only add support to the svg.
+  sed "$(
-  favicon_dark_style="<style>@media (prefers-color-scheme: dark) {* { fill: white; }}</style>"
+    cat -n << EOF
-  cp favicon.svg favicon-dark-support.svg
+s%<rect id="favicon"%$favicon_dark_style<rect id="favicon"%
-  sed "s%<path%$favicon_dark_style\n  <path%" favicon.svg > favicon-dark-support.svg
+EOF
+  )" favicon.svg > favicon-dark-support.svg
 }
 
 main "$@"

ci/dev/postinstall.sh

@@ -3,13 +3,14 @@ set -euo pipefail
 
 # Install dependencies in $1.
 install-deps() {
-  local args=()
+  local args=(install)
   if [[ ${CI-} ]]; then
-    args+=(ci)
+    args+=(--frozen-lockfile)
-  else
-    args+=(install)
   fi
-  # If there is no package.json then npm will look upward and end up installing
+  if [[ "$1" == "lib/vscode" ]]; then
+    args+=(--no-default-rc)
+  fi
+  # If there is no package.json then yarn will look upward and end up installing
   # from the root resulting in an infinite loop (this can happen if you have not
   # checked out the submodule yet for example).
   if [[ ! -f "$1/package.json" ]]; then
@@ -18,7 +19,7 @@ install-deps() {
   fi
   pushd "$1"
   echo "Installing dependencies for $PWD"
-  npm "${args[@]}"
+  yarn "${args[@]}"
   popd
 }
 

ci/dev/preinstall.js

@@ -1,3 +0,0 @@
-if (process.env.npm_execpath.includes("yarn")) {
-  throw new Error("`yarn` is no longer supported; please use `npm install` instead")
-}

ci/dev/test-e2e.sh

@@ -2,9 +2,9 @@
 set -euo pipefail
 
 help() {
-  echo >&2 "  You can build with 'npm run watch' or you can build a release"
+  echo >&2 "  You can build with 'yarn watch' or you can build a release"
-  echo >&2 "  For example: 'npm run build && npm run build:vscode && KEEP_MODULES=1 npm run release'"
+  echo >&2 "  For example: 'yarn build && yarn build:vscode && KEEP_MODULES=1 yarn release'"
-  echo >&2 "  Then 'CODE_SERVER_TEST_ENTRY=./release npm run test:e2e'"
+  echo >&2 "  Then 'CODE_SERVER_TEST_ENTRY=./release yarn test:e2e'"
   echo >&2 "  You can manually run that release with 'node ./release'"
 }
 
@@ -15,7 +15,7 @@ main() {
 
   pushd test/e2e/extensions/test-extension
   echo "Building test extension"
-  npm run build
+  yarn build
   popd
 
   local dir="$PWD"
@@ -44,7 +44,7 @@ main() {
   fi
 
   cd test
-  ./node_modules/.bin/playwright test "$@"
+  yarn playwright test "$@"
 }
 
 main "$@"

ci/dev/test-integration.sh

@@ -2,9 +2,9 @@
 set -euo pipefail
 
 help() {
-  echo >&2 "  You can build the standalone release with 'npm run release:standalone'"
+  echo >&2 "  You can build the standalone release with 'yarn release:standalone'"
   echo >&2 "  Or you can pass in a custom path."
-  echo >&2 "  CODE_SERVER_PATH='/var/tmp/coder/code-server/bin/code-server' npm run test:integration"
+  echo >&2 "  CODE_SERVER_PATH='/var/tmp/coder/code-server/bin/code-server' yarn test:integration"
 }
 
 # Make sure a code-server release works. You can pass in the path otherwise it
@@ -33,7 +33,7 @@ main() {
     exit 1
   fi
 
-  CODE_SERVER_PATH="$path" ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures"
+  CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures"
 }
 
 main "$@"

ci/dev/test-native.sh

@@ -2,9 +2,9 @@
 set -euo pipefail
 
 help() {
-  echo >&2 "  You can build the standalone release with 'npm run release:standalone'"
+  echo >&2 "  You can build the standalone release with 'yarn release:standalone'"
   echo >&2 "  Or you can pass in a custom path."
-  echo >&2 "  CODE_SERVER_PATH='/var/tmp/coder/code-server/bin/code-server' npm run test:integration"
+  echo >&2 "  CODE_SERVER_PATH='/var/tmp/coder/code-server/bin/code-server' yarn test:integration"
 }
 
 # Make sure a code-server release works. You can pass in the path otherwise it

ci/dev/test-unit.sh

@@ -6,10 +6,15 @@ main() {
 
   source ./ci/lib.sh
 
+  echo "Building test plugin"
+  pushd test/unit/node/test-plugin
+  make -s out/index.js
+  popd
+
   # We must keep jest in a sub-directory. See ../../test/package.json for more
   # information. We must also run it from the root otherwise coverage will not
   # include our source files.
-  ./test/node_modules/.bin/jest "$@" --testRegex "./test/unit/.*ts"
+  CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --testRegex "./test/unit/.*ts" --testPathIgnorePatterns "./test/unit/node/test-plugin"
 }
 
 main "$@"

ci/dev/watch.ts

@@ -45,11 +45,9 @@ class Watcher {
 
   private readonly compilers: DevelopmentCompilers = {
     codeServer: spawn("tsc", ["--watch", "--pretty", "--preserveWatchOutput"], { cwd: this.rootPath }),
-    vscode: spawn("npm", ["run", "watch"], { cwd: this.paths.vscodeDir }),
+    vscode: spawn("yarn", ["watch"], { cwd: this.paths.vscodeDir }),
-    vscodeWebExtensions: spawn("npm", ["run", "watch-web"], { cwd: this.paths.vscodeDir }),
+    vscodeWebExtensions: spawn("yarn", ["watch-web"], { cwd: this.paths.vscodeDir }),
-    plugins: this.paths.pluginDir
+    plugins: this.paths.pluginDir ? spawn("yarn", ["build", "--watch"], { cwd: this.paths.pluginDir }) : undefined,
-      ? spawn("npm", ["run", "build", "--watch"], { cwd: this.paths.pluginDir })
-      : undefined,
   }
 
   public async initialize(): Promise<void> {

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.31.2
+version: 3.21.1
 
 # 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.104.2
+appVersion: 4.90.3

ci/helm-chart/templates/deployment.yaml

@@ -7,11 +7,8 @@ metadata:
     helm.sh/chart: {{ include "code-server.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- if .Values.annotations }}
-  annotations: {{- toYaml .Values.annotations | nindent 4 }}
-  {{- end }}
 spec:
-  replicas: {{ .Values.replicaCount | default 1 }}
+  replicas: 1
   strategy:
     type: Recreate
   selector:
@@ -38,9 +35,8 @@ spec:
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
       {{- end }}
-      {{- if or (and .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.extraInitContainers }}
-      initContainers:
       {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
+      initContainers:
       - name: init-chmod-data
         image: busybox:latest
         imagePullPolicy: IfNotPresent
@@ -54,7 +50,6 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /home/coder
-      {{- end }}
 {{- if .Values.extraInitContainers }}
 {{ tpl .Values.extraInitContainers . | indent 6}}
 {{- end }}

ci/helm-chart/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: codercom/code-server
-  tag: '4.104.2'
+  tag: '4.90.3'
   pullPolicy: Always
 
 # Specifies one or more secrets to be used when pulling images from a
@@ -19,9 +19,6 @@ nameOverride: ""
 fullnameOverride: ""
 hostnameOverride: ""
 
-# The existing secret to use for code-server authentication in the frontend. the password is stored in the secret under the key `password`
-# existingSecret: ""
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -31,9 +28,6 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-# Specifies annotations for deployment
-annotations: {}
-
 podAnnotations: {}
 
 podSecurityContext: {}
@@ -78,9 +72,8 @@ extraArgs: []
 extraVars: []
 #  - name: DISABLE_TELEMETRY
 #    value: "true"
-# if dind is desired:
 #  - name: DOCKER_HOST
-#    value: "tcp://localhost:2376"
+#    value: "tcp://localhost:2375"
 
 ##
 ## Init containers parameters:
@@ -143,39 +136,25 @@ lifecycle:
   #      - -c
   #      - curl -s -L SOME_SCRIPT | bash
 
-  # for dind, the following may be helpful
-  # postStart:
-  #   exec:
-  #     command:
-  #       - /bin/sh
-  #       - -c
-  #       - |
-  #         sudo apt-get update \
-  #           && sudo apt-get install -y docker.io
-
 ## Enable an Specify container in extraContainers.
 ## This is meant to allow adding code-server dependencies, like docker-dind.
 extraContainers: |
 # If docker-dind is used, DOCKER_HOST env is mandatory to set in "extraVars"
-# - name: docker-dind
+#- name: docker-dind
-#   image: docker:28.3.2-dind
+#  image: docker:19.03-dind
-#   imagePullPolicy: IfNotPresent
+#  imagePullPolicy: IfNotPresent
-#   resources:
+#  resources:
-#     requests:
+#    requests:
-#       cpu: 1
+#      cpu: 250m
-#       ephemeral-storage: "50Gi"
+#      memory: 256M
-#       memory: 10Gi
+#  securityContext:
-#   securityContext:
+#    privileged: true
-#     privileged: true
+#    procMount: Default
-#     procMount: Default
+#  env:
-#   env:
+#  - name: DOCKER_TLS_CERTDIR
-#     - name: DOCKER_TLS_CERTDIR
+#    value: ""
-#       value: "" # disable TLS setup
+#  - name: DOCKER_DRIVER
-#   command:
+#    value: "overlay2"
-#     - dockerd
-#     - --host=unix:///var/run/docker.sock
-#     - --host=tcp://0.0.0.0:2376
-
 
 extraInitContainers: |
 # - name: customization

ci/release-image/Dockerfile

@@ -31,10 +31,7 @@ RUN sed -i "s/# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen \
   && locale-gen
 ENV LANG=en_US.UTF-8
 
-RUN if grep -q 1000 /etc/passwd; then \
+RUN adduser --gecos '' --disabled-password coder \
-    userdel -r "$(id -un 1000)"; \
-  fi \
-  && adduser --gecos '' --disabled-password coder \
   && echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
 
 RUN ARCH="$(dpkg --print-architecture)" \

ci/release-image/entrypoint.sh

@@ -7,7 +7,7 @@ eval "$(fixuid -q)"
 
 if [ "${DOCKER_USER-}" ]; then
   USER="$DOCKER_USER"
-  if [ -z "$(id -u "$DOCKER_USER" 2>/dev/null)" ]; then
+  if [ "$DOCKER_USER" != "$(whoami)" ]; then
     echo "$DOCKER_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
     # Unfortunately we cannot change $HOME as we cannot move any bind mounts
     # nor can we bind mount $HOME into a new home as that requires a privileged container.

ci/steps/publish-npm.sh

@@ -53,11 +53,11 @@ main() {
   # This string is used to determine how we should tag the npm release.
   # Environment can be one of three choices:
   # "development" - this means we tag with the PR number, allowing
-  # a developer to install this version with `npm install code-server@<pr-number>`
+  # a developer to install this version with `yarn add code-server@<pr-number>`
   # "staging" - this means we tag with `beta`, allowing
-  # a developer to install this version with `npm install code-server@beta`
+  # a developer to install this version with `yarn add code-server@beta`
   # "production" - this means we tag with `latest` (default), allowing
-  # a developer to install this version with `npm install code-server@latest`
+  # a developer to install this version with `yarn add code-server@latest`
   if ! is_env_var_set "NPM_ENVIRONMENT"; then
     echo "NPM_ENVIRONMENT is not set."
     echo "Determining in script based on GITHUB environment variables."
@@ -86,7 +86,7 @@ main() {
   if [[ "$NPM_ENVIRONMENT" == "production" ]]; then
     NPM_VERSION="$VERSION"
     # This means the npm version will be published as "stable"
-    # and installed when a user runs `npm install code-server`
+    # and installed when a user runs `yarn install code-server`
     NPM_TAG="latest"
   else
     COMMIT_SHA="$GITHUB_SHA"
@@ -94,7 +94,7 @@ main() {
     if [[ "$NPM_ENVIRONMENT" == "staging" ]]; then
       NPM_VERSION="$VERSION-beta-$COMMIT_SHA"
       # This means the npm version will be tagged with "beta"
-      # and installed when a user runs `npm install code-server@beta`
+      # and installed when a user runs `yarn install code-server@beta`
       NPM_TAG="beta"
       PACKAGE_NAME="@coder/code-server-pr"
     fi
@@ -105,7 +105,7 @@ main() {
       NPM_VERSION="$VERSION-$PR_NUMBER-$COMMIT_SHA"
       PACKAGE_NAME="@coder/code-server-pr"
       # This means the npm version will be tagged with "<pr number>"
-      # and installed when a user runs `npm install code-server@<pr number>`
+      # and installed when a user runs `yarn install code-server@<pr number>`
       NPM_TAG="$PR_NUMBER"
     fi
 
@@ -120,7 +120,10 @@ main() {
     # Example: "version": "4.0.1-4769-ad7b23cfe6ffd72914e34781ef7721b129a23040"
     # Example: "version": "4.0.1-beta-ad7b23cfe6ffd72914e34781ef7721b129a23040"
     pushd release
+    # NOTE@jsjoeio
+    # I originally tried to use `yarn version` but ran into issues and abandoned it.
     npm version "$NPM_VERSION"
+    # NOTE@jsjoeio
     # Use the development package name
     # This is so we don't clutter the code-server versions on npm
     # with development versions.
@@ -131,6 +134,7 @@ main() {
     popd
   fi
 
+  # NOTE@jsjoeio
   # We need to make sure we haven't already published the version.
   # If we get error, continue with script because we want to publish
   # If version is valid, we check if we're publishing the same one
@@ -140,10 +144,10 @@ main() {
     return
   fi
 
+  # NOTE@jsjoeio
   # Since the dev builds are scoped to @coder
   # We pass --access public to ensure npm knows it's not private.
-  cd release
+  yarn publish --non-interactive release --tag "$NPM_TAG" --access public
-  npm publish --tag "$NPM_TAG" --access public
 }
 
 main "$@"

docs/CONTRIBUTING.md

@@ -32,10 +32,10 @@ The prerequisites for contributing to code-server are almost the same as those
 for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
 Here is what is needed:
 
-- `node` v22.x
+- `node` v20.x
 - `git` v2.x or greater
 - [`git-lfs`](https://git-lfs.github.com)
-- [`npm`](https://www.npmjs.com/)
+- [`yarn`](https://classic.yarnpkg.com/en/)
   - Used to install JS packages and run scripts
 - [`nfpm`](https://nfpm.goreleaser.com/)
   - Used to build `.deb` and `.rpm` packages
@@ -70,8 +70,8 @@ for more information.
 1. `git clone https://github.com/coder/code-server.git` - Clone `code-server`
 2. `git submodule update --init` - Clone `vscode` submodule
 3. `quilt push -a` - Apply patches to the `vscode` submodule.
-4. `npm install` - Install dependencies
+4. `yarn` - Install dependencies
-5. `npm run watch` - Launch code-server localhost:8080. code-server will be live
+5. `yarn watch` - Launch code-server localhost:8080. code-server will be live
    reloaded when changes are made; the browser needs to be refreshed manually.
 
 When pulling down changes that include modifications to the patches you will
@@ -102,7 +102,7 @@ commits first if you are doing this).
    but the lines changed, update the patch with `quilt refresh`. If there are
    conflicts, then force apply with `quilt push -f`, manually add back the
    rejected code, then run `quilt refresh`.
-4. From the code-server **project root**, run `npm install`.
+4. From the code-server **project root**, run `yarn install`.
 5. Check the Node.js version that's used by Electron (which is shipped with VS
    Code. If necessary, update our version of Node.js to match.
 
@@ -127,14 +127,14 @@ You can build a full production as follows:
 ```shell
 git submodule update --init
 quilt push -a
-npm install
+yarn install
-npm run build
+yarn build
-VERSION=0.0.0 npm run build:vscode
+VERSION=0.0.0 yarn build:vscode
-npm run release
+yarn release
 ```
 
 This does not keep `node_modules`. If you want them to be kept, use
-`KEEP_MODULES=1 npm run release`
+`KEEP_MODULES=1 yarn release`
 
 Run your build:
 
@@ -148,9 +148,9 @@ node .
 Then, to build the release package:
 
 ```shell
-npm run release:standalone
+yarn release:standalone
-npm run test:integration
+yarn test:integration
-npm run package
+yarn package
 ```
 
 > On Linux, the currently running distro will become the minimum supported
@@ -170,9 +170,9 @@ writing, we do this for the following platforms/architectures:
 - Linux armhf.rpm
 - macOS arm64.tar.gz
 
-Currently, these are compiled in CI using the `npm run release:standalone`
+Currently, these are compiled in CI using the `yarn release:standalone` command
-command in the `release.yaml` workflow. We then upload them to the draft release
+in the `release.yaml` workflow. We then upload them to the draft release and
-and distribute via GitHub Releases.
+distribute via GitHub Releases.
 
 ### Troubleshooting
 
@@ -226,7 +226,7 @@ We use these to test anything related to our scripts (most of which live under
 
 ### Integration tests
 
-These are a work in progress. We build code-server and run tests with `npm run
+These are a work in progress. We build code-server and run tests with `yarn
 test:integration`, which ensures that code-server builds work on their
 respective platforms.
 

docs/FAQ.md

@@ -31,14 +31,12 @@
 - [What's the difference between code-server and Theia?](#whats-the-difference-between-code-server-and-theia)
 - [What's the difference between code-server and OpenVSCode-Server?](#whats-the-difference-between-code-server-and-openvscode-server)
 - [What's the difference between code-server and GitHub Codespaces?](#whats-the-difference-between-code-server-and-github-codespaces)
-- [What's the difference between code-server and VS Code web?](#whats-the-difference-between-code-server-and-vs-code-web)
 - [Does code-server have any security login validation?](#does-code-server-have-any-security-login-validation)
 - [Are there community projects involving code-server?](#are-there-community-projects-involving-code-server)
 - [How do I change the port?](#how-do-i-change-the-port)
 - [How do I hide the coder/coder promotion in Help: Getting Started?](#how-do-i-hide-the-codercoder-promotion-in-help-getting-started)
 - [How do I disable the proxy?](#how-do-i-disable-the-proxy)
 - [How do I disable file download?](#how-do-i-disable-file-download)
-- [Why do web views not work?](#why-do-web-views-not-work)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
@@ -323,8 +321,12 @@ As long as there is an active browser connection, code-server touches
 `~/.local/share/code-server/heartbeat` once a minute.
 
 If you want to shutdown code-server if there hasn't been an active connection
-after a predetermined amount of time, you can use the --idle-timeout-seconds flag
+after a predetermined amount of time, you can do so by checking continuously for
-or set an `CODE_SERVER_IDLE_TIMEOUT_SECONDS` environment variable.
+the last modified time on the heartbeat file. If it is older than X minutes (or
+whatever amount of time you'd like), you can kill code-server.
+
+Eventually, [#1636](https://github.com/coder/code-server/issues/1636) will make
+this process better.
 
 ## How do I change the password?
 
@@ -380,9 +382,6 @@ mount into `/home/coder/myproject` from inside the `code-server` container. You
 need to make sure the Docker daemon's `/home/coder/myproject` is the same as the
 one mounted inside the `code-server` container, and the mount will work.
 
-If you want Docker enabled when deploying on Kubernetes, look at the `values.yaml`
-file for the 3 fields: `extraVars`, `lifecycle.postStart`, and `extraContainers`.
-
 ## How do I disable telemetry?
 
 Use the `--disable-telemetry` flag to disable telemetry.
@@ -440,8 +439,6 @@ Specific changes include:
 - The ability to use your own marketplace and collect your own telemetry
 - Built-in proxy for accessing ports on the remote machine integrated into
   VS Code's ports panel
-- Settings are stored on disk like desktop VS Code, instead of in browser
-  storage (note that state is still stored in browser storage).
 - Wrapper process that spawns VS Code on-demand and has a separate CLI
 - Notification when updates are available
 - [Some other things](https://github.com/coder/code-server/tree/main/patches)
@@ -450,12 +447,6 @@ Some of these changes appear very unlikely to ever be adopted by Microsoft.
 Some may make their way upstream, further closing the gap, but at the moment it
 looks like there will always be some subtle differences.
 
-## What's the difference between code-server and VS Code web?
-
-VS Code web (which can be ran using `code serve-web`) has the same differences
-as the Codespaces section above. VS Code web can be a better choice if you need
-access to the official Microsoft marketplace.
-
 ## Does code-server have any security login validation?
 
 code-server supports setting a single password and limits logins to two per
@@ -496,22 +487,3 @@ when using the option.
 ## How do I disable file download?
 
 You can pass the flag `--disable-file-downloads` to `code-server`
-
-## Why do web views not work?
-
-Web views rely on service workers, and service workers are only available in a
-secure context, so most likely the answer is that you are using an insecure
-context (for example an IP address).
-
-If this happens, in the browser log you will see something like:
-
-> Error loading webview: Error: Could not register service workers: SecurityError: Failed to register a ServiceWorker for scope with script: An SSL certificate error occurred when fetching the script..
-
-To fix this, you must either:
-
-- Access over localhost/127.0.0.1 which is always considered secure.
-- Use a domain with a real certificate (for example with Let's Encrypt).
-- Use a trusted self-signed certificate with [mkcert](https://mkcert.dev) (or
-  create and trust a certificate manually).
-- Disable security if your browser allows it. For example, in Chromium see
-  `chrome://flags/#unsafely-treat-insecure-origin-as-secure`

docs/MAINTAINING.md

@@ -90,7 +90,7 @@ Our testing structure is laid out under our [Contributing docs](https://coder.co
 
 If you're ever looking to add more tests, here are a few ways to get started:
 
-- run `npm run test:unit` and look at the coverage chart. You'll see all the
+- run `yarn test:unit` and look at the coverage chart. You'll see all the
   uncovered lines. This is a good place to start.
 - look at `test/scripts` to see which scripts are tested. We can always use more
   tests there.

docs/README.md

@@ -1,6 +1,6 @@
 # code-server
 
-[!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/coder/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://coder.com/community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq) [![Discord](https://img.shields.io/discord/747933592273027093)](https://discord.com/invite/coder) [![codecov](https://codecov.io/gh/coder/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/coder/code-server) [![See latest](https://img.shields.io/static/v1?label=Docs&message=see%20latest&color=blue)](https://coder.com/docs/code-server/latest)
+[!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/coder/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://coder.com/community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq) [![codecov](https://codecov.io/gh/coder/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/coder/code-server) [![See latest](https://img.shields.io/static/v1?label=Docs&message=see%20latest&color=blue)](https://coder.com/docs/code-server/latest)
 
 Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and
 access it in the browser.
@@ -24,7 +24,7 @@ on how to set up a Google VM on which you can install code-server.
 
 ## Getting started
 
-There are five ways to get started:
+There are four ways to get started:
 
 1. Using the [install
    script](https://github.com/coder/code-server/blob/main/install.sh), which
@@ -35,9 +35,6 @@ There are five ways to get started:
 3. Deploy code-server to your team with [coder/coder](https://cdr.co/coder-github)
 4. Using our one-click buttons and guides to [deploy code-server to a cloud
    provider](https://github.com/coder/deploy-code-server) ⚡
-5. Using the [code-server feature for
-   devcontainers](https://github.com/coder/devcontainer-features/blob/main/src/code-server/README.md),
-   if you already use devcontainers in your project.
 
 If you use the install script, you can preview what occurs during the install
 process:

docs/SECURITY.md

@@ -17,8 +17,10 @@ We use the following tools to help us stay on top of vulnerability mitigation.
     - Comprehensive vulnerability scanner that runs on PRs into the default
       branch and scans both our container image and repository code (see
       `trivy-scan-repo` and `trivy-scan-image` jobs in `build.yaml`)
-- `npm audit`
+- [`audit-ci`](https://github.com/IBM/audit-ci)
-  - Audits NPM dependencies.
+  - Audits npm and Yarn dependencies in CI (see `Audit for vulnerabilities` step
+    in `build.yaml`) on PRs into the default branch and fails CI if moderate or
+    higher vulnerabilities (see the `audit.sh` script) are present.
 
 ## Supported Versions
 

docs/android.md

@@ -11,11 +11,11 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
 ```
 
 6. Exit the terminal using `exit` and then reopen the terminal
-7. Install and use Node.js 22:
+7. Install and use Node.js 20:
 
 ```shell
-nvm install 22
+nvm install 18
-nvm use 22
+nvm use 18
 ```
 
 8. Install code-server globally on device with: `npm install --global code-server`

docs/guide.md

@@ -20,11 +20,9 @@
   - [Proxying to a Vue app](#proxying-to-a-vue-app)
   - [Proxying to an Angular app](#proxying-to-an-angular-app)
   - [Proxying to a Svelte app](#proxying-to-a-svelte-app)
-  - [Prefixing `/absproxy/<port>` with a path](#prefixing-absproxyport-with-a-path)
+- [SSH into code-server on VS Code](#ssh-into-code-server-on-vs-code)
-  - [Preflight requests](#preflight-requests)
+  - [Option 1: cloudflared tunnel](#option-1-cloudflared-tunnel)
-- [Internationalization and customization](#internationalization-and-customization)
+  - [Option 2: ngrok tunnel](#option-2-ngrok-tunnel)
-  - [Available keys and placeholders](#available-keys-and-placeholders)
-  - [Legacy flag](#legacy-flag)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
@@ -123,22 +121,22 @@ access code-server on an iPad or do not want to use SSH port forwarding.
 
 1. This option requires that the remote machine be exposed to the internet. Make sure that your instance allows HTTP/HTTPS traffic.
 
-2. You'll need a domain name (if you don't have one, you can purchase one from
+1. You'll need a domain name (if you don't have one, you can purchase one from
    [Google Domains](https://domains.google.com) or the domain service of your
-   choice). Once you have a domain name, add an A record to your domain that contains your
+   choice)). Once you have a domain name, add an A record to your domain that contains your
    instance's IP address.
 
-3. Install [Caddy](https://caddyserver.com/docs/download#debian-ubuntu-raspbian):
+1. Install [Caddy](https://caddyserver.com/docs/download#debian-ubuntu-raspbian):
 
-   ```console
+```console
-   sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https
+sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https
-   curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
+curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
-   curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list
+curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list
-   sudo apt update
+sudo apt update
-   sudo apt install caddy
+sudo apt install caddy
-   ```
+```
 
-4. Replace `/etc/caddy/Caddyfile` using `sudo` so that the file looks like this:
+1. Replace `/etc/caddy/Caddyfile` using `sudo` so that the file looks like this:
 
    ```text
    mydomain.com {
@@ -157,7 +155,7 @@ access code-server on an iPad or do not want to use SSH port forwarding.
 
    Remember to replace `mydomain.com` with your domain name!
 
-5. Reload Caddy:
+1. Reload Caddy:
 
    ```console
    sudo systemctl reload caddy
@@ -168,22 +166,21 @@ At this point, you should be able to access code-server via
 
 ### Using Let's Encrypt with NGINX
 
-1. This option requires that the remote machine be exposed to the internet. Make
+1. This option requires that the remote machine be exposed to the internet. Make sure that your instance allows HTTP/HTTPS traffic.
-   sure that your instance allows HTTP/HTTPS traffic.
 
-2. You'll need a domain name (if you don't have one, you can purchase one from
+1. You'll need a domain name (if you don't have one, you can purchase one from
    [Google Domains](https://domains.google.com) or the domain service of your
-   choice). Once you have a domain name, add an A record to your domain that contains your
+   choice)). Once you have a domain name, add an A record to your domain that contains your
    instance's IP address.
 
-3. Install NGINX:
+1. Install NGINX:
 
    ```bash
    sudo apt update
    sudo apt install -y nginx certbot python3-certbot-nginx
    ```
 
-4. Update `/etc/nginx/sites-available/code-server` using sudo with the following
+1. Update `/etc/nginx/sites-available/code-server` using sudo with the following
    configuration:
 
    ```text
@@ -204,11 +201,13 @@ At this point, you should be able to access code-server via
 
    Be sure to replace `mydomain.com` with your domain name!
 
-5. Enable the config:
+1. Enable the config:
+
    ```console
    sudo ln -s ../sites-available/code-server /etc/nginx/sites-enabled/code-server
    sudo certbot --non-interactive --redirect --agree-tos --nginx -d mydomain.com -m me@example.com
    ```
+
    Be sure to replace `me@example.com` with your actual email.
 
 At this point, you should be able to access code-server via
@@ -274,9 +273,9 @@ should see OSSStatus: 9836 in the browser console.
 If you want to use external authentication mechanism (e.g., Sign in with
 Google), you can do this with a reverse proxy such as:
 
-- [Pomerium](https://www.pomerium.com/docs/guides/code-server.html)
+- [Pomerium](https://www.pomerium.io/guides/code-server.html)
-- [oauth2-proxy](https://oauth2-proxy.github.io/oauth2-proxy/)
+- [oauth2_proxy](https://github.com/pusher/oauth2_proxy)
-- [Cloudflare Access](https://www.cloudflare.com/zero-trust/products/access/)
+- [Cloudflare Access](https://teams.cloudflare.com/access)
 
 ## HTTPS and self-signed certificates
 
@@ -295,9 +294,7 @@ redirect all HTTP requests to HTTPS.
 > You can use [Let's Encrypt](https://letsencrypt.org/) to get a TLS certificate
 > for free.
 
-Note: if you set `proxy_set_header Host $host;` in your reverse proxy config, it
+Note: if you set `proxy_set_header Host $host;` in your reverse proxy config, it will change the address displayed in the green section of code-server in the bottom left to show the correct address.
-will change the address displayed in the green section of code-server in the
-bottom left to show the correct address.
 
 ## Accessing web services
 
@@ -383,16 +380,14 @@ PUBLIC_URL=/absproxy/3000 \
   BROWSER=none yarn start
 ```
 
-You should then be able to visit
+You should then be able to visit `https://my-code-server-address.io/absproxy/3000` to see your app exposed through
-`https://my-code-server-address.io/absproxy/3000` to see your app exposed
+code-server!
-through code-server.
 
 > We highly recommend using the subdomain approach instead to avoid this class of issue.
 
 ### Proxying to a Vue app
 
-Similar to the situation with React apps, you have to make a few modifications
+Similar to the situation with React apps, you have to make a few modifications to proxy a Vue app.
-to proxy a Vue app.
 
 1. add `vue.config.js`
 2. update the values to match this (you can use any free port):
@@ -413,8 +408,7 @@ Read more about `publicPath` in the [Vue.js docs](https://cli.vuejs.org/config/#
 
 ### Proxying to an Angular app
 
-In order to use code-server's built-in proxy with Angular, you need to make the
+In order to use code-server's built-in proxy with Angular, you need to make the following changes in your app:
-following changes in your app:
 
 1. use `<base href="./.">` in `src/index.html`
 2. add `--serve-path /absproxy/4200` to `ng serve` in your `package.json`
@@ -423,8 +417,7 @@ For additional context, see [this GitHub Discussion](https://github.com/coder/co
 
 ### Proxying to a Svelte app
 
-In order to use code-server's built-in proxy with Svelte, you need to make the
+In order to use code-server's built-in proxy with Svelte, you need to make the following changes in your app:
-following changes in your app:
 
 1. Add `svelte.config.js` if you don't already have one
 2. Update the values to match this (you can use any free port):
@@ -443,70 +436,92 @@ const config = {
 
 For additional context, see [this Github Issue](https://github.com/sveltejs/kit/issues/2958)
 
-### Prefixing `/absproxy/<port>` with a path
+## SSH into code-server on VS Code
 
-This is a case where you need to serve an application via `absproxy` as
+[![SSH](https://img.shields.io/badge/SSH-363636?style=for-the-badge&logo=GNU+Bash&logoColor=ffffff)](https://ohmyz.sh/) [![Terminal](https://img.shields.io/badge/Terminal-2E2E2E?style=for-the-badge&logo=Windows+Terminal&logoColor=ffffff)](https://img.shields.io/badge/Terminal-2E2E2E?style=for-the-badge&logo=Windows+Terminal&logoColor=ffffff) [![Visual Studio Code](https://img.shields.io/badge/Visual_Studio_Code-007ACC?style=for-the-badge&logo=Visual+Studio+Code&logoColor=ffffff)](vscode:extension/ms-vscode-remote.remote-ssh)
-explained above while serving code-server itself from a path other than the root
-in your domain.
 
-For example: `http://my-code-server.com/user/123/workspace/my-app`. To achieve
+Follow these steps where code-server is running:
-this result:
 
-1. Start code-server with the switch `--abs-proxy-base-path=/user/123/workspace`
+1. Install `openssh-server`, `wget`, and `unzip`.
-2. Follow one of the instructions above for your framework.
 
-### Preflight requests
+```bash
-
+# example for Debian and Ubuntu operating systems
-By default, if you have auth enabled, code-server will authenticate all proxied
+sudo apt update
-requests including preflight requests. This can cause issues because preflight
+sudo apt install wget unzip openssh-server
-requests do not typically include credentials. To allow all preflight requests
-through the proxy without authentication, use `--skip-auth-preflight`.
-
-## Internationalization and customization
-
-code-server allows you to provide a JSON file to configure certain strings. This
-can be used for both internationalization and customization.
-
-Create a JSON file with your custom strings:
-
-```json
-{
-  "WELCOME": "Welcome to {{app}}",
-  "LOGIN_TITLE": "{{app}} Access Portal",
-  "LOGIN_BELOW": "Please log in to continue",
-  "PASSWORD_PLACEHOLDER": "Enter Password"
-}
 ```
 
-Then reference the file:
+2. Start the SSH server and set the password for your user, if you haven't already. If you use [deploy-code-server](https://github.com/coder/deploy-code-server),
+
+```bash
+sudo service ssh start
+sudo passwd {user} # replace user with your code-server user
+```
+
+### Option 1: cloudflared tunnel
+
+[![Cloudflared](https://img.shields.io/badge/Cloudflared-E4863B?style=for-the-badge&logo=cloudflare&logoColor=ffffff)](https://github.com/cloudflare/cloudflared)
+
+1.  Install [cloudflared](https://github.com/cloudflare/cloudflared#installing-cloudflared) on your local computer and remote server
+2.  Then go to `~/.ssh/config` and add the following on your local computer:
 
 ```shell
-code-server --i18n /path/to/custom-strings.json
+Host *.trycloudflare.com
+HostName %h
+User user
+Port 22
+ProxyCommand "cloudflared location" access ssh --hostname %h
 ```
 
-Or this can be done in the config file:
+3. Run `cloudflared tunnel --url ssh://localhost:22` on the remote server
 
-```yaml
+4. Finally on VS Code or any IDE that supports SSH, run `ssh user@https://your-link.trycloudflare.com` or `ssh user@your-link.trycloudflare.com`
-i18n: /path/to/custom-strings.json
+
+### Option 2: ngrok tunnel
+
+[![Ngrok](https://img.shields.io/badge/Ngrok-1F1E37?style=for-the-badge&logo=ngrok&logoColor=ffffff)](https://ngrok.com/)
+
+1.  Make a new account for ngrok [here](https://dashboard.ngrok.com/login)
+
+2.  Now, get the ngrok binary with `wget` and unzip it with `unzip`:
+
+```bash
+wget "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip"
+unzip "ngrok-stable-linux-amd64.zip"
 ```
 
-You can combine this with the `--locale` flag to configure language support for
+5.  Then, go to [dashboard.ngrok.com](https://dashboard.ngrok.com) and go to the `Your Authtoken` section.
-both code-server and VS Code in cases where code-server has no support but VS
+6.  Copy the Authtoken shown there.
-Code does. If you are using this for internationalization, please consider
+7.  Now, go to the folder where you unzipped ngrok and store the Authtoken from the ngrok Dashboard.
-sending us a pull request to contribute it to `src/node/i18n/locales`.
 
-### Available keys and placeholders
+```bash
+./ngrok authtoken YOUR_AUTHTOKEN # replace YOUR_AUTHTOKEN with the ngrok authtoken.
+```
 
-Refer to [../src/node/i18n/locales/en.json](../src/node/i18n/locales/en.json)
+8.  Now, forward port 22, which is the SSH port with this command:
-for a full list of the available keys for translations. Note that the only
-placeholders supported for each key are the ones used in the default string.
 
-The `--app-name` flag controls the `{{app}}` placeholder in templates. If you
+```bash
-want to change the name, you can either:
+./ngrok tcp 22
+```
 
-1. Set `--app-name` (potentially alongside `--i18n`)
+Now, you get a screen in the terminal like this:
-2. Use `--i18n` and hardcode the name in your strings
 
-### Legacy flag
+```console
+ngrok by @inconshreveable(Ctrl+C to quit)
 
-The `--welcome-text` flag is now deprecated. Use the `WELCOME` key instead.
+Session Status                online
+Account                       {Your name} (Plan: Free)
+Version                       2.3.40
+Region                        United States (us)
+Web Interface                 http://127.0.0.1:4040
+Forwarding                    tcp://0.tcp.ngrok.io:19028 -> localhost:22
+```
+
+In this case, copy the forwarded link `0.tcp.ngrok.io` and remember the port number `19028`. Type this on your local Visual Studio Code:
+
+```bash
+ssh user@0.tcp.ngrok.io -p 19028
+```
+
+The port redirects you to the default SSH port 22, and you can then successfully connect to code-server by entering the password you set for the user.
+
+Note: the port and the url provided by ngrok will change each time you run it so modify as needed.

docs/install.md

@@ -82,11 +82,13 @@ _exact_ same commands presented in the rest of this document.
 - For Arch Linux, code-server will install the AUR package.
 - For any unrecognized Linux operating system, code-server will install the
   latest standalone release into `~/.local`.
+
   - Ensure that you add `~/.local/bin` to your `$PATH` to run code-server.
 
 - For macOS, code-server will install the Homebrew package (if you don't have
   Homebrew installed, code-server will install the latest standalone release
   into `~/.local`).
+
   - Ensure that you add `~/.local/bin` to your `$PATH` to run code-server.
 
 - For FreeBSD, code-server will install the [npm package](#npm) with `npm`

docs/npm.md

@@ -30,7 +30,7 @@ includes installing instructions based on your operating system.
 ## Node.js version
 
 We use the same major version of Node.js shipped with Code's remote, which is
-currently `22.x`. VS Code also [lists Node.js
+currently `20.x`. VS Code also [lists Node.js
 requirements](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites).
 
 Using other versions of Node.js [may lead to unexpected
@@ -62,7 +62,8 @@ Proceed to [installing](#installing)
 ## Alpine
 
 ```bash
-apk add alpine-sdk bash libstdc++ libc6-compat python3 krb5-dev
+apk add alpine-sdk bash libstdc++ libc6-compat
+npm config set python python3
 ```
 
 Proceed to [installing](#installing)
@@ -78,7 +79,7 @@ Proceed to [installing](#installing)
 ## FreeBSD
 
 ```sh
-pkg install -y git python npm-node22 pkgconf
+pkg install -y git python npm-node20 pkgconf
 pkg install -y libinotify
 ```
 

docs/termux.md

@@ -57,7 +57,7 @@ npm config set python python3
 node -v
 ```
 
-you will get Node version `v22`
+you will get Node version `v20`
 
 5. Now install code-server following our guide on [installing with npm](./npm.md)
 

eslint.config.mjs

@@ -1,84 +0,0 @@
-import { fixupConfigRules } from "@eslint/compat"
-import globals from "globals"
-import tsParser from "@typescript-eslint/parser"
-import path from "node:path"
-import { fileURLToPath } from "node:url"
-import js from "@eslint/js"
-import { FlatCompat } from "@eslint/eslintrc"
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
-})
-
-export default [
-  ...fixupConfigRules(
-    compat.extends(
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended",
-      "plugin:import/recommended",
-      "plugin:import/typescript",
-      "plugin:prettier/recommended",
-      "prettier",
-    ),
-  ),
-  {
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.jest,
-        ...globals.node,
-      },
-
-      parser: tsParser,
-      ecmaVersion: 2018,
-      sourceType: "module",
-    },
-
-    settings: {
-      "import/resolver": {
-        typescript: {
-          alwaysTryTypes: true,
-        },
-      },
-    },
-
-    rules: {
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          args: "none",
-        },
-      ],
-
-      "no-dupe-class-members": "off",
-      "@typescript-eslint/no-use-before-define": "off",
-      "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/ban-types": "off",
-      "@typescript-eslint/no-var-requires": "off",
-      "@typescript-eslint/explicit-module-boundary-types": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/no-extra-semi": "off",
-      "@typescript-eslint/no-require-imports": "off",
-      "@typescript-eslint/no-unused-vars": "off", // TODO: Fix these.
-      "@typescript-eslint/no-empty-object-type": "off",
-      eqeqeq: "error",
-
-      "import/order": [
-        "error",
-        {
-          alphabetize: {
-            order: "asc",
-          },
-
-          groups: [["builtin", "external", "internal"], "parent", "sibling"],
-        },
-      ],
-
-      "no-async-promise-executor": "off",
-    },
-  },
-]

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1710146030,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,18 +20,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739303263,
+        "lastModified": 1716137900,
-        "narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=",
+        "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
-        "owner": "nixos",
+        "path": "/nix/store/r8nhgnkxacbnf4kv8kdi8b6ks3k9b16i-source",
-        "repo": "nixpkgs",
+        "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
-        "rev": "6cc4213488e886db863878a1e3dc26cc932d38b8",
+        "type": "path"
-        "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "id": "nixpkgs",
-        "ref": "nixos-unstable-small",
+        "type": "indirect"
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -1,30 +1,18 @@
 {
   description = "code-server";
 
-  inputs = {
+  inputs.flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let pkgs = nixpkgs.legacyPackages.${system};
-            nodejs = pkgs.nodejs_22;
+            nodejs = pkgs.nodejs_20;
+            yarn' = pkgs.yarn.override { inherit nodejs; };
         in {
           devShells.default = pkgs.mkShell {
             nativeBuildInputs = with pkgs; [
-              imagemagick
+              nodejs yarn' python3 pkg-config git rsync jq moreutils quilt bats openssl
-              nodejs
-              python3
-              pkg-config
-              git
-              rsync
-              jq
-              moreutils
-              quilt
-              bats
-              openssl
             ];
             buildInputs = with pkgs; (lib.optionals (!stdenv.isDarwin) [ libsecret libkrb5 ]
                           ++ (with xorg; [ libX11 libxkbfile ])

install.sh

@@ -424,7 +424,7 @@ install_standalone() {
 }
 
 install_npm() {
-  echoh "Installing v$VERSION from npm."
+  echoh "Installing latest from npm."
   echoh
 
   NPM_PATH="${YARN_PATH-npm}"
@@ -436,7 +436,7 @@ install_npm() {
     fi
     echoh "Installing with npm."
     echoh
-    "$sh_c" "$NPM_PATH" install -g "code-server@$VERSION" --unsafe-perm
+    "$sh_c" "$NPM_PATH" install -g code-server --unsafe-perm
     NPM_BIN_DIR="\$($NPM_PATH bin -g)" echo_npm_postinstall
     return
   fi
@@ -461,9 +461,9 @@ npm_fallback() {
 # Determine if we have standalone releases on GitHub for the system's arch.
 has_standalone() {
   case $ARCH in
-    arm64) return 0 ;;
+    amd64) return 0 ;;
-    # We only have arm64 for macOS.
+    # We only have amd64 for macOS.
-    amd64)
+    arm64)
       [ "$(distro)" != macos ]
       return
       ;;

lib/vscode

@@ -1 +1 @@
-Subproject commit bf9252a2fb45be6893dd8870c0bf37e2e1766d61
+Subproject commit ea1445cc7016315d0f5728f8e8b12a45dc0a7286

package.json

@@ -23,49 +23,47 @@
     "test:native": "./ci/dev/test-native.sh",
     "test:scripts": "./ci/dev/test-scripts.sh",
     "package": "./ci/build/build-packages.sh",
-    "prettier": "prettier --write --log-level=warn --cache .",
+    "prettier": "prettier --write --loglevel=warn --cache .",
-    "preinstall": "node ./ci/dev/preinstall.js",
     "postinstall": "./ci/dev/postinstall.sh",
     "publish:npm": "./ci/steps/publish-npm.sh",
     "publish:docker": "./ci/steps/docker-buildx-push.sh",
-    "fmt": "npm run prettier && ./ci/dev/doctoc.sh",
+    "_audit": "./ci/dev/audit.sh",
+    "fmt": "yarn prettier && ./ci/dev/doctoc.sh",
     "lint:scripts": "./ci/dev/lint-scripts.sh",
     "lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.js' | grep -v 'lib/vscode')",
-    "test": "echo 'Run npm run test:unit or npm run test:e2e' && exit 1",
+    "test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
+    "ci": "./ci/dev/ci.sh",
     "watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",
     "icons": "./ci/dev/gen_icons.sh"
   },
   "main": "out/node/entry.js",
   "devDependencies": {
-    "@eslint/compat": "^1.2.0",
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.12.0",
     "@schemastore/package": "^0.0.10",
     "@types/compression": "^1.7.3",
     "@types/cookie-parser": "^1.4.4",
-    "@types/eslint__js": "^8.42.3",
+    "@types/express": "^4.17.17",
-    "@types/express": "^5.0.0",
     "@types/http-proxy": "1.17.7",
     "@types/js-yaml": "^4.0.6",
-    "@types/node": "22.x",
+    "@types/node": "20.x",
     "@types/pem": "^1.14.1",
     "@types/proxy-from-env": "^1.0.1",
     "@types/safe-compare": "^1.1.0",
     "@types/semver": "^7.5.2",
     "@types/trusted-types": "^2.0.4",
     "@types/ws": "^8.5.5",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^6.7.2",
+    "audit-ci": "^6.6.1",
     "doctoc": "^2.2.1",
-    "eslint": "^9.12.0",
+    "eslint": "^8.49.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^5.0.0",
-    "globals": "^16.1.0",
+    "prettier": "^3.0.3",
-    "prettier": "3.6.2",
     "prettier-plugin-sh": "^0.14.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.6.2",
+    "typescript": "^5.2.2"
-    "typescript-eslint": "^8.8.0"
   },
   "dependencies": {
     "@coder/logger": "^3.0.1",
@@ -73,23 +71,24 @@
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "env-paths": "^2.2.1",
-    "express": "^5.0.1",
+    "express": "5.0.0-beta.3",
     "http-proxy": "^1.18.1",
     "httpolyglot": "^0.1.2",
-    "i18next": "^25.3.0",
+    "i18next": "^23.5.1",
     "js-yaml": "^4.1.0",
     "limiter": "^2.1.0",
     "pem": "^1.14.8",
     "proxy-agent": "^6.3.1",
-    "qs": "6.14.0",
+    "qs": "6.12.1",
     "rotating-file-stream": "^3.1.1",
+    "safe-buffer": "^5.2.1",
     "safe-compare": "^1.1.4",
     "semver": "^7.5.4",
     "ws": "^8.14.2",
     "xdg-basedir": "^4.0.0"
   },
   "resolutions": {
-    "@types/node": "22.x"
+    "@types/node": "20.x"
   },
   "bin": {
     "code-server": "out/node/entry.js"
@@ -104,7 +103,7 @@
     "remote-development"
   ],
   "engines": {
-    "node": "22"
+    "node": "20"
   },
   "jest": {
     "transform": {

patches/base-path.diff

@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/network.ts
 +++ code-server/lib/vscode/src/vs/base/common/network.ts
-@@ -237,7 +237,9 @@ class RemoteAuthoritiesImpl {
+@@ -212,7 +212,9 @@ class RemoteAuthoritiesImpl {
  		return URI.from({
  			scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
  			authority: `${host}:${port}`,
@@ -46,18 +46,18 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
 +		<link rel="icon" href="{{BASE}}/_static/src/browser/media/favicon-dark-support.svg" />
 +		<link rel="alternate icon" href="{{BASE}}/_static/src/browser/media/favicon.ico" type="image/x-icon" />
 +		<link rel="manifest" href="{{VS_BASE}}/manifest.json" crossorigin="use-credentials" />
- 		<style id="vscode-css-modules" type="text/css" media="screen"></style>
- 
  	</head>
-@@ -39,7 +39,7 @@
  
- 	<!-- Startup (do not modify order of script tags!) -->
+ 	<body aria-label="">
+@@ -39,7 +39,7 @@
+ 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
+ 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
  	<script>
 -		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
 +		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
- 		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
+ 		Object.keys(self.webPackagePaths).map(function (key, index) {
- 	</script>
+ 			self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
- 	<script>
+ 		});
 Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.html
@@ -83,54 +83,49 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 +		<link rel="icon" href="{{BASE}}/_static/src/browser/media/favicon-dark-support.svg" />
 +		<link rel="alternate icon" href="{{BASE}}/_static/src/browser/media/favicon.ico" type="image/x-icon" />
 +		<link rel="manifest" href="{{VS_BASE}}/manifest.json" crossorigin="use-credentials" />
- 		<link rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.css">
+ 		<link data-name="vs/workbench/workbench.web.main" rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.css">
  
  	</head>
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
- 
+ 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
- 	<!-- Startup (do not modify order of script tags!) -->
+ 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
  	<script>
 -		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
 +		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
- 		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
+ 		Object.keys(self.webPackagePaths).map(function (key, index) {
- 	</script>
+ 			self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
- 	<script>
+ 		});
 Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
 +++ code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
-@@ -282,6 +282,7 @@ export class BrowserSocketFactory implem
+@@ -281,6 +281,7 @@ export class BrowserSocketFactory implem
  	connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
  		return new Promise<ISocket>((resolve, reject) => {
  			const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
 +			path = (mainWindow.location.pathname + "/" + path).replace(/\/\/+/g, "/")
  			const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
- 			const disposables = new DisposableStore();
+ 			const errorListener = socket.onError(reject);
- 			disposables.add(socket.onError(reject));
+ 			socket.onOpen(() => {
 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
-@@ -245,7 +245,9 @@ export class WebClientServer {
+@@ -270,16 +270,15 @@ export class WebClientServer {
- 		};
+ 			return void res.end();
- 
+ 		}
- 		// Prefix routes with basePath for clients
--		const basePath = getFirstHeader('x-forwarded-prefix') || this._basePath;
-+		const rootBase = relativeRoot(getOriginalUrl(req))
-+		const vscodeBase = relativePath(getOriginalUrl(req))
-+		const basePath = vscodeBase || getFirstHeader('x-forwarded-prefix') || this._basePath;
- 
- 		const queryConnectionToken = parsedUrl.query[connectionTokenQueryName];
- 		if (typeof queryConnectionToken === 'string') {
-@@ -284,10 +286,14 @@ export class WebClientServer {
- 		};
  
+-		const getFirstHeader = (headerName: string) => {
+-			const val = req.headers[headerName];
+-			return Array.isArray(val) ? val[0] : val;
+-		};
+-
  		const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
 +		// For now we are getting the remote authority from the client to avoid
 +		// needing specific configuration for reverse proxies to work.  Set this to
 +		// something invalid to make sure we catch code that is using this value
 +		// from the backend when it should not.
- 		let remoteAuthority = (
+ 		const remoteAuthority = (
  			useTestResolver
  				? 'test+test'
 -				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host)
@@ -138,35 +133,42 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  		);
  		if (!remoteAuthority) {
  			return serveError(req, res, 400, `Bad request.`);
-@@ -334,6 +340,7 @@ export class WebClientServer {
+@@ -306,8 +305,12 @@ export class WebClientServer {
+ 			scopes: [['user:email'], ['repo']]
+ 		} : undefined;
  
- 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
++		const base = relativeRoot(getOriginalUrl(req))
++		const vscodeBase = relativePath(getOriginalUrl(req))
++
+ 		const productConfiguration = {
  			codeServerVersion: this._productService.codeServerVersion,
-+			rootEndpoint: rootBase,
++			rootEndpoint: base,
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
  				...this._productService.extensionsGallery,
-@@ -387,7 +394,9 @@ export class WebClientServer {
+@@ -343,8 +346,10 @@ export class WebClientServer {
+ 		const values: { [key: string]: string } = {
+ 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
  			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
- 			WORKBENCH_WEB_BASE_URL: staticRoute,
+-			WORKBENCH_WEB_BASE_URL: this._staticRoute,
- 			WORKBENCH_NLS_URL,
+-			WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
--			WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`
++			WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
-+			WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`,
++			WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
-+			BASE: rootBase,
++			BASE: base,
-+			VS_BASE: basePath,
++			VS_BASE: vscodeBase,
  		};
  
- 		// DEV ---------------------------------------------------------------------------------------
+ 		if (useTestResolver) {
-@@ -424,7 +433,7 @@ export class WebClientServer {
+@@ -371,7 +376,7 @@ export class WebClientServer {
  			'default-src \'self\';',
  			'img-src \'self\' https: data: blob:;',
  			'media-src \'self\';',
--			`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`,  // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+-			`script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
-+			`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : ``};`,  // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
++			`script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : ''};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
  			'child-src \'self\';',
  			`frame-src 'self' https://*.vscode-cdn.net data:;`,
  			'worker-src \'self\' data: blob:;',
-@@ -497,3 +506,70 @@ export class WebClientServer {
+@@ -444,3 +449,70 @@ export class WebClientServer {
  		return void res.end(data);
  	}
  }
@@ -241,7 +243,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -65,6 +65,7 @@ export type ExtensionVirtualWorkspaceSup
+@@ -56,6 +56,7 @@ export type ExtensionVirtualWorkspaceSup
  
  export interface IProductConfiguration {
  	readonly codeServerVersion?: string
@@ -253,7 +255,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 +++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
-@@ -339,7 +339,8 @@ class LocalStorageURLCallbackProvider ex
+@@ -304,7 +304,8 @@ class LocalStorageURLCallbackProvider ex
  			this.startListening();
  		}
  
@@ -263,7 +265,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
  	}
  
  	private startListening(): void {
-@@ -584,17 +585,6 @@ class WorkspaceProvider implements IWork
+@@ -550,17 +551,6 @@ class WorkspaceProvider implements IWork
  	}
  }
  
@@ -281,7 +283,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
  (function () {
  
  	// Find config by checking for DOM
-@@ -604,8 +594,8 @@ function readCookie(name: string): strin
+@@ -569,8 +559,8 @@ function readCookie(name: string): strin
  	if (!configElement || !configElementAttribute) {
  		throw new Error('Missing web configuration element');
  	}
@@ -296,7 +298,15 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
 +++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
-@@ -120,7 +120,7 @@ export abstract class AbstractExtensionR
+@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/
+ import { IStorageService } from 'vs/platform/storage/common/storage';
+ import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
+ import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
+-import { RemoteAuthorities } from 'vs/base/common/network';
+ import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
+ 
+ const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
+@@ -99,7 +98,7 @@ export abstract class AbstractExtensionR
  					: version,
  				path: 'extension'
  			}));

patches/cli-window-open.diff

@@ -17,7 +17,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
-@@ -107,10 +107,14 @@ class RemoteTerminalBackend extends Base
+@@ -106,10 +106,14 @@ class RemoteTerminalBackend extends Base
  			}
  			const reqId = e.reqId;
  			const commandId = e.commandId;

patches/clipboard.diff

@@ -2,16 +2,16 @@ Index: code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
 +++ code-server/lib/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.ts
-@@ -8,6 +8,7 @@ import { isWeb } from '../../../base/com
+@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/pl
- import { isString } from '../../../base/common/types.js';
+ import { isString } from 'vs/base/common/types';
- import { URI, UriComponents } from '../../../base/common/uri.js';
+ import { URI, UriComponents } from 'vs/base/common/uri';
- import { localize } from '../../../nls.js';
+ import { localize } from 'vs/nls';
-+import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
++import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
- import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
+ import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
- import { IExtensionGalleryService, IExtensionManagementService } from '../../../platform/extensionManagement/common/extensionManagement.js';
+ import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
- import { ExtensionManagementCLI } from '../../../platform/extensionManagement/common/extensionManagementCLI.js';
+ import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
-@@ -95,6 +96,11 @@ CommandsRegistry.registerCommand('_remot
+@@ -89,6 +90,11 @@ CommandsRegistry.registerCommand('_remot
- 
+ 	return lines.join('\n');
  });
  
 +CommandsRegistry.registerCommand('_remoteCLI.setClipboard', function (accessor: ServicesAccessor, content: string) {
@@ -26,7 +26,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
 +++ code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
-@@ -44,7 +44,12 @@ export interface ExtensionManagementPipe
+@@ -43,7 +43,12 @@ export interface ExtensionManagementPipe
  	force?: boolean;
  }
  
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
  
  export interface ICommandsExecuter {
  	executeCommand<T>(id: string, ...args: any[]): Promise<T>;
-@@ -106,6 +111,9 @@ export class CLIServerBase {
+@@ -105,6 +110,9 @@ export class CLIServerBase {
  					case 'extensionManagement':
  						returnObj = await this.manageExtensions(data);
  						break;
@@ -50,7 +50,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostCLIServer.ts
  					default:
  						sendResponse(404, `Unknown message type: ${data.type}`);
  						break;
-@@ -173,6 +181,10 @@ export class CLIServerBase {
+@@ -172,6 +180,10 @@ export class CLIServerBase {
  		return await this._commands.executeCommand<string | undefined>('_remoteCLI.getSystemStatus');
  	}
  
@@ -65,7 +65,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
-@@ -98,7 +98,7 @@ class RemoteTerminalBackend extends Base
+@@ -97,7 +97,7 @@ class RemoteTerminalBackend extends Base
  			}
  		});
  
@@ -78,19 +78,19 @@ 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
-@@ -137,6 +137,7 @@ export interface NativeParsedArgs {
+@@ -119,6 +119,7 @@ export interface NativeParsedArgs {
- 	'disable-chromium-sandbox'?: boolean;
  	sandbox?: boolean;
+ 
  	'enable-coi'?: boolean;
 +	'stdin-to-clipboard'?: boolean;
- 	'unresponsive-sample-interval'?: string;
+ 
- 	'unresponsive-sample-period'?: string;
+ 	// chromium command line args: https://electronjs.org/docs/all#supported-chrome-command-line-switches
- 	'enable-rdp-display-tracking'?: boolean;
+ 	'no-proxy-server'?: boolean;
 Index: code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/environment/node/argv.ts
 +++ code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
-@@ -105,6 +105,7 @@ export const OPTIONS: OptionDescriptions
+@@ -90,6 +90,7 @@ export const OPTIONS: OptionDescriptions
  	'user-data-dir': { type: 'string', cat: 'o', args: 'dir', description: localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.") },
  	'profile': { type: 'string', 'cat': 'o', args: 'profileName', description: localize('profileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created.") },
  	'help': { type: 'boolean', cat: 'o', alias: 'h', description: localize('help', "Print usage.") },
@@ -102,7 +102,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/server.cli.ts
 +++ code-server/lib/vscode/src/vs/server/node/server.cli.ts
-@@ -77,6 +77,7 @@ const isSupportedForPipe = (optionId: ke
+@@ -76,6 +76,7 @@ const isSupportedForPipe = (optionId: ke
  		case 'verbose':
  		case 'remote':
  		case 'locate-shell-integration-path':
@@ -110,7 +110,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
  			return true;
  		default:
  			return false;
-@@ -295,6 +296,22 @@ export async function main(desc: Product
+@@ -293,6 +294,23 @@ export async function main(desc: Product
  			}
  		}
  	} else {
@@ -119,6 +119,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
 +				console.error("stdin has a tty.");
 +				return;
 +			}
++			const fs = require("fs");
 +			const stdinBuffer = fs.readFileSync(0); // STDIN_FILENO = 0
 +			const clipboardContent = stdinBuffer.toString();
 +			sendToPipe({
@@ -131,5 +132,5 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
 +		}
 +
  		if (parsedArgs.status) {
- 			await sendToPipe({
+ 			sendToPipe({
  				type: 'status'

patches/disable-builtin-ext-update.diff

@@ -7,7 +7,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
-@@ -341,6 +341,10 @@ export class Extension implements IExten
+@@ -287,6 +287,10 @@ export class Extension implements IExten
  			if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
  				return false;
  			}

patches/display-language.diff

@@ -1,26 +1,38 @@
 Add display language support
 
-VS Code web appears to implement language support by setting a cookie and
+We can remove this once upstream supports all language packs.
-downloading language packs from a URL configured in the product.json. This patch
+
-supports language pack extensions and uses files on the remote to set the
+1. Proxies language packs to the service on the backend.
-language instead, so it works like the desktop version.
+2. NLS configuration is embedded into the HTML for the browser to pick up.  This
+   code to generate this configuration is copied from the native portion.
+3. Remove configuredLocale since we have our own thing.
+4. Move the argv.json file to the server instead of in-browser storage.  This is
+   where the current locale is stored and currently the server needs to be able
+   to read it.
+5. Add the locale flag.
+6. Remove the redundant locale verification.  It does the same as the existing
+   one but is worse because it does not handle non-existent or empty files.
+7. Replace some caching and Node requires because code-server does not restart
+   when changing the language unlike native Code.
+8. Make language extensions installable like normal rather than using the
+   special set/clear language actions.
 
 Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
-@@ -12,7 +12,7 @@ import * as path from '../../base/common
+@@ -11,7 +11,7 @@ import * as path from 'vs/base/common/pa
- import { IURITransformer } from '../../base/common/uriIpc.js';
+ import { IURITransformer } from 'vs/base/common/uriIpc';
- import { getMachineId, getSqmMachineId, getDevDeviceId } from '../../base/node/id.js';
+ import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
- import { Promises } from '../../base/node/pfs.js';
+ import { Promises } from 'vs/base/node/pfs';
--import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
+-import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
-+import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
++import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
- import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
+ import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
- import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+ import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
- import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
+ import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
-@@ -272,6 +272,9 @@ export async function setupServerService
+@@ -238,6 +238,9 @@ export async function setupServerService
- 
+ 		const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
- 		socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
+ 		socketServer.registerChannel('extensions', channel);
  
 +		const languagePackChannel = ProxyChannel.fromService<RemoteAgentConnectionContext>(accessor.get(ILanguagePackService), disposables);
 +		socketServer.registerChannel('languagePacks', languagePackChannel);
@@ -28,11 +40,105 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
  		// clean up extensions folder
  		remoteExtensionsScanner.whenExtensionsReady().then(() => extensionManagementService.cleanUp());
  
+Index: code-server/lib/vscode/src/vs/base/common/platform.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/base/common/platform.ts
++++ code-server/lib/vscode/src/vs/base/common/platform.ts
+@@ -2,8 +2,6 @@
+  *  Copyright (c) Microsoft Corporation. All rights reserved.
+  *  Licensed under the MIT License. See License.txt in the project root for license information.
+  *--------------------------------------------------------------------------------------------*/
+-import * as nls from 'vs/nls';
+-
+ export const LANGUAGE_DEFAULT = 'en';
+ 
+ let _isWindows = false;
+@@ -112,17 +110,21 @@ else if (typeof navigator === 'object' &
+ 	_isMobile = _userAgent?.indexOf('Mobi') >= 0;
+ 	_isWeb = true;
+ 
+-	const configuredLocale = nls.getConfiguredDefaultLocale(
+-		// This call _must_ be done in the file that calls `nls.getConfiguredDefaultLocale`
+-		// to ensure that the NLS AMD Loader plugin has been loaded and configured.
+-		// This is because the loader plugin decides what the default locale is based on
+-		// how it's able to resolve the strings.
+-		nls.localize({ key: 'ensureLoaderPluginIsLoaded', comment: ['{Locked}'] }, '_')
+-	);
+-
+-	_locale = configuredLocale || LANGUAGE_DEFAULT;
++	_locale = LANGUAGE_DEFAULT;
+ 	_language = _locale;
+ 	_platformLocale = navigator.language;
++	const el = typeof document !== 'undefined' && document.getElementById('vscode-remote-nls-configuration');
++	const rawNlsConfig = el && el.getAttribute('data-settings');
++	if (rawNlsConfig) {
++		try {
++			const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
++			const resolved = nlsConfig.availableLanguages['*'];
++			_locale = nlsConfig.locale;
++			_platformLocale = nlsConfig.osLocale;
++			_language = resolved ? resolved : LANGUAGE_DEFAULT;
++			_translationsConfigFile = nlsConfig._translationsConfigFile;
++		} catch (error) { /* Oh well. */ }
++	}
+ }
+ 
+ // Unknown environment
+Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.html
++++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
+@@ -23,6 +23,9 @@
+ 		<!-- Workbench Auth Session -->
+ 		<meta id="vscode-workbench-auth-session" data-settings="{{WORKBENCH_AUTH_SESSION}}">
+ 
++		<!-- NLS Configuration -->
++		<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}">
++
+ 		<!-- Workbench Icon/Manifest/CSS -->
+ 		<link rel="icon" href="{{BASE}}/_static/src/browser/media/favicon-dark-support.svg" />
+ 		<link rel="alternate icon" href="{{BASE}}/_static/src/browser/media/favicon.ico" type="image/x-icon" />
+@@ -48,15 +51,27 @@
+ 		// Normalize locale to lowercase because translationServiceUrl is case-sensitive.
+ 		// ref: https://github.com/microsoft/vscode/issues/187795
+ 		const locale = localStorage.getItem('vscode.nls.locale') || navigator.language.toLowerCase();
+-		if (!locale.startsWith('en')) {
+-			nlsConfig['vs/nls'] = {
+-				availableLanguages: {
+-					'*': locale
+-				},
+-				translationServiceUrl: '{{WORKBENCH_NLS_BASE_URL}}'
+-			};
+-		}
+ 
++		try {
++			nlsConfig['vs/nls'] = JSON.parse(document.getElementById("vscode-remote-nls-configuration").getAttribute("data-settings"))
++			if (nlsConfig['vs/nls']._resolvedLanguagePackCoreLocation) {
++				const bundles = Object.create(null)
++				nlsConfig['vs/nls'].loadBundle = (bundle, _language, cb) => {
++					const result = bundles[bundle]
++					if (result) {
++						return cb(undefined, result)
++					}
++					const path = nlsConfig['vs/nls']._resolvedLanguagePackCoreLocation + "/" + bundle.replace(/\//g, "!") + ".nls.json"
++					fetch(`{{WORKBENCH_WEB_BASE_URL}}/../vscode-remote-resource?path=${encodeURIComponent(path)}`)
++						.then((response) => response.json())
++						.then((json) => {
++							bundles[bundle] = json
++							cb(undefined, json)
++						})
++						.catch(cb)
++				}
++			}
++		} catch (error) { /* Probably fine. */ }
+ 		require.config({
+ 			baseUrl: `${baseUrl}/out`,
+ 			recordStats: true,
 Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
 +++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
-@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi
+@@ -101,7 +101,7 @@ export abstract class AbstractNativeEnvi
  			return URI.file(join(vscodePortable, 'argv.json'));
  		}
  
@@ -45,37 +151,31 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
 +++ code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
-@@ -3,6 +3,8 @@
+@@ -32,6 +32,12 @@ export function getNLSConfiguration(lang
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
+ 				if (InternalNLSConfiguration.is(value)) {
-  *--------------------------------------------------------------------------------------------*/
+ 					value._languagePackSupport = true;
- 
+ 				}
-+import { promises as fs } from 'fs';
++				// If the configuration has no results keep trying since code-server
-+import * as path from 'path';
++				// doesn't restart when a language is installed so this result would
- import { FileAccess } from '../../base/common/network.js';
++				// persist (the plugin might not be installed yet for example).
- import { join } from '../../base/common/path.js';
++				if (value.locale !== 'en' && value.locale !== 'en-us' && Object.keys(value.availableLanguages).length === 0) {
- import type { INLSConfiguration } from '../../nls.js';
++					_cache.delete(key);
-@@ -33,7 +35,94 @@ export async function getNLSConfiguratio
++				}
- 	if (!result) {
+ 				return value;
- 		result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath });
+ 			});
- 		nlsConfigurationCache.set(cacheKey, result);
+ 			_cache.set(key, result);
-+		// If the language pack does not yet exist, it defaults to English, which is
+@@ -46,3 +52,43 @@ export namespace InternalNLSConfiguratio
-+		// then cached and you have to restart even if you then install the pack.
+ 		return candidate && typeof candidate._languagePackId === 'string';
-+		result.then((r) => {
-+			if (!language.startsWith('en') && r.resolvedLanguage.startsWith('en')) {
-+				nlsConfigurationCache.delete(cacheKey);
-+			}
-+		})
  	}
- 
- 	return result;
  }
 +
 +/**
-+ * Copied from from src/main.js.
++ * The code below is copied from from src/main.js.
 + */
++
 +export const getLocaleFromConfig = async (argvResource: string): Promise<string> => {
 +	try {
-+		const content = stripComments(await fs.readFile(argvResource, 'utf8'));
++		const content = stripComments(await fs.promises.readFile(argvResource, 'utf8'));
 +		return JSON.parse(content).locale;
 +	} catch (error) {
 +		if (error.code !== "ENOENT") {
@@ -85,9 +185,6 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
 +	}
 +};
 +
-+/**
-+ * Copied from from src/main.js.
-+ */
 +const stripComments = (content: string): string => {
 +	const regexp = /('(?:[^\\']*(?:\\.)?)*')|('(?:[^\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
 +
@@ -111,116 +208,95 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
 +		}
 +	});
 +};
-+
-+/**
-+ * Generate translations then return a path to a JavaScript file that sets the
-+ * translations into global variables.  This file is loaded by the browser to
-+ * set global variables that the loader uses when looking for translations.
-+ *
-+ * Normally, VS Code pulls these files from a CDN but we want them to be local.
-+ */
-+export async function getBrowserNLSConfiguration(locale: string, userDataPath: string): Promise<string> {
-+	if (locale.startsWith('en')) {
-+		return ''; // Use fallback translations.
-+	}
-+
-+	const nlsConfig = await getNLSConfiguration(locale, userDataPath);
-+	const messagesFile = nlsConfig?.languagePack?.messagesFile;
-+	const resolvedLanguage = nlsConfig?.resolvedLanguage;
-+	if (!messagesFile || !resolvedLanguage) {
-+		return ''; // Use fallback translations.
-+	}
-+
-+	const nlsFile = path.join(path.dirname(messagesFile), "nls.messages.js");
-+	try {
-+		await fs.stat(nlsFile);
-+		return nlsFile; // We already generated the file.
-+	} catch (error) {
-+		// ENOENT is fine, that just means we need to generate the file.
-+		if (error.code !== 'ENOENT') {
-+			throw error;
-+		}
-+	}
-+
-+	const messages = (await fs.readFile(messagesFile)).toString();
-+	const content = `globalThis._VSCODE_NLS_MESSAGES=${messages};
-+globalThis._VSCODE_NLS_LANGUAGE=${JSON.stringify(resolvedLanguage)};`
-+	await fs.writeFile(nlsFile, content, "utf-8");
-+
-+	return nlsFile;
-+}
 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
-@@ -25,6 +25,7 @@ import { URI } from '../../base/common/u
+@@ -27,6 +27,7 @@ import { URI } from 'vs/base/common/uri'
- import { streamToBuffer } from '../../base/common/buffer.js';
+ import { streamToBuffer } from 'vs/base/common/buffer';
- import { IProductConfiguration } from '../../base/common/product.js';
+ import { IProductConfiguration } from 'vs/base/common/product';
- import { isString, Mutable } from '../../base/common/types.js';
+ import { isString } from 'vs/base/common/types';
-+import { getLocaleFromConfig, getBrowserNLSConfiguration } from './remoteLanguagePacks.js';
++import { getLocaleFromConfig, getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
- import { CharCode } from '../../base/common/charCode.js';
+ import { CharCode } from 'vs/base/common/charCode';
- import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
+ import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
- import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
+ 
-@@ -385,14 +386,22 @@ export class WebClientServer {
+@@ -348,6 +349,8 @@ export class WebClientServer {
+ 			callbackRoute: this._callbackRoute
  		};
  
- 		const cookies = cookie.parse(req.headers.cookie || '');
++		const locale = this._environmentService.args.locale || await getLocaleFromConfig(this._environmentService.argvResource.fsPath);
--		const locale = cookies['vscode.nls.locale'] || req.headers['accept-language']?.split(',')[0]?.toLowerCase() || 'en';
++		const nlsConfiguration = await getNLSConfiguration(locale, this._environmentService.userDataPath)
-+		const locale = this._environmentService.args.locale || await getLocaleFromConfig(this._environmentService.argvResource.fsPath) || cookies['vscode.nls.locale'] || req.headers['accept-language']?.split(',')[0]?.toLowerCase() || 'en';
+ 		const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
- 		let WORKBENCH_NLS_BASE_URL: string | undefined;
- 		let WORKBENCH_NLS_URL: string;
- 		if (!locale.startsWith('en') && this._productService.nlsCoreBaseUrl) {
- 			WORKBENCH_NLS_BASE_URL = this._productService.nlsCoreBaseUrl;
- 			WORKBENCH_NLS_URL = `${WORKBENCH_NLS_BASE_URL}${this._productService.commit}/${this._productService.version}/${locale}/nls.messages.js`;
- 		} else {
--			WORKBENCH_NLS_URL = ''; // fallback will apply
-+			try {
-+				const nlsFile = await getBrowserNLSConfiguration(locale, this._environmentService.userDataPath);
-+				WORKBENCH_NLS_URL = nlsFile
-+					? `${vscodeBase}/vscode-remote-resource?path=${encodeURIComponent(nlsFile)}`
-+					: '';
-+			} catch (error) {
-+				console.error("Failed to generate translations", error);
-+				WORKBENCH_NLS_URL = '';
-+			}
- 		}
- 
  		const values: { [key: string]: string } = {
+ 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
+@@ -356,6 +359,7 @@ export class WebClientServer {
+ 			WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
+ 			BASE: base,
+ 			VS_BASE: vscodeBase,
++			NLS_CONFIGURATION: asJSON(nlsConfiguration),
+ 		};
+ 
+ 		if (useTestResolver) {
 Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -21,6 +21,7 @@ export const serverOptions: OptionDescri
+@@ -18,6 +18,7 @@ export const serverOptions: OptionDescri
+ 	'auth': { type: 'string' },
  	'disable-file-downloads': { type: 'boolean' },
  	'disable-file-uploads': { type: 'boolean' },
- 	'disable-getting-started-override': { type: 'boolean' },
 +	'locale': { type: 'string' },
  
  	/* ----- server setup ----- */
  
-@@ -110,6 +111,7 @@ export interface ServerParsedArgs {
+@@ -103,6 +104,7 @@ export interface ServerParsedArgs {
+ 	'auth'?: string;
  	'disable-file-downloads'?: boolean;
  	'disable-file-uploads'?: boolean;
- 	'disable-getting-started-override'?: boolean,
 +	'locale'?: string
  
  	/* ----- server setup ----- */
  
+Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
++++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
+@@ -52,7 +52,7 @@ import 'vs/workbench/services/dialogs/br
+ import 'vs/workbench/services/host/browser/browserHostService';
+ import 'vs/workbench/services/lifecycle/browser/lifecycleService';
+ import 'vs/workbench/services/clipboard/browser/clipboardService';
+-import 'vs/workbench/services/localization/browser/localeService';
++import 'vs/workbench/services/localization/electron-sandbox/localeService';
+ import 'vs/workbench/services/path/browser/pathService';
+ import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
+ import 'vs/workbench/services/encryption/browser/encryptionService';
+@@ -118,8 +118,9 @@ registerSingleton(ILanguagePackService,
+ // Logs
+ import 'vs/workbench/contrib/logs/browser/logs.contribution';
+ 
+-// Localization
+-import 'vs/workbench/contrib/localization/browser/localization.contribution';
++// Localization.  This does not actually import anything specific to Electron so
++// it should be safe.
++import 'vs/workbench/contrib/localization/electron-sandbox/localization.contribution';
+ 
+ // Performance
+ import 'vs/workbench/contrib/performance/browser/performance.web.contribution';
 Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
 +++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
 @@ -5,18 +5,24 @@
  
- import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+ import { CancellationTokenSource } from 'vs/base/common/cancellation';
- import { URI } from '../../../base/common/uri.js';
+ import { URI } from 'vs/base/common/uri';
-+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
++import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
- import { IExtensionGalleryService } from '../../extensionManagement/common/extensionManagement.js';
+ import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
- import { IExtensionResourceLoaderService } from '../../extensionResourceLoader/common/extensionResourceLoader.js';
+ import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
--import { ILanguagePackItem, LanguagePackBaseService } from '../common/languagePacks.js';
+-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
-+import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from '../common/languagePacks.js';
++import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
- import { ILogService } from '../../log/common/log.js';
+ import { ILogService } from 'vs/platform/log/common/log';
-+import { IRemoteAgentService } from '../../../workbench/services/remote/common/remoteAgentService.js';
++import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
  
  export class WebLanguagePacksService extends LanguagePackBaseService {
 +	private readonly languagePackService: ILanguagePackService;
@@ -244,10 +320,10 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack
 +		return this.languagePackService.getInstalledLanguages()
  	}
  }
-Index: code-server/lib/vscode/src/vs/workbench/services/localization/electron-browser/localeService.ts
+Index: code-server/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
 ===================================================================
---- code-server.orig/lib/vscode/src/vs/workbench/services/localization/electron-browser/localeService.ts
+--- code-server.orig/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
-+++ code-server/lib/vscode/src/vs/workbench/services/localization/electron-browser/localeService.ts
++++ code-server/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
 @@ -51,7 +51,8 @@ class NativeLocaleService implements ILo
  		@IProductService private readonly productService: IProductService
  	) { }
@@ -272,7 +348,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
-@@ -475,9 +475,6 @@ export class InstallAction extends Exten
+@@ -411,9 +411,6 @@ export class InstallAction extends Exten
  		if (this.extension.isBuiltin) {
  			return;
  		}
@@ -282,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  		if (this.extension.state !== ExtensionState.Uninstalled) {
  			return;
  		}
-@@ -782,7 +779,7 @@ export abstract class InstallInOtherServ
+@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ
  		}
  
  		if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -291,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  		}
  
  		// Prefers to run on UI
-@@ -2073,17 +2070,6 @@ export class SetLanguageAction extends E
+@@ -1928,17 +1925,6 @@ export class SetLanguageAction extends E
  	update(): void {
  		this.enabled = false;
  		this.class = SetLanguageAction.DisabledClass;
@@ -309,15 +385,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  	}
  
  	override async run(): Promise<any> {
-@@ -2100,7 +2086,6 @@ export class ClearLanguageAction extends
+@@ -1955,7 +1941,6 @@ export class ClearLanguageAction extends
- 	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
+ 	private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
  
  	constructor(
 -		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
  		@ILocaleService private readonly localeService: ILocaleService,
  	) {
  		super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
-@@ -2110,17 +2095,6 @@ export class ClearLanguageAction extends
+@@ -1965,17 +1950,6 @@ export class ClearLanguageAction extends
  	update(): void {
  		this.enabled = false;
  		this.class = ClearLanguageAction.DisabledClass;
@@ -335,16 +411,3 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
  	}
  
  	override async run(): Promise<any> {
-Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
-===================================================================
---- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
-+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
-@@ -55,7 +55,7 @@ import './services/dialogs/browser/fileD
- import './services/host/browser/browserHostService.js';
- import './services/lifecycle/browser/lifecycleService.js';
- import './services/clipboard/browser/clipboardService.js';
--import './services/localization/browser/localeService.js';
-+import './services/localization/electron-browser/localeService.js';
- import './services/path/browser/pathService.js';
- import './services/themes/browser/browserHostColorSchemeService.js';
- import './services/encryption/browser/encryptionService.js';

patches/external-file-actions.diff

@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -18,6 +18,8 @@ export const serverOptions: OptionDescri
+@@ -16,6 +16,8 @@ export const serverOptions: OptionDescri
  	/* ----- code-server ----- */
  	'disable-update-check': { type: 'boolean' },
  	'auth': { type: 'string' },
@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
  
  	/* ----- server setup ----- */
  
-@@ -104,6 +106,8 @@ export interface ServerParsedArgs {
+@@ -99,6 +101,8 @@ export interface ServerParsedArgs {
  	/* ----- code-server ----- */
  	'disable-update-check'?: boolean;
  	'auth'?: string;
@@ -112,9 +112,9 @@ 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
-@@ -369,6 +369,8 @@ export class WebClientServer {
+@@ -334,6 +334,8 @@ export class WebClientServer {
- 			serverBasePath: basePath,
+ 			serverBasePath: this._basePath,
- 			webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
+ 			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
  			userDataPath: this._environmentService.userDataPath,
 +			isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
 +			isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],
@@ -125,20 +125,21 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
-@@ -6,10 +6,10 @@
+@@ -7,11 +7,11 @@ import { Event } from 'vs/base/common/ev
- import { Disposable } from '../../base/common/lifecycle.js';
+ import { Disposable } from 'vs/base/common/lifecycle';
- import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
+ import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
- import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
+ import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
--import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext } from '../common/contextkeys.js';
+-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext } from 'vs/workbench/common/contextkeys';
-+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
++import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
- import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+ import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
- import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+ import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
--import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js';
+ import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
+-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
- import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js';
++import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
- import { IWorkbenchLayoutService, Parts, positionToString } from '../services/layout/browser/layoutService.js';
+ import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
- import { getRemoteName } from '../../platform/remote/common/remoteHosts.js';
+ import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
-@@ -69,7 +69,7 @@ export class WorkbenchContextKeysHandler
+ import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
+@@ -70,7 +70,7 @@ export class WorkbenchContextKeysHandler
  		@IContextKeyService private readonly contextKeyService: IContextKeyService,
  		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
  		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -147,9 +148,9 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
  		@IProductService private readonly productService: IProductService,
  		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
  		@IEditorService private readonly editorService: IEditorService,
-@@ -199,6 +199,10 @@ export class WorkbenchContextKeysHandler
+@@ -197,6 +197,10 @@ export class WorkbenchContextKeysHandler
- 		this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService);
+ 		this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
- 		this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized());
+ 		this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
  
 +		// code-server
 +		IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)
@@ -163,15 +164,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
 @@ -20,7 +20,7 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID,
- import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+ import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
- import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js';
+ import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
- import { Schemas } from '../../../../base/common/network.js';
+ import { Schemas } from 'vs/base/common/network';
--import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
+-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext } from 'vs/workbench/common/contextkeys';
-+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
++import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
- import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+ import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
- import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
- import { ThemeIcon } from '../../../../base/common/themables.js';
+ import { ThemeIcon } from 'vs/base/common/themables';
-@@ -571,13 +571,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
+@@ -561,13 +561,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
  		id: DOWNLOAD_COMMAND_ID,
  		title: DOWNLOAD_LABEL
  	},
@@ -195,7 +196,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
  	)
  }));
  
-@@ -589,6 +592,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
+@@ -579,6 +582,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
  		title: UPLOAD_LABEL,
  	},
  	when: ContextKeyExpr.and(
@@ -207,30 +208,30 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
 +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
-@@ -39,6 +39,9 @@ export const EmbedderIdentifierContext =
+@@ -40,6 +40,9 @@ export const HasWebFileSystemAccess = ne
  
- export const InAutomationContext = new RawContextKey<boolean>('inAutomation', false, localize('inAutomation', "Whether VS Code is running under automation/smoke test"));
+ export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('embedderIdentifier', undefined, localize('embedderIdentifier', 'The identifier of the embedder according to the product service, if one is defined'));
  
 +export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
 +export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);
 +
  //#endregion
  
- //#region < --- Window --- >
+ 
 Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
-@@ -18,7 +18,7 @@ import { IModelService } from '../../../
+@@ -18,7 +18,7 @@ import { IModelService } from 'vs/editor
- import { ILanguageService } from '../../../../editor/common/languages/language.js';
+ import { ILanguageService } from 'vs/editor/common/languages/language';
- import { getIconClasses } from '../../../../editor/common/services/getIconClasses.js';
+ import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
- import { Schemas } from '../../../../base/common/network.js';
+ import { Schemas } from 'vs/base/common/network';
--import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
++import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
- import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
- import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+ import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
- import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js';
+ import { equalsIgnoreCase, format, startsWithIgnoreCase } from 'vs/base/common/strings';
-@@ -144,7 +144,7 @@ export class SimpleFileDialog extends Di
+@@ -143,7 +143,7 @@ export class SimpleFileDialog implements
  		@IFileDialogService private readonly fileDialogService: IFileDialogService,
  		@IModelService private readonly modelService: IModelService,
  		@ILanguageService private readonly languageService: ILanguageService,
@@ -239,10 +240,10 @@ 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,
-@@ -311,20 +311,22 @@ export class SimpleFileDialog extends Di
+@@ -286,20 +286,22 @@ export class SimpleFileDialog implements
- 			this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path");
+ 			this.filePickBox.sortByLabel = false;
+ 			this.filePickBox.ignoreFocusOut = true;
  			this.filePickBox.ok = true;
- 			this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;
 -			if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
 -				this.filePickBox.customButton = true;
 -				this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');
@@ -280,15 +281,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
-@@ -65,6 +65,7 @@ import { timeout } from '../../../../../
+@@ -65,6 +65,7 @@ import { timeout } from 'vs/base/common/
- import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
- import { mainWindow } from '../../../../../base/browser/window.js';
+ import { mainWindow } from 'vs/base/browser/window';
- import { IExplorerFileContribution, explorerFileContribRegistry } from '../explorerFileContrib.js';
+ import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib';
-+import { IBrowserWorkbenchEnvironmentService } from '../../../../services/environment/browser/environmentService.js';
++import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
- import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
+ 
- import { ISearchService, QueryType, getExcludes, ISearchConfiguration, ISearchComplete, IFileQuery } from '../../../../services/search/common/search.js';
+ export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {
- import { CancellationToken } from '../../../../../base/common/cancellation.js';
+ 
-@@ -1594,7 +1595,8 @@ export class FileDragAndDrop implements
+@@ -1001,7 +1002,8 @@ export class FileDragAndDrop implements
  		@IConfigurationService private configurationService: IConfigurationService,
  		@IInstantiationService private instantiationService: IInstantiationService,
  		@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@@ -298,7 +299,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
  	) {
  		const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
  			if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
-@@ -1819,15 +1821,17 @@ export class FileDragAndDrop implements
+@@ -1226,15 +1228,17 @@ export class FileDragAndDrop implements
  
  			// External file DND (Import/Upload file)
  			if (data instanceof NativeDragAndDropData) {
@@ -329,7 +330,7 @@ Index: code-server/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderS
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderServer.ts
 +++ code-server/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderServer.ts
-@@ -99,6 +99,7 @@ export abstract class AbstractDiskFileSy
+@@ -92,6 +92,7 @@ export abstract class AbstractDiskFileSy
  
  	private async readFile(uriTransformer: IURITransformer, _resource: UriComponents, opts?: IFileAtomicReadOptions): Promise<VSBuffer> {
  		const resource = this.transformIncoming(uriTransformer, _resource, true);
@@ -337,7 +338,7 @@ Index: code-server/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderS
  		const buffer = await this.provider.readFile(resource, opts);
  
  		return VSBuffer.wrap(buffer);
-@@ -117,6 +118,7 @@ export abstract class AbstractDiskFileSy
+@@ -110,6 +111,7 @@ export abstract class AbstractDiskFileSy
  			}
  		});
  
@@ -345,7 +346,7 @@ Index: code-server/lib/vscode/src/vs/platform/files/node/diskFileSystemProviderS
  		const fileStream = this.provider.readFileStream(resource, opts, cts.token);
  		listenStream(fileStream, {
  			onData: chunk => emitter.fire(VSBuffer.wrap(chunk)),
-@@ -137,7 +139,7 @@ export abstract class AbstractDiskFileSy
+@@ -130,7 +132,7 @@ export abstract class AbstractDiskFileSy
  
  	private writeFile(uriTransformer: IURITransformer, _resource: UriComponents, content: VSBuffer, opts: IFileWriteOptions): Promise<void> {
  		const resource = this.transformIncoming(uriTransformer, _resource);

patches/getting-started.diff

@@ -14,21 +14,21 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
   *  Licensed under the MIT License. See License.txt in the project root for license information.
   *--------------------------------------------------------------------------------------------*/
  
--import { $, Dimension, addDisposableListener, append, clearNode, reset } from '../../../../base/browser/dom.js';
+-import { $, Dimension, addDisposableListener, append, clearNode, reset } from 'vs/base/browser/dom';
-+import { $, Dimension, addDisposableListener, append, clearNode, reset, prepend } from '../../../../base/browser/dom.js';
++import { $, Dimension, addDisposableListener, append, clearNode, reset, prepend } from 'vs/base/browser/dom';
- import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+ import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
- import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { Button } from '../../../../base/browser/ui/button/button.js';
+ import { Button } from 'vs/base/browser/ui/button/button';
-@@ -53,7 +53,7 @@ import { IRecentFolder, IRecentWorkspace
+@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
- import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
+ import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
- import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
+ import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
- import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
--import { WorkbenchStateContext } from '../../../common/contextkeys.js';
+-import { WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
-+import { IsEnabledCoderGettingStarted, WorkbenchStateContext } from '../../../common/contextkeys.js';
++import { IsEnabledCoderGettingStarted, WorkbenchStateContext } from 'vs/workbench/common/contextkeys';
- import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
+ import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor';
- import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
+ import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
- import './gettingStartedColors.js';
+ import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors';
-@@ -902,6 +902,72 @@ export class GettingStartedPage extends
+@@ -804,6 +804,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', {},);
  
-@@ -937,6 +1003,9 @@ export class GettingStartedPage extends
+@@ -839,6 +905,9 @@ export class GettingStartedPage extends
  				recentList.setLimit(5);
  				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
  			}
@@ -181,18 +181,18 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -20,6 +20,7 @@ export const serverOptions: OptionDescri
+@@ -19,6 +19,7 @@ export const serverOptions: OptionDescri
- 	'auth': { type: 'string' },
  	'disable-file-downloads': { type: 'boolean' },
  	'disable-file-uploads': { type: 'boolean' },
+ 	'locale': { type: 'string' },
 +	'disable-getting-started-override': { type: 'boolean' },
  
  	/* ----- server setup ----- */
  
-@@ -108,6 +109,7 @@ export interface ServerParsedArgs {
+@@ -105,6 +106,7 @@ export interface ServerParsedArgs {
- 	'auth'?: string;
  	'disable-file-downloads'?: boolean;
  	'disable-file-uploads'?: boolean;
+ 	'locale'?: string
 +	'disable-getting-started-override'?: boolean,
  
  	/* ----- server setup ----- */
@@ -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
-@@ -373,6 +373,7 @@ export class WebClientServer {
+@@ -339,6 +339,7 @@ export class WebClientServer {
  			userDataPath: this._environmentService.userDataPath,
  			isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
  			isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],
@@ -213,16 +213,16 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
-@@ -6,7 +6,7 @@
+@@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/ev
- import { Disposable } from '../../base/common/lifecycle.js';
+ import { Disposable } from 'vs/base/common/lifecycle';
- import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
+ import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
- import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
+ import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
--import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
+-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
-+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from '../common/contextkeys.js';
++import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } from 'vs/workbench/common/contextkeys';
- import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+ import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
- import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+ import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
- import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
+ import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-@@ -202,6 +202,7 @@ export class WorkbenchContextKeysHandler
+@@ -200,6 +200,7 @@ export class WorkbenchContextKeysHandler
  		// code-server
  		IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)
  		IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true)
@@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
 +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
-@@ -41,6 +41,7 @@ export const InAutomationContext = new R
+@@ -42,6 +42,7 @@ export const EmbedderIdentifierContext =
  
  export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
  export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);

patches/insecure-notification.diff

@@ -17,9 +17,9 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
 @@ -1,7 +1,10 @@
- import { Disposable } from "../../base/common/lifecycle.js";
+ import { Disposable } from 'vs/base/common/lifecycle';
-+import { localize } from '../../nls.js';
++import { localize } from 'vs/nls';
-+import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
++import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
  
  export class CodeServerClient extends Disposable {
  	constructor (

patches/integration.diff

@@ -3,28 +3,26 @@ Prepare Code for integration with code-server
 1. We already have the arguments so allow passing them in.  There is also a
    slight change in a few directories to preserve the directory structure we
    have been using and to not override passed-in arguments.
-2. Modify the entry point to allow importing the code, instead of just running
+2. Modify the terminal environment to filter out code-server environment variables.
-   the server immediately.
+3. Add the code-server version to the help dialog.
-3. Modify the terminal environment to filter out code-server environment variables.
+4. Add ready events for use in an iframe.
-4. Add the code-server version to the help dialog.
+5. Add our icons.
-5. Add ready events for use in an iframe.
+6. Use our own manifest.
-6. Add our icons and remove the existing ones.
-7. Use our own manifest.
 
 Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/server.main.ts
 +++ code-server/lib/vscode/src/vs/server/node/server.main.ts
 @@ -12,7 +12,7 @@ import { createServer as doCreateServer,
- import { parseArgs, ErrorReporter } from '../../platform/environment/node/argv.js';
+ import { parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv';
- import { join, dirname } from '../../base/common/path.js';
+ import { join, dirname } from 'vs/base/common/path';
  import { performance } from 'perf_hooks';
--import { serverOptions } from './serverEnvironmentService.js';
+-import { serverOptions } from 'vs/server/node/serverEnvironmentService';
-+import { serverOptions, ServerParsedArgs } from './serverEnvironmentService.js';
++import { serverOptions, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
- import product from '../../platform/product/common/product.js';
+ import product from 'vs/platform/product/common/product';
- import * as perf from '../../base/common/performance.js';
+ import * as perf from 'vs/base/common/performance';
  
-@@ -34,38 +34,47 @@ const errorReporter: ErrorReporter = {
+@@ -34,38 +34,43 @@ const errorReporter: ErrorReporter = {
  	}
  };
  
@@ -80,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
   */
 -export function spawnCli() {
 -	runCli(args, REMOTE_DATA_FOLDER, serverOptions);
-+function spawnCli(args = parse()): Promise<void> {
++export function spawnCli(args = parse()): Promise<void> {
 +	return runCli(args, createDirs(args), serverOptions);
  }
  
@@ -89,13 +87,9 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
   */
 -export function createServer(address: string | net.AddressInfo | null): Promise<IServerAPI> {
 -	return doCreateServer(address, args, REMOTE_DATA_FOLDER);
-+function createServer(address: string | net.AddressInfo | null, args = parse()): Promise<IServerAPI> {
++export function createServer(address: string | net.AddressInfo | null, args = parse()): Promise<IServerAPI> {
 +	return doCreateServer(address, args, createDirs(args));
  }
-+
-+// The aliases prevent the names getting mangled during minification which would
-+// make it difficult to import.
-+export { spawnCli as spawnCli, createServer as createServer };
 Index: code-server/lib/vscode/src/vs/base/common/processes.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/processes.ts
@@ -109,12 +103,30 @@ Index: code-server/lib/vscode/src/vs/base/common/processes.ts
  	];
  	const envKeys = Object.keys(env);
  	envKeys
+Index: code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
++++ code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+@@ -77,8 +77,11 @@ export class BrowserDialogHandler extend
+ 
+ 	async about(): Promise<void> {
+ 		const detailString = (useAgo: boolean): string => {
+-			return localize('aboutDetail',
+-				"Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
++			return localize('aboutCodeServerDetail',
++				"code-server: {0}",
++				this.productService.codeServerVersion ? `v${this.productService.codeServerVersion}` : 'Unknown'
++			) + '\n' + localize('aboutDetail',
++				"Code: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
+ 				this.productService.version || 'Unknown',
+ 				this.productService.commit || 'Unknown',
+ 				this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
 Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 ===================================================================
 --- /dev/null
 +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
 @@ -0,0 +1,46 @@
-+import { Disposable } from "../../base/common/lifecycle.js";
++import { Disposable } from 'vs/base/common/lifecycle';
 +
 +export class CodeServerClient extends Disposable {
 +	constructor (
@@ -164,15 +176,15 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
-@@ -64,6 +64,7 @@ import { IOpenerService } from '../../pl
+@@ -64,6 +64,7 @@ import { IOpenerService } from 'vs/platf
- import { mixin, safeStringify } from '../../base/common/objects.js';
+ import { mixin, safeStringify } from 'vs/base/common/objects';
- import { IndexedDB } from '../../base/browser/indexedDB.js';
+ import { IndexedDB } from 'vs/base/browser/indexedDB';
- import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
+ import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
-+import { CodeServerClient } from '../../workbench/browser/client.js';
++import { CodeServerClient } from 'vs/workbench/browser/client';
- import { IProgressService } from '../../platform/progress/common/progress.js';
+ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
- import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
+ import { IProgressService } from 'vs/platform/progress/common/progress';
- import { dirname, joinPath } from '../../base/common/resources.js';
+ import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
-@@ -130,6 +131,9 @@ export class BrowserMain extends Disposa
+@@ -131,6 +132,9 @@ export class BrowserMain extends Disposa
  		// Startup
  		const instantiationService = workbench.startup();
  
@@ -186,7 +198,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -64,6 +64,8 @@ export type ExtensionVirtualWorkspaceSup
+@@ -55,6 +55,8 @@ export type ExtensionVirtualWorkspaceSup
  };
  
  export interface IProductConfiguration {
@@ -209,18 +221,19 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
  
  		<!-- Disable pinch zooming -->
  		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-@@ -26,8 +27,9 @@
+@@ -26,9 +27,9 @@
  		<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
  
  		<!-- Workbench Icon/Manifest/CSS -->
 -		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/favicon.ico" type="image/x-icon" />
 -		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/manifest.json" crossorigin="use-credentials" />
+-
 +		<link rel="icon" href="/_static/src/browser/media/favicon-dark-support.svg" />
 +		<link rel="alternate icon" href="/_static/src/browser/media/favicon.ico" type="image/x-icon" />
 +		<link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />
- 		<style id="vscode-css-modules" type="text/css" media="screen"></style>
- 
  	</head>
+ 
+ 	<body aria-label="">
 Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.html
@@ -244,81 +257,18 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 +		<link rel="icon" href="/_static/src/browser/media/favicon-dark-support.svg" />
 +		<link rel="alternate icon" href="/_static/src/browser/media/favicon.ico" type="image/x-icon" />
 +		<link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />
- 		<link rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.css">
+ 		<link data-name="vs/workbench/workbench.web.main" rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.css">
  
  	</head>
 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
-@@ -333,6 +333,7 @@ export class WebClientServer {
+@@ -307,6 +307,7 @@ export class WebClientServer {
  		} : undefined;
  
- 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
+ 		const productConfiguration = {
 +			codeServerVersion: this._productService.codeServerVersion,
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
  				...this._productService.extensionsGallery,
-Index: code-server/lib/vscode/src/server-main.ts
-===================================================================
---- code-server.orig/lib/vscode/src/server-main.ts
-+++ code-server/lib/vscode/src/server-main.ts
-@@ -22,6 +22,9 @@ import { IServerAPI } from './vs/server/
- perf.mark('code/server/start');
- (globalThis as { vscodeServerStartTime?: number }).vscodeServerStartTime = performance.now();
- 
-+// This is not indented to make the diff less noisy.  We need to move this out
-+// of the top-level so it will not run immediately and we can control the start.
-+async function start() {
- // Do a quick parse to determine if a server or the cli needs to be started
- const parsedArgs = minimist(process.argv.slice(2), {
- 	boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'],
-@@ -150,6 +153,7 @@ if (shouldSpawnCli) {
- 		}
- 	});
- }
-+}
- 
- function sanitizeStringArg(val: unknown): string | undefined {
- 	if (Array.isArray(val)) { // if an argument is passed multiple times, minimist creates an array
-@@ -283,3 +287,22 @@ function prompt(question: string): Promi
- 		});
- 	});
- }
-+
-+async function loadCodeWithNls() {
-+	const nlsConfiguration = await resolveNLSConfiguration({
-+		userLocale: 'en',
-+		osLocale: 'en',
-+		commit: product.commit,
-+		userDataPath: '',
-+		nlsMetadataPath: import.meta.dirname,
-+	});
-+	return loadCode(nlsConfiguration);
-+}
-+
-+// This alias prevents the name getting mangled during minification which would
-+// make it difficult to import.
-+export { loadCodeWithNls as loadCodeWithNls };
-+
-+if (!process.env.CODE_SERVER_PARENT_PID) {
-+	start();
-+}
-Index: code-server/lib/vscode/src/vs/platform/dialogs/browser/dialog.ts
-===================================================================
---- code-server.orig/lib/vscode/src/vs/platform/dialogs/browser/dialog.ts
-+++ code-server/lib/vscode/src/vs/platform/dialogs/browser/dialog.ts
-@@ -45,8 +45,11 @@ export function createWorkbenchDialogOpt
- 
- export function createBrowserAboutDialogDetails(productService: IProductService): { title: string; details: string; detailsToCopy: string } {
- 	const detailString = (useAgo: boolean): string => {
--		return localize('aboutDetail',
--			"Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
-+		return localize('aboutCodeServerDetail',
-+			"code-server: {0}",
-+			productService.codeServerVersion ? `v${productService.codeServerVersion}` : 'Unknown'
-+		) + '\n' + localize('aboutDetail',
-+			"Code: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
- 			productService.version || 'Unknown',
- 			productService.commit || 'Unknown',
- 			productService.date ? `${productService.date}${useAgo ? ' (' + fromNow(new Date(productService.date), true) + ')' : ''}` : 'Unknown',

patches/keepalive.diff

@@ -12,4 +12,4 @@ Index: code-server/lib/vscode/src/vs/platform/request/node/proxy.ts
 +		keepAlive: true,
  	};
  
- 	if (requestURL.protocol === 'http:') {
+ 	return requestURL.protocol === 'http:'

patches/local-storage.diff

@@ -18,10 +18,10 @@ 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
-@@ -364,6 +364,7 @@ export class WebClientServer {
+@@ -329,6 +329,7 @@ export class WebClientServer {
  			remoteAuthority,
- 			serverBasePath: basePath,
+ 			serverBasePath: this._basePath,
- 			webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
+ 			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
 +			userDataPath: this._environmentService.userDataPath,
  			_wrapWebWorkerExtHostInIframe,
  			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 @@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO
  	 */
- 	readonly configurationDefaults?: Record<string, unknown>;
+ 	readonly configurationDefaults?: Record<string, any>;
  
 +	/**
 +	 * Path to the user data directory.
@@ -66,7 +66,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
-@@ -147,8 +147,10 @@ export class WorkspaceService extends Di
+@@ -145,8 +145,10 @@ export class WorkspaceService extends Di
  		this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService));
  		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => {
  			this.onWorkspaceConfigurationChanged(fromCache).then(() => {
@@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
  			});
  		}));
  
-@@ -556,6 +558,12 @@ export class WorkspaceService extends Di
+@@ -552,6 +554,12 @@ export class WorkspaceService extends Di
  			previousFolders = this.workspace.folders;
  			this.workspace.update(workspace);
  		} else {

patches/logout.diff

@@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -67,6 +67,7 @@ export interface IProductConfiguration {
+@@ -58,6 +58,7 @@ export interface IProductConfiguration {
  	readonly codeServerVersion?: string
  	readonly rootEndpoint?: string
  	readonly updateEndpoint?: string
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -17,6 +17,7 @@ import { join } from '../../base/common/
+@@ -15,6 +15,7 @@ import { URI } from 'vs/base/common/uri'
  export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
  	/* ----- code-server ----- */
  	'disable-update-check': { type: 'boolean' },
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
  
  	/* ----- server setup ----- */
  
-@@ -102,6 +103,7 @@ export const serverOptions: OptionDescri
+@@ -97,6 +98,7 @@ export const serverOptions: OptionDescri
  export interface ServerParsedArgs {
  	/* ----- code-server ----- */
  	'disable-update-check'?: boolean;
@@ -40,27 +40,27 @@ 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
-@@ -341,6 +341,7 @@ export class WebClientServer {
+@@ -312,6 +312,7 @@ export class WebClientServer {
  			codeServerVersion: this._productService.codeServerVersion,
- 			rootEndpoint: rootBase,
+ 			rootEndpoint: base,
- 			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
+ 			updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
-+			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
++			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined,
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._productService.extensionsGallery,
- 		};
+ 		} satisfies Partial<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
 @@ -1,11 +1,15 @@
- import { Disposable } from "../../base/common/lifecycle.js";
+ import { Disposable } from 'vs/base/common/lifecycle';
- import { localize } from '../../nls.js';
+ import { localize } from 'vs/nls';
-+import { MenuId, MenuRegistry } from '../../platform/actions/common/actions.js';
++import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-+import { CommandsRegistry } from '../../platform/commands/common/commands.js';
++import { CommandsRegistry } from 'vs/platform/commands/common/commands';
- import { ILogService } from '../../platform/log/common/log.js';
+ import { ILogService } from 'vs/platform/log/common/log';
- import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
+ import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
- import { IProductService } from '../../platform/product/common/productService.js';
+ import { IProductService } from 'vs/platform/product/common/productService';
- import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
+ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
  
  export class CodeServerClient extends Disposable {
 +	static LOGOUT_COMMAND_ID = 'code-server.logout';

patches/marketplace.diff

@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts
 +++ code-server/lib/vscode/src/vs/platform/product/common/product.ts
-@@ -49,6 +49,17 @@ else if (globalThis._VSCODE_PRODUCT_JSON
+@@ -47,6 +47,16 @@ else if (globalThis._VSCODE_PRODUCT_JSON
  			version: pkg.version
  		});
  	}
@@ -28,7 +28,6 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts
 +		extensionsGallery: env.EXTENSIONS_GALLERY ? JSON.parse(env.EXTENSIONS_GALLERY) : (product.extensionsGallery || {
 +			serviceUrl: "https://open-vsx.org/vscode/gallery",
 +			itemUrl: "https://open-vsx.org/vscode/item",
-+			extensionUrlTemplate: "https://open-vsx.org/vscode/gallery/{publisher}/{name}/latest",
 +			resourceUrlTemplate: "https://open-vsx.org/vscode/asset/{publisher}/{name}/{version}/Microsoft.VisualStudio.Code.WebResources/{path}",
 +			controlUrl: "",
 +			recommendationsUrl: "",
@@ -41,43 +40,36 @@ 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
-@@ -326,7 +326,6 @@ export class WebClientServer {
+@@ -114,7 +114,7 @@ export class WebClientServer {
  
- 		const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH);
+ 		this._staticRoute = `${serverRootPath}/static`;
- 		const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH);
+ 		this._callbackRoute = `${serverRootPath}/callback`;
--		const webExtensionRoute = posix.join(basePath, this._productPath, WEB_EXTENSION_PATH);
+-		this._webExtensionRoute = `${serverRootPath}/web-extension-resource`;
++		this._webExtensionRoute = `/web-extension-resource`;
+ 	}
  
- 		const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
+ 	/**
- 
+@@ -312,14 +312,7 @@ export class WebClientServer {
-@@ -342,14 +341,7 @@ export class WebClientServer {
  			codeServerVersion: this._productService.codeServerVersion,
- 			rootEndpoint: rootBase,
+ 			rootEndpoint: base,
  			embedderIdentifier: 'server-distro',
 -			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
 -				...this._productService.extensionsGallery,
 -				resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({
 -					scheme: 'http',
 -					authority: remoteAuthority,
--					path: `${webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
+-					path: `${this._webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
 -				}).toString(true)
 -			} : undefined
 +			extensionsGallery: this._productService.extensionsGallery,
- 		};
+ 		} satisfies Partial<IProductConfiguration>;
  
- 		const proposedApi = this._environmentService.args['enable-proposed-api'];
+ 		if (!this._environmentService.isBuilt) {
 Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
 +++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
-@@ -15,7 +15,6 @@ import { getServiceMachineId } from '../
+@@ -140,9 +140,9 @@ export abstract class AbstractExtensionR
- import { IStorageService } from '../../storage/common/storage.js';
- import { TelemetryLevel } from '../../telemetry/common/telemetry.js';
- import { getTelemetryLevel, supportsTelemetry } from '../../telemetry/common/telemetryUtils.js';
--import { RemoteAuthorities } from '../../../base/common/network.js';
- import { TargetPlatform } from '../../extensions/common/extensions.js';
- import { ExtensionGalleryResourceType, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../extensionManagement/common/extensionGalleryManifest.js';
- import { ILogService } from '../../log/common/log.js';
-@@ -163,9 +162,9 @@ export abstract class AbstractExtensionR
  	}
  
  	protected _isWebExtensionResourceEndPoint(uri: URI): boolean {
@@ -90,3 +82,18 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
  	}
  
  }
+Index: code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts
++++ code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionDownloader.ts
+@@ -114,7 +114,10 @@ export class ExtensionsDownloader extend
+ 			return false;
+ 		}
+ 
++		return false
++		// @ts-expect-error
+ 		const value = this.configurationService.getValue('extensions.verifySignature');
++		// @ts-expect-error
+ 		return isBoolean(value) ? value : true;
+ 	}
+ 

patches/proposed-api.diff

@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
-@@ -321,10 +321,7 @@ function extensionDescriptionArrayToMap(
+@@ -312,10 +312,7 @@ function extensionDescriptionArrayToMap(
  }
  
  export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {

patches/proxy-uri.diff

@@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -68,6 +68,7 @@ export interface IProductConfiguration {
+@@ -59,6 +59,7 @@ export interface IProductConfiguration {
  	readonly rootEndpoint?: string
  	readonly updateEndpoint?: string
  	readonly logoutEndpoint?: string
@@ -71,19 +71,19 @@ 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
-@@ -342,6 +342,7 @@ export class WebClientServer {
+@@ -313,6 +313,7 @@ export class WebClientServer {
- 			rootEndpoint: rootBase,
+ 			rootEndpoint: base,
- 			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
+ 			updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
- 			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
+ 			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined,
-+			proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/',
++			proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? base + '/proxy/{{port}}/',
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._productService.extensionsGallery,
- 		};
+ 		} satisfies Partial<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
-@@ -292,7 +292,7 @@ export async function createTerminalEnvi
+@@ -291,7 +291,7 @@ export async function createTerminalEnvi
  
  		// Sanitize the environment, removing any undesirable VS Code and Electron environment
  		// variables
@@ -96,15 +96,15 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 +++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
-@@ -20,6 +20,7 @@ import { ISecretStorageProvider } from '
+@@ -19,6 +19,7 @@ import { ISecretStorageProvider } from '
- import { isFolderToOpen, isWorkspaceToOpen } from '../../../platform/window/common/window.js';
+ import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window';
- import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from '../../../workbench/browser/web.api.js';
+ import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/browser/web.api';
- import { AuthenticationSessionInfo } from '../../../workbench/services/authentication/browser/authenticationService.js';
+ import { AuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
-+import { extractLocalHostUriMetaDataForPortMapping, TunnelOptions, TunnelCreationOptions } from '../../../platform/tunnel/common/tunnel.js';
++import { extractLocalHostUriMetaDataForPortMapping, TunnelOptions, TunnelCreationOptions } from 'vs/platform/tunnel/common/tunnel';
- import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js';
+ import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
- import { create } from '../../../workbench/workbench.web.main.internal.js';
+ import { create } from 'vs/workbench/workbench.web.main';
  
-@@ -606,6 +607,39 @@ class WorkspaceProvider implements IWork
+@@ -571,6 +572,39 @@ class WorkspaceProvider implements IWork
  		settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
  		workspaceProvider: WorkspaceProvider.create(config),
  		urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
@@ -148,14 +148,12 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExpl
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
-@@ -83,8 +83,8 @@ export class ForwardedPortsView extends
+@@ -77,7 +77,7 @@ export class ForwardedPortsView extends
- 	private async enableForwardedPortsFeatures() {
+ 	private async enableForwardedPortsView() {
  		this.contextKeyListener.clear();
  
--		const featuresEnabled: boolean = !!forwardedPortsFeaturesEnabled.getValue(this.contextKeyService);
 -		const viewEnabled: boolean = !!forwardedPortsViewEnabled.getValue(this.contextKeyService);
-+		const featuresEnabled: boolean = true;
 +		const viewEnabled: boolean = true;
  
- 		if (featuresEnabled || viewEnabled) {
+ 		if (viewEnabled) {
- 			// Also enable the view if it isn't already.
+ 			const viewContainer = await this.getViewContainer();

patches/safari.diff

@@ -0,0 +1,68 @@
+Revert back to es2020
+
+es2022 outputs static blocks when using static properties that are not
+compatible with Safari, or at least not older versions of Safari.
+
+Index: code-server/lib/vscode/src/tsconfig.base.json
+===================================================================
+--- code-server.orig/lib/vscode/src/tsconfig.base.json
++++ code-server/lib/vscode/src/tsconfig.base.json
+@@ -17,9 +17,30 @@
+ 				"./vs/*"
+ 			]
+ 		},
+-		"target": "es2022",
+-		"useDefineForClassFields": false,
++		"target": "es2020",
+ 		"lib": [
++			"ES2016",
++			"ES2017.Object",
++			"ES2017.String",
++			"ES2017.Intl",
++			"ES2017.TypedArrays",
++			"ES2018.AsyncIterable",
++			"ES2018.AsyncGenerator",
++			"ES2018.Promise",
++			"ES2018.Regexp",
++			"ES2018.Intl",
++			"ES2019.Array",
++			"ES2019.Object",
++			"ES2019.String",
++			"ES2019.Symbol",
++			"ES2020.BigInt",
++			"ES2020.Promise",
++			"ES2020.String",
++			"ES2020.Symbol.WellKnown",
++			"ES2020.Intl",
++			"ES2021.Promise",
++			"ES2021.String",
++			"ES2021.WeakRef",
+ 			"ES2022",
+ 			"DOM",
+ 			"DOM.Iterable",
+Index: code-server/lib/vscode/build/lib/tsb/transpiler.js
+===================================================================
+--- code-server.orig/lib/vscode/build/lib/tsb/transpiler.js
++++ code-server/lib/vscode/build/lib/tsb/transpiler.js
+@@ -293,7 +293,7 @@ class SwcTranspiler {
+                 tsx: false,
+                 decorators: true
+             },
+-            target: 'es2022',
++            target: 'es2020',
+             loose: false,
+             minify: {
+                 compress: false,
+Index: code-server/lib/vscode/build/lib/tsb/transpiler.ts
+===================================================================
+--- code-server.orig/lib/vscode/build/lib/tsb/transpiler.ts
++++ code-server/lib/vscode/build/lib/tsb/transpiler.ts
+@@ -376,7 +376,7 @@ export class SwcTranspiler implements IT
+ 				tsx: false,
+ 				decorators: true
+ 			},
+-			target: 'es2022',
++			target: 'es2020',
+ 			loose: false,
+ 			minify: {
+ 				compress: false,

patches/series

@@ -15,10 +15,9 @@ service-worker.diff
 sourcemaps.diff
 external-file-actions.diff
 telemetry.diff
+display-language.diff
 cli-window-open.diff
 getting-started.diff
+safari.diff
 keepalive.diff
 clipboard.diff
-display-language.diff
-trusted-domains.diff
-signature-verification.diff

patches/service-worker.diff

@@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -69,6 +69,10 @@ export interface IProductConfiguration {
+@@ -60,6 +60,10 @@ export interface IProductConfiguration {
  	readonly updateEndpoint?: string
  	readonly logoutEndpoint?: string
  	readonly proxyEndpointTemplate?: string
@@ -54,14 +54,14 @@ 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
-@@ -343,6 +343,10 @@ export class WebClientServer {
+@@ -314,6 +314,10 @@ export class WebClientServer {
- 			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
+ 			updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
- 			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
+ 			logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined,
- 			proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/',
+ 			proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? base + '/proxy/{{port}}/',
 +			serviceWorker: {
 +				scope: vscodeBase + '/',
-+				path: rootBase + '/_static/out/browser/serviceWorker.js',
++				path: base + '/_static/out/browser/serviceWorker.js',
 +			},
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._productService.extensionsGallery,
- 		};
+ 		} satisfies Partial<IProductConfiguration>;

patches/signature-verification.diff

@@ -1,34 +0,0 @@
-Disable signature verification.
-
-Extension signature verification is now mandatory for all platforms and needs to be disabled.
-
-Index: code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-===================================================================
---- code-server.orig/lib/vscode/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-+++ code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -34,6 +34,7 @@ import {
- 	ExtensionSignatureVerificationCode,
- 	computeSize,
- 	IAllowedExtensionsService,
-+	// @ts-expect-error no-unused-variable
- 	VerifyExtensionSignatureConfigKey,
- 	shouldRequireRepositorySignatureFor,
- } from '../common/extensionManagement.js';
-@@ -87,6 +88,7 @@ export class ExtensionManagementService
- 		@IDownloadService private downloadService: IDownloadService,
- 		@IInstantiationService private readonly instantiationService: IInstantiationService,
- 		@IFileService private readonly fileService: IFileService,
-+		// @ts-expect-error no-unused-variable
- 		@IConfigurationService private readonly configurationService: IConfigurationService,
- 		@IExtensionGalleryManifestService protected readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
- 		@IProductService productService: IProductService,
-@@ -339,8 +341,7 @@ export class ExtensionManagementService
- 
- 	private async downloadExtension(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionSignatureVerificationCode | undefined }> {
- 		if (verifySignature) {
--			const value = this.configurationService.getValue(VerifyExtensionSignatureConfigKey);
--			verifySignature = isBoolean(value) ? value : true;
-+			verifySignature = false;
- 		}
- 		const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
- 		const shouldRequireSignature = shouldRequireRepositorySignatureFor(extension.private, await this.extensionGalleryManifestService.getExtensionGalleryManifest());

patches/sourcemaps.diff

@@ -10,31 +10,31 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
 ===================================================================
 --- code-server.orig/lib/vscode/build/gulpfile.reh.js
 +++ code-server/lib/vscode/build/gulpfile.reh.js
-@@ -257,8 +257,7 @@ function packageTask(type, platform, arc
+@@ -237,8 +237,7 @@ function packageTask(type, platform, arc
  
  		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
  			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
 -			.pipe(util.setExecutableBit(['**/*.sh']))
--			.pipe(filter(['**', '!**/*.{js,css}.map']));
+-			.pipe(filter(['**', '!**/*.js.map']));
 +			.pipe(util.setExecutableBit(['**/*.sh']));
  
  		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
  		const isUIExtension = (manifest) => {
-@@ -297,9 +296,9 @@ function packageTask(type, platform, arc
+@@ -277,9 +276,9 @@ function packageTask(type, platform, arc
  			.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 }));
+ 			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
 +		const sources = es.merge(src, extensions, extensionsCommonDependencies);
  
  		let version = packageJson.version;
  		const quality = product.quality;
-@@ -452,7 +451,7 @@ function tweakProductForServerWeb(produc
+@@ -440,7 +439,7 @@ function tweakProductForServerWeb(produc
  	const minifyTask = task.define(`minify-vscode-${type}`, task.series(
- 		bundleTask,
+ 		optimizeTask,
  		util.rimraf(`out-vscode-${type}-min`),
 -		optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
 +		optimize.minifyTask(`out-vscode-${type}`, ``)

patches/store-socket.diff

@@ -15,24 +15,25 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts
 +++ code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.ts
-@@ -3,6 +3,7 @@
+@@ -2,7 +2,7 @@
+  *  Copyright (c) Microsoft Corporation. All rights reserved.
   *  Licensed under the MIT License. See License.txt in the project root for license information.
   *--------------------------------------------------------------------------------------------*/
- 
+-
 +import * as _http from 'http';
- import * as performance from '../../../base/common/performance.js';
+ import * as performance from 'vs/base/common/performance';
- import type * as vscode from 'vscode';
+ import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl';
- import { createApiFactoryAndRegisterActors } from '../common/extHost.api.impl.js';
+ import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
-@@ -18,6 +19,7 @@ import { ExtensionRuntime } from '../com
+@@ -17,6 +17,7 @@ import { ExtensionRuntime } from 'vs/wor
- import { CLIServer } from './extHostCLIServer.js';
+ import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
- import { realpathSync } from '../../../base/node/pfs.js';
+ import { realpathSync } from 'vs/base/node/extpath';
- import { ExtHostConsoleForwarder } from './extHostConsoleForwarder.js';
+ import { ExtHostConsoleForwarder } from 'vs/workbench/api/node/extHostConsoleForwarder';
-+import { IExtHostWorkspace } from '../common/extHostWorkspace.js';
++import { IExtHostWorkspace } from '../common/extHostWorkspace';
- import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js';
+ import { ExtHostDiskFileSystemProvider } from 'vs/workbench/api/node/extHostDiskFileSystemProvider';
- import nodeModule from 'node:module';
- import { assertType } from '../../../base/common/types.js';
-@@ -226,6 +228,52 @@ export class ExtHostExtensionService ext
  
+ class NodeModuleRequireInterceptor extends RequireInterceptor {
+@@ -83,6 +84,52 @@ export class ExtHostExtensionService ext
+ 		await interceptor.install();
  		performance.mark('code/extHost/didInitAPI');
  
 +		(async () => {
@@ -83,7 +84,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
 +
  		// Do this when extension service exists, but extensions are not being activated yet.
  		const configProvider = await this._extHostConfiguration.getConfigProvider();
- 		await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData, this._store);
+ 		await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData);
 Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
@@ -96,7 +97,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
  import minimist from 'minimist';
  import * as nativeWatchdog from 'native-watchdog';
  import * as net from 'net';
-@@ -451,7 +452,28 @@ async function startExtensionHostProcess
+@@ -421,7 +422,28 @@ async function startExtensionHostProcess
  	);
  
  	// rewrite onTerminate-function to be a proper shutdown

patches/telemetry.diff

@@ -12,34 +12,26 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
-@@ -4,6 +4,7 @@
+@@ -65,6 +65,7 @@ import { IExtensionsScannerService } fro
-  *--------------------------------------------------------------------------------------------*/
+ import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
- 
+ import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
- import { hostname, release } from 'os';
+ import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-+import { promises as fs } from 'fs';
++import { TelemetryClient } from 'vs/server/node/telemetryClient';
- import { Emitter, Event } from '../../base/common/event.js';
+ import { NullPolicyService } from 'vs/platform/policy/common/policy';
- import { DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
+ import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
- import { Schemas } from '../../base/common/network.js';
+ import { LoggerService } from 'vs/platform/log/node/loggerService';
-@@ -65,6 +66,7 @@ import { IExtensionsScannerService } fro
+@@ -147,11 +148,23 @@ export async function setupServerService
- import { ExtensionsScannerService } from './extensionsScannerService.js';
+ 	const requestService = new RequestService(configurationService, environmentService, logService, loggerService);
- import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js';
- import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
-+import { TelemetryClient } from './telemetryClient.js';
- import { NullPolicyService } from '../../platform/policy/common/policy.js';
- import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
- import { LoggerService } from '../../platform/log/node/loggerService.js';
-@@ -166,11 +168,23 @@ export async function setupServerService
- 	const requestService = new RequestService('remote', configurationService, environmentService, logService);
  	services.set(IRequestService, requestService);
  
 +	let isContainer = undefined;
 +	try {
-+		await fs.stat('/run/.containerenv');
++		await Promises.stat('/run/.containerenv');
 +		isContainer = true;
 +	} catch (error) { /* Does not exist, probably. */ }
 +	if (!isContainer) {
 +		try {
-+			const content = await fs.readFile('/proc/self/cgroup', 'utf8')
++			const content = await Promises.readFile('/proc/self/cgroup', 'utf8')
 +			isContainer = content.includes('docker');
 +		} catch (error) { /* Permission denied, probably. */ }
 +	}
@@ -134,20 +126,20 @@ 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
-@@ -347,6 +347,8 @@ export class WebClientServer {
+@@ -318,6 +318,8 @@ export class WebClientServer {
  				scope: vscodeBase + '/',
- 				path: rootBase + '/_static/out/browser/serviceWorker.js',
+ 				path: base + '/_static/out/browser/serviceWorker.js',
  			},
 +			enableTelemetry: this._productService.enableTelemetry,
 +			telemetryEndpoint: this._productService.telemetryEndpoint,
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._productService.extensionsGallery,
- 		};
+ 		} satisfies Partial<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -73,6 +73,7 @@ export interface IProductConfiguration {
+@@ -64,6 +64,7 @@ export interface IProductConfiguration {
  		readonly path: string;
  		readonly scope: string;
  	}
@@ -159,7 +151,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts
 +++ code-server/lib/vscode/src/vs/platform/product/common/product.ts
-@@ -58,7 +58,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON
+@@ -55,7 +55,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON
  			resourceUrlTemplate: "https://open-vsx.org/vscode/asset/{publisher}/{name}/{version}/Microsoft.VisualStudio.Code.WebResources/{path}",
  			controlUrl: "",
  			recommendationsUrl: "",

patches/trusted-domains.diff

@@ -1,49 +0,0 @@
-Allow configuring trusted domains via product.json or flag.
-
-Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-===================================================================
---- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -22,6 +22,7 @@ export const serverOptions: OptionDescri
- 	'disable-file-uploads': { type: 'boolean' },
- 	'disable-getting-started-override': { type: 'boolean' },
- 	'locale': { type: 'string' },
-+	'link-protection-trusted-domains': { type: 'string[]' },
- 
- 	/* ----- server setup ----- */
- 
-@@ -112,6 +113,7 @@ export interface ServerParsedArgs {
- 	'disable-file-uploads'?: boolean;
- 	'disable-getting-started-override'?: boolean,
- 	'locale'?: string
-+	'link-protection-trusted-domains'?: string[],
- 
- 	/* ----- server setup ----- */
- 
-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
-@@ -338,6 +338,14 @@ export class WebClientServer {
- 			scopes: [['user:email'], ['repo']]
- 		} : undefined;
- 
-+		const linkProtectionTrustedDomains: string[] = [];
-+		if (this._environmentService.args['link-protection-trusted-domains']) {
-+			linkProtectionTrustedDomains.push(...this._environmentService.args['link-protection-trusted-domains']);
-+		}
-+		if (this._productService.linkProtectionTrustedDomains) {
-+			linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains);
-+		}
-+
- 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
- 			codeServerVersion: this._productService.codeServerVersion,
- 			rootEndpoint: rootBase,
-@@ -352,6 +360,7 @@ export class WebClientServer {
- 			telemetryEndpoint: this._productService.telemetryEndpoint,
- 			embedderIdentifier: 'server-distro',
- 			extensionsGallery: this._productService.extensionsGallery,
-+			linkProtectionTrustedDomains,
- 		};
- 
- 		const proposedApi = this._environmentService.args['enable-proposed-api'];

patches/unique-db.diff

@@ -14,14 +14,14 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS
 --- code-server.orig/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageService.ts
 @@ -18,6 +18,7 @@ import { AbstractStorageService, isProfi
- import { isUserDataProfile, IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+ import { isUserDataProfile, IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
- import { IAnyWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+ import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
- import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
+ import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-+import { hash } from '../../../../base/common/hash.js';
++import { hash } from 'vs/base/common/hash';
  
  export class BrowserStorageService extends AbstractStorageService {
  
-@@ -300,7 +301,11 @@ export class IndexedDBStorageDatabase ex
+@@ -298,7 +299,11 @@ export class IndexedDBStorageDatabase ex
  	}
  
  	static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise<IIndexedDBStorageDatabase> {

patches/update-check.diff

@@ -13,12 +13,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
 @@ -1,10 +1,16 @@
- import { Disposable } from "../../base/common/lifecycle.js";
+ import { Disposable } from 'vs/base/common/lifecycle';
- import { localize } from '../../nls.js';
+ import { localize } from 'vs/nls';
-+import { ILogService } from '../../platform/log/common/log.js';
++import { ILogService } from 'vs/platform/log/common/log';
- import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
+ import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-+import { IProductService } from '../../platform/product/common/productService.js';
++import { IProductService } from 'vs/platform/product/common/productService';
-+import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
++import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
  
  export class CodeServerClient extends Disposable {
  	constructor (
@@ -93,7 +93,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/product.ts
 +++ code-server/lib/vscode/src/vs/base/common/product.ts
-@@ -66,6 +66,7 @@ export type ExtensionVirtualWorkspaceSup
+@@ -57,6 +57,7 @@ export type ExtensionVirtualWorkspaceSup
  export interface IProductConfiguration {
  	readonly codeServerVersion?: string
  	readonly rootEndpoint?: string
@@ -105,20 +105,20 @@ 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
-@@ -340,6 +340,7 @@ export class WebClientServer {
+@@ -311,6 +311,7 @@ export class WebClientServer {
- 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
+ 		const productConfiguration = {
  			codeServerVersion: this._productService.codeServerVersion,
- 			rootEndpoint: rootBase,
+ 			rootEndpoint: base,
-+			updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
++			updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
  			embedderIdentifier: 'server-distro',
  			extensionsGallery: this._productService.extensionsGallery,
- 		};
+ 		} satisfies Partial<IProductConfiguration>;
 Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -15,6 +15,8 @@ import { joinPath } from '../../base/com
+@@ -13,6 +13,8 @@ import { memoize } from 'vs/base/common/
- import { join } from '../../base/common/path.js';
+ import { URI } from 'vs/base/common/uri';
  
  export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 +	/* ----- code-server ----- */
@@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
  
  	/* ----- server setup ----- */
  
-@@ -98,6 +100,8 @@ export const serverOptions: OptionDescri
+@@ -93,6 +95,8 @@ export const serverOptions: OptionDescri
  };
  
  export interface ServerParsedArgs {

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
-@@ -220,7 +220,7 @@ export class BrowserWorkbenchEnvironment
+@@ -225,7 +225,7 @@ export class BrowserWorkbenchEnvironment
  
  	@memoize
  	get webviewExternalEndpoint(): string {
@@ -54,11 +54,11 @@ 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 {
+@@ -325,6 +325,7 @@ export class WebClientServer {
  		const workbenchWebConfiguration = {
  			remoteAuthority,
- 			serverBasePath: basePath,
+ 			serverBasePath: this._basePath,
-+			webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
++			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
  			_wrapWebWorkerExtHostInIframe,
  			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
  			settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
@@ -66,25 +66,33 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
 +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
-@@ -5,7 +5,7 @@
+@@ -6,7 +6,7 @@
- 	<meta charset="UTF-8">
  
  	<meta http-equiv="Content-Security-Policy"
--		content="default-src 'none'; script-src 'sha256-ZcIhtIuU4M9PbKfs7w/CLqHimFJRK8L7mYTXOfiUv0I=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+ 
-+		content="default-src 'none'; script-src 'sha256-dVbEBqfV68sWYG05nAX+55pv4dls0VnI6ZDMMV/0GYQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+-	content="default-src 'none'; script-src 'sha256-ikaxwm2UFoiIKkEZTEU4mnSxpYf3lmsrhy5KqqJZfek=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
++	content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+ 
  
  	<!-- Disable pinch zooming -->
- 	<meta name="viewport"
+@@ -350,6 +350,12 @@
-@@ -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') ?? ''}`);
+ 				const hostname = location.hostname;
--			navigator.serviceWorker.register(swPath, { type: 'module' })
+ 
-+			navigator.serviceWorker.register(swPath)
++				// It is safe to run if we are on the same host.
- 				.then(async registration => {
++				const parent = new URL(parentOrigin)
- 					/**
++				if (parent.hostname === hostname) {
- 					 * @param {MessageEvent} event
++					return start(parentOrigin)
-@@ -370,6 +370,12 @@
++				}
++
+ 				if (!crypto.subtle) {
+ 					// cannot validate, not running in a secure context
+ 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
+Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
++++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+@@ -343,6 +343,12 @@
  
  				const hostname = location.hostname;
  
@@ -105,12 +113,12 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWor
  		<meta http-equiv="Content-Security-Policy" content="
  			default-src 'none';
  			child-src 'self' data: blob:;
--			script-src 'self' 'unsafe-eval' 'sha256-cl8ijlOzEe+0GRCQNJQu2k6nUQ0fAYNYIuuKEm72JDs=' https: http://localhost:* blob:;
+-			script-src 'self' 'unsafe-eval' 'sha256-75NYUUvf+5++1WbfCZOV3PSWxBhONpaxwx+mkOFRv/Y=' https:;
-+			script-src 'self' 'unsafe-eval' 'sha256-yhZXuB8LS6t73dvNg6rtLX8y4PHLnqRm5+6DdOGkOcw=' https: http://localhost:* blob:;
++			script-src 'self' 'unsafe-eval' 'sha256-c7vPrYRaSLDtFSrI4CuHYgBQ3a4c4x2LSm/LefSZADQ=' https:;
  			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
  	</head>
  	<body>
-@@ -25,6 +25,13 @@
+@@ -23,6 +23,13 @@
  			// validation not requested
  			return start();
  		}

src/browser/favicon.afdesign

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:625d2049c38ae27df0613fa533020e889fa98affd603050f46d3748be7b90d0b
+size 38675

src/browser/media/favicon-dark-support.svg

@@ -1,4 +1,7 @@
-<svg width="100%" height="100%" viewBox="0 0 147 147" xmlns="http://www.w3.org/2000/svg">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 2250 2250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><style>
-  <style>@media (prefers-color-scheme: dark) {* { fill: white; }}</style>
+@media (prefers-color-scheme: dark) {
-  <path d="m42.4214,39.655c-24.4057,0 -42.1554,13.1721 -42.1554,33.845c0,20.5814 18.4892,33.845 42.1554,33.845c23.6662,0 38.1803,-11.6171 38.7349,-28.7225l-21.0777,-0.4574c-0.9244,9.3303 -9.1059,15.1845 -17.6572,15.1845c-11.7406,0 -20.4306,-7.5922 -20.4306,-19.8496c0,-12.2574 8.69,-19.9868 20.4306,-20.2155c8.5513,-0.183 16.9177,5.9457 17.4723,15.276l21.0777,-0.6403c-0.4622,-16.8311 -14.1442,-28.2652 -38.55,-28.2652zm48.8446,2l55.468,0l0,64.0311l-55.468,0l0,-64.0311z" clip-rule="evenodd" fill-rule="evenodd"/>
+  * {
-</svg>
+    fill: white;
+  }
+}
+</style><rect id="favicon" x="0" y="0" width="2250" height="2250" style="fill:none;"/><g id="favicon1" serif:id="favicon"><path d="M1991.66,1034.72c-38.493,0 -64.144,-22.57 -64.144,-68.897l-0,-266.084c-0,-169.867 -69.982,-263.709 -250.762,-263.709l-83.976,0l-0,179.368l25.661,0c71.144,0 104.967,39.201 104.967,109.285l0,235.201c0,102.156 30.324,143.733 96.806,165.114c-66.482,20.196 -96.806,62.958 -96.806,165.114l0,174.621c0,48.7 0,96.216 -12.829,144.917c-12.829,45.141 -33.823,87.903 -62.98,124.726c-16.329,21.386 -34.991,39.202 -55.981,55.835l-0,23.755l83.971,-0c180.781,-0 250.763,-93.843 250.763,-263.709l-0,-266.084c-0,-47.516 24.485,-68.897 64.144,-68.897l47.822,-0l-0,-179.37l-46.656,-0l0,-1.186Z" style="fill-rule:nonzero;"/><path d="M1420.16,706.904l-258.923,0c-5.833,0 -10.495,-4.752 -10.495,-10.691l-0,-20.192c-0,-5.941 4.662,-10.692 10.495,-10.692l260.089,0c5.83,0 10.495,4.751 10.495,10.692l0,20.192c0,5.939 -5.833,10.691 -11.661,10.691Z" style="fill-rule:nonzero;"/><path d="M1464.48,963.474l-188.942,0c-5.833,0 -10.501,-4.754 -10.501,-10.693l0,-20.192c0,-5.938 4.668,-10.691 10.501,-10.691l188.942,-0c5.833,-0 10.495,4.753 10.495,10.691l-0,20.192c-0,4.754 -4.662,10.693 -10.495,10.693Z" style="fill-rule:nonzero;"/><path d="M1539.12,835.188l-377.885,0c-5.833,0 -10.495,-4.75 -10.495,-10.689l-0,-20.196c-0,-5.939 4.662,-10.69 10.495,-10.69l376.719,0c5.833,0 10.499,4.751 10.499,10.69l-0,20.196c-0,4.75 -3.5,10.689 -9.333,10.689Z" style="fill-rule:nonzero;"/><path d="M861.493,765.074c25.658,0 51.319,2.376 75.811,8.316l0,-48.705c0,-68.897 34.989,-109.285 104.971,-109.285l25.658,0l-0,-179.368l-83.977,0c-180.781,0 -250.758,93.842 -250.758,263.709l0,87.901c40.819,-14.252 83.977,-22.568 128.295,-22.568Z" style="fill-rule:nonzero;"/><path d="M1618.44,1411.25c-18.662,-150.861 -132.962,-276.776 -279.919,-305.285c-40.818,-8.314 -81.642,-9.504 -121.295,-2.376c-1.166,-0 -1.166,-1.189 -2.332,-1.189c-64.148,-136.605 -201.772,-226.884 -351.063,-226.884c-149.289,-0 -285.747,87.905 -351.062,224.51c-1.166,-0 -1.166,1.188 -2.332,1.188c-41.987,-4.753 -83.975,-2.379 -125.963,8.314c-144.623,35.634 -254.257,159.175 -274.085,308.847c-2.332,15.441 -3.499,30.883 -3.499,45.141c0,45.136 30.325,86.713 74.645,92.652c54.817,8.317 102.636,-34.448 101.469,-89.089c0,-8.317 0,-17.821 1.167,-26.134c9.331,-76.025 66.48,-140.168 141.123,-157.99c23.328,-5.939 46.654,-7.124 68.814,-3.559c71.146,9.502 141.124,-27.324 171.449,-91.467c22.162,-47.516 57.151,-89.094 103.804,-111.664c51.314,-24.946 109.633,-28.506 163.286,-9.499c55.979,20.192 97.966,62.954 123.627,116.409c26.824,52.27 39.653,89.093 96.805,96.221c23.325,3.559 88.639,2.374 113.132,1.185c47.82,0 95.64,16.631 129.463,51.079c22.156,23.757 38.485,53.455 45.486,86.715c10.495,53.455 -2.334,106.908 -33.825,147.296c-22.162,28.509 -52.485,49.89 -86.308,59.394c-16.329,4.754 -32.657,5.939 -48.986,5.939l-257.757,0c-51.314,0 -92.138,-41.573 -92.138,-93.842l0,-348.049c0,-14.251 -11.661,-26.13 -25.658,-26.13l-36.156,0c-71.148,1.185 -128.295,81.964 -128.295,167.488l-0,312.415c-0,92.652 73.476,167.488 164.451,167.488c0,0 404.714,-1.19 410.544,-1.19c93.304,-9.503 179.614,-58.204 237.927,-133.04c58.319,-72.46 85.142,-167.492 73.481,-264.894Z" style="fill-rule:nonzero;"/></g></svg>

src/browser/media/favicon.svg

@@ -1,3 +1 @@
-<svg width="100%" height="100%" viewBox="0 0 147 147" xmlns="http://www.w3.org/2000/svg">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 2250 2250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="favicon" x="0" y="0" width="2250" height="2250" style="fill:none;"/><g id="favicon1" serif:id="favicon"><path d="M1991.66,1034.72c-38.493,0 -64.144,-22.57 -64.144,-68.897l-0,-266.084c-0,-169.867 -69.982,-263.709 -250.762,-263.709l-83.976,0l-0,179.368l25.661,0c71.144,0 104.967,39.201 104.967,109.285l0,235.201c0,102.156 30.324,143.733 96.806,165.114c-66.482,20.196 -96.806,62.958 -96.806,165.114l0,174.621c0,48.7 0,96.216 -12.829,144.917c-12.829,45.141 -33.823,87.903 -62.98,124.726c-16.329,21.386 -34.991,39.202 -55.981,55.835l-0,23.755l83.971,-0c180.781,-0 250.763,-93.843 250.763,-263.709l-0,-266.084c-0,-47.516 24.485,-68.897 64.144,-68.897l47.822,-0l-0,-179.37l-46.656,-0l0,-1.186Z" style="fill-rule:nonzero;"/><path d="M1420.16,706.904l-258.923,0c-5.833,0 -10.495,-4.752 -10.495,-10.691l-0,-20.192c-0,-5.941 4.662,-10.692 10.495,-10.692l260.089,0c5.83,0 10.495,4.751 10.495,10.692l0,20.192c0,5.939 -5.833,10.691 -11.661,10.691Z" style="fill-rule:nonzero;"/><path d="M1464.48,963.474l-188.942,0c-5.833,0 -10.501,-4.754 -10.501,-10.693l0,-20.192c0,-5.938 4.668,-10.691 10.501,-10.691l188.942,-0c5.833,-0 10.495,4.753 10.495,10.691l-0,20.192c-0,4.754 -4.662,10.693 -10.495,10.693Z" style="fill-rule:nonzero;"/><path d="M1539.12,835.188l-377.885,0c-5.833,0 -10.495,-4.75 -10.495,-10.689l-0,-20.196c-0,-5.939 4.662,-10.69 10.495,-10.69l376.719,0c5.833,0 10.499,4.751 10.499,10.69l-0,20.196c-0,4.75 -3.5,10.689 -9.333,10.689Z" style="fill-rule:nonzero;"/><path d="M861.493,765.074c25.658,0 51.319,2.376 75.811,8.316l0,-48.705c0,-68.897 34.989,-109.285 104.971,-109.285l25.658,0l-0,-179.368l-83.977,0c-180.781,0 -250.758,93.842 -250.758,263.709l0,87.901c40.819,-14.252 83.977,-22.568 128.295,-22.568Z" style="fill-rule:nonzero;"/><path d="M1618.44,1411.25c-18.662,-150.861 -132.962,-276.776 -279.919,-305.285c-40.818,-8.314 -81.642,-9.504 -121.295,-2.376c-1.166,-0 -1.166,-1.189 -2.332,-1.189c-64.148,-136.605 -201.772,-226.884 -351.063,-226.884c-149.289,-0 -285.747,87.905 -351.062,224.51c-1.166,-0 -1.166,1.188 -2.332,1.188c-41.987,-4.753 -83.975,-2.379 -125.963,8.314c-144.623,35.634 -254.257,159.175 -274.085,308.847c-2.332,15.441 -3.499,30.883 -3.499,45.141c0,45.136 30.325,86.713 74.645,92.652c54.817,8.317 102.636,-34.448 101.469,-89.089c0,-8.317 0,-17.821 1.167,-26.134c9.331,-76.025 66.48,-140.168 141.123,-157.99c23.328,-5.939 46.654,-7.124 68.814,-3.559c71.146,9.502 141.124,-27.324 171.449,-91.467c22.162,-47.516 57.151,-89.094 103.804,-111.664c51.314,-24.946 109.633,-28.506 163.286,-9.499c55.979,20.192 97.966,62.954 123.627,116.409c26.824,52.27 39.653,89.093 96.805,96.221c23.325,3.559 88.639,2.374 113.132,1.185c47.82,0 95.64,16.631 129.463,51.079c22.156,23.757 38.485,53.455 45.486,86.715c10.495,53.455 -2.334,106.908 -33.825,147.296c-22.162,28.509 -52.485,49.89 -86.308,59.394c-16.329,4.754 -32.657,5.939 -48.986,5.939l-257.757,0c-51.314,0 -92.138,-41.573 -92.138,-93.842l0,-348.049c0,-14.251 -11.661,-26.13 -25.658,-26.13l-36.156,0c-71.148,1.185 -128.295,81.964 -128.295,167.488l-0,312.415c-0,92.652 73.476,167.488 164.451,167.488c0,0 404.714,-1.19 410.544,-1.19c93.304,-9.503 179.614,-58.204 237.927,-133.04c58.319,-72.46 85.142,-167.492 73.481,-264.894Z" style="fill-rule:nonzero;"/></g></svg>
-  <path d="m42.4214,39.655c-24.4057,0 -42.1554,13.1721 -42.1554,33.845c0,20.5814 18.4892,33.845 42.1554,33.845c23.6662,0 38.1803,-11.6171 38.7349,-28.7225l-21.0777,-0.4574c-0.9244,9.3303 -9.1059,15.1845 -17.6572,15.1845c-11.7406,0 -20.4306,-7.5922 -20.4306,-19.8496c0,-12.2574 8.69,-19.9868 20.4306,-20.2155c8.5513,-0.183 16.9177,5.9457 17.4723,15.276l21.0777,-0.6403c-0.4622,-16.8311 -14.1442,-28.2652 -38.55,-28.2652zm48.8446,2l55.468,0l0,64.0311l-55.468,0l0,-64.0311z" clip-rule="evenodd" fill-rule="evenodd"/>
-</svg>

src/browser/pages/error.css

@@ -11,7 +11,6 @@
 
 .error-display > .body {
   color: #444;
-  color: light-dark(#444, #ccc);
   font-size: 1.2rem;
 }
 

src/browser/pages/error.html

@@ -10,7 +10,7 @@
       http-equiv="Content-Security-Policy"
       content="style-src 'self'; manifest-src 'self'; img-src 'self' data:; font-src 'self' data:;"
     />
-    <meta name="color-scheme" content="light dark" />
+
     <title>{{ERROR_TITLE}} - code-server</title>
     <link rel="icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon-dark-support.svg" />
     <link rel="alternate icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon.ico" />

src/browser/pages/global.css

@@ -1,7 +1,3 @@
-:root {
-  color-scheme: light dark;
-}
-
 html,
 body,
 #root {
@@ -11,12 +7,9 @@ body,
 
 body {
   background: rgb(244, 247, 252);
-  background: light-dark(rgb(244, 247, 252), #111827);
   color: #111;
-  color: light-dark(#111, #ddd);
   margin: 0;
-  font-family:
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
-    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
     "Segoe UI Emoji", "Segoe UI Symbol";
   overflow: hidden;
 }
@@ -30,15 +23,12 @@ button {
 
 .-button {
   background-color: rgb(87, 114, 245);
-  background-color: light-dark(rgb(87, 114, 245), rgb(26, 86, 219));
   border-radius: 5px;
   border: none;
   box-sizing: border-box;
   color: white;
-  color: light-dark(white, white);
   cursor: pointer;
   padding: 18px 20px;
-  font-weight: 500;
   text-decoration: none;
 }
 
@@ -55,10 +45,9 @@ button {
 
 .card-box {
   background-color: rgb(250, 253, 258);
-  background-color: light-dark(rgb(250, 253, 258), #1f2937);
   border-radius: 5px;
   box-shadow:
-    light-dark(rgba(60, 66, 87, 0.117647), rgba(10, 10, 10, 0.617647)) 0px 7px 14px 0px,
+    rgba(60, 66, 87, 0.117647) 0px 7px 14px 0px,
     rgba(0, 0, 0, 0.117647) 0px 3px 6px 0px;
   max-width: 650px;
   width: 100%;
@@ -66,9 +55,7 @@ button {
 
 .card-box > .header {
   border-bottom: 1px solid #ddd;
-  border-bottom: 1px solid light-dark(#ddd, #111827);
   color: #444;
-  color: light-dark(#444, #fff);
   padding: 30px;
 }
 
@@ -79,7 +66,6 @@ button {
 
 .card-box > .header > .sub {
   color: #555;
-  color: light-dark(#555, #9ca3af);
   margin-top: 10px;
 }
 

src/browser/pages/login.css

@@ -30,23 +30,14 @@ body {
 
 .login-form > .field > .password {
   background-color: rgb(244, 247, 252);
-  background-color: light-dark(rgb(244, 247, 252), #374151);
   border-radius: 5px;
   border: 1px solid #ddd;
-  border: 1px solid light-dark(#ddd, #4b5563);
   box-sizing: border-box;
+  color: black;
   flex: 1;
   padding: 16px;
 }
 
-.login-form > .field > .password::placeholder {
-  color: rgb(148 163 184);
-}
-
-.login-form > .field > .password:focus {
-  outline: 2px solid rgb(63, 131, 248);
-}
-
 .login-form > .user {
   display: none;
 }

src/browser/pages/login.html

@@ -10,7 +10,6 @@
       http-equiv="Content-Security-Policy"
       content="style-src 'self'; script-src 'self' 'unsafe-inline'; manifest-src 'self'; img-src 'self' data:; font-src 'self' data:;"
     />
-    <meta name="color-scheme" content="light dark" />
     <title>{{I18N_LOGIN_TITLE}}</title>
     <link rel="icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon-dark-support.svg" />
     <link rel="alternate icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon.ico" />

src/browser/serviceWorker.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 self.addEventListener("install", () => {
   console.debug("[Service Worker] installed")
 })

src/node/cli.ts

@@ -30,7 +30,7 @@ export enum LogLevel {
 export class OptionalString extends Optional<string> {}
 
 /**
- * (VS) Code flags provided by the user.
+ * Code flags provided by the user.
  */
 export interface UserProvidedCodeArgs {
   "disable-telemetry"?: boolean
@@ -53,9 +53,6 @@ export interface UserProvidedCodeArgs {
   "disable-getting-started-override"?: boolean
   "disable-proxy"?: boolean
   "session-socket"?: string
-  "link-protection-trusted-domains"?: string[]
-  // locale is used by both VS Code and code-server.
-  locale?: string
 }
 
 /**
@@ -75,6 +72,7 @@ export interface UserProvidedArgs extends UserProvidedCodeArgs {
   enable?: string[]
   help?: boolean
   host?: string
+  locale?: string
   port?: number
   json?: boolean
   log?: LogLevel
@@ -85,16 +83,12 @@ export interface UserProvidedArgs extends UserProvidedCodeArgs {
   "trusted-origins"?: string[]
   version?: boolean
   "proxy-domain"?: string[]
-  "skip-auth-preflight"?: boolean
   "reuse-window"?: boolean
   "new-window"?: boolean
   "ignore-last-opened"?: boolean
   verbose?: boolean
   "app-name"?: string
   "welcome-text"?: string
-  "abs-proxy-base-path"?: string
-  i18n?: string
-  "idle-timeout-seconds"?: number
   /* Positional arguments. */
   _?: string[]
 }
@@ -123,18 +117,18 @@ interface Option<T> {
 type OptionType<T> = T extends boolean
   ? "boolean"
   : T extends OptionalString
-    ? typeof OptionalString
+  ? typeof OptionalString
-    : T extends LogLevel
+  : T extends LogLevel
-      ? typeof LogLevel
+  ? typeof LogLevel
-      : T extends AuthType
+  : T extends AuthType
-        ? typeof AuthType
+  ? typeof AuthType
-        : T extends number
+  : T extends number
-          ? "number"
+  ? "number"
-          : T extends string
+  : T extends string
-            ? "string"
+  ? "string"
-            : T extends string[]
+  : T extends string[]
-              ? "string[]"
+  ? "string[]"
-              : "unknown"
+  : "unknown"
 
 export type Options<T> = {
   [P in keyof T]: Option<OptionType<T[P]>>
@@ -198,10 +192,6 @@ export const options: Options<Required<UserProvidedArgs>> = {
   enable: { type: "string[]" },
   help: { type: "boolean", short: "h", description: "Show this output." },
   json: { type: "boolean" },
-  "link-protection-trusted-domains": {
-    type: "string[]",
-    description: "Links matching a trusted domain can be opened without link protection.",
-  },
   locale: {
     // The preferred way to set the locale is via the UI.
     type: "string",
@@ -261,10 +251,6 @@ export const options: Options<Required<UserProvidedArgs>> = {
     description: "GitHub authentication token (can only be passed in via $GITHUB_TOKEN or the config file).",
   },
   "proxy-domain": { type: "string[]", description: "Domain used for proxying ports." },
-  "skip-auth-preflight": {
-    type: "boolean",
-    description: "Allows preflight requests through proxy without authentication.",
-  },
   "ignore-last-opened": {
     type: "boolean",
     short: "e",
@@ -286,27 +272,12 @@ export const options: Options<Required<UserProvidedArgs>> = {
   "app-name": {
     type: "string",
     short: "an",
-    description:
+    description: "The name to use in branding. Will be shown in titlebar and welcome message",
-      "Will replace the {{app}} placeholder in any strings, which by default includes the title bar and welcome message",
   },
   "welcome-text": {
     type: "string",
     short: "w",
     description: "Text to show on login page",
-    deprecated: true,
-  },
-  "abs-proxy-base-path": {
-    type: "string",
-    description: "The base path to prefix to all absproxy requests",
-  },
-  i18n: {
-    type: "string",
-    path: true,
-    description: "Path to JSON file with custom translations. Merges with default strings and supports all i18n keys.",
-  },
-  "idle-timeout-seconds": {
-    type: "number",
-    description: "Timeout in seconds to wait before shutting down when idle.",
   },
 }
 
@@ -401,10 +372,6 @@ export const parse = (
         throw new Error("--github-auth can only be set in the config file or passed in via $GITHUB_TOKEN")
       }
 
-      if (key === "idle-timeout-seconds" && Number(value) <= 60) {
-        throw new Error("--idle-timeout-seconds must be greater than 60 seconds.")
-      }
-
       const option = options[key]
       if (option.type === "boolean") {
         ;(args[key] as boolean) = true
@@ -620,16 +587,6 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config
     args["github-auth"] = process.env.GITHUB_TOKEN
   }
 
-  if (process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS) {
-    if (isNaN(Number(process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS))) {
-      logger.info("CODE_SERVER_IDLE_TIMEOUT_SECONDS must be a number")
-    }
-    if (Number(process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS) <= 60) {
-      throw new Error("--idle-timeout-seconds must be greater than 60 seconds.")
-    }
-    args["idle-timeout-seconds"] = Number(process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS)
-  }
-
   // Ensure they're not readable by child processes.
   delete process.env.PASSWORD
   delete process.env.HASHED_PASSWORD
@@ -740,16 +697,12 @@ export function parseConfigFile(configFile: string, configPath: string): ConfigA
 
   // We convert the config file into a set of flags.
   // This is a temporary measure until we add a proper CLI library.
-  const configFileArgv = Object.entries(config)
+  const configFileArgv = Object.entries(config).map(([optName, opt]) => {
-    .map(([optName, opt]) => {
+    if (opt === true) {
-      if (opt === true) {
+      return `--${optName}`
-        return `--${optName}`
+    }
-      } else if (Array.isArray(opt)) {
+    return `--${optName}=${opt}`
-        return opt.map((o) => `--${optName}=${o}`)
+  })
-      }
-      return `--${optName}=${opt}`
-    })
-    .flat()
   const args = parse(configFileArgv, {
     configFile: configPath,
   })
@@ -884,6 +837,11 @@ export interface CodeArgs extends UserProvidedCodeArgs {
   log?: string[]
 }
 
+/**
+ * Types for ../../lib/vscode/src/vs/server/node/server.main.ts:65.
+ */
+export type SpawnCodeCli = (args: CodeArgs) => Promise<void>
+
 /**
  * Convert our arguments to equivalent VS Code server arguments.
  * Does not add any extra arguments.

src/node/heart.ts

@@ -1,6 +1,5 @@
 import { logger } from "@coder/logger"
 import { promises as fs } from "fs"
-import { Emitter } from "../common/emitter"
 
 /**
  * Provides a heartbeat using a local file to indicate activity.
@@ -9,9 +8,6 @@ export class Heart {
   private heartbeatTimer?: NodeJS.Timeout
   private heartbeatInterval = 60000
   public lastHeartbeat = 0
-  private readonly _onChange = new Emitter<"alive" | "expired" | "unknown">()
-  readonly onChange = this._onChange.event
-  private state: "alive" | "expired" | "unknown" = "expired"
 
   public constructor(
     private readonly heartbeatPath: string,
@@ -21,13 +17,6 @@ export class Heart {
     this.alive = this.alive.bind(this)
   }
 
-  private setState(state: typeof this.state) {
-    if (this.state !== state) {
-      this.state = state
-      this._onChange.emit(this.state)
-    }
-  }
-
   public alive(): boolean {
     const now = Date.now()
     return now - this.lastHeartbeat < this.heartbeatInterval
@@ -39,7 +28,6 @@ export class Heart {
    */
   public async beat(): Promise<void> {
     if (this.alive()) {
-      this.setState("alive")
       return
     }
 
@@ -48,22 +36,7 @@ export class Heart {
     if (typeof this.heartbeatTimer !== "undefined") {
       clearTimeout(this.heartbeatTimer)
     }
-
+    this.heartbeatTimer = setTimeout(() => heartbeatTimer(this.isActive, this.beat), this.heartbeatInterval)
-    this.heartbeatTimer = setTimeout(async () => {
-      try {
-        if (await this.isActive()) {
-          this.beat()
-        } else {
-          this.setState("expired")
-        }
-      } catch (error: unknown) {
-        logger.warn((error as Error).message)
-        this.setState("unknown")
-      }
-    }, this.heartbeatInterval)
-
-    this.setState("alive")
-
     try {
       return await fs.writeFile(this.heartbeatPath, "")
     } catch (error: any) {
@@ -80,3 +53,20 @@ export class Heart {
     }
   }
 }
+
+/**
+ * Helper function for the heartbeatTimer.
+ *
+ * If heartbeat is active, call beat. Otherwise do nothing.
+ *
+ * Extracted to make it easier to test.
+ */
+export async function heartbeatTimer(isActive: Heart["isActive"], beat: Heart["beat"]) {
+  try {
+    if (await isActive()) {
+      beat()
+    }
+  } catch (error: unknown) {
+    logger.warn((error as Error).message)
+  }
+}

src/node/http.ts

@@ -1,8 +1,9 @@
 import { field, logger } from "@coder/logger"
 import * as express from "express"
+import * as expressCore from "express-serve-static-core"
 import * as http from "http"
 import * as net from "net"
-import qs from "qs"
+import * as qs from "qs"
 import { Disposable } from "../common/emitter"
 import { CookieKeys, HttpCode, HttpError } from "../common/http"
 import { normalize } from "../common/util"
@@ -184,7 +185,12 @@ export const constructRedirectPath = (req: express.Request, query: qs.ParsedQs,
  * preserved.  `to` should be a simple path without any query parameters
  * `override` will merge with the existing query (use `undefined` to unset).
  */
-export const redirect = (req: express.Request, res: express.Response, to: string, override: qs.ParsedQs = {}): void => {
+export const redirect = (
+  req: express.Request,
+  res: express.Response,
+  to: string,
+  override: expressCore.Query = {},
+): void => {
   const query = Object.assign({}, req.query, override)
   Object.keys(override).forEach((key) => {
     if (typeof override[key] === "undefined") {