Enable webkit e2e tests

2026-11-02 22:09:11 +01:00 · 2026-09-08 13:25:15 -08:00
43 changed files with 477 additions and 1086 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -144,7 +144,7 @@ jobs:
            test/package-lock.json
      - run: SKIP_SUBMODULE_DEPS=1 npm ci
      - run: npm run test:unit
-      - uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+      - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
        if: success()
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -156,7 +156,6 @@ jobs:
      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
      DISABLE_V8_COMPILE_CACHE: 1
      VERSION: 0.0.0
-      VSCODE_ARCH: x64
      VSCODE_TARGET: linux-x64
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
@@ -180,13 +179,13 @@ jobs:
          cache-dependency-path: |
            package-lock.json
            test/package-lock.json
-
+      - run: SKIP_SUBMODULE_DEPS=1 npm ci
+      - run: npm run 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 force a rebuild.
@@ -199,21 +198,10 @@ jobs:
      - name: Build vscode
        if: steps.cache-vscode.outputs.cache-hit != 'true'
        run: |
-          cd lib/vscode/build
+          pushd lib/vscode
          npm ci
-          cd ..
-          source ./build/azure-pipelines/linux/setup-env.sh
-          # Run preinstall script before root dependencies are installed
-          # so that v8 headers are patched correctly for native modules.
-          node build/npm/preinstall.ts
-          npm ci
-          cd ../..
+          popd
          npm run build:vscode
-
-      # Build the code-server wrapper.
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
-      - run: npm run build
-
      # Push up an artifact containing the linux-x64 release.
      - run: KEEP_MODULES=1 npm run release
      - run: tar -czf package.tar.gz release
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -110,7 +110,7 @@ jobs:

      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
      - uses: docker/setup-qemu-action@1f40c72289eff860ee54a304f1438e3cff362e0a # v4.3.0
-      - uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+      - uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0

      - uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
        with:
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -79,9 +79,6 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
        with:
          submodules: true
-          # When an update/ branch is merged, a release is automatically created
-          # which requires secrets.
-          allow-unsafe-pr-checkout: true
      - run: quilt push -a
      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
        with:
@@ -176,9 +173,6 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
        with:
          submodules: true
-          # When an update/ branch is merged, a release is automatically created
-          # which requires secrets.
-          allow-unsafe-pr-checkout: true
      - run: quilt push -a
      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
        with:
@@ -239,9 +233,6 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
        with:
          submodules: true
-          # When an update/ branch is merged, a release is automatically created
-          # which requires secrets.
-          allow-unsafe-pr-checkout: true

      # quilt has no windows build. The patches are ordinary -p1 diffs
      # against the repository root, so git applies them in series order.
--- a/.github/workflows/security.yaml
+++ b/.github/workflows/security.yaml
@@ -80,13 +80,13 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
        with:
          config-file: ./.github/codeql-config.yml
          languages: javascript

      - name: Autobuild
-        uses: github/codeql-action/autobuild@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/autobuild@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-24.21.0
+24.18.1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,67 +22,6 @@ Code v99.99.999

 ## Unreleased

-Code v1.141.0
-
-### Added
-
- A new `--enable-remote-storage` flag can be used to make code-server persist
-  workbench storage on the remote server instead of browser storage. Use this if
-  you want to share storage between multiple devices.
-
-### Fixed
-
- The Typescript extension was trying to load as a browser extension even though
-  we build the remote server version, causing it to fail to activate.
-
-### Changed
-
- Update to Code 1.141.0
-
-## [4.140.0](https://github.com/coder/code-server/releases/tag/v4.140.0) - 2026-10-02
-
-Code v1.140.0
-
-### Changed
-
- Update to Code 1.140.0
-
-## [4.139.1](https://github.com/coder/code-server/releases/tag/v4.139.1) - 2026-09-26
-
-Code v1.139.1
-
-### Changed
-
- Update to Code 1.139.1
-
-### Fixed
-
- `--idle-timeout-seconds` was only validated when passed as
-  `--idle-timeout-seconds=<value>`; values of 60 or less passed as
-  `--idle-timeout-seconds <value>` were silently accepted.
-
-## [4.138.0](https://github.com/coder/code-server/releases/tag/v4.138.0) - 2026-09-19
-
-Code v1.138.0
-
-### Changed
-
- Update to Code 1.138.0
-
-### Fixed
-
- Preserve the original path, query parameters, and fragment when rewriting
-  localhost URLs through the port proxy. If `VSCODE_PROXY_URI` has any query
-  parameters or fragments, those will be lost.
-
-## [4.137.0](https://github.com/coder/code-server/releases/tag/v4.137.0) - 2026-09-11
-
-Code v1.137.0
-
-### Changed
-
- Update to Code 1.137.0
-
 ## [4.136.2](https://github.com/coder/code-server/releases/tag/v4.136.2) - 2026-09-08

 Code v1.136.1
--- a/ci/build/build-vscode.sh
+++ b/ci/build/build-vscode.sh
@@ -58,17 +58,10 @@ main() {
    exit 1
  fi

-  # Modify the product.json:
-  # - Add the date
-  # - Set the code-server name.
-  # - Add our links
-  # - Enable telemetry (this just makes telemetry available; telemetry can still
-  #   be disabled by flag or setting)
-  # - Configure trusted extensions (since some, like github.copilot-chat, never
-  #   ask to be trusted and this is the only way to get auth working).
-  # - Make Typescript server plugins run in the workspace.  We build the remote
-  #   server version, so there is no browser distribution, and this key is not
-  #   added automatically.
+  # Add the date, our name, links, enable telemetry (this just makes telemetry
+  # available; telemetry can still be disabled by flag or setting), and
+  # configure trusted extensions (since some, like github.copilot-chat, never
+  # ask to be trusted and this is the only way to get auth working).
  #
  # This needs to be done before building as Code will read this file and embed
  # it into the client-side code.
@@ -110,9 +103,6 @@ main() {
    ],
    "aiConfig": {
      "ariaKey": "code-server"
-    },
-    "extensionPointExtensionKind": {
-      "typescriptServerPlugins": ["workspace"]
    }
  }
 EOF
--- a/ci/helm-chart/Chart.yaml
+++ b/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.55.0
+version: 3.51.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.140.0
+appVersion: 4.136.2
--- a/ci/helm-chart/values.yaml
+++ b/ci/helm-chart/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1

 image:
  repository: codercom/code-server
-  tag: '4.140.0'
+  tag: '4.136.2'
  pullPolicy: Always

 # Specifies one or more secrets to be used when pulling images from a
--- a/docs/guide.md
+++ b/docs/guide.md
@@ -9,7 +9,6 @@
  - [Using Let's Encrypt with NGINX](#using-lets-encrypt-with-nginx)
  - [Using a self-signed certificate](#using-a-self-signed-certificate)
  - [TLS 1.3 and Safari](#tls-13-and-safari)
-  - [Cloudflare Rocket Loader](#cloudflare-rocket-loader)
 - [External authentication](#external-authentication)
 - [HTTPS and self-signed certificates](#https-and-self-signed-certificates)
 - [Accessing web services](#accessing-web-services)
@@ -270,26 +269,6 @@ than TLS 1.3 you will need to add support for TLS 1.2 since Safari does not
 support TLS 1.3 for web sockets at the time of writing. If this is the case you
 should see OSSStatus: 9836 in the browser console.

-### Cloudflare Rocket Loader
-
-If you serve code-server through Cloudflare, disable Rocket Loader for that
-hostname. Rocket Loader rewrites inline `<script>` tags at the edge and
-re-injects them from its own loader, and the re-injected scripts do not carry
-the nonce in code-server's Content Security Policy, so the browser blocks them.
-The result is a blank page: every request returns HTTP 200 and the server logs
-look healthy, and the only console output is `Cannot determine URI for module
-id!`.
-
-Scope it with a Configuration Rule rather than turning it off zone-wide:
-
-```
-Expression: (http.host eq "code.example.com")
-Setting:    Rocket Loader -> Off
-```
-
-Adding `'unsafe-inline'` to the policy does not help, because CSP ignores it
-whenever a nonce or hash is present.
-
 ## External authentication

 If you want to use external authentication mechanism (e.g., Sign in with
--- a/docs/helm.md
+++ b/docs/helm.md
@@ -1,6 +1,6 @@
 # code-server Helm Chart

-[![Version: 3.54.0](https://img.shields.io/badge/Version-3.54.0-informational?style=flat-square)](https://img.shields.io/badge/Version-3.54.0-informational?style=flat-square) [![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![AppVersion: 4.139.1](https://img.shields.io/badge/AppVersion-4.139.1-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.139.1-informational?style=flat-square)
+[![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square)](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) [![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![AppVersion: 4.8.0](https://img.shields.io/badge/AppVersion-4.8.0-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.8.0-informational?style=flat-square)

 [code-server](https://github.com/coder/code-server) code-server is VS Code running
 on a remote server, accessible through the browser.
@@ -62,12 +62,10 @@ and their default values.
 | Key                                         | Type   | Default                  |
 | ------------------------------------------- | ------ | ------------------------ |
 | affinity                                    | object | `{}`                     |
-| annotations                                 | object | `{}`                     |
 | extraArgs                                   | list   | `[]`                     |
 | extraConfigmapMounts                        | list   | `[]`                     |
 | extraContainers                             | string | `""`                     |
 | extraInitContainers                         | string | `""`                     |
-| extraPorts                                  | list   | `[]`                     |
 | extraSecretMounts                           | list   | `[]`                     |
 | extraVars                                   | list   | `[]`                     |
 | extraVolumeMounts                           | list   | `[]`                     |
@@ -75,32 +73,26 @@ and their default values.
 | hostnameOverride                            | string | `""`                     |
 | image.pullPolicy                            | string | `"Always"`               |
 | image.repository                            | string | `"codercom/code-server"` |
-| image.tag                                   | string | `"4.139.1"`              |
+| image.tag                                   | string | `"4.8.0"`                |
 | imagePullSecrets                            | list   | `[]`                     |
 | ingress.enabled                             | bool   | `false`                  |
-| ingress.ingressClassName                    | string | `""`                     |
-| lifecycle.enabled                           | bool   | `false`                  |
-| livenessProbe.enabled                       | bool   | `true`                   |
 | nameOverride                                | string | `""`                     |
 | nodeSelector                                | object | `{}`                     |
 | persistence.accessMode                      | string | `"ReadWriteOnce"`        |
 | persistence.annotations                     | object | `{}`                     |
 | persistence.enabled                         | bool   | `true`                   |
-| persistence.size                            | string | `"10Gi"`                 |
+| persistence.size                            | string | `"1Gi"`                  |
 | podAnnotations                              | object | `{}`                     |
 | podSecurityContext                          | object | `{}`                     |
-| priorityClassName                           | string | `""`                     |
-| readinessProbe.enabled                      | bool   | `true`                   |
 | replicaCount                                | int    | `1`                      |
 | resources                                   | object | `{}`                     |
 | securityContext.enabled                     | bool   | `true`                   |
 | securityContext.fsGroup                     | int    | `1000`                   |
 | securityContext.runAsUser                   | int    | `1000`                   |
-| service.port                                | int    | `8080`                   |
+| service.port                                | int    | `8443`                   |
 | service.type                                | string | `"ClusterIP"`            |
-| serviceAccount.annotations                  | object | `{}`                     |
 | serviceAccount.create                       | bool   | `true`                   |
-| serviceAccount.name                         | string | `""`                     |
+| serviceAccount.name                         | string | `nil`                    |
 | tolerations                                 | list   | `[]`                     |
 | volumePermissions.enabled                   | bool   | `true`                   |
 | volumePermissions.securityContext.runAsUser | int    | `0`                      |
@@ -122,7 +114,7 @@ can be provided while installing the chart. For example,
 $ helm upgrade --install code-server ci/helm-chart -f values.yaml
 ```

-> **Tip**: You can use the default [values.yaml](../ci/helm-chart/values.yaml)
+> **Tip**: You can use the default [values.yaml](values.yaml)

 # Extra Containers

--- a/lib/vscode
+++ b/lib/vscode
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
        "httpolyglot": "^0.1.2",
        "i18next": "^26.3.1",
        "js-yaml": "^5.2.3",
-        "limiter": "^4.1.0",
+        "limiter": "^2.1.0",
        "pem": "^1.14.8",
        "proxy-agent": "^6.3.1",
        "qs": "^6.15.0",
@@ -59,7 +59,7 @@
        "eslint-plugin-prettier": "^5.0.0",
        "globals": "^17.6.0",
        "prettier": "3.9.4",
-        "prettier-plugin-sh": "^0.20.2",
+        "prettier-plugin-sh": "^0.18.0",
        "ts-node": "^10.9.1",
        "typescript": "^5.6.2",
        "typescript-eslint": "^8.8.0"
@@ -458,80 +458,15 @@
      }
    },
    "node_modules/@reteps/dockerfmt": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@reteps/dockerfmt/-/dockerfmt-0.5.4.tgz",
-      "integrity": "sha512-HEGgXVVOb+JtGUSSzXl/XPKFIZjMDTUoHarCjaQdkY+cb5M9K/O3b5xm+x0IPIk3SfHurbc0bSgcFsQlzjitxA==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@reteps/dockerfmt/-/dockerfmt-0.3.6.tgz",
+      "integrity": "sha512-Tb5wIMvBf/nLejTQ61krK644/CEMB/cpiaIFXqGApfGqO3GwcR3qnI0DbmkFVCl2OyEp8LnLX3EkucoL0+tbFg==",
      "dev": true,
      "license": "MIT",
-      "bin": {
-        "dockerfmt": "dist/launcher.js"
-      },
      "engines": {
        "node": "^v12.20.0 || ^14.13.0 || >=16.0.0"
-      },
-      "optionalDependencies": {
-        "@reteps/dockerfmt-darwin-arm64": "0.5.4",
-        "@reteps/dockerfmt-darwin-x64": "0.5.4",
-        "@reteps/dockerfmt-linux-arm64": "0.5.4",
-        "@reteps/dockerfmt-linux-x64": "0.5.4"
      }
    },
-    "node_modules/@reteps/dockerfmt-darwin-arm64": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@reteps/dockerfmt-darwin-arm64/-/dockerfmt-darwin-arm64-0.5.4.tgz",
-      "integrity": "sha512-urMqV+dQyvVI8/WrXwClX9e1PEyS35wFdwJjpZYmL09AkV4Io5U1oam8UBKK7jZk0+YsdF88ay6e86Kn6DIyQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@reteps/dockerfmt-darwin-x64": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@reteps/dockerfmt-darwin-x64/-/dockerfmt-darwin-x64-0.5.4.tgz",
-      "integrity": "sha512-fJORy6DFxbgDiMqxpLTPZlb5KUY0Vq0iR4NGnyKnuYZ9LdZUS508DK2kt/AJ87/jIKNV1qRG0JXG1Tc6xdvWjw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@reteps/dockerfmt-linux-arm64": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@reteps/dockerfmt-linux-arm64/-/dockerfmt-linux-arm64-0.5.4.tgz",
-      "integrity": "sha512-6pVakO06eXtDuvxy1Dnjs/gQyUoGGycle8PRSt5IFRwLi/AVaOQwfkfmW0WP8VH9wNUeti6BfJ3ksTn2G+XMxg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@reteps/dockerfmt-linux-x64": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@reteps/dockerfmt-linux-x64/-/dockerfmt-linux-x64-0.5.4.tgz",
-      "integrity": "sha512-OD6SIlUV1D4TgJoTui3FMBAZsGbTSPYsiT0BKhD6jMUcJb3GpFTa7dY9rL8rP9FUqfL7OTHVUGUOL4Rh64Olog==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
    "node_modules/@rtsao/scc": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -857,17 +792,17 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.69.0.tgz",
-      "integrity": "sha512-t5jQTKPIgVW1PE6dR6H6Qz5gm8zjMlX5/2gRaOGd9eO6V7J+tQc6iWKukEe7dY8u9HyYasQ0yfF0/FSSTEO2gA==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz",
+      "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.69.0",
-        "@typescript-eslint/type-utils": "8.69.0",
-        "@typescript-eslint/utils": "8.69.0",
-        "@typescript-eslint/visitor-keys": "8.69.0",
+        "@typescript-eslint/scope-manager": "8.61.1",
+        "@typescript-eslint/type-utils": "8.61.1",
+        "@typescript-eslint/utils": "8.61.1",
+        "@typescript-eslint/visitor-keys": "8.61.1",
        "ignore": "^7.0.5",
        "natural-compare": "^1.4.0",
        "ts-api-utils": "^2.5.0"
@@ -880,15 +815,15 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.69.0",
+        "@typescript-eslint/parser": "^8.61.1",
        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
        "typescript": ">=4.8.4 <6.1.0"
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.8.tgz",
-      "integrity": "sha512-YYNsSlXBjMk92SKnkwvB5LOVSa6OznlFUGcsvrFgNJbJCd0M1XKeFVRc8ZByeCqz32FivYNHJVooLmdqrmvp/Q==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -896,16 +831,16 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.69.0.tgz",
-      "integrity": "sha512-l4b0DhWioGg6Gt2ebGlvfkFMOjRsauxtsnDRwUSRX1qHq3HdTfQHV8wW9zEXeciai6HfeaKOedQn2Zoofx3WBw==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz",
+      "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.69.0",
-        "@typescript-eslint/types": "8.69.0",
-        "@typescript-eslint/typescript-estree": "8.69.0",
-        "@typescript-eslint/visitor-keys": "8.69.0",
+        "@typescript-eslint/scope-manager": "8.61.1",
+        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/typescript-estree": "8.61.1",
+        "@typescript-eslint/visitor-keys": "8.61.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -921,14 +856,14 @@
      }
    },
    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.69.0.tgz",
-      "integrity": "sha512-yi4obFrHMmnsesWehHbkg9zMA7Jt8cXT+mKM08G999pH1yT6nqgsHx7MYm0uY1wAj8CqiBXYRJ7WAT0QdQHQXg==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz",
+      "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.69.0",
-        "@typescript-eslint/types": "^8.69.0",
+        "@typescript-eslint/tsconfig-utils": "^8.61.1",
+        "@typescript-eslint/types": "^8.61.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -943,14 +878,14 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.69.0.tgz",
-      "integrity": "sha512-ewfspqWvSxKSOaplqAUNbaSFO0eB6w1EtQ+esfYFRm3614Ty4uNtExkcbgd6nWsXphbqKyf9ZYdbZdv2xEoWEQ==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz",
+      "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.69.0",
-        "@typescript-eslint/visitor-keys": "8.69.0"
+        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/visitor-keys": "8.61.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -961,9 +896,9 @@
      }
    },
    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.69.0.tgz",
-      "integrity": "sha512-xNqK7YTDZsLniQMV/4rpFR8Z5JlqeRvVjuG1YgF/mdPVH84HSD19L8CczMA0qg2RfwEV231GHH3VnToJDo4MfQ==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz",
+      "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -978,15 +913,15 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.69.0.tgz",
-      "integrity": "sha512-ZfoJAVg3JZndQEpEl9petVlxau3lRuElc4HRMuAlLCf8to04/iHz692RUSNmXKDjEuJmIL+KZ2/BsOcBc16dsA==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz",
+      "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.69.0",
-        "@typescript-eslint/typescript-estree": "8.69.0",
-        "@typescript-eslint/utils": "8.69.0",
+        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/typescript-estree": "8.61.1",
+        "@typescript-eslint/utils": "8.61.1",
        "debug": "^4.4.3",
        "ts-api-utils": "^2.5.0"
      },
@@ -1003,9 +938,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.69.0.tgz",
-      "integrity": "sha512-K3VrubUPhlo9VDBS6QdI8YB5j7ClpqLRdefcz6PFrhnwicehBweqQ9Evhl4l+FYz0HdDmMqIiSX0aldGRYtDCA==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz",
+      "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1017,16 +952,16 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.69.0.tgz",
-      "integrity": "sha512-AdFkgqck3Vudb/kWnxlyafU/4aBhHrbQ9locP2N4psXTy5mOBg0SHJumnLvx7r6g1gV4DKvUFwV2nJZBoqOD8w==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz",
+      "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/project-service": "8.69.0",
-        "@typescript-eslint/tsconfig-utils": "8.69.0",
-        "@typescript-eslint/types": "8.69.0",
-        "@typescript-eslint/visitor-keys": "8.69.0",
+        "@typescript-eslint/project-service": "8.61.1",
+        "@typescript-eslint/tsconfig-utils": "8.61.1",
+        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/visitor-keys": "8.61.1",
        "debug": "^4.4.3",
        "minimatch": "^10.2.2",
        "semver": "^7.7.3",
@@ -1068,13 +1003,13 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "10.2.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
-      "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
      "dev": true,
      "license": "BlueOak-1.0.0",
      "dependencies": {
-        "brace-expansion": "^5.0.8"
+        "brace-expansion": "^5.0.5"
      },
      "engines": {
        "node": "18 || 20 || >=22"
@@ -1084,16 +1019,16 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.69.0.tgz",
-      "integrity": "sha512-tUbx60BBqQa31kXF5MCsOOLL5E/WzUuxIn7YpAvq+eaUlqvk8/NXnXMBNAdLCr0icjkzem7iUA5QqWHe/hJ1aw==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz",
+      "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.69.0",
-        "@typescript-eslint/types": "8.69.0",
-        "@typescript-eslint/typescript-estree": "8.69.0"
+        "@typescript-eslint/scope-manager": "8.61.1",
+        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/typescript-estree": "8.61.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1108,13 +1043,13 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.69.0.tgz",
-      "integrity": "sha512-+rmdgPA+EXkNgKYvHvFfhrs35utXbwaC5PGpDquSXcoXQDKUA5UjV0LmTucG/4JXkM31BTu4TilHtrN8IVBe8w==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz",
+      "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.69.0",
+        "@typescript-eslint/types": "8.61.1",
        "eslint-visitor-keys": "^5.0.0"
      },
      "engines": {
@@ -1981,15 +1916,14 @@
      }
    },
    "node_modules/compression": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.2.tgz",
-      "integrity": "sha512-o8vI5RE5A6EVVOd9o41jKp41aJom+QTEO/Bx8MYNjexMo/Bv2WOjUfZr+aL0WnYSgymUy6zeguqLTsIhV0gMvQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
      "license": "MIT",
      "dependencies": {
        "bytes": "3.1.2",
        "compressible": "~2.0.18",
        "debug": "2.6.9",
-        "destroy": "1.2.0",
        "negotiator": "~0.6.4",
        "on-headers": "~1.1.0",
        "safe-buffer": "5.2.1",
@@ -1997,10 +1931,6 @@
      },
      "engines": {
        "node": ">= 0.8.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/compression/node_modules/debug": {
@@ -2281,16 +2211,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
    "node_modules/diff": {
      "version": "4.0.4",
      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
@@ -3777,9 +3697,9 @@
      }
    },
    "node_modules/ip-address": {
-      "version": "10.7.2",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.2.tgz",
-      "integrity": "sha512-7H/2gFSIitxc0hG3nOI1glS8QLo/EHBFFLk8vEUjXY/xu0AdL8jZ9U1IzO2PUm0d2D/ofQcAifb0g6OBkt8U7w==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.4.0.tgz",
+      "integrity": "sha512-oSK96Grm3aP6OrS263xVxbNDGVL7rzBtYdpGqlDG8iQdoenDoTs/nkki+DflYbAEE8Xl6o5YxhxlrKvI3nqKXQ==",
      "license": "MIT",
      "engines": {
        "node": ">= 12"
@@ -4325,6 +4245,12 @@
        "json5": "lib/cli.js"
      }
    },
+    "node_modules/just-performance": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/just-performance/-/just-performance-4.3.0.tgz",
+      "integrity": "sha512-L7RjvtJsL0QO8xFs5wEoDDzzJwoiowRw6Rn/GnvldlchS2JQr9wFYPiwZcDfrbbujEKqKN0tvENdbjXdYhDp5Q==",
+      "license": "MIT"
+    },
    "node_modules/keyv": {
      "version": "4.5.4",
      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -4350,10 +4276,13 @@
      }
    },
    "node_modules/limiter": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/limiter/-/limiter-4.1.0.tgz",
-      "integrity": "sha512-dx+FIOmHyJSBT6CTOPrVmhcwhfK2cDjM7d0p6oghDYJeMMfGDIVM/83qX+EM9MgQpRxEwu9QLsScocXIWqz+VA==",
-      "license": "MIT"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-2.1.0.tgz",
+      "integrity": "sha512-361TYz6iay6n+9KvUUImqdLuFigK+K79qrUtBsXhJTLdH4rIt/r1y8r1iozwh8KbZNpujbFTSh74mJ7bwbAMOw==",
+      "license": "MIT",
+      "dependencies": {
+        "just-performance": "4.3.0"
+      }
    },
    "node_modules/locate-path": {
      "version": "6.0.0",
@@ -5294,14 +5223,14 @@
      }
    },
    "node_modules/prettier-plugin-sh": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.20.2.tgz",
-      "integrity": "sha512-4QVyY7Vav0f5i6AVa80SFwUJXaWsAv9t0yUZIivwI0ucxTei6Jwhso/khWqaKDj4QGdwjP2py1nxQrDUeZ0jyQ==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.18.0.tgz",
+      "integrity": "sha512-cW1XL27FOJQ/qGHOW6IHwdCiNWQsAgK+feA8V6+xUTaH0cD3Mh+tFAtBvEEWvuY6hTDzRV943Fzeii+qMOh7nQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@reteps/dockerfmt": "^0.5.4",
-        "sh-syntax": "^0.7.0"
+        "@reteps/dockerfmt": "^0.3.6",
+        "sh-syntax": "^0.5.8"
      },
      "engines": {
        "node": ">=16.0.0"
@@ -5314,9 +5243,9 @@
      }
    },
    "node_modules/proxy-addr": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.8.tgz",
-      "integrity": "sha512-5nnx0yGyVUcY6t9RnWcARWtwT9F1D8O9rt08htPvnd49W1IgZtmLkhu9WfMzQj1cFxjHIO6connUNVW5k7AVyQ==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
      "license": "MIT",
      "dependencies": {
        "forwarded": "0.2.0",
@@ -5324,10 +5253,6 @@
      },
      "engines": {
        "node": ">= 0.10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/proxy-agent": {
@@ -5803,11 +5728,14 @@
      "license": "ISC"
    },
    "node_modules/sh-syntax": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/sh-syntax/-/sh-syntax-0.7.0.tgz",
-      "integrity": "sha512-sgMyAxpHiGgAaNg+gD3ad41vha24CzIjjghD4mdiON1lUafZPLJNYknyjcXmU4geilPstd69zCKkpccY0YvajA==",
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/sh-syntax/-/sh-syntax-0.5.8.tgz",
+      "integrity": "sha512-JfVoxf4FxQI5qpsPbkHhZo+n6N9YMJobyl4oGEUBb/31oQYlgTjkXQD8PBiafS2UbWoxrTO0Z5PJUBXEPAG1Zw==",
      "dev": true,
      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.8.1"
+      },
      "engines": {
        "node": ">=16.0.0"
      },
@@ -6373,16 +6301,16 @@
      }
    },
    "node_modules/typescript-eslint": {
-      "version": "8.69.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.69.0.tgz",
-      "integrity": "sha512-B3MltX0VqjUBNEe3b3sSuiRbfa6XrfHFtBiPamjT5AsW/dfq+y+bc0wyuS9DxAS1LyzCxRp2+rxzpLUvqM2BvA==",
+      "version": "8.61.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.1.tgz",
+      "integrity": "sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.69.0",
-        "@typescript-eslint/parser": "8.69.0",
-        "@typescript-eslint/typescript-estree": "8.69.0",
-        "@typescript-eslint/utils": "8.69.0"
+        "@typescript-eslint/eslint-plugin": "8.61.1",
+        "@typescript-eslint/parser": "8.61.1",
+        "@typescript-eslint/typescript-estree": "8.61.1",
+        "@typescript-eslint/utils": "8.61.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
    "eslint-plugin-prettier": "^5.0.0",
    "globals": "^17.6.0",
    "prettier": "3.9.4",
-    "prettier-plugin-sh": "^0.20.2",
+    "prettier-plugin-sh": "^0.18.0",
    "ts-node": "^10.9.1",
    "typescript": "^5.6.2",
    "typescript-eslint": "^8.8.0"
@@ -77,7 +77,7 @@
    "httpolyglot": "^0.1.2",
    "i18next": "^26.3.1",
    "js-yaml": "^5.2.3",
-    "limiter": "^4.1.0",
+    "limiter": "^2.1.0",
    "pem": "^1.14.8",
    "proxy-agent": "^6.3.1",
    "qs": "^6.15.0",
--- a/patches/base-path.diff
+++ b/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
-@@ -256,7 +256,9 @@ class RemoteAuthoritiesImpl {
+@@ -251,7 +251,9 @@ class RemoteAuthoritiesImpl {
 		return URI.from({
 			scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
 			authority: `${host}:${port}`,
@@ -48,8 +48,8 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
 +		<link rel="manifest" href="{{VS_BASE}}/manifest.json" crossorigin="use-credentials" />
 		<style id="vscode-css-modules" type="text/css" media="screen"></style>
 
- 		<!-- Startup fallback: shown only if the scripts below never run, e.g. because a proxy,
-@@ -92,7 +92,7 @@
+ 	</head>
+@@ -41,7 +41,7 @@
 
 	<!-- Startup (do not modify order of script tags!) -->
 	<script nonce="{{WORKBENCH_SCRIPT_NONCE}}">
@@ -85,8 +85,8 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 +		<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">
 
- 		<!-- Startup fallback: shown only if the scripts below never run, e.g. because a proxy,
-@@ -88,7 +88,7 @@
+ 	</head>
+@@ -37,7 +37,7 @@
 
 	<!-- Startup (do not modify order of script tags!) -->
 	<script nonce="{{WORKBENCH_SCRIPT_NONCE}}">
@@ -281,8 +281,8 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 -
 (function () {
 
- 	// This script running at all means the page scripts were not blocked or rewritten.
-@@ -614,8 +604,8 @@ function readCookie(name: string): strin
+ 	// Find config by checking for DOM
+@@ -610,8 +600,8 @@ function readCookie(name: string): strin
 	if (!configElement || !configElementAttribute) {
 		throw new Error('Missing web configuration element');
 	}
--- a/patches/clipboard.diff
+++ b/patches/clipboard.diff
@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
 +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
-@@ -148,6 +148,7 @@ export interface NativeParsedArgs {
+@@ -147,6 +147,7 @@ export interface NativeParsedArgs {
 	'disable-chromium-sandbox'?: boolean;
 	sandbox?: boolean;
 	'enable-coi'?: boolean;
@@ -90,7 +90,7 @@ 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
-@@ -116,6 +116,7 @@ export const OPTIONS: OptionDescriptions
+@@ -115,6 +115,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.") },
--- a/patches/copilot.diff
+++ b/patches/copilot.diff
@@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
 import watcher from './watch/index.ts';
 
 import { createRequire } from 'module';
-@@ -487,6 +488,116 @@ export function packageCopilotExtensionS
+@@ -491,6 +492,116 @@ export function packageCopilotExtensionS
 	).pipe(util2.setExecutableBit(['**/*.sh']));
 }
 
--- a/patches/display-language.diff
+++ b/patches/display-language.diff
@@ -56,7 +56,7 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
 import type { INLSConfiguration } from '../../nls.js';
@@ -33,7 +35,94 @@ export async function getNLSConfiguratio
 	if (!result) {
- 		result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, nlsMetadataHash: product.nlsMetadataHash, userDataPath, nlsMetadataPath });
+ 		result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath });
 		nlsConfigurationCache.set(cacheKey, result);
 +		// If the language pack does not yet exist, it defaults to English, which is
 +		// then cached and you have to restart even if you then install the pack.
@@ -272,7 +272,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
-@@ -479,9 +479,6 @@ export class InstallAction extends Exten
+@@ -475,9 +475,6 @@ export class InstallAction extends Exten
 		if (this.extension.isBuiltin) {
 			return;
 		}
@@ -282,7 +282,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 		if (this.extension.state !== ExtensionState.Uninstalled) {
 			return;
 		}
-@@ -786,7 +783,7 @@ export abstract class InstallInOtherServ
+@@ -782,7 +779,7 @@ export abstract class InstallInOtherServ
 		}
 
 		if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 		}
 
 		// Prefers to run on UI
-@@ -2285,17 +2282,6 @@ export class SetLanguageAction extends E
+@@ -2281,17 +2278,6 @@ export class SetLanguageAction extends E
 	update(): void {
 		this.enabled = false;
 		this.class = SetLanguageAction.DisabledClass;
@@ -309,7 +309,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 	}
 
 	override async run(): Promise<any> {
-@@ -2312,7 +2298,6 @@ export class ClearLanguageAction extends
+@@ -2308,7 +2294,6 @@ export class ClearLanguageAction extends
 	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	constructor(
@@ -317,7 +317,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 		@ILocaleService private readonly localeService: ILocaleService,
 	) {
 		super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
-@@ -2322,17 +2307,6 @@ export class ClearLanguageAction extends
+@@ -2318,17 +2303,6 @@ export class ClearLanguageAction extends
 	update(): void {
 		this.enabled = false;
 		this.class = ClearLanguageAction.DisabledClass;
--- a/patches/external-file-actions.diff
+++ b/patches/external-file-actions.diff
@@ -48,8 +48,8 @@ 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
-@@ -39,6 +39,16 @@ export interface IBrowserWorkbenchEnviro
- 	readonly sessionTitle?: string;
+@@ -34,6 +34,16 @@ export interface IBrowserWorkbenchEnviro
+ 	readonly options?: IWorkbenchConstructionOptions;
 
 	/**
 +	 * Enable downloading files via menu actions.
@@ -65,7 +65,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
 	 * Gets whether a resolver extension is expected for the environment.
 	 */
 	readonly expectsResolverExtension: boolean;
-@@ -116,6 +126,20 @@ export class BrowserWorkbenchEnvironment
+@@ -111,6 +121,20 @@ export class BrowserWorkbenchEnvironment
 		return this.options.userDataPath;
 	}
 
@@ -128,7 +128,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
@@ -6,10 +6,10 @@
 import { Disposable } from '../../base/common/lifecycle.js';
 import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
- import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext, IsChromeOSContext } from '../../platform/contextkey/common/contextkeys.js';
+ import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
 -import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SecondarySideBarVisibleContext, 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, IsSessionsWindowContext } from '../common/contextkeys.js';
 +import { IsEnabledFileDownloads, IsEnabledFileUploads, SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SecondarySideBarVisibleContext, 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, IsSessionsWindowContext } from '../common/contextkeys.js';
 import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
@@ -147,7 +147,7 @@ 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,
-@@ -206,6 +206,10 @@ export class WorkbenchContextKeysHandler
+@@ -205,6 +205,10 @@ export class WorkbenchContextKeysHandler
 		this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService);
 		this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized());
 
--- a/patches/getting-started.diff
+++ b/patches/getting-started.diff
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
 import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-@@ -55,7 +55,7 @@ import { IRecentFolder, IRecentWorkspace
+@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
 import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
 import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
 import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
 import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
 import './gettingStartedColors.js';
-@@ -930,6 +930,72 @@ export class GettingStartedPage extends
+@@ -928,6 +928,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', {},);
 
-@@ -980,6 +1046,9 @@ export class GettingStartedPage extends
+@@ -977,6 +1043,9 @@ export class GettingStartedPage extends
 				recentList.setLimit(5);
 				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
 			}
@@ -151,7 +151,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
-@@ -49,6 +49,11 @@ export interface IBrowserWorkbenchEnviro
+@@ -44,6 +44,11 @@ export interface IBrowserWorkbenchEnviro
 	readonly isEnabledFileUploads?: boolean;
 
 	/**
@@ -163,7 +163,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
 	 * Gets whether a resolver extension is expected for the environment.
 	 */
 	readonly expectsResolverExtension: boolean;
-@@ -140,6 +145,13 @@ export class BrowserWorkbenchEnvironment
+@@ -135,6 +140,13 @@ export class BrowserWorkbenchEnvironment
 		return this.options.isEnabledFileUploads;
 	}
 
@@ -216,13 +216,13 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
@@ -6,7 +6,7 @@
 import { Disposable } from '../../base/common/lifecycle.js';
 import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
- import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext, IsChromeOSContext } from '../../platform/contextkey/common/contextkeys.js';
+ import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
 -import { IsEnabledFileDownloads, IsEnabledFileUploads, SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SecondarySideBarVisibleContext, 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, IsSessionsWindowContext } from '../common/contextkeys.js';
 +import { IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SecondarySideBarVisibleContext, 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, IsSessionsWindowContext } from '../common/contextkeys.js';
 import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
 import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
 import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
-@@ -209,6 +209,7 @@ export class WorkbenchContextKeysHandler
+@@ -208,6 +208,7 @@ export class WorkbenchContextKeysHandler
 		// code-server
 		IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)
 		IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true)
--- a/patches/integration.diff
+++ b/patches/integration.diff
@@ -225,7 +225,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
 +		<link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />
 		<style id="vscode-css-modules" type="text/css" media="screen"></style>
 
- 		<!-- Startup fallback: shown only if the scripts below never run, e.g. because a proxy,
+ 	</head>
 Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.html
@@ -251,7 +251,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
 +		<link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />
 		<link rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.css">
 
- 		<!-- Startup fallback: shown only if the scripts below never run, e.g. because a proxy,
+ 	</head>
 Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
--- a/patches/local-storage.diff
+++ b/patches/local-storage.diff
@@ -46,7 +46,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
-@@ -107,7 +107,14 @@ export class BrowserWorkbenchEnvironment
+@@ -102,7 +102,14 @@ export class BrowserWorkbenchEnvironment
 	get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }
 
 	@memoize
@@ -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
-@@ -150,8 +150,10 @@ export class WorkspaceService extends Di
+@@ -148,8 +148,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
 			});
 		}));
 
-@@ -563,6 +565,12 @@ export class WorkspaceService extends Di
+@@ -561,6 +563,12 @@ export class WorkspaceService extends Di
 			previousFolders = this.workspace.folders;
 			this.workspace.update(workspace);
 		} else {
--- a/patches/marketplace.diff
+++ b/patches/marketplace.diff
@@ -20,7 +20,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
@@ -65,6 +65,17 @@ else if (globalThis._VSCODE_PRODUCT_JSON
- 			Object.assign(product, { copilotVersions: { runtime: packageConfiguration.copilotRuntimeVersion, sdk } });
+ 			Object.assign(product, { copilotVersions: { runtime, sdk } });
 		}
 	}
 +
--- a/patches/proposed-api.diff
+++ b/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,6 +321,10 @@ function extensionDescriptionArrayToMap(
+@@ -324,6 +324,10 @@ function extensionDescriptionArrayToMap(
 }
 
 export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {
--- a/patches/proxy-uri.diff
+++ b/patches/proxy-uri.diff
@@ -13,18 +13,12 @@ This has e2e tests.
 For the `asExternalUri` changes, you'll need to test manually by:
 1. running code-server with the test extension
 2. Command Palette > code-server: asExternalUri test
-3. input a url like http://localhost:3000/my/path?token=abc#section
-4. it should show a notification and show output as
-   <code-server>/proxy/3000/my/path?token%3Dabc#section
+3. input a url like http://localhost:3000
+4. it should show a notification and show output as <code-server>/proxy/3000

 Do the same thing but set `VSCODE_PROXY_URI: "https://{{port}}-main-workspace-name-user-name.coder.com"`
 and the output should replace `{{port}}` with port used in input url.

-The rewritten URI must preserve the original path, query, and fragment (see
-#7668). Append the original path to the proxy path using URI components so
-encoded characters are not decoded or encoded twice. This also works with
-proxy templates that do not have a trailing slash.
-
 This also enables the forwared ports view panel by default.

 Lastly, it adds a tunnelProvider so that ports are forwarded using code-server's
@@ -110,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js';
 import { create } from '../../../workbench/workbench.web.main.internal.js';
 
-@@ -616,6 +617,44 @@ class WorkspaceProvider implements IWork
+@@ -612,6 +613,39 @@ class WorkspaceProvider implements IWork
 		settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
 		workspaceProvider: WorkspaceProvider.create(config),
 		urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
@@ -122,12 +116,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 +					const renderedTemplate = config.productConfiguration.proxyEndpointTemplate
 +						.replace('{{port}}', localhostMatch.port.toString())
 +						.replace('{{host}}', window.location.host)
-+					const proxyUri = URI.parse(new URL(renderedTemplate, window.location.href).toString())
-+					resolvedUri = proxyUri.with({
-+						path: proxyUri.path.replace(/\/$/, '') + uri.path,
-+						query: uri.query,
-+						fragment: uri.fragment,
-+					})
+					resolvedUri = URI.parse(new URL(renderedTemplate, window.location.href).toString())
 +				} else {
 +					throw new Error(`Failed to resolve external URI: ${uri.toString()}. Could not determine base url because productConfiguration missing.`)
 +				}
@@ -159,7 +148,7 @@ 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
-@@ -100,8 +100,8 @@ export class ForwardedPortsView extends
+@@ -99,8 +99,8 @@ export class ForwardedPortsView extends
 	private async enableForwardedPortsFeatures() {
 		this.contextKeyListener.clear();
 
--- a/patches/remote-secret-storage.diff
+++ b/patches/remote-secret-storage.diff
@@ -1,90 +0,0 @@
-AI: store secrets on remote for VS Code Web
-Index: code-server/lib/vscode/src/vs/platform/secrets/common/secrets.ts
-===================================================================
--- code-server.orig/lib/vscode/src/vs/platform/secrets/common/secrets.ts
-+++ code-server/lib/vscode/src/vs/platform/secrets/common/secrets.ts
-@@ -144,8 +144,13 @@ export class BaseSecretStorageService ex
- 				return await readEncryptedSecret(
- 					key,
- 					(fullKey) => this.getValueFromStorage(key, fullKey, storageService),
-					// If the storage service is in-memory, we don't need to decrypt
-					this._type === 'in-memory' ? (v) => Promise.resolve(v) : (v) => this._encryptionService.decrypt(v),
-+					// Don't decrypt if storage is in-memory or if encryption service is not available
-+					async (v) => {
-+						if (this._type === 'in-memory' || !await this._encryptionService.isEncryptionAvailable()) {
-+							return v;
-+						}
-+						return this._encryptionService.decrypt(v);
-+					},
- 					this._logService,
- 				);
- 			} catch (e) {
-@@ -168,8 +173,13 @@ export class BaseSecretStorageService ex
- 					key,
- 					value,
- 					(fullKey, encrypted) => this.setValueInStorage(key, fullKey, encrypted, storageService),
-					// If the storage service is in-memory, we don't need to encrypt
-					this._type === 'in-memory' ? (v) => Promise.resolve(v) : (v) => this._encryptionService.encrypt(v),
-+					// Don't encrypt if storage is in-memory or if encryption service is not available
-+					async (v) => {
-+						if (this._type === 'in-memory' || !await this._encryptionService.isEncryptionAvailable()) {
-+							return v;
-+						}
-+						return this._encryptionService.encrypt(v);
-+					},
- 					this._logService,
- 				);
- 			} catch (e) {
-@@ -224,8 +234,9 @@ export class BaseSecretStorageService ex
- 
- 	private async initialize(): Promise<IStorageService> {
- 		let storageService;
-		if (!this._useInMemoryStorage && await this._encryptionService.isEncryptionAvailable()) {
-			this._logService.trace(`[SecretStorageService] Encryption is available, using persisted storage`);
-+		if (!this._useInMemoryStorage) {
-+			// Use persisted storage when not forced to use in-memory
-+			this._logService.trace(`[SecretStorageService] Using persisted storage`);
- 			this._type = 'persisted';
- 			storageService = this._storageService;
- 		} else {
-@@ -233,7 +244,7 @@ export class BaseSecretStorageService ex
- 			if (this._type === 'in-memory') {
- 				return this._storageService;
- 			}
-			this._logService.trace('[SecretStorageService] Encryption is not available, falling back to in-memory storage');
-+			this._logService.trace('[SecretStorageService] Falling back to in-memory storage');
- 			this._type = 'in-memory';
- 			storageService = this._register(new InMemoryStorageService());
- 		}
-Index: code-server/lib/vscode/src/vs/workbench/services/secrets/browser/secretStorageService.ts
-===================================================================
--- code-server.orig/lib/vscode/src/vs/workbench/services/secrets/browser/secretStorageService.ts
-+++ code-server/lib/vscode/src/vs/workbench/services/secrets/browser/secretStorageService.ts
-@@ -22,9 +22,9 @@ export class BrowserSecretStorageService
- 		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
- 		@ILogService logService: ILogService
- 	) {
-		// We don't have encryption in the browser so instead we use the
-		// in-memory base class implementation instead.
-		super(true, storageService, encryptionService, logService);
-+		// Use remote storage if enabled, otherwise use in-memory storage
-+		const useRemoteStorage = environmentService.options?.remoteStorageEnabled ?? false;
-+		super(!useRemoteStorage, storageService, encryptionService, logService);
- 
- 		if (environmentService.options?.secretStorageProvider) {
- 			this._secretStorageProvider = environmentService.options.secretStorageProvider;
-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
-@@ -655,8 +655,8 @@ class WorkspaceProvider implements IWork
- 				})
- 			}
- 		},
-		secretStorageProvider: config.remoteAuthority && !secretStorageKeyPath
-			? undefined /* with a remote without embedder-preferred storage, store on the remote */
-+		secretStorageProvider: config.remoteStorageEnabled || (config.remoteAuthority && !secretStorageKeyPath)
-+			? undefined /* with remote storage enabled, or without embedder-prefered storage, store on the remote */
- 			: new LocalStorageSecretStorageProvider(secretStorageCrypto),
- 	});
- })();
--- a/patches/remote-storage.diff
+++ b/patches/remote-storage.diff
@@ -1,246 +0,0 @@
-Reuse VS Code's Electron storage service for remote persistence
-
-Index: code-server/lib/vscode/src/vs/platform/storage/electron-main/storageMainService.ts
-===================================================================
--- code-server.orig/lib/vscode/src/vs/platform/storage/electron-main/storageMainService.ts
-+++ code-server/lib/vscode/src/vs/platform/storage/electron-main/storageMainService.ts
-@@ -11,7 +11,12 @@ import { IStorage } from '../../../base/
- import { INativeEnvironmentService } from '../../environment/common/environment.js';
- import { IFileService } from '../../files/common/files.js';
- import { createDecorator } from '../../instantiation/common/instantiation.js';
-import { ILifecycleMainService, LifecycleMainPhase, ShutdownReason } from '../../lifecycle/electron-main/lifecycleMainService.js';
-+import type { ILifecycleMainService, ShutdownReason } from '../../lifecycle/electron-main/lifecycleMainService.js';
-+
-+// Keep these values local so the server does not load lifecycleMainService at runtime;
-+// that module imports Electron, which is not present in the code-server server image.
-+const LIFECYCLE_MAIN_PHASE_AFTER_WINDOW_OPEN = 3;
-+const SHUTDOWN_REASON_KILL = 2;
- import { ILogService } from '../../log/common/log.js';
- import { AbstractStorageService, isProfileUsingDefaultStorage, IStorageService, StorageScope, StorageTarget } from '../common/storage.js';
- import { ApplicationStorageMain, ApplicationSharedStorageMain, ProfileStorageMain, InMemoryStorageMain, IStorageMain, IStorageMainOptions, WorkspaceStorageMain, IStorageChangeEvent } from './storageMain.js';
-@@ -92,7 +97,7 @@ export class StorageMainService extends
- 		@ILogService private readonly logService: ILogService,
- 		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
- 		@IUserDataProfilesMainService private readonly userDataProfilesService: IUserDataProfilesMainService,
-		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
-+		private readonly lifecycleMainService: ILifecycleMainService,
- 		@IFileService private readonly fileService: IFileService,
- 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
- 	) {
-@@ -114,7 +119,7 @@ export class StorageMainService extends
- 
- 		// Application Storage: Warmup when any window opens
- 		(async () => {
-			await this.lifecycleMainService.when(LifecycleMainPhase.AfterWindowOpen);
-+			await this.lifecycleMainService.when(LIFECYCLE_MAIN_PHASE_AFTER_WINDOW_OPEN);
- 
- 			this.applicationStorage.init();
- 			this.applicationSharedStorage.init();
-@@ -253,7 +258,7 @@ export class StorageMainService extends
- 	}
- 
- 	private createProfileStorage(profile: IUserDataProfile): IStorageMain {
-		if (this.shutdownReason === ShutdownReason.KILL) {
-+		if (this.shutdownReason === SHUTDOWN_REASON_KILL) {
- 
- 			// Workaround for native crashes that we see when
- 			// SQLite DBs are being created even after shutdown
-@@ -292,7 +297,7 @@ export class StorageMainService extends
- 	}
- 
- 	private createWorkspaceStorage(workspace: IAnyWorkspaceIdentifier): IStorageMain {
-		if (this.shutdownReason === ShutdownReason.KILL) {
-+		if (this.shutdownReason === SHUTDOWN_REASON_KILL) {
- 
- 			// Workaround for native crashes that we see when
- 			// SQLite DBs are being created even after shutdown
-Index: code-server/lib/vscode/src/vs/workbench/services/storage/electron-browser/storageService.ts
-===================================================================
--- code-server.orig/lib/vscode/src/vs/workbench/services/storage/electron-browser/storageService.ts
-+++ code-server/lib/vscode/src/vs/workbench/services/storage/electron-browser/storageService.ts
-@@ -3,7 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- 
-import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
-+import { IRemoteService } from '../../../../platform/ipc/common/services.js';
- import { IStorage, Storage, MigratingStorage } from '../../../../base/parts/storage/common/storage.js';
- import { RemoteStorageService } from '../../../../platform/storage/common/storageService.js';
- import { FallbackApplicationStorageDatabaseClient, ApplicationSharedStorageDatabaseClient } from '../../../../platform/storage/common/storageIpc.js';
-@@ -19,10 +19,10 @@ export class NativeWorkbenchStorageServi
- 		workspace: IAnyWorkspaceIdentifier | undefined,
- 		private readonly userDataProfileService: IUserDataProfileService,
- 		userDataProfilesService: IUserDataProfilesService,
-		mainProcessService: IMainProcessService,
-+		remoteService: Pick<IRemoteService, 'getChannel'>,
- 		private readonly workbenchEnvironmentService: IWorkbenchEnvironmentService,
- 	) {
-		super(workspace, { currentProfile: userDataProfileService.currentProfile, defaultProfile: userDataProfilesService.defaultProfile }, mainProcessService, workbenchEnvironmentService);
-+		super(workspace, { currentProfile: userDataProfileService.currentProfile, defaultProfile: userDataProfilesService.defaultProfile }, remoteService as IRemoteService, workbenchEnvironmentService);
- 
- 		this.registerListeners();
- 	}
-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
-@@ -66,6 +66,7 @@ export const serverOptions: OptionDescri
- 	'disable-experiments': OPTIONS['disable-experiments'],
- 	'disable-workspace-trust': OPTIONS['disable-workspace-trust'],
- 	'file-watcher-polling': { type: 'string', deprecates: ['fileWatcherPolling'] },
-+	'enable-remote-storage': { type: 'boolean', cat: 'o', description: nls.localize('enable-remote-storage', 'Persist browser storage (settings, state, etc.) on the server instead of browser IndexedDB. Enables state portability across browsers/devices.') },
- 	'log': OPTIONS['log'],
- 	'logsPath': OPTIONS['logsPath'],
- 	'force-disable-user-env': OPTIONS['force-disable-user-env'],
-@@ -212,6 +213,7 @@ export interface ServerParsedArgs {
- 	'logsPath'?: string;
- 
- 	'force-disable-user-env'?: boolean;
-+	'enable-remote-storage'?: boolean;
- 	'enable-proposed-api'?: string[];
- 
- 	/* ----- vs code web options ----- */
-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
-@@ -105,6 +105,10 @@ import { McpManagementChannel } from '..
- import { AllowedMcpServersService } from '../../platform/mcp/common/allowedMcpServersService.js';
- import { IMcpGalleryManifestService } from '../../platform/mcp/common/mcpGalleryManifest.js';
- import { McpGalleryManifestIPCService } from '../../platform/mcp/common/mcpGalleryManifestServiceIpc.js';
-+import { StorageDatabaseChannel } from '../../platform/storage/electron-main/storageIpc.js';
-+import { StorageMainService } from '../../platform/storage/electron-main/storageMainService.js';
-+import type { ILifecycleMainService } from '../../platform/lifecycle/electron-main/lifecycleMainService.js';
-+import type { IUserDataProfilesMainService } from '../../platform/userDataProfile/electron-main/userDataProfile.js';
- import { SANDBOX_HELPER_CHANNEL_NAME, SandboxHelperChannel } from '../../platform/sandbox/common/sandboxHelperIpc.js';
- import { SandboxHelperService } from '../../platform/sandbox/node/sandboxHelper.js';
- 
-@@ -238,6 +242,21 @@ export async function setupServerService
- 	services.set(IMcpGatewayService, new SyncDescriptor(McpGatewayService));
- 
- 	const instantiationService: IInstantiationService = new InstantiationService(services);
-+	// Reuse the Electron storage service on the remote. The server has no
-+	// windows, so its lifecycle is always ready and never loads a window.
-+	const storageMainService = disposables.add(new StorageMainService(
-+		logService,
-+		environmentService,
-+		userDataProfilesService as unknown as IUserDataProfilesMainService,
-+		{
-+			when: () => Promise.resolve(),
-+			onWillLoadWindow: Event.None,
-+			onWillShutdown: Event.None,
-+		} as unknown as ILifecycleMainService,
-+		fileService,
-+		uriIdentityService,
-+	));
-+
- 	services.set(ILanguagePackService, instantiationService.createInstance(NativeLanguagePackService));
- 
- 	const ptyHostStarter = instantiationService.createInstance(
-@@ -420,6 +439,7 @@ export async function setupServerService
- 
- 		const languagePackChannel = ProxyChannel.fromService<RemoteAgentConnectionContext>(accessor.get(ILanguagePackService), disposables);
- 		socketServer.registerChannel('languagePacks', languagePackChannel);
-+		socketServer.registerChannel('storage', disposables.add(new StorageDatabaseChannel(logService, storageMainService)));
- 
- 		// clean up extensions folder
- 		remoteExtensionsScanner.whenExtensionsReady().then(() => extensionManagementService.cleanUp());
-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
-@@ -451,7 +451,8 @@ export class WebClientServer {
- 			folderUri: resolveWorkspaceURI(this._environmentService.args['default-folder']),
- 			workspaceUri: resolveWorkspaceURI(this._environmentService.args['default-workspace']),
- 			productConfiguration,
-			callbackRoute: callbackRoute
-+			callbackRoute: callbackRoute,
-+			remoteStorageEnabled: this._environmentService.args['enable-remote-storage'] ? true : undefined
- 		};
- 
- 		const cookies = cookie.parse(req.headers.cookie || '');
-Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-===================================================================
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
-+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-@@ -411,6 +411,11 @@ export interface IWorkbenchConstructionO
- 	readonly authenticationProviders?: readonly IAuthenticationProvider[];
- 
- 	//#endregion
-+	/**
-+	 * Persist workbench storage on the remote server instead of browser IndexedDB.
-+	 */
-+	readonly remoteStorageEnabled?: boolean;
-+
- 
- 	//#region Development options
- 
-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
-@@ -33,6 +33,7 @@ import { ISignService } from '../../plat
- import { SignService } from '../../platform/sign/browser/signService.js';
- import { IWorkbenchConstructionOptions, IWorkbench, IWorkspace, ITunnel } from './web.api.js';
- import { BrowserStorageService } from '../services/storage/browser/storageService.js';
-+import { NativeWorkbenchStorageService } from '../services/storage/electron-browser/storageService.js';
- import { IStorageService } from '../../platform/storage/common/storage.js';
- import { toLocalISOString } from '../../base/common/date.js';
- import { isWorkspaceToOpen, isFolderToOpen } from '../../platform/window/common/window.js';
-@@ -482,7 +483,7 @@ export class BrowserMain extends Disposa
- 				serviceCollection.set(IWorkbenchConfigurationService, service);
- 				return service;
- 			}),
-			this.createStorageService(workspace, logService, userDataProfileService).then(service => {
-+			this.createStorageService(workspace, environmentService, logService, userDataProfileService, userDataProfilesService, remoteAgentService).then(service => {
- 				serviceCollection.set(IStorageService, service);
- 				return service;
- 			})
-@@ -604,7 +605,21 @@ export class BrowserMain extends Disposa
- 		}));
- 	}
- 
-	protected async createStorageService(workspace: IAnyWorkspaceIdentifier, logService: ILogService, userDataProfileService: IUserDataProfileService): Promise<IStorageService> {
-+	protected async createStorageService(workspace: IAnyWorkspaceIdentifier, environmentService: IBrowserWorkbenchEnvironmentService, logService: ILogService, userDataProfileService: IUserDataProfileService, userDataProfilesService: IUserDataProfilesService, remoteAgentService: IRemoteAgentService): Promise<IStorageService> {
-+		const connection = remoteAgentService.getConnection();
-+		if (this.configuration.remoteStorageEnabled && connection) {
-+			const storageService = new NativeWorkbenchStorageService(workspace, userDataProfileService, userDataProfilesService, connection, environmentService);
-+
-+			try {
-+				await storageService.initialize();
-+				this.onWillShutdownDisposables.add(toDisposable(() => storageService.close()));
-+				return storageService;
-+			} catch (error) {
-+				onUnexpectedError(error);
-+				logService.error('Remote storage service initialization failed, falling back to browser storage', error);
-+			}
-+		}
-+
- 		const storageService = new BrowserStorageService(workspace, userDataProfileService, logService);
- 
- 		try {
-Index: code-server/lib/vscode/src/vs/sessions/browser/web.main.ts
-===================================================================
--- code-server.orig/lib/vscode/src/vs/sessions/browser/web.main.ts
-+++ code-server/lib/vscode/src/vs/sessions/browser/web.main.ts
-@@ -39,9 +39,9 @@ export class SessionsBrowserMain extends
- 		_workspace: IAnyWorkspaceIdentifier,
- 		environmentService: IBrowserWorkbenchEnvironmentService,
- 		userDataProfileService: IUserDataProfileService,
-		_userDataProfilesService: BrowserUserDataProfilesService,
-+		userDataProfilesService: BrowserUserDataProfilesService,
- 		fileService: FileService,
-		_remoteAgentService: IRemoteAgentService,
-+		remoteAgentService: IRemoteAgentService,
- 		uriIdentityService: IUriIdentityService,
- 		policyService: IPolicyService,
- 		logService: ILogService,
-@@ -82,7 +82,7 @@ export class SessionsBrowserMain extends
- 		serviceCollection.set(IWorkbenchConfigurationService, configurationService);
- 
- 		// Storage
-		const storageService = await this.createStorageService(workspaceIdentifier, logService, userDataProfileService);
-+		const storageService = await this.createStorageService(workspaceIdentifier, environmentService, logService, userDataProfileService, userDataProfilesService, remoteAgentService);
- 		serviceCollection.set(IStorageService, storageService);
- 
- 		// Workspace Trust Service
--- a/patches/series
+++ b/patches/series
@@ -24,6 +24,4 @@ trusted-domains.diff
 signature-verification.diff
 copilot.diff
 app-name.diff
-remote-storage.diff
-remote-secret-storage.diff
 csp-hashes.diff
--- a/patches/sourcemaps.diff
+++ b/patches/sourcemaps.diff
@@ -6,7 +6,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts
 ===================================================================
 --- code-server.orig/lib/vscode/build/gulpfile.reh.ts
 +++ code-server/lib/vscode/build/gulpfile.reh.ts
-@@ -260,10 +260,15 @@ function packageTask(type: string, platf
+@@ -344,10 +344,15 @@ function packageTask(type: string, platf
 	const destination = path.join(BUILD_ROOT, destinationFolderName);
 
 	return () => {
--- a/patches/store-socket.diff
+++ b/patches/store-socket.diff
@@ -31,7 +31,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
 import { ExtHostDiskFileSystemProvider } from './extHostDiskFileSystemProvider.js';
 import nodeModule from 'node:module';
 import { assertType } from '../../../base/common/types.js';
-@@ -176,6 +178,52 @@ export class ExtHostExtensionService ext
+@@ -175,6 +177,52 @@ export class ExtHostExtensionService ext
 
 		performance.mark('code/extHost/didInitAPI');
 
--- a/patches/update-check.diff
+++ b/patches/update-check.diff
@@ -101,14 +101,14 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
 
 	readonly version: string;
 	readonly date?: string;
-@@ -148,6 +149,7 @@ export interface IProductConfiguration {
+@@ -151,6 +152,7 @@ export interface IProductConfiguration {
+ 		readonly resourceUrlTemplate: string;
+ 		readonly nlsBaseUrl: string;
+ 		readonly accessSKUs?: string[];
+		readonly authorizationHeaderToken?: string;
 	};
 
- 	readonly extensionsGallery?: {
-+		readonly authorizationHeaderToken?: string;
- 		readonly serviceUrl: string;
- 		readonly controlUrl: string;
- 		readonly extensionUrlTemplate: string;
+ 	readonly agentSdks?: { readonly [packageId: string]: IAgentSdkProductConfig };
 Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
--- a/patches/webview.diff
+++ b/patches/webview.diff
@@ -28,7 +28,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
-@@ -239,7 +239,7 @@ export class BrowserWorkbenchEnvironment
+@@ -234,7 +234,7 @@ export class BrowserWorkbenchEnvironment
 
 	@memoize
 	get webviewExternalEndpoint(): string {
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -47,7 +47,6 @@ export interface UserProvidedCodeArgs {
  "show-versions"?: boolean
  category?: string
  "github-auth"?: string
-  "enable-remote-storage"?: boolean
  "disable-update-check"?: boolean
  "disable-file-downloads"?: boolean
  "disable-file-uploads"?: boolean
@@ -276,10 +275,6 @@ export const options: Options<Required<UserProvidedArgs>> = {
    type: "string",
    description: "GitHub authentication token (can only be passed in via $GITHUB_TOKEN or the config file).",
  },
-  "enable-remote-storage": {
-    type: "boolean",
-    description: "Persist VS Code workbench storage on the remote server instead of browser storage.",
-  },
  "proxy-domain": { type: "string[]", description: "Domain used for proxying ports." },
  "skip-auth-preflight": {
    type: "boolean",
@@ -434,6 +429,10 @@ 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
@@ -453,10 +452,6 @@ export const parse = (
        throw error(`--${key} requires a value`)
      }

-      if (key === "idle-timeout-seconds" && Number(value) <= 60) {
-        throw new Error("--idle-timeout-seconds must be greater than 60 seconds.")
-      }
-
      if (option.type === OptionalString && value === "false") {
        continue
      }
--- a/test/e2e/extensions.test.ts
+++ b/test/e2e/extensions.test.ts
@@ -15,56 +15,6 @@ function runTestExtensionTests() {
    const normalizedAddress = address.replace(/\/+$/, "")
    await expect(codeServerPage.page.getByText(`Info: proxyUri: ${normalizedAddress}/proxy/{{port}}/`)).toBeVisible()
  })
-
-  runExternalUriTests()
-}
-
-function runExternalUriTests(proxyEndpointTemplate?: string) {
-  const cases = [
-    {
-      name: "path",
-      input: "http://127.0.0.1:1234/my/path",
-      suffix: "/my/path",
-    },
-    {
-      name: "query and fragment",
-      input: "http://localhost:1234/my/path?token=abc&mode=preview#section",
-      suffix: "/my/path?token%3Dabc%26mode%3Dpreview#section",
-    },
-    {
-      name: "encoded components",
-      input: "http://0.0.0.0:1234/my%20path/%23file?token=a%20b#my%20section",
-      suffix: "/my%20path/%23file?token%3Da%20b#my%20section",
-    },
-    {
-      name: "root path",
-      input: "http://127.0.0.1:1234/",
-      suffix: "/",
-    },
-  ]
-
-  for (const { name, input, suffix } of cases) {
-    test(`asExternalUri should preserve ${name}`, async ({ codeServerPage }) => {
-      const address = await getMaybeProxiedCodeServer(codeServerPage)
-      const normalizedAddress = address.replace(/\/+$/, "")
-      const proxyBase = proxyEndpointTemplate
-        ? new URL(proxyEndpointTemplate.replace("{{port}}", "1234"), `${normalizedAddress}/`).toString()
-        : `${normalizedAddress}/proxy/1234/`
-
-      await codeServerPage.waitForTestExtensionLoaded()
-      await codeServerPage.executeCommandViaMenus("code-server: asExternalUri test")
-
-      await codeServerPage.page.waitForSelector(".quick-input-widget:focus-within")
-      await codeServerPage.page.keyboard.type(input)
-      await codeServerPage.page.keyboard.press("Enter")
-
-      // The test extension displays URI.toString(), which also encodes query delimiters.
-      const output = `${proxyBase.replace(/\/$/, "")}${suffix}`
-      await expect(
-        codeServerPage.page.getByText(`Info: input: ${input} output: ${output}`, { exact: true }),
-      ).toBeVisible()
-    })
-  }
 }

 const flags = ["--disable-workspace-trust", "--extensions-dir", path.join(__dirname, "./extensions")]
@@ -73,17 +23,6 @@ describe("Extensions", flags, {}, () => {
  runTestExtensionTests()
 })

-for (const proxyEndpointTemplate of ["./proxy/{{port}}", "https://{{port}}-workspace.example.com"]) {
-  describe(
-    `Extensions with VSCODE_PROXY_URI=${proxyEndpointTemplate}`,
-    flags,
-    { VSCODE_PROXY_URI: proxyEndpointTemplate },
-    () => {
-      runExternalUriTests(proxyEndpointTemplate)
-    },
-  )
-}
-
 if (process.env.USE_PROXY !== "1") {
  describe("Extensions with --cert", [...flags, "--cert"], {}, () => {
    runTestExtensionTests()
--- a/test/e2e/extensions/test-extension/extension.ts
+++ b/test/e2e/extensions/test-extension/extension.ts
@@ -2,8 +2,7 @@ import * as vscode from "vscode"

 export function activate(context: vscode.ExtensionContext) {
  vscode.window.showInformationMessage("test extension loaded")
-
-  // Prints the current proxy URI into a notification.
+  // Test extension
  context.subscriptions.push(
    vscode.commands.registerCommand("codeServerTest.proxyUri", () => {
      if (process.env.VSCODE_PROXY_URI) {
@@ -14,8 +13,7 @@ export function activate(context: vscode.ExtensionContext) {
    }),
  )

-  // Asks for a URI, then runs it through asExternalUri and prints the result
-  // into a notification.
+  // asExternalUri extension
  context.subscriptions.push(
    vscode.commands.registerCommand("codeServerTest.asExternalUri", async () => {
      const input = await vscode.window.showInputBox({
@@ -30,29 +28,4 @@ export function activate(context: vscode.ExtensionContext) {
      }
    }),
  )
-
-  const secretKey = "code-server-test-secret"
-
-  // Asks for a string, then stores it as a secret.
-  context.subscriptions.push(
-    vscode.commands.registerCommand("codeServerTest.setSecret", async () => {
-      const input = await vscode.window.showInputBox({
-        prompt: "Secret to store",
-      })
-
-      if (input) {
-        await context.secrets.store(secretKey, input)
-        vscode.window.showInformationMessage(`set secret: ${input}`)
-      } else {
-        vscode.window.showErrorMessage(`Failed to run test case. No input provided.`)
-      }
-    }),
-  )
-
-  // Prints the current secret, if any.
-  context.subscriptions.push(
-    vscode.commands.registerCommand("codeServerTest.getSecret", async () => {
-      vscode.window.showInformationMessage(`get secret: ${await context.secrets.get(secretKey)}`)
-    }),
-  )
 }
--- a/test/e2e/extensions/test-extension/package.json
+++ b/test/e2e/extensions/test-extension/package.json
@@ -22,16 +22,6 @@
        "command": "codeServerTest.asExternalUri",
        "title": "asExternalUri test",
        "category": "code-server"
-      },
-      {
-        "command": "codeServerTest.setSecret",
-        "title": "Set test secret",
-        "category": "code-server"
-      },
-      {
-        "command": "codeServerTest.getSecret",
-        "title": "Get test secret",
-        "category": "code-server"
      }
    ]
  },
--- a/test/e2e/models/CodeServer.ts
+++ b/test/e2e/models/CodeServer.ts
@@ -363,14 +363,13 @@ export class CodeServerPage {
  }

  /**
-   * Checks if the test extension loaded by waiting for its notification.  Once
-   * it appears, dismiss the notification.
+   * Checks if the test extension loaded
   */
  async waitForTestExtensionLoaded(): Promise<void> {
+    const selector = "text=test extension loaded"
    this.codeServer.logger.debug("Waiting for test extension to load...")
-    const locator = this.page.getByRole("dialog", { name: "Info: test extension loaded" })
-    await locator.hover()
-    await locator.getByLabel("Clear Notification (Del)").click()
+
+    await this.page.waitForSelector(selector)
  }

  /**
@@ -438,7 +437,6 @@ export class CodeServerPage {
  async executeCommandViaMenus(command: string) {
    await this.navigateMenus(["View", "Command Palette..."])

-    await this.page.waitForSelector(".quick-input-widget:focus-within")
    await this.page.keyboard.type(command)

    await this.page.hover(`text=${command}`)
--- a/test/e2e/settings.test.ts
+++ b/test/e2e/settings.test.ts
@@ -1,3 +1,5 @@
+import { promises as fs } from "fs"
+import * as path from "path"
 import { clean } from "../utils/helpers"
 import { describe, test, expect } from "./baseFixture"

--- a/test/e2e/storage.test.ts
+++ b/test/e2e/storage.test.ts
@@ -1,61 +0,0 @@
-import { promises as fs } from "fs"
-import * as path from "path"
-import { describe, test, expect } from "./baseFixture"
-
-const tests = [
-  {
-    name: "browser storage",
-    args: [],
-  },
-  {
-    name: "remote storage",
-    args: ["--enable-remote-storage"],
-  },
-]
-
-for (const tc of tests) {
-  const args = ["--disable-workspace-trust", "--extensions-dir", path.join(__dirname, "./extensions"), ...tc.args]
-  describe(tc.name, args, {}, () => {
-    test("should store workbench state and secrets", async ({ codeServerPage }) => {
-      // Create and open a file.
-      const dir = await codeServerPage.workspaceDir
-      const file = path.join(dir, "foo")
-      await fs.writeFile(file, "bar")
-      await codeServerPage.openFile(file)
-
-      // Store a secret.
-      const secret = "foo-bar-baz"
-      await codeServerPage.waitForTestExtensionLoaded()
-      await codeServerPage.executeCommandViaMenus("code-server: Set test secret")
-      await codeServerPage.page.waitForSelector(".quick-input-widget:focus-within")
-      await codeServerPage.page.keyboard.type(secret)
-      await codeServerPage.page.keyboard.press("Enter")
-      await expect(codeServerPage.page.getByText(`Info: set secret: ${secret}`)).toBeVisible()
-
-      // There should be a workspace storage directory.
-      const userDir = path.join(dir, "User/workspaceStorage")
-      const dirs = await fs.readdir(userDir)
-      expect(dirs.length).toBe(1)
-
-      const storageFile = path.join(userDir, dirs[0], "state.vscdb")
-      if (tc.args.includes("--enable-remote-storage")) {
-        // The sqlite database should exist.
-        fs.stat(storageFile)
-      } else {
-        // But no sqlite database.
-        expect(() => fs.stat(storageFile)).rejects.toThrow("ENOENT")
-      }
-
-      // Reload using a command so it has a chance to flush storage.
-      await codeServerPage.executeCommandViaMenus("Developer: Reload Window")
-      await codeServerPage.waitForTestExtensionLoaded()
-
-      // Should see the same file.
-      await codeServerPage.waitForTab(file)
-
-      // Should be able to retrieve the secret.
-      await codeServerPage.executeCommandViaMenus("code-server: Get test secret")
-      await expect(codeServerPage.page.getByText(`Info: get secret: ${secret}`)).toBeVisible()
-    })
-  })
-}
--- a/test/e2e/typescript.test.ts
+++ b/test/e2e/typescript.test.ts
@@ -1,19 +0,0 @@
-import { promises as fs } from "fs"
-import * as path from "path"
-import { describe, test, expect } from "./baseFixture"
-
-const args = ["--disable-workspace-trust"]
-
-describe("typescript extension", args, {}, () => {
-  test("should load as a workspace extension", async ({ codeServerPage }) => {
-    const dir = await codeServerPage.workspaceDir
-    const file = path.join(dir, "foo.ts")
-    await fs.writeFile(file, 'const n: number = "x"')
-    await codeServerPage.openFile(file)
-
-    await codeServerPage.executeCommandViaMenus("Developer: Show Running Extensions")
-    await expect(
-      codeServerPage.page.getByLabel("typescript-language-features").getByText(/localhost:\d+/),
-    ).toBeVisible()
-  })
-})
--- a/test/package-lock.json
+++ b/test/package-lock.json
@@ -23,25 +23,38 @@
        "wtfnode": "^0.9.1"
      }
    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
    "node_modules/@babel/code-frame": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
-      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
+      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
+        "@babel/highlight": "^7.25.7",
+        "picocolors": "^1.0.0"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/compat-data": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
-      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.7.tgz",
+      "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -49,22 +62,22 @@
      }
    },
    "node_modules/@babel/core": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
-      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz",
+      "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.7",
-        "@babel/helper-compilation-targets": "^7.29.7",
-        "@babel/helper-module-transforms": "^7.29.7",
-        "@babel/helpers": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/template": "^7.29.7",
-        "@babel/traverse": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "@jridgewell/remapping": "^2.3.5",
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helpers": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7",
        "convert-source-map": "^2.0.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
@@ -97,16 +110,15 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.29.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz",
-      "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
+      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/parser": "^7.29.8",
-        "@babel/types": "^7.29.8",
-        "@jridgewell/gen-mapping": "^0.3.12",
-        "@jridgewell/trace-mapping": "^0.3.28",
+        "@babel/types": "^7.25.7",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
        "jsesc": "^3.0.2"
      },
      "engines": {
@@ -114,14 +126,14 @@
      }
    },
    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
-      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
+      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/compat-data": "^7.29.7",
-        "@babel/helper-validator-option": "^7.29.7",
+        "@babel/compat-data": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
        "browserslist": "^4.24.0",
        "lru-cache": "^5.1.1",
        "semver": "^6.3.1"
@@ -140,40 +152,31 @@
        "semver": "bin/semver.js"
      }
    },
-    "node_modules/@babel/helper-globals": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
-      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
    "node_modules/@babel/helper-module-imports": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
-      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
+      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/traverse": "^7.29.7",
-        "@babel/types": "^7.29.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
-      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
+      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-module-imports": "^7.29.7",
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "@babel/traverse": "^7.29.7"
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-simple-access": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -192,10 +195,24 @@
        "node": ">=6.9.0"
      }
    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
+      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
-      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -203,9 +220,9 @@
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
-      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -213,9 +230,9 @@
      }
    },
    "node_modules/@babel/helper-validator-option": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
-      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
+      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -223,27 +240,121 @@
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.29.10",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.10.tgz",
-      "integrity": "sha512-EMCx3AGZ3WfAl6ht7AyQoPm2Lh+BGYEMdc4Q6Hf7uSCDOZFuLq44qNwL+iaim8VlyYhRAo4X43+weadK8ZB4Yg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz",
+      "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.8"
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
-    "node_modules/@babel/parser": {
-      "version": "7.29.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz",
-      "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==",
+    "node_modules/@babel/highlight": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
+      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.29.8"
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz",
+      "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.25.7"
      },
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -476,48 +587,49 @@
      }
    },
    "node_modules/@babel/template": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
-      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
+      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/types": "^7.29.7"
+        "@babel/code-frame": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/types": "^7.25.7"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.29.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.10.tgz",
-      "integrity": "sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
+      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.8",
-        "@babel/helper-globals": "^7.29.7",
-        "@babel/parser": "^7.29.9",
-        "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.8",
-        "debug": "^4.3.1"
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.29.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
-      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz",
+      "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-string-parser": "^7.29.7",
-        "@babel/helper-validator-identifier": "^7.29.7"
+        "@babel/helper-string-parser": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "to-fast-properties": "^2.0.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -823,25 +935,18 @@
      }
    },
    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "node_modules/@jridgewell/remapping": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
-      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
      }
    },
    "node_modules/@jridgewell/resolve-uri": {
@@ -854,17 +959,27 @@
        "node": ">=6.0.0"
      }
    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
-      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
      "dev": true,
      "license": "MIT"
    },
    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.31",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1383,9 +1498,9 @@
      "license": "MIT"
    },
    "node_modules/baseline-browser-mapping": {
-      "version": "2.11.27",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.27.tgz",
-      "integrity": "sha512-ElY12DaROGuan+lMmZ8Cvo/ZUbXPe7Enc/9VU/b1T3Kp4dwytRcNdR8DoSJN5SNJT/CuvcCA0DHDVmMOCePdRQ==",
+      "version": "2.11.21",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.21.tgz",
+      "integrity": "sha512-uh8vpY/1/YyFkunIDFH/12p7/7VdPKA1hejMVEbdkEaWnUz0Hesvx5EbiU6XxjyHZIOju+ZMbQJkRh+es3/spQ==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
@@ -1396,9 +1511,9 @@
      }
    },
    "node_modules/brace-expansion": {
-      "version": "1.1.21",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
-      "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1427,9 +1542,9 @@
      "license": "BSD-2-Clause"
    },
    "node_modules/browserslist": {
-      "version": "4.29.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.3.tgz",
-      "integrity": "sha512-1R4kiYKXGViqEN0CnoDrXc1StD9niAwu+j2dukWzrD4bJgsD4lDmEp0CRbc6E/vYJIfTHwPmwyaKtVSudICdPA==",
+      "version": "4.28.9",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.9.tgz",
+      "integrity": "sha512-EWazOblFYUvlGZcfGhPUPmYh3nikUxBVb+y9MJun5f3hBi812X+8MSQTujLBtgK3cf51fJWbWfOjyeO954d+Eg==",
      "dev": true,
      "funding": [
        {
@@ -1447,11 +1562,11 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "baseline-browser-mapping": "^2.11.26",
-        "caniuse-lite": "^1.0.30001813",
-        "electron-to-chromium": "^1.5.439",
-        "node-releases": "^2.0.57",
-        "update-browserslist-db": "^1.3.3"
+        "baseline-browser-mapping": "^2.11.20",
+        "caniuse-lite": "^1.0.30001810",
+        "electron-to-chromium": "^1.5.420",
+        "node-releases": "^2.0.54",
+        "update-browserslist-db": "^1.3.2"
      },
      "bin": {
        "browserslist": "cli.js"
@@ -1535,9 +1650,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001815",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001815.tgz",
-      "integrity": "sha512-uDybUEyfgbyJJ93J1vikTylBX31AkdVYeVPeffMQpf8XN7hSfr0oZOn4VFOIMNvtU5+rHvC5Udg2TgtJKHm23Q==",
+      "version": "1.0.30001810",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz",
+      "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==",
      "dev": true,
      "funding": [
        {
@@ -1879,9 +1994,9 @@
      }
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.451",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.451.tgz",
-      "integrity": "sha512-vUNKPrUzw8ByEMOxloq0a71iD/mPuPxVkbDm3G5YhnxTzOw/I6qAg2MUS0cYj/c267lWmw26yW4Vv7foxTxPLg==",
+      "version": "1.5.422",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.422.tgz",
+      "integrity": "sha512-UvA/32XqrLDdZSn7Jllo1AYNcWji/G0d5M0GTViE7KoGBiMunw3a34Sb2KO4ZZyrSEhqsxFoVhWWJshdyfKqJA==",
      "dev": true,
      "license": "ISC"
    },
@@ -2343,6 +2458,16 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/gopd": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -3383,9 +3508,9 @@
      "license": "MIT"
    },
    "node_modules/js-yaml": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
-      "integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3741,9 +3866,9 @@
      "license": "MIT"
    },
    "node_modules/node-releases": {
-      "version": "2.0.57",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.57.tgz",
-      "integrity": "sha512-kQK9LGGFiHtrWiNhZtA7Qbw17AQz+dmsEKODRIVTXA9+e5MS/2gZEBhYJt13GrAz5/IOZKddH/0Z3TP/Zgo+yw==",
+      "version": "2.0.54",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.54.tgz",
+      "integrity": "sha512-YHs7BmmcsdAI5Ozuf8JZo6PT0mv2GIWC9vMfvUC3dp65M8hn7Ux8CPL+2oBI7juNuj9d0ndhTcznq2ODBps9cQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4470,6 +4595,16 @@
      "dev": true,
      "license": "BSD-3-Clause"
    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -4622,9 +4757,9 @@
      }
    },
    "node_modules/update-browserslist-db": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.4.tgz",
-      "integrity": "sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.2.tgz",
+      "integrity": "sha512-UQ+MSxlhRm1bzjhU+DcuXfjFO1FzNtqhK5+9Yvlp90ItDLk5vT932A0rFu619nf7RVS+Y/VeaUW1jaRDqZ8VJw==",
      "dev": true,
      "funding": [
        {
--- a/test/playwright.config.ts
+++ b/test/playwright.config.ts
@@ -33,12 +33,10 @@ const config: PlaywrightTestConfig = {
    //   name: "Firefox",
    //   use: { browserName: "firefox" },
    // },
-    // Keeps failing with "Underlying ArrayBuffer has been detached from the view or out-of-bounds"
-    // Not sure what we can do about it...so skip for now.
-    // {
-    //   name: "WebKit",
-    //   use: { browserName: "webkit" },
-    // },
+    {
+      name: "WebKit",
+      use: { browserName: "webkit" },
+    },
  ],
 }

--- a/test/unit/node/cli.test.ts
+++ b/test/unit/node/cli.test.ts
@@ -268,16 +268,6 @@ describe("parser", () => {
    expect(() => parse(["--log", "invalid"])).toThrowError(/--log valid values: \[trace, debug, info, warn, error\]/)
  })

-  it("should error if idle-timeout-seconds is too low", () => {
-    expect(() => parse(["--idle-timeout-seconds=60"])).toThrowError(
-      /--idle-timeout-seconds must be greater than 60 seconds/,
-    )
-    expect(() => parse(["--idle-timeout-seconds", "60"])).toThrowError(
-      /--idle-timeout-seconds must be greater than 60 seconds/,
-    )
-    expect(parse(["--idle-timeout-seconds", "61"])).toEqual({ "idle-timeout-seconds": 61 })
-  })
-
  it("should error if the option doesn't exist", () => {
    expect(() => parse(["--foo"])).toThrowError(/Unknown option --foo/)
  })
@@ -1067,13 +1057,6 @@ describe("toCodeArgs", () => {
    })
  })

-  it("should pass through --enable-remote-storage", async () => {
-    expect(await toCodeArgs(await setDefaults(parse(["--enable-remote-storage"])))).toStrictEqual({
-      ...vscodeDefaults,
-      "enable-remote-storage": true,
-    })
-  })
-
  it("should collect a repeated --vscode-option into an array", async () => {
    const args = parse([
      "--vscode-option",
@@ -1 +1 @@
 .21.0
 .18.1