From 63c071959faa3743a51224272932c475ea202784 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Wed, 3 Jun 2026 04:42:18 +1000 Subject: [PATCH 001/129] Update Helm chart and changelog with 4.122.1 (#7835) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a471d2305e..44f99ab0465d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.122.1](https://github.com/coder/code-server/releases/tag/v4.122.1) - 2026-06-02 + Code v1.122.1 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index eeb2cf3f1836..6e0eaae6338f 100644 --- 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.37.0 +version: 3.37.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.122.0 +appVersion: 4.122.1 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 7406fa1ffb64..e9432f39e7eb 100644 --- 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.122.0' + tag: '4.122.1' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 6fd40c04c78d04778616c2acd780790507189a8a Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 2 Jun 2026 11:23:22 -0800 Subject: [PATCH 002/129] Fix Helm chart version bump script Instead of relying on semver which is not installed, just parse it with bash. --- ci/build/update-repo.sh | 65 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 8 deletions(-) diff --git a/ci/build/update-repo.sh b/ci/build/update-repo.sh index e36afaf9daaf..0f1924fa91a4 100755 --- a/ci/build/update-repo.sh +++ b/ci/build/update-repo.sh @@ -2,16 +2,65 @@ set -Eeuo pipefail +# Given versions $1 and $2 figure out the first component that is different +# (major, minor, patch). +function find_version_diff() { + # shellcheck disable=SC2206 + local a=( ${1//./ } ) + # shellcheck disable=SC2206 + local b=( ${2//./ } ) + + if [[ ${a[0]} != "${b[0]}" ]] ; then + echo major + elif [[ ${a[1]} != "${b[1]}" ]] ; then + echo minor + else + echo patch + fi +} + +# Bump $1 by the bump type (major, minor, patch) in $2. +function bump_version() { + # shellcheck disable=SC2206 + local a=( ${1//./ } ) + case $2 in + major) + ((a[0]++)) + a[1]=0 + a[2]=0 + ;; + minor) + ((a[1]++)) + a[2]=0 + ;; + *) + ((a[2]++)) + ;; + esac + echo "${a[0]}.${a[1]}.${a[2]}" +} + function update_helm() { - local current - current=$(yq .version ci/helm-chart/Chart.yaml) - local next - next=$(semver "$current" -i minor) - echo "Bumping version from $current to $next..." - sed -i.bak "s/^version: $current\$/version: $next/" ci/helm-chart/Chart.yaml - - echo "Setting app version and image to $version..." + local chart_version + chart_version=$(yq .version ci/helm-chart/Chart.yaml) + local app_version + app_version=$(yq .appVersion ci/helm-chart/Chart.yaml) + local image_version + image_version=$(yq .image.tag ci/helm-chart/values.yaml) + + local bump_type + bump_type=$(find_version_diff "$app_version" "$version") + local chart_version_bump + chart_version_bump=$(bump_version "$chart_version" "$bump_type") + + # Use sed to replace because yq will reformat. + echo "Bumping version from $chart_version to $chart_version_bump..." + sed -i.bak "s/^version: $chart_version\$/version: $chart_version_bump/" ci/helm-chart/Chart.yaml + + echo "Bumping app version from $app_version to $version..." sed -i.bak "s/^appVersion: .\+\$/appVersion: $version/" ci/helm-chart/Chart.yaml + + echo "Bumping image version from $image_version to $version..." sed -i.bak "s/^ tag: .\+\$/ tag: '$version'/" ci/helm-chart/values.yaml } From 559d73a636592f965eeb15737d0b57167b66934a Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 3 Jun 2026 11:33:49 -0800 Subject: [PATCH 003/129] Update Code to 1.123.0 (#7837) --- .node-version | 2 +- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 4 ++-- patches/disable-builtin-ext-update.diff | 2 +- patches/proxy-uri.diff | 2 +- patches/sourcemaps.diff | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.node-version b/.node-version index 32a2d7bd80d1..5bf4400f2292 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -22.22.1 +24.15.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f99ab0465d..75e284f8bad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.123.0 + +### Changed + +- Update to Code 1.123.0 + ## [4.122.1](https://github.com/coder/code-server/releases/tag/v4.122.1) - 2026-06-02 Code v1.122.1 diff --git a/lib/vscode b/lib/vscode index 8761a5560cfd..6a44c352bd24 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 8761a5560cfd65fdd19ce7e2bd18dab5c0a4d84e +Subproject commit 6a44c352bd24569c417e530095901b649960f9f8 diff --git a/patches/base-path.diff b/patches/base-path.diff index 693afc8f4d5c..234b8403c6c4 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts } private startListening(): void { -@@ -584,17 +585,6 @@ class WorkspaceProvider implements IWork +@@ -590,17 +591,6 @@ class WorkspaceProvider implements IWork } } @@ -281,7 +281,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts (function () { // Find config by checking for DOM -@@ -604,8 +594,8 @@ function readCookie(name: string): strin +@@ -610,8 +600,8 @@ function readCookie(name: string): strin if (!configElement || !configElementAttribute) { throw new Error('Missing web configuration element'); } diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 20af3023a47c..96c916a16b5c 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -342,6 +342,10 @@ export class Extension implements IExten +@@ -344,6 +344,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index ca55153eeb87..9921cc23022a 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -104,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'; -@@ -606,6 +607,39 @@ 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), diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 615edca9dad4..4c51aace765e 100644 --- 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 -@@ -255,10 +255,15 @@ function packageTask(type: string, platf +@@ -296,10 +296,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { From 77d880d0c3fcbf4ac613644b3e113cedd6173a16 Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 3 Jun 2026 12:05:24 -0800 Subject: [PATCH 004/129] Drop armhf builds --- .github/workflows/release.yaml | 3 --- CHANGELOG.md | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d6d0bd3a6ec3..31589fa7ffa5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,9 +39,6 @@ jobs: - npm_arch: arm64 vscode_arch: arm64 package_arch: arm64 - - npm_arch: arm - vscode_arch: armhf - package_arch: armv7l env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 75e284f8bad7..098f5b8e6ed0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ Code v1.123.0 ### Changed - Update to Code 1.123.0 +- Microsoft dropped support for armhf remotes so there will no longer be any + builds for armhf. ## [4.122.1](https://github.com/coder/code-server/releases/tag/v4.122.1) - 2026-06-02 From d0d53d924e0d3462d8d02dfc6083031932bd024d Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 5 Jun 2026 04:50:04 +1000 Subject: [PATCH 005/129] Update Helm chart and changelog with 4.123.0 (#7838) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 098f5b8e6ed0..9dbab3c87315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.123.0](https://github.com/coder/code-server/releases/tag/v4.123.0) - 2026-06-03 + Code v1.123.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 6e0eaae6338f..60f9b1720cf8 100644 --- 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.37.1 +version: 3.38.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.122.1 +appVersion: 4.123.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index e9432f39e7eb..81f112ced5fd 100644 --- 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.122.1' + tag: '4.123.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 92a7dce46ffcd363798e5ef008991e8cc6426de5 Mon Sep 17 00:00:00 2001 From: ka-ishimoto Date: Thu, 11 Jun 2026 04:59:45 +0900 Subject: [PATCH 006/129] Fix false positive CVE alerts by setting package name to code-oss-dev (#7839) The VS Code build process sets the bundled lib/vscode/package.json name to "code-server" (from product.json nameShort), causing vulnerability scanners to misidentify it and flag non-applicable CVEs. Override the name to "code-oss-dev" in build-release.sh after merging package.json. Fixes #7071 Signed-off-by: ka-ishimoto --- ci/build/build-release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index 9ded35f98ccb..30dcfef6399e 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -128,7 +128,9 @@ bundle_vscode() { # Merge the package.json for the web/remote server so we can include # dependencies, since we want to ship this via NPM. - jq --slurp '.[0] * .[1]' \ + # Also override the name to prevent vulnerability scanners from + # misidentifying this package as VS Code (see #7071). + jq --slurp '.[0] * .[1] | .name = "code-oss-dev"' \ "$VSCODE_SRC_PATH/remote/package.json" \ "$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged" mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json" From 364cf99338d5f2f1574057b132fc00bf163b2653 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 15 Jun 2026 16:37:07 -0800 Subject: [PATCH 007/129] Strip token from cookies before proxying Since this functionality requires information placed onto the request by code-server (req.args) and Express (req.cookies), move the standalone tests into the integration tests as the proxy can no longer run correctly on its own without that context. We could strip the header elsewhere or refactor in some way (pass in a callback function for the stripping or something) but this seems like the simplest and safest place at the moment to ensure we catch all uses of the proxy. In any case, I think it does lend more confidence to know we are testing the proxy the way it will be used in practice. The downside is some additional complexity when setting up tests, but at the moment I do not think that exchange is overly burdensome. --- package-lock.json | 31 +++++++++-- package.json | 1 + src/node/proxy.ts | 17 ++++++- test/unit/node/proxy.test.ts | 99 ++++++++++++++---------------------- 4 files changed, 81 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index b3ef6a0f26cc..eac3f50ddebe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@coder/logger": "^3.0.1", "argon2": "^0.44.0", "compression": "^1.7.4", + "cookie": "^1.1.1", "cookie-parser": "^1.4.6", "env-paths": "^2.2.1", "express": "^5.0.1", @@ -1936,12 +1937,16 @@ } }, "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz", + "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==", "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/cookie-parser": { @@ -1957,6 +1962,15 @@ "node": ">= 0.8.0" } }, + "node_modules/cookie-parser/node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2953,6 +2967,15 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express/node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/cookie-signature": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", diff --git a/package.json b/package.json index b229efb3f5e5..35fae5970f9d 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "@coder/logger": "^3.0.1", "argon2": "^0.44.0", "compression": "^1.7.4", + "cookie": "^1.1.1", "cookie-parser": "^1.4.6", "env-paths": "^2.2.1", "express": "^5.0.1", diff --git a/src/node/proxy.ts b/src/node/proxy.ts index afa964ae529b..8282729cc34d 100644 --- a/src/node/proxy.ts +++ b/src/node/proxy.ts @@ -1,5 +1,7 @@ +import * as cookie from "cookie" +import type { Request } from "express" import proxyServer from "http-proxy" -import { HttpCode } from "../common/http" +import { getCookieSessionName, HttpCode } from "../common/http" export const proxy = proxyServer.createProxyServer({}) @@ -18,6 +20,19 @@ proxy.on("error", (error, _, res) => { } }) +// Strip the code-server cookie if it exists to avoid transmitting the cookie +// to potentially malicious local ports. +proxy.on("proxyReq", (preq, req) => { + const cookieSessionName = getCookieSessionName((req as Request).args["cookie-suffix"]) + preq.setHeader( + "Cookie", + cookie.stringifyCookie({ + ...(req as Request).cookies, + [cookieSessionName]: undefined, + }), + ) +}) + // Intercept the response to rewrite absolute redirects against the base path. // Is disabled when the request has no base path which means /absproxy is in use. proxy.on("proxyRes", (res, req) => { diff --git a/test/unit/node/proxy.test.ts b/test/unit/node/proxy.test.ts index b3509ed640df..94945cb94eaa 100644 --- a/test/unit/node/proxy.test.ts +++ b/test/unit/node/proxy.test.ts @@ -1,15 +1,12 @@ import * as express from "express" -import * as http from "http" -import nodeFetch from "node-fetch" import { HttpCode } from "../../../src/common/http" -import { proxy } from "../../../src/node/proxy" import { wss, Router as WsRouter } from "../../../src/node/wsRouter" -import { getAvailablePort, mockLogger } from "../../utils/helpers" +import { mockLogger } from "../../utils/helpers" import * as httpserver from "../../utils/httpserver" import * as integration from "../../utils/integration" describe("proxy", () => { - const nhooyrDevServer = new httpserver.HttpServer() + const proxyTarget = new httpserver.HttpServer() const wsApp = express.default() const wsRouter = WsRouter() let codeServer: httpserver.HttpServer | undefined @@ -19,21 +16,22 @@ describe("proxy", () => { beforeAll(async () => { wsApp.use("/", wsRouter.router) - await nhooyrDevServer.listen((req, res) => { + await proxyTarget.listen((req, res) => { e(req, res) }) - nhooyrDevServer.listenUpgrade(wsApp) - proxyPath = `/proxy/${nhooyrDevServer.port()}/wsup` + proxyTarget.listenUpgrade(wsApp) + proxyPath = `/proxy/${proxyTarget.port()}/wsup` absProxyPath = proxyPath.replace("/proxy/", "/absproxy/") }) afterAll(async () => { - await nhooyrDevServer.dispose() + await proxyTarget.dispose() }) beforeEach(() => { e = express.default() mockLogger() + delete process.env.PASSWORD }) afterEach(async () => { @@ -283,65 +281,42 @@ describe("proxy", () => { const resp = await codeServer.fetch(proxyPath, { method: "OPTIONS" }) expect(resp.status).toBe(200) }) -}) -// NOTE@jsjoeio -// Both this test suite and the one above it are very similar -// The main difference is this one uses http and node-fetch -// and specifically tests the proxy in isolation vs. using -// the httpserver abstraction we've built. -// -// Leaving this as a separate test suite for now because -// we may consider refactoring the httpserver abstraction -// in the future. -// -// If you're writing a test specifically for code in -// src/node/proxy.ts, you should probably add it to -// this test suite. -describe("proxy (standalone)", () => { - let URL = "" - let PROXY_URL = "" - let testServer: http.Server - let proxyTarget: http.Server + it("should return a 500 when no target is running ", async () => { + const target = new httpserver.HttpServer() + await target.listen(() => {}) + const port = target.port() + target.dispose() + codeServer = await integration.setup(["--auth=none"], "") + const resp = await codeServer.fetch(`/proxy/${port}/wsup`) + expect(resp.status).toBe(HttpCode.ServerError) + expect(resp.statusText).toBe("Internal Server Error") + }) - beforeEach(async () => { - const PORT = await getAvailablePort() - const PROXY_PORT = await getAvailablePort() - URL = `http://localhost:${PORT}` - PROXY_URL = `http://localhost:${PROXY_PORT}` - // Define server and a proxy server - testServer = http.createServer((req, res) => { - proxy.web(req, res, { - target: PROXY_URL, - }) - }) + it("should strip token cookie", async () => { + const token = "my-super-secure-token" + process.env.HASHED_PASSWORD = token + codeServer = await integration.setup(["--auth=password"]) - proxyTarget = http.createServer((req, res) => { - res.writeHead(200, { "Content-Type": "text/plain" }) - res.end() + // Set up a listener that just prints the cookies it got. + e.get("/wsup/cookies", (req, res) => { + res.writeHead(HttpCode.Ok, { "Content-Type": "text/plain" }) + res.end(req.headers.cookie) }) - // Start both servers - proxyTarget.listen(PROXY_PORT) - testServer.listen(PORT) - }) - - afterEach(async () => { - testServer.close() - proxyTarget.close() - }) - - it("should return a 500 when proxy target errors ", async () => { - // Close the proxy target so that proxy errors - proxyTarget.close() - const errorResp = await nodeFetch(`${URL}/error`) - expect(errorResp.status).toBe(HttpCode.ServerError) - expect(errorResp.statusText).toBe("Internal Server Error") - }) + // Send the token along with other cookies which should be preserved. + // Encode one to make sure they are being re-encoded properly. + const value = "hello=there" + const encodedValue = encodeURIComponent(value) + const resp = await codeServer.fetch(proxyPath + "/cookies", { + headers: { + cookie: `cookie1=${encodedValue}; code-server-session=${token}; cookie2=hello;`, + }, + }) - it("should proxy correctly", async () => { - const resp = await nodeFetch(`${URL}/route`) + // The proxied listener should not have printed the code-server token. expect(resp.status).toBe(200) - expect(resp.statusText).toBe("OK") + const text = await resp.text() + expect(text).toBe(`cookie1=${encodedValue}; cookie2=hello`) }) }) From 1ccd4f04d2f77ddace6df3f9e3945de45068568a Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 15 Jun 2026 16:40:30 -0800 Subject: [PATCH 008/129] Update brace-expansion, js-yaml, and ws --- package-lock.json | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index eac3f50ddebe..66bb41851332 100644 --- a/package-lock.json +++ b/package-lock.json @@ -969,9 +969,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "dev": true, "license": "MIT", "dependencies": { @@ -4153,9 +4153,19 @@ "license": "ISC" }, "node_modules/js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -6636,9 +6646,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "8.20.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz", - "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "license": "MIT", "engines": { "node": ">=10.0.0" From 9fe7eb79d5ab2f2ed369d0e79cce4dbc6fe00a31 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:28:49 +1000 Subject: [PATCH 009/129] Update Code to 1.124.2 (#7846) --- CHANGELOG.md | 14 ++++++++++++++ lib/vscode | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/webview.diff | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dbab3c87315..6d2568a32466 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,20 @@ Code v99.99.999 ## Unreleased +Code v1.124.2 + +### Security + +- Strip code-server's session token from the cookie before proxying to a local + port. Previously, when you used built-in password authentication, the cookie + would be sent to the local proxied port, which meant if the service was + malicious and not already running as your code-server user it could use the + cookie to log into code-server and execute commands as your code-server user. + +### Changed + +- Update to Code 1.124.2 + ## [4.123.0](https://github.com/coder/code-server/releases/tag/v4.123.0) - 2026-06-03 Code v1.123.0 diff --git a/lib/vscode b/lib/vscode index 6a44c352bd24..6928394f91b6 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 6a44c352bd24569c417e530095901b649960f9f8 +Subproject commit 6928394f91b684055b873eecb8bc281365131f1c diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 96c916a16b5c..0d3690b35765 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -344,6 +344,10 @@ export class Extension implements IExten +@@ -345,6 +345,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/webview.diff b/patches/webview.diff index a1ce247be496..5dd0f9d4b95c 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -70,8 +70,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-m1DlJtsIJd46QuWYNcsaYIG1xI+9FyjKQu+cfp+zq5Q=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-nXjtuhBilO++r8hfxl5VjEScSmdm07wDAk6jw228DgM=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> Date: Wed, 17 Jun 2026 01:57:28 +1000 Subject: [PATCH 010/129] Update Helm chart and changelog with 4.124.2 (#7851) Co-authored-by: cdrci --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2568a32466..2abd8e0a57b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.124.2](https://github.com/coder/code-server/releases/tag/v4.124.2) - 2026-06-16 + Code v1.124.2 ### Security diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 60f9b1720cf8..778a90353141 100644 --- 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.38.0 +version: 3.39.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.123.0 +appVersion: 4.124.2 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 81f112ced5fd..413920542f8d 100644 --- 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.123.0' + tag: '4.124.2' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 71ba0191f2af9761f9a7f244912238b1644bbab6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 08:59:54 -0800 Subject: [PATCH 011/129] chore: bump globals from 16.5.0 to 17.6.0 (#7831) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66bb41851332..8b65159c4570 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", - "globals": "^16.1.0", + "globals": "^17.6.0", "prettier": "3.8.3", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", @@ -3333,9 +3333,9 @@ } }, "node_modules/globals": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", - "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", + "version": "17.6.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.6.0.tgz", + "integrity": "sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index 35fae5970f9d..66577cdcd712 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", - "globals": "^16.1.0", + "globals": "^17.6.0", "prettier": "3.8.3", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", From f7663cc34cff80078ba1cbb8444fa00706812bdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:02:59 -0800 Subject: [PATCH 012/129] chore: bump codecov/codecov-action from 5.5.4 to 6.0.1 (#7833) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b64c12359b4c..d92a46da632b 100644 --- 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@75cd11691c0faa626561e295848008c8a7dddffe # v5 + - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 if: success() with: token: ${{ secrets.CODECOV_TOKEN }} From 7393d50b09921e8d19d52909d162563b9235869b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:03:28 -0800 Subject: [PATCH 013/129] chore: bump awalsh128/cache-apt-pkgs-action from 1.5.3 to 1.6.0 (#7832) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d92a46da632b..e097e49ee3f7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -163,7 +163,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 31589fa7ffa5..59bf79cbc968 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 3ea12c5d9e07..48753ca2fa52 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -47,7 +47,7 @@ jobs: echo done=false >> $GITHUB_OUTPUT fi - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest if: steps.check.outputs.done == 'false' with: packages: quilt From 53ed1e30d2a8b9b4c8dee3a3664060fa8ba60873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:04:01 -0800 Subject: [PATCH 014/129] chore: bump docker/setup-qemu-action from 4.0.0 to 4.1.0 (#7830) --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 64355ee0dcd8..c1ecbacf5d90 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -109,7 +109,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 + - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 From 24811a62698a30c81bf03cc90043fc4d1c64ca61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 17:16:41 +0000 Subject: [PATCH 015/129] chore: bump docker/setup-buildx-action from 4.0.0 to 4.1.0 (#7829) --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c1ecbacf5d90..c72ec1bd88ce 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: From a056406effc29b1562ddbdd92ee1521d150444cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 17:35:17 +0000 Subject: [PATCH 016/129] chore: bump form-data in /test (#7848) --- test/package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 171c8d085db8..56b2e683ad84 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -2336,17 +2336,17 @@ } }, "node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", + "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" + "hasown": "^2.0.4", + "mime-types": "^2.1.35" }, "engines": { "node": ">= 6" @@ -2561,9 +2561,9 @@ } }, "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", "dev": true, "license": "MIT", "dependencies": { @@ -3602,16 +3602,16 @@ } }, "node_modules/jsdom/node_modules/form-data": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz", - "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.5.tgz", + "integrity": "sha512-j23EibVLnp4zNXGW7LjryXYa2X6U/M96yoOX+ybZxwkYajdxRNEqYY3zhh7y0i6kfISKS2jr+EJq1YTUDEv5+w==", "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", + "hasown": "^2.0.4", "mime-types": "^2.1.35" }, "engines": { From 87ac56bf8c29fd091d2512d4321eb06aa9d3a734 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:37:41 -0800 Subject: [PATCH 017/129] chore: bump softprops/action-gh-release from 1 to 3 (#7774) --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 59bf79cbc968..9a1774fde86d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -110,7 +110,7 @@ jobs: - run: | sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes if: ${{ matrix.vscode_arch == 'x64' }} - - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 if: ${{ matrix.vscode_arch == 'x64' }} with: draft: true @@ -123,7 +123,7 @@ jobs: # Platform-specific release. - run: KEEP_MODULES=1 npm run release - run: npm run package - - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 with: draft: true discussion_category_name: "📣 Announcements" @@ -189,7 +189,7 @@ jobs: - run: npm run test:native - run: npm run package - - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 with: draft: true discussion_category_name: "📣 Announcements" From 5dca609c2a99a604cd2f9fb568eac68666a797ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 09:38:09 -0800 Subject: [PATCH 018/129] chore: bump i18next from 25.8.13 to 26.3.1 (#7828) --- package-lock.json | 28 ++++++++-------------------- package.json | 2 +- src/node/i18n/index.ts | 1 - 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b65159c4570..b873ca7ef0f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "express": "^5.0.1", "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", - "i18next": "^25.8.3", + "i18next": "^26.3.1", "js-yaml": "^4.1.0", "limiter": "^2.1.0", "pem": "^1.14.8", @@ -69,15 +69,6 @@ "node": "22" } }, - "node_modules/@babel/runtime": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz", - "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@coder/logger": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@coder/logger/-/logger-3.0.1.tgz", @@ -3555,29 +3546,26 @@ } }, "node_modules/i18next": { - "version": "25.8.13", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.13.tgz", - "integrity": "sha512-E0vzjBY1yM+nsFrtgkjLhST2NBkirkvOVoQa0MSldhsuZ3jUge7ZNpuwG0Cfc74zwo5ZwRzg3uOgT+McBn32iA==", + "version": "26.3.1", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz", + "integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==", "funding": [ { "type": "individual", - "url": "https://locize.com" + "url": "https://www.locize.com/i18next" }, { "type": "individual", - "url": "https://locize.com/i18next.html" + "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" }, { "type": "individual", - "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" + "url": "https://www.locize.com" } ], "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.4" - }, "peerDependencies": { - "typescript": "^5" + "typescript": "^5 || ^6" }, "peerDependenciesMeta": { "typescript": { diff --git a/package.json b/package.json index 66577cdcd712..170d7295247d 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "express": "^5.0.1", "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", - "i18next": "^25.8.3", + "i18next": "^26.3.1", "js-yaml": "^4.1.0", "limiter": "^2.1.0", "pem": "^1.14.8", diff --git a/src/node/i18n/index.ts b/src/node/i18n/index.ts index a7f9f17bccc4..e8186067ba98 100644 --- a/src/node/i18n/index.ts +++ b/src/node/i18n/index.ts @@ -54,7 +54,6 @@ init({ lowerCaseLng: true, debug: process.env.NODE_ENV === "development", resources: defaultResources, - showSupportNotice: false, }) export default i18next From d31d0347cf8c6683553f4d9e4795155dae631fbf Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 09:43:26 -0800 Subject: [PATCH 019/129] Remove Dependabot commit prefix The changelog is manually curated so the prefixes are noise. --- .github/dependabot.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 87513b7cee1d..7cc5663e9f42 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -16,8 +16,6 @@ updates: interval: "monthly" time: "06:00" timezone: "America/Chicago" - commit-message: - prefix: "chore" labels: [] ignore: # Ignore patch updates for all dependencies From 7617ab2b92b3a4d991da1b4b60ac42a6ddaccdd6 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 09:42:12 -0800 Subject: [PATCH 020/129] Update AUR commit message to match code-server's --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c72ec1bd88ce..3ab55adacd10 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -93,7 +93,7 @@ jobs: run: | git checkout -b update-version-${{ env.VERSION }} git add . - git commit -m "chore: updating version to ${{ env.VERSION }}" + git commit -m "Update to ${{ env.VERSION }}" git push -u origin $(git branch --show) gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR From 72086edbdb615389d804d04fa8e9e7652fa13237 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 09:41:30 -0800 Subject: [PATCH 021/129] Remove Windows npm installation recommendation We need to properly support Windows before we can recommend any method of installation, including npm. --- docs/install.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/install.md b/docs/install.md index 30da4d415e77..edd256ba3072 100644 --- a/docs/install.md +++ b/docs/install.md @@ -101,9 +101,8 @@ _exact_ same commands presented in the rest of this document. We recommend installing with `npm` when: 1. You aren't using a machine with `amd64` or `arm64`. -2. You are installing code-server on Windows. -3. You're on Linux with `glibc` < v2.28 or `glibcxx` < v3.4.21. -4. You're running Alpine Linux or are using a non-glibc libc. See +2. You're on Linux with `glibc` < v2.28 or `glibcxx` < v3.4.21. +3. You're running Alpine Linux or are using a non-glibc libc. See [#1430](https://github.com/coder/code-server/issues/1430#issuecomment-629883198) for more information. @@ -296,8 +295,7 @@ You can install code-server using the [Helm package manager](https://coder.com/d ## Windows We currently [do not publish Windows -releases](https://github.com/coder/code-server/issues/1397). We recommend -installing code-server onto Windows with [`npm`](#npm). +releases](https://github.com/coder/code-server/issues/1397). ## Raspberry Pi From 7dfd68589a8757e7e967ebebeb6b72ff9f7015b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YONGJAE=20LEE=20=28=EC=9D=B4=EC=9A=A9=EC=9E=AC=29?= Date: Wed, 17 Jun 2026 02:58:42 +0900 Subject: [PATCH 022/129] fix: re-enable skipped Heart tests and make non-asserting checks assert (#7845) --- test/e2e/codeServer.test.ts | 2 +- test/e2e/downloads.test.ts | 16 ++++++++-------- test/e2e/extensions.test.ts | 2 +- test/e2e/github.test.ts | 4 ++-- test/e2e/login.test.ts | 15 ++++++++------- test/e2e/uploads.test.ts | 8 ++++---- test/unit/node/heart.test.ts | 5 ++++- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/test/e2e/codeServer.test.ts b/test/e2e/codeServer.test.ts index 0e04742ea31a..199298a1495e 100644 --- a/test/e2e/codeServer.test.ts +++ b/test/e2e/codeServer.test.ts @@ -32,7 +32,7 @@ describe("code-server", ["--disable-workspace-trust"], {}, () => { test("should show the Integrated Terminal", async ({ codeServerPage }) => { await codeServerPage.focusTerminal() - expect(await codeServerPage.page.isVisible("#terminal")).toBe(true) + await expect(codeServerPage.page.locator("#terminal")).toBeVisible() }) test("should open a file", async ({ codeServerPage }) => { diff --git a/test/e2e/downloads.test.ts b/test/e2e/downloads.test.ts index 0adcd68ff83d..f08e13b74e0a 100644 --- a/test/e2e/downloads.test.ts +++ b/test/e2e/downloads.test.ts @@ -18,7 +18,7 @@ describe("Downloads (enabled)", ["--disable-workspace-trust"], {}, async () => { // Action await codeServerPage.openContextMenu("text=unique-file.txt") - expect(await codeServerPage.page.isVisible("text=Download...")).toBe(true) + await expect(codeServerPage.page.locator("text=Download...")).toBeVisible() }) test("should see the 'Show Local' button on Save As", async ({ codeServerPage }) => { @@ -37,7 +37,7 @@ describe("Downloads (enabled)", ["--disable-workspace-trust"], {}, async () => { await codeServerPage.page.keyboard.type("Making some edits.") await codeServerPage.navigateMenus(["File", "Save As..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) test("should see the 'Show Local' button on Save File", async ({ codeServerPage }) => { @@ -46,14 +46,14 @@ describe("Downloads (enabled)", ["--disable-workspace-trust"], {}, async () => { await codeServerPage.waitForTab("Untitled-1") await codeServerPage.navigateMenus(["File", "Save"]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) test("should see the 'Show Local' button on Save Workspace As", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Save Workspace As..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) }) @@ -72,7 +72,7 @@ describe("Downloads (disabled)", ["--disable-workspace-trust", "--disable-file-d // Action await codeServerPage.openContextMenu("text=unique-file.txt") - expect(await codeServerPage.page.isVisible("text=Download...")).toBe(false) + await expect(codeServerPage.page.locator("text=Download...")).not.toBeVisible() }) test("should not see the 'Show Local' button on Save as", async ({ codeServerPage }) => { @@ -87,7 +87,7 @@ describe("Downloads (disabled)", ["--disable-workspace-trust", "--disable-file-d await codeServerPage.openFile(fileName) await codeServerPage.page.click(".tab") await codeServerPage.navigateMenus(["File", "Save As..."]) - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) test("should not see the 'Show Local' button on Save File", async ({ codeServerPage }) => { @@ -96,13 +96,13 @@ describe("Downloads (disabled)", ["--disable-workspace-trust", "--disable-file-d await codeServerPage.waitForTab("Untitled-1") await codeServerPage.navigateMenus(["File", "Save"]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) test("should not see the 'Show Local' button on Save Workspace As", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Save Workspace As..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) }) diff --git a/test/e2e/extensions.test.ts b/test/e2e/extensions.test.ts index ac56fcfec059..9861e0004e7b 100644 --- a/test/e2e/extensions.test.ts +++ b/test/e2e/extensions.test.ts @@ -13,7 +13,7 @@ function runTestExtensionTests() { // Remove end slash in address. const normalizedAddress = address.replace(/\/+$/, "") - await codeServerPage.page.getByText(`Info: proxyUri: ${normalizedAddress}/proxy/{{port}}/`) + await expect(codeServerPage.page.getByText(`Info: proxyUri: ${normalizedAddress}/proxy/{{port}}/`)).toBeVisible() }) } diff --git a/test/e2e/github.test.ts b/test/e2e/github.test.ts index 403d3161a208..aa45886bd1f6 100644 --- a/test/e2e/github.test.ts +++ b/test/e2e/github.test.ts @@ -12,7 +12,7 @@ if (process.env.GITHUB_TOKEN) { await codeServerPage.page.click("text=Allow") // It should ask to select an account, one of which will be the one we // pre-injected. - expect(await codeServerPage.page.isVisible("text=Select an account")).toBe(false) + await expect(codeServerPage.page.locator("text=Select an account")).not.toBeVisible() }) }) @@ -26,7 +26,7 @@ if (process.env.GITHUB_TOKEN) { await codeServerPage.page.click("text=Allow") // Since there is no account it will ask directly for the token (because // we are on localhost; otherwise it would initiate the oauth flow). - expect(await codeServerPage.page.isVisible("text=GitHub Personal Access Token")).toBe(false) + await expect(codeServerPage.page.locator("text=GitHub Personal Access Token")).not.toBeVisible() }) }) } else { diff --git a/test/e2e/login.test.ts b/test/e2e/login.test.ts index 90ec1b8cdef9..2ce9ce8e8035 100644 --- a/test/e2e/login.test.ts +++ b/test/e2e/login.test.ts @@ -24,8 +24,8 @@ describe("login", ["--disable-workspace-trust", "--auth", "password"], {}, () => // Skip entering password // Click the submit button and login await codeServerPage.page.click(".submit") - await codeServerPage.page.waitForLoadState("networkidle") - expect(await codeServerPage.page.isVisible("text=Missing password")) + // The required input blocks empty submits, so the server-side error can't render. + await expect(codeServerPage.page.locator("input.password:invalid")).toBeVisible() }) test("should see an error message for incorrect password", async ({ codeServerPage }) => { @@ -34,28 +34,29 @@ describe("login", ["--disable-workspace-trust", "--auth", "password"], {}, () => // Click the submit button and login await codeServerPage.page.click(".submit") await codeServerPage.page.waitForLoadState("networkidle") - expect(await codeServerPage.page.isVisible("text=Incorrect password")) + await expect(codeServerPage.page.locator("text=Incorrect password")).toBeVisible() }) test("should hit the rate limiter for too many unsuccessful logins", async ({ codeServerPage }) => { - // Type in password - await codeServerPage.page.fill(".password", "password123") + test.slow() // Click the submit button and login // The current RateLimiter allows 2 logins per minute plus // 12 logins per hour for a total of 14 // See: src/node/routes/login.ts for (let i = 1; i <= 14; i++) { + await codeServerPage.page.fill(".password", "password123") await codeServerPage.page.click(".submit") await codeServerPage.page.waitForLoadState("networkidle") // We double-check that the correct error message shows // which should be for incorrect password - expect(await codeServerPage.page.isVisible("text=Incorrect password")) + await expect(codeServerPage.page.locator("text=Incorrect password")).toBeVisible() } // The 15th should fail for a different reason: // login rate + await codeServerPage.page.fill(".password", "password123") await codeServerPage.page.click(".submit") await codeServerPage.page.waitForLoadState("networkidle") - expect(await codeServerPage.page.isVisible("text=Login rate limited!")) + await expect(codeServerPage.page.locator("text=Login rate limited!")).toBeVisible() }) }) diff --git a/test/e2e/uploads.test.ts b/test/e2e/uploads.test.ts index 80df808a44e4..05bb9ffd98a3 100644 --- a/test/e2e/uploads.test.ts +++ b/test/e2e/uploads.test.ts @@ -18,14 +18,14 @@ describe("Uploads (enabled)", ["--disable-workspace-trust"], {}, () => { // Action await codeServerPage.openContextMenu('span:has-text("test-directory")') - expect(await codeServerPage.page.isVisible("text=Upload...")).toBe(true) + await expect(codeServerPage.page.locator("text=Upload...")).toBeVisible() }) test("should see the 'Show Local' button on Open File", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Open File..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(true) + await expect(codeServerPage.page.locator("text=Show Local")).toBeVisible() }) }) @@ -44,13 +44,13 @@ describe("Uploads (disabled)", ["--disable-workspace-trust", "--disable-file-upl // Action await codeServerPage.openContextMenu('span:has-text("test-directory")') - expect(await codeServerPage.page.isVisible("text=Upload...")).toBe(false) + await expect(codeServerPage.page.locator("text=Upload...")).not.toBeVisible() }) test("should not see the 'Show Local' button on Open File", async ({ codeServerPage }) => { // Action await codeServerPage.navigateMenus(["File", "Open File..."]) await codeServerPage.page.waitForSelector(".quick-input-widget") - expect(await codeServerPage.page.isVisible("text=Show Local")).toBe(false) + await expect(codeServerPage.page.locator("text=Show Local")).not.toBeVisible() }) }) diff --git a/test/unit/node/heart.test.ts b/test/unit/node/heart.test.ts index 7ad0d21752f2..e7c7b166ca11 100644 --- a/test/unit/node/heart.test.ts +++ b/test/unit/node/heart.test.ts @@ -115,6 +115,9 @@ describe("heartbeatTimer", () => { const heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) await heart.beat() jest.advanceTimersByTime(60 * 1000) + // Yield a real macrotask so the callback's rejection handler can run first + // (fake timers stub the global setImmediate). + await new Promise((resolve) => jest.requireActual("timers").setImmediate(resolve)) expect(mockIsActive).toHaveBeenCalled() expect(logger.warn).toHaveBeenCalledWith(errorMsg) @@ -147,7 +150,7 @@ describe("stateChange", () => { expect(mockOnChange.mock.calls[0][0]).toBe("alive") }) - it.only("should change to expired when not active", async () => { + it("should change to expired when not active", async () => { jest.useFakeTimers() heart = new Heart(`${testDir}/shutdown.txt`, () => new Promise((resolve) => resolve(false))) const mockOnChange = jest.fn() From e1c839fb1d9ce641919ffb8ea8afd8ac2cc62a0c Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 11:23:29 -0800 Subject: [PATCH 023/129] Slightly improve heart tests - Get rid of the global isActive mock; in particular the way it shadows local ones seemed sketchy. - No need for requireActual from my testing. - Reword the comment for why we need setImmediate. - Add the setImmediate to another test that seemed to only pass because of an await on the timer call which is not actually a promise but had the side effect of yielding. - Always set fake/real timers in the before/after handlers and never in individual tests. --- test/unit/node/heart.test.ts | 79 +++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/test/unit/node/heart.test.ts b/test/unit/node/heart.test.ts index e7c7b166ca11..85b1945e3760 100644 --- a/test/unit/node/heart.test.ts +++ b/test/unit/node/heart.test.ts @@ -1,10 +1,9 @@ import { logger } from "@coder/logger" import { readFile, writeFile, stat, utimes } from "fs/promises" +import { setImmediate } from "timers" import { Heart } from "../../../src/node/heart" import { clean, mockLogger, tmpdir } from "../../utils/helpers" -const mockIsActive = (resolveTo: boolean) => jest.fn().mockResolvedValue(resolveTo) - describe("Heart", () => { const testName = "heartTests" let testDir = "" @@ -15,12 +14,15 @@ describe("Heart", () => { await clean(testName) testDir = await tmpdir(testName) }) - beforeEach(() => { - heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive(true)) - }) + afterAll(() => { jest.restoreAllMocks() }) + + beforeEach(() => { + heart = new Heart(`${testDir}/shutdown.txt`, jest.fn().mockResolvedValue(true)) + }) + afterEach(() => { jest.resetAllMocks() jest.useRealTimers() @@ -28,6 +30,7 @@ describe("Heart", () => { heart.dispose() } }) + it("should write to a file when given a valid file path", async () => { // Set up heartbeat file with contents const text = "test" @@ -42,7 +45,7 @@ describe("Heart", () => { expect(fileContents).toBe(text) - heart = new Heart(pathToFile, mockIsActive(true)) + heart = new Heart(pathToFile, jest.fn().mockResolvedValue(true)) await heart.beat() // Check that the heart wrote to the heartbeatFilePath and overwrote our text const fileContentsAfterBeat = await readFile(pathToFile, { encoding: "utf8" }) @@ -51,31 +54,30 @@ describe("Heart", () => { const fileStatusAfterEdit = await stat(pathToFile) expect(fileStatusAfterEdit.mtimeMs).toBeGreaterThan(0) }) + it("should log a warning when given an invalid file path", async () => { - heart = new Heart(`fakeDir/fake.txt`, mockIsActive(false)) + heart = new Heart(`fakeDir/fake.txt`, jest.fn().mockResolvedValue(false)) await heart.beat() expect(logger.warn).toHaveBeenCalled() }) + it("should be active after calling beat", async () => { await heart.beat() const isAlive = heart.alive() expect(isAlive).toBe(true) }) + it("should not be active after dispose is called", () => { heart.dispose() const isAlive = heart.alive() expect(isAlive).toBe(false) }) + it("should beat twice without warnings", async () => { - // Use fake timers so we can speed up setTimeout - jest.useFakeTimers() - heart = new Heart(`${testDir}/hello.txt`, mockIsActive(true)) + heart = new Heart(`${testDir}/hello.txt`, jest.fn().mockResolvedValue(true)) await heart.beat() - // we need to speed up clocks, timeouts - // call heartbeat again (and it won't be alive I think) - // then assert no warnings were called jest.runAllTimers() expect(logger.warn).not.toHaveBeenCalled() }) @@ -84,43 +86,48 @@ describe("Heart", () => { describe("heartbeatTimer", () => { const testName = "heartbeatTimer" let testDir = "" + beforeAll(async () => { await clean(testName) testDir = await tmpdir(testName) mockLogger() }) + afterAll(() => { jest.restoreAllMocks() }) + beforeEach(() => { jest.useFakeTimers() }) + afterEach(() => { jest.resetAllMocks() jest.clearAllTimers() jest.useRealTimers() }) + it("should call isActive when timeout expires", async () => { - const isActive = true - const mockIsActive = jest.fn().mockResolvedValue(isActive) + const mockIsActive = jest.fn().mockResolvedValue(true) const heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) await heart.beat() jest.advanceTimersByTime(60 * 1000) expect(mockIsActive).toHaveBeenCalled() }) + it("should log a warning when isActive rejects", async () => { - const errorMsg = "oh no" - const error = new Error(errorMsg) + const error = new Error("oh no") const mockIsActive = jest.fn().mockRejectedValue(error) const heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) await heart.beat() jest.advanceTimersByTime(60 * 1000) - // Yield a real macrotask so the callback's rejection handler can run first - // (fake timers stub the global setImmediate). - await new Promise((resolve) => jest.requireActual("timers").setImmediate(resolve)) - expect(mockIsActive).toHaveBeenCalled() - expect(logger.warn).toHaveBeenCalledWith(errorMsg) + + // The timer callback waits on mockIsActive, so we need to yield to let the + // callback finish. + await new Promise((resolve) => setImmediate(resolve)) + + expect(logger.warn).toHaveBeenCalledWith(error.message) }) }) @@ -128,38 +135,54 @@ describe("stateChange", () => { const testName = "stateChange" let testDir = "" let heart: Heart + beforeAll(async () => { await clean(testName) testDir = await tmpdir(testName) mockLogger() }) + afterAll(() => { jest.restoreAllMocks() }) + + beforeEach(() => { + jest.useFakeTimers() + }) + afterEach(() => { jest.resetAllMocks() + jest.useRealTimers() if (heart) { heart.dispose() } }) + it("should change to alive after a beat", async () => { - heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive(true)) + const mockIsActive = jest.fn().mockResolvedValue(true) + heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) const mockOnChange = jest.fn() heart.onChange(mockOnChange) + await heart.beat() expect(mockOnChange.mock.calls[0][0]).toBe("alive") }) + it("should change to expired when not active", async () => { - jest.useFakeTimers() - heart = new Heart(`${testDir}/shutdown.txt`, () => new Promise((resolve) => resolve(false))) + const mockIsActive = jest.fn().mockResolvedValue(false) + heart = new Heart(`${testDir}/shutdown.txt`, mockIsActive) const mockOnChange = jest.fn() heart.onChange(mockOnChange) + await heart.beat() + jest.advanceTimersByTime(60 * 1000) + expect(mockIsActive).toHaveBeenCalled() + + // The timer callback waits on the isActive promise, so we need to yield to + // let the callback finish. + await new Promise((resolve) => setImmediate(resolve)) - await jest.advanceTimersByTime(60 * 1000) expect(mockOnChange.mock.calls[1][0]).toBe("expired") - jest.clearAllTimers() - jest.useRealTimers() }) }) From 25e847dc9424252c2172afd259135018d0f014c2 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 16 Jun 2026 11:33:33 -0800 Subject: [PATCH 024/129] Update Playwright --- test/package-lock.json | 73 ++++++++---------------------------------- test/package.json | 4 +-- 2 files changed, 15 insertions(+), 62 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 56b2e683ad84..422c6c393fa4 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -7,7 +7,7 @@ "license": "MIT", "devDependencies": { "@jest-mock/express": "^1.4.5", - "@playwright/test": "^1.56.1", + "@playwright/test": "^1.61.0", "@types/jest": "^27.0.2", "@types/jsdom": "^16.2.13", "@types/node-fetch": "^2.5.8", @@ -18,7 +18,7 @@ "jest-fetch-mock": "^3.0.3", "jsdom": "^16.4.0", "node-fetch": "^2.6.7", - "playwright": "^1.59.1", + "playwright": "^1.61.0", "ts-jest": "^27.0.7", "wtfnode": "^0.9.1" } @@ -998,13 +998,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz", - "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==", + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.0.tgz", + "integrity": "sha512-cKA5B6lpFEMyMGjxF54QihfYpB4FkEGH+qZhtArDEG+wezQAJY8Pq6C7T1SjWz+FFzt3TbyoXBQYk/0292TdJA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.56.1" + "playwright": "1.61.0" }, "bin": { "playwright": "cli.js" @@ -1013,53 +1013,6 @@ "node": ">=18" } }, - "node_modules/@playwright/test/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/@playwright/test/node_modules/playwright": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz", - "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "playwright-core": "1.56.1" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "fsevents": "2.3.2" - } - }, - "node_modules/@playwright/test/node_modules/playwright-core": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz", - "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "playwright-core": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@sinonjs/commons": { "version": "1.8.6", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", @@ -4114,13 +4067,13 @@ } }, "node_modules/playwright": { - "version": "1.59.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz", - "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==", + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.0.tgz", + "integrity": "sha512-Z+7BeeqQPRRzklHsVFP4KTGIyMxKUmfeRA4WisM6G3/XW6nwGeX6fX9qYaDa+CiUqpOkb2f6X3nar05R3kSuJQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.59.1" + "playwright-core": "1.61.0" }, "bin": { "playwright": "cli.js" @@ -4133,9 +4086,9 @@ } }, "node_modules/playwright-core": { - "version": "1.59.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz", - "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==", + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.0.tgz", + "integrity": "sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/test/package.json b/test/package.json index 508876c785f2..46ae308fda52 100644 --- a/test/package.json +++ b/test/package.json @@ -3,7 +3,7 @@ "#": "We must put jest in a sub-directory otherwise VS Code somehow picks up the types and generates conflicts with mocha.", "devDependencies": { "@jest-mock/express": "^1.4.5", - "@playwright/test": "^1.56.1", + "@playwright/test": "^1.61.0", "@types/jest": "^27.0.2", "@types/jsdom": "^16.2.13", "@types/node-fetch": "^2.5.8", @@ -14,7 +14,7 @@ "jest-fetch-mock": "^3.0.3", "jsdom": "^16.4.0", "node-fetch": "^2.6.7", - "playwright": "^1.59.1", + "playwright": "^1.61.0", "ts-jest": "^27.0.7", "wtfnode": "^0.9.1" }, From a7f457046f3d83cd4ef6b376cdf92480af2547a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:51:19 -0800 Subject: [PATCH 025/129] Bump actions/checkout from 6.0.2 to 6.0.3 (#7852) --- .github/workflows/build.yaml | 20 ++++++++++---------- .github/workflows/installer.yaml | 6 +++--- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/release.yaml | 4 ++-- .github/workflows/scripts.yaml | 4 ++-- .github/workflows/security.yaml | 6 +++--- .github/workflows/trivy-docker.yaml | 2 +- .github/workflows/update.yaml | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e097e49ee3f7..b45473942e09 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: docs: ${{ steps.filter.outputs.docs }} helm: ${{ steps.filter.outputs.helm }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: filter with: @@ -55,7 +55,7 @@ jobs: name: Run prettier check runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -72,7 +72,7 @@ jobs: needs: changes if: needs.changes.outputs.docs == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -89,7 +89,7 @@ jobs: needs: changes if: needs.changes.outputs.helm == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -103,7 +103,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -121,7 +121,7 @@ jobs: if: needs.changes.outputs.ci == 'true' steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Check workflow files run: | bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9 @@ -134,7 +134,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -168,7 +168,7 @@ jobs: packages: quilt version: 1.0 - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true - run: quilt push -a @@ -219,7 +219,7 @@ jobs: if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -269,7 +269,7 @@ jobs: mkdir -p ~/.cache/caddy tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index a77a5fd61919..9b4ab9018ff1 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install code-server run: ./install.sh @@ -44,7 +44,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install curl run: apk add curl @@ -67,7 +67,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install code-server run: ./install.sh diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3ab55adacd10..37b4747aa7d9 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -33,7 +33,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -64,7 +64,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Checkout code-server-aur repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: repository: "cdrci/code-server-aur" token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} @@ -108,7 +108,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 @@ -149,7 +149,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - run: ./ci/build/update-repo.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9a1774fde86d..2ed2ca1f95d1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -76,7 +76,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true - run: quilt push -a @@ -170,7 +170,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true - run: quilt push -a diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml index 4ebef47ea875..1c671c48fa90 100644 --- a/.github/workflows/scripts.yaml +++ b/.github/workflows/scripts.yaml @@ -41,7 +41,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install test utilities run: apk add bats checkbashisms @@ -58,7 +58,7 @@ jobs: timeout-minutes: 5 steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Install lint utilities run: sudo apt install shellcheck diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index ba4bcbba5da1..c47695e0bb4a 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -25,7 +25,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: fetch-depth: 0 @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: fetch-depth: 0 @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 98a8d8c4063f..0153229ac4fc 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - name: Run Trivy vulnerability scanner in image mode uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 48753ca2fa52..2c09920336fe 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -28,7 +28,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: submodules: true From a59c3ab99026e61031cab95e3c476d4e38395f34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:51:47 -0800 Subject: [PATCH 026/129] Bump github/codeql-action from 4.35.4 to 4.36.2 (#7860) --- .github/workflows/security.yaml | 8 ++++---- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index c47695e0bb4a..7671a094e6d5 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -62,7 +62,7 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: sarif_file: "trivy-repo-results.sarif" @@ -80,13 +80,13 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: config-file: ./.github/codeql-config.yml languages: javascript - name: Autobuild - uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 0153229ac4fc..26bf15886948 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -58,6 +58,6 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: sarif_file: "trivy-image-results.sarif" From 4ae1fc202eb25367645423c0e9fcd3804859f887 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:52:36 -0800 Subject: [PATCH 027/129] Bump doctoc from 2.3.0 to 2.5.0 (#7858) --- package-lock.json | 142 +++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index b873ca7ef0f8..e458b23c7647 100644 --- a/package-lock.json +++ b/package-lock.json @@ -446,27 +446,28 @@ "license": "MIT" }, "node_modules/@textlint/ast-node-types": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz", - "integrity": "sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==", + "version": "15.7.1", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.7.1.tgz", + "integrity": "sha512-Wii5UgUKFEh9Uv6wbq1zr4/Kf+dtjiUuzPrrXzKp8H+ifkvKNzi23V4Nz+6wVyHQn5T28AFuc8VH8OtzvGYecA==", "dev": true, "license": "MIT" }, "node_modules/@textlint/markdown-to-ast": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz", - "integrity": "sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==", + "version": "15.7.1", + "resolved": "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-15.7.1.tgz", + "integrity": "sha512-9DLSah7g6mYNHvO6pssLdFvFPAl3HHyEIm4RE5of/1QN9FXJXDgdOcVV3YpQmbYT/YntuIvOQiqOndCSPWTW2A==", "dev": true, "license": "MIT", "dependencies": { - "@textlint/ast-node-types": "^12.6.1", - "debug": "^4.3.4", + "@textlint/ast-node-types": "15.7.1", + "debug": "^4.4.3", "mdast-util-gfm-autolink-literal": "^0.1.3", + "neotraverse": "^0.6.18", "remark-footnotes": "^3.0.0", "remark-frontmatter": "^3.0.0", "remark-gfm": "^1.0.0", "remark-parse": "^9.0.0", - "traverse": "^0.6.7", + "structured-source": "^4.0.0", "unified": "^9.2.2" } }, @@ -1397,9 +1398,9 @@ } }, "node_modules/anchor-markdown-header": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.8.2.tgz", - "integrity": "sha512-ix0Hx6ARkHOsQRmt1++ZmjURq4Pr5MGXQJjh0lQ/l5jTpTURn4aqhbZ+AJMpZ/Sd3JiyNwi7KaeiF64OsMGCPg==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.8.4.tgz", + "integrity": "sha512-20eMBMpts7k5rXAAj67geSqc/tsexHZOZJDWQD214YcDuNtyizDa7Q77sYa5rkao2FwsQP1WKRt2X6mphwmhbg==", "dev": true, "license": "MIT", "dependencies": { @@ -1663,6 +1664,13 @@ "url": "https://opencollective.com/express" } }, + "node_modules/boundary": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/boundary/-/boundary-2.0.0.tgz", + "integrity": "sha512-rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA==", + "dev": true, + "license": "BSD-2-Clause" + }, "node_modules/brace-expansion": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", @@ -2172,18 +2180,17 @@ } }, "node_modules/doctoc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.3.0.tgz", - "integrity": "sha512-duuDNVnRHE5mFGYlI+oDf1vguML8PIhKnbUCs7iKPHIEdzYhkCldk6MQeX3ZeXQStRtZxGspSHImtgOMQPIS4A==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/doctoc/-/doctoc-2.5.0.tgz", + "integrity": "sha512-xWb2P8mQw9x+T9xPYToytRP0/bA68oexdsY0anMG72RdhZGTVPx6oHJfI57gbZe9LsOSfQUNNLwxSspdoTlJIQ==", "dev": true, "license": "MIT", "dependencies": { - "@textlint/markdown-to-ast": "^12.1.1", - "anchor-markdown-header": "^0.8.2", + "@textlint/markdown-to-ast": "^15.6.0", + "anchor-markdown-header": "^0.8.4", "htmlparser2": "^7.2.0", - "minimist": "^1.2.6", - "underscore": "^1.13.2", - "update-section": "^0.3.3" + "loglevel": "^1.9.2", + "minimist": "^1.2.6" }, "bin": { "doctoc": "doctoc.js" @@ -4258,6 +4265,20 @@ "dev": true, "license": "MIT" }, + "node_modules/loglevel": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz", + "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6.0" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/loglevel" + } + }, "node_modules/longest-streak": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", @@ -4731,6 +4752,16 @@ "node": ">= 0.6" } }, + "node_modules/neotraverse": { + "version": "0.6.18", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.18.tgz", + "integrity": "sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, "node_modules/netmask": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", @@ -5360,9 +5391,9 @@ } }, "node_modules/remove-markdown": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.6.3.tgz", - "integrity": "sha512-Qvp2p0Q1irE7AaJO7QemJe04HdObHylJrG+q4hszvPlYp7q4EvfINpEIaIEFdB+3XTDp1h6fiyT60ae00gmRow==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.6.4.tgz", + "integrity": "sha512-BompiLClzjfh46irZmzv+1Q61jZYlKN3iq/hzae9EOUwf7ctr/5wpD4qwgn/FWDAYE18RORO7z/yr+HXZJCY8Q==", "dev": true, "license": "MIT" }, @@ -5925,6 +5956,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/structured-source": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/structured-source/-/structured-source-4.0.0.tgz", + "integrity": "sha512-qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boundary": "^2.0.0" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -5993,24 +6034,6 @@ "node": ">=0.6" } }, - "node_modules/traverse": { - "version": "0.6.11", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz", - "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==", - "dev": true, - "license": "MIT", - "dependencies": { - "gopd": "^1.2.0", - "typedarray.prototype.slice": "^1.0.5", - "which-typed-array": "^1.1.18" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/trough": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", @@ -6203,29 +6226,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typedarray.prototype.slice": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz", - "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.8", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.9", - "es-errors": "^1.3.0", - "get-proto": "^1.0.1", - "math-intrinsics": "^1.1.0", - "typed-array-buffer": "^1.0.3", - "typed-array-byte-offset": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/typescript": { "version": "5.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", @@ -6283,13 +6283,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/underscore": { - "version": "1.13.8", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz", - "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==", - "dev": true, - "license": "MIT" - }, "node_modules/undici-types": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", @@ -6424,13 +6417,6 @@ "@unrs/resolver-binding-win32-x64-msvc": "1.11.1" } }, - "node_modules/update-section": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz", - "integrity": "sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==", - "dev": true, - "license": "MIT" - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", From 8009d3c360c0fd608bb2e8b4f1ceb1e213cdcd38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:53:49 -0800 Subject: [PATCH 028/129] Bump typescript-eslint from 8.56.1 to 8.61.1 (#7857) --- package-lock.json | 158 +++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index e458b23c7647..5b723da89b86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -763,20 +763,20 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz", - "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==", + "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.56.1", - "@typescript-eslint/type-utils": "8.56.1", - "@typescript-eslint/utils": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1", + "@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.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -786,9 +786,9 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.56.1", + "@typescript-eslint/parser": "^8.61.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { @@ -802,16 +802,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz", - "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==", + "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.56.1", - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1", + "@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": { @@ -823,18 +823,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz", - "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==", + "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.56.1", - "@typescript-eslint/types": "^8.56.1", + "@typescript-eslint/tsconfig-utils": "^8.61.1", + "@typescript-eslint/types": "^8.61.1", "debug": "^4.4.3" }, "engines": { @@ -845,18 +845,18 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz", - "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==", + "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.56.1", - "@typescript-eslint/visitor-keys": "8.56.1" + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -867,9 +867,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz", - "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==", + "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": { @@ -880,21 +880,21 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz", - "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==", + "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.56.1", - "@typescript-eslint/typescript-estree": "8.56.1", - "@typescript-eslint/utils": "8.56.1", + "@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.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -905,13 +905,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz", - "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==", + "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": { @@ -923,21 +923,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz", - "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==", + "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.56.1", - "@typescript-eslint/tsconfig-utils": "8.56.1", - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/visitor-keys": "8.56.1", + "@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", "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -947,7 +947,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { @@ -974,13 +974,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "10.2.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", - "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", + "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.2" + "brace-expansion": "^5.0.5" }, "engines": { "node": "18 || 20 || >=22" @@ -990,16 +990,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz", - "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==", + "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.56.1", - "@typescript-eslint/types": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1" + "@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" @@ -1010,17 +1010,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz", - "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==", + "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.56.1", + "@typescript-eslint/types": "8.61.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -6046,9 +6046,9 @@ } }, "node_modules/ts-api-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", - "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", + "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", "dev": true, "license": "MIT", "engines": { @@ -6241,16 +6241,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.56.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz", - "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==", + "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.56.1", - "@typescript-eslint/parser": "8.56.1", - "@typescript-eslint/typescript-estree": "8.56.1", - "@typescript-eslint/utils": "8.56.1" + "@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" @@ -6261,7 +6261,7 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/unbox-primitive": { From 2ef530ce11f49874644fcd771ac61171cefc8e63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 12:01:11 -0800 Subject: [PATCH 029/129] Bump actions/cache from 4.3.0 to 5.0.5 (#7856) --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b45473942e09..0d9e966fcb6f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -191,7 +191,7 @@ jobs: # embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild. - name: Fetch prebuilt linux-x64 Code package from cache id: cache-vscode - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 with: path: lib/vscode-reh-web-linux-x64 key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }} @@ -256,7 +256,7 @@ jobs: steps: - name: Cache Caddy - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 id: caddy-cache with: path: | From 9545b26036b10a5c1eb9cfdaa58b6b3a6b6a22b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 12:01:52 -0800 Subject: [PATCH 030/129] Bump awalsh128/cache-apt-pkgs-action from 1.6.0 to 1.6.1 (#7855) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0d9e966fcb6f..a8e28b175f16 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -163,7 +163,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2ed2ca1f95d1..ce69cd72c9f7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 2c09920336fe..461a31e1b40d 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -47,7 +47,7 @@ jobs: echo done=false >> $GITHUB_OUTPUT fi - - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # latest + - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest if: steps.check.outputs.done == 'false' with: packages: quilt From 804ba5bfce6a9bc1d3f8ca32d71720c22e9d6991 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 12:02:46 -0800 Subject: [PATCH 031/129] Bump codecov/codecov-action from 6.0.1 to 7.0.0 (#7853) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a8e28b175f16..e12411acca60 100644 --- 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@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 + - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 if: success() with: token: ${{ secrets.CODECOV_TOKEN }} From fade53fcaf82e7c535cb972a7e3d8da4e43b63a4 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 18 Jun 2026 04:51:01 +1000 Subject: [PATCH 032/129] Update Code to 1.125.0 (#7861) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/external-file-actions.diff | 4 ++-- patches/integration.diff | 4 ++-- patches/logout.diff | 2 +- patches/proxy-uri.diff | 2 +- patches/service-worker.diff | 2 +- patches/sourcemaps.diff | 2 +- patches/telemetry.diff | 2 +- patches/update-check.diff | 6 +++--- 12 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abd8e0a57b6..361124ba75b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.125.0 + +### Changed + +- Update to Code 1.125.0 + ## [4.124.2](https://github.com/coder/code-server/releases/tag/v4.124.2) - 2026-06-16 Code v1.124.2 diff --git a/lib/vscode b/lib/vscode index 6928394f91b6..93cfdd489c3b 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 6928394f91b684055b873eecb8bc281365131f1c +Subproject commit 93cfdd489c3b228840d0f86ec77c3636277c93ea diff --git a/patches/base-path.diff b/patches/base-path.diff index 234b8403c6c4..1aef085bf3eb 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -241,7 +241,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -66,6 +66,7 @@ export type ExtensionVirtualWorkspaceSup +@@ -85,6 +85,7 @@ export interface IAgentSdkProductConfig export interface IProductConfiguration { readonly codeServerVersion?: string diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 0d3690b35765..05f964dd5859 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -345,6 +345,10 @@ export class Extension implements IExten +@@ -343,6 +343,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 582384af6cee..4719d13ccdd9 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -230,7 +230,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js'; import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js'; import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js'; -@@ -161,7 +161,7 @@ export class SimpleFileDialog extends Di +@@ -152,7 +152,7 @@ export class SimpleFileDialog extends Di @IFileDialogService private readonly fileDialogService: IFileDialogService, @IModelService private readonly modelService: IModelService, @ILanguageService private readonly languageService: ILanguageService, @@ -239,7 +239,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi @IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService, @IPathService protected readonly pathService: IPathService, @IKeybindingService private readonly keybindingService: IKeybindingService, -@@ -392,21 +392,23 @@ export class SimpleFileDialog extends Di +@@ -362,21 +362,23 @@ export class SimpleFileDialog extends Di this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path"); this.filePickBox.ok = true; this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic; diff --git a/patches/integration.diff b/patches/integration.diff index 44327d24e005..a9244dd1734a 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -186,8 +186,8 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -65,6 +65,8 @@ export type ExtensionVirtualWorkspaceSup - }; +@@ -84,6 +84,8 @@ export interface IAgentSdkProductConfig + } export interface IProductConfiguration { + readonly codeServerVersion?: string diff --git a/patches/logout.diff b/patches/logout.diff index c21be0de9115..5af694506d6c 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -68,6 +68,7 @@ export interface IProductConfiguration { +@@ -87,6 +87,7 @@ export interface IProductConfiguration { readonly codeServerVersion?: string readonly rootEndpoint?: string readonly updateEndpoint?: string diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index 9921cc23022a..ef98ae832064 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -69,6 +69,7 @@ export interface IProductConfiguration { +@@ -88,6 +88,7 @@ export interface IProductConfiguration { readonly rootEndpoint?: string readonly updateEndpoint?: string readonly logoutEndpoint?: string diff --git a/patches/service-worker.diff b/patches/service-worker.diff index 9e048c3c66e6..0204d57dd904 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -70,6 +70,10 @@ export interface IProductConfiguration { +@@ -89,6 +89,10 @@ export interface IProductConfiguration { readonly updateEndpoint?: string readonly logoutEndpoint?: string readonly proxyEndpointTemplate?: string diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 4c51aace765e..f90d489b0204 100644 --- 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 -@@ -296,10 +296,15 @@ function packageTask(type: string, platf +@@ -297,10 +297,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 462d3ce01c77..cd17a28bbfcb 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -147,7 +147,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -74,6 +74,7 @@ export interface IProductConfiguration { +@@ -93,6 +93,7 @@ export interface IProductConfiguration { readonly path: string; readonly scope: string; } diff --git a/patches/update-check.diff b/patches/update-check.diff index d668e4254c9f..6cadd81e3ef7 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -93,7 +93,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -67,6 +67,7 @@ export type ExtensionVirtualWorkspaceSup +@@ -86,6 +86,7 @@ export interface IAgentSdkProductConfig export interface IProductConfiguration { readonly codeServerVersion?: string readonly rootEndpoint?: string @@ -101,14 +101,14 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts readonly version: string; readonly date?: string; -@@ -119,6 +120,7 @@ export interface IProductConfiguration { +@@ -138,6 +139,7 @@ export interface IProductConfiguration { readonly resourceUrlTemplate: string; readonly nlsBaseUrl: string; readonly accessSKUs?: string[]; + readonly authorizationHeaderToken?: string; }; - readonly mcpGallery?: { + 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 From 02e28cd2546aed36a47a40ff8be2f89bd203085b Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 18 Jun 2026 10:50:51 -0800 Subject: [PATCH 033/129] Name VS Code package "code-oss" The -dev seems a bit weird since it is not a dev version once it is built, and also there is a false positive advisory with the code-oss-dev name. --- ci/build/build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index 30dcfef6399e..6dbc2784acbc 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -130,7 +130,7 @@ bundle_vscode() { # dependencies, since we want to ship this via NPM. # Also override the name to prevent vulnerability scanners from # misidentifying this package as VS Code (see #7071). - jq --slurp '.[0] * .[1] | .name = "code-oss-dev"' \ + jq --slurp '.[0] * .[1] | .name = "code-oss"' \ "$VSCODE_SRC_PATH/remote/package.json" \ "$VSCODE_OUT_PATH/package.json" > "$VSCODE_OUT_PATH/package.json.merged" mv "$VSCODE_OUT_PATH/package.json.merged" "$VSCODE_OUT_PATH/package.json" From 40b39293fa7ca7eed44df270109064787063fe8c Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 23 Jun 2026 05:29:01 +1000 Subject: [PATCH 034/129] Update Helm chart and changelog with 4.125.0 (#7863) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 361124ba75b0..4315b01b2f69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.125.0](https://github.com/coder/code-server/releases/tag/v4.125.0) - 2026-06-18 + Code v1.125.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 778a90353141..89c1af202b9a 100644 --- 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.39.0 +version: 3.40.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.124.2 +appVersion: 4.125.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 413920542f8d..42308aa7065e 100644 --- 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.124.2' + tag: '4.125.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 9ccf763b0297eb4dd787b3470190df1e82d32dcc Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 22 Jun 2026 11:30:34 -0800 Subject: [PATCH 035/129] Match update PRs titles with commits --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 37b4747aa7d9..76a7c78533bc 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -95,7 +95,7 @@ jobs: git add . git commit -m "Update to ${{ env.VERSION }}" git push -u origin $(git branch --show) - gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR + gh pr create --repo coder/code-server-aur --title "Update to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR docker: runs-on: ubuntu-latest @@ -164,4 +164,4 @@ jobs: gh pr create \ --repo coder/code-server \ --body-file .cache/checklist \ - --title "Update to $VERSION" + --title "Update Helm chart and changelog with $VERSION" From 2c06497ca93cab8ced876947c58e6b42be5a8210 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 25 Jun 2026 06:05:00 +1000 Subject: [PATCH 036/129] Update Code to 1.126.0 (#7868) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 6 +++--- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 2 +- patches/integration.diff | 4 ++-- patches/local-storage.diff | 2 +- patches/marketplace.diff | 2 +- patches/trusted-domains.diff | 2 +- patches/webview.diff | 2 +- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4315b01b2f69..7ee3d22c53d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.126.0 + +### Changed + +- Update to Code 1.126.0 + ## [4.125.0](https://github.com/coder/code-server/releases/tag/v4.125.0) - 2026-06-18 Code v1.125.0 diff --git a/lib/vscode b/lib/vscode index 93cfdd489c3b..7e7950df89d0 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 93cfdd489c3b228840d0f86ec77c3636277c93ea +Subproject commit 7e7950df89d055b5a378379db9ee14290772148a diff --git a/patches/base-path.diff b/patches/base-path.diff index 1aef085bf3eb..9191effe8ed5 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { ...this._productService.extensionsGallery, -@@ -407,7 +414,9 @@ export class WebClientServer { +@@ -401,7 +408,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -444,7 +453,7 @@ export class WebClientServer { +@@ -438,7 +447,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -517,3 +526,70 @@ export class WebClientServer { +@@ -511,3 +520,70 @@ export class WebClientServer { return void res.end(data); } } diff --git a/patches/display-language.diff b/patches/display-language.diff index 526272fe5775..6c721eb2c102 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -405,14 +406,22 @@ export class WebClientServer { +@@ -399,14 +400,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 4719d13ccdd9..9624a1ae1778 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -389,6 +389,8 @@ export class WebClientServer { +@@ -383,6 +383,8 @@ export class WebClientServer { serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 7135955f6efe..db7f80c73601 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -393,6 +393,7 @@ export class WebClientServer { +@@ -387,6 +387,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], diff --git a/patches/integration.diff b/patches/integration.diff index a9244dd1734a..cb2e458dd1aa 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -164,7 +164,7 @@ 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 -@@ -65,6 +65,7 @@ import { IOpenerService } from '../../pl +@@ -64,6 +64,7 @@ import { IOpenerService } from '../../pl import { mixin, safeStringify } from '../../base/common/objects.js'; import { IndexedDB } from '../../base/browser/indexedDB.js'; import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js'; @@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts import { IProgressService } from '../../platform/progress/common/progress.js'; import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js'; import { dirname, joinPath } from '../../base/common/resources.js'; -@@ -140,6 +141,9 @@ export class BrowserMain extends Disposa +@@ -139,6 +140,9 @@ export class BrowserMain extends Disposa // Startup const instantiationService = workbench.startup(); diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 986eb4dde3ba..87710698a9ca 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -384,6 +384,7 @@ export class WebClientServer { +@@ -378,6 +378,7 @@ export class WebClientServer { remoteAuthority, serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 37347d13b660..539ba28bb7ca 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -64,7 +64,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + extensionsGallery: this._productService.extensionsGallery, }; - const proposedApi = this._environmentService.args['enable-proposed-api']; + if (!this._environmentService.isBuilt) { Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index 9d42246bda34..f6ca9dc5fc01 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -46,4 +46,4 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + linkProtectionTrustedDomains, }; - const proposedApi = this._environmentService.args['enable-proposed-api']; + if (!this._environmentService.isBuilt) { diff --git a/patches/webview.diff b/patches/webview.diff index 5dd0f9d4b95c..fd5349d73198 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -380,6 +380,7 @@ export class WebClientServer { +@@ -374,6 +374,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, serverBasePath: basePath, From dd48f7753b3b57f5f85c5c8ab8a09d4c2bec9dc9 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 25 Jun 2026 08:08:03 +1000 Subject: [PATCH 037/129] Update Helm chart and changelog with 4.126.0 (#7869) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ee3d22c53d8..1706c15bc0da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.126.0](https://github.com/coder/code-server/releases/tag/v4.126.0) - 2026-06-24 + Code v1.126.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 89c1af202b9a..70a00e8e2272 100644 --- 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.40.0 +version: 3.41.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.125.0 +appVersion: 4.126.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 42308aa7065e..1fa2e7fb1bb3 100644 --- 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.125.0' + tag: '4.126.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 1e6ed874e3138141a5636f6e0dbe8570aa6cd001 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 2 Jul 2026 07:01:48 +1000 Subject: [PATCH 038/129] Update Code to 1.127.0 (#7880) There is a new use of parsedArgs so we have to pass that in since we parse on demand instead of globally. --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 2 +- patches/integration.diff | 24 +++++++++++++++++++++--- patches/sourcemaps.diff | 2 +- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1706c15bc0da..64b0fbf57649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.127.0 + +### Changed + +- Update to Code 1.127.0 + ## [4.126.0](https://github.com/coder/code-server/releases/tag/v4.126.0) - 2026-06-24 Code v1.126.0 diff --git a/lib/vscode b/lib/vscode index 7e7950df89d0..a22d00300655 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 7e7950df89d055b5a378379db9ee14290772148a +Subproject commit a22d00300655c17490ce63dffc28bcdcedcd82c4 diff --git a/patches/display-language.diff b/patches/display-language.diff index 6c721eb2c102..3ff62227f3e8 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -359,6 +359,9 @@ export async function setupServerService +@@ -358,6 +358,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 9624a1ae1778..abbfac2cb32a 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -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, -@@ -201,6 +201,10 @@ export class WorkbenchContextKeysHandler +@@ -202,6 +202,10 @@ export class WorkbenchContextKeysHandler this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService); this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized()); diff --git a/patches/getting-started.diff b/patches/getting-started.diff index db7f80c73601..9d50f8f47d35 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -222,7 +222,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts 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'; -@@ -204,6 +204,7 @@ export class WorkbenchContextKeysHandler +@@ -205,6 +205,7 @@ export class WorkbenchContextKeysHandler // code-server IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true) IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true) diff --git a/patches/integration.diff b/patches/integration.diff index cb2e458dd1aa..2d4507fe2bd2 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/server-main.ts =================================================================== --- code-server.orig/lib/vscode/src/server-main.ts +++ code-server/lib/vscode/src/server-main.ts -@@ -22,6 +22,9 @@ import { IServerAPI } from './vs/server/ +@@ -23,6 +23,9 @@ import { IServerAPI } from './vs/server/ perf.mark('code/server/start'); (globalThis as { vscodeServerStartTime?: number }).vscodeServerStartTime = performance.now(); @@ -273,7 +273,16 @@ Index: code-server/lib/vscode/src/server-main.ts // Do a quick parse to determine if a server or the cli needs to be started const parsedArgs = minimist(process.argv.slice(2), { boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'], -@@ -150,6 +153,7 @@ if (shouldSpawnCli) { +@@ -50,7 +53,7 @@ if (shouldSpawnCli) { + mod.spawnCli(); + }); + } else { +- installServerProcessExitDiagnostics(); ++ installServerProcessExitDiagnostics(parsedArgs); + + let _remoteExtensionHostAgentServer: IServerAPI | null = null; + let _remoteExtensionHostAgentServerPromise: Promise | null = null; +@@ -153,6 +156,7 @@ if (shouldSpawnCli) { } }); } @@ -281,7 +290,16 @@ Index: code-server/lib/vscode/src/server-main.ts function sanitizeStringArg(val: unknown): string | undefined { if (Array.isArray(val)) { // if an argument is passed multiple times, minimist creates an array -@@ -283,3 +287,22 @@ function prompt(question: string): Promi +@@ -173,7 +177,7 @@ function sanitizeStringArg(val: unknown) + * provided) so they survive process teardown (an async stdio write from an + * `exit` handler does not). + */ +-function installServerProcessExitDiagnostics(): void { ++function installServerProcessExitDiagnostics(parsedArgs: minimist.ParsedArgs): void { + if (!process.env['VSCODE_SERVER_EXIT_DIAGNOSTICS']) { + return; + } +@@ -406,3 +410,22 @@ function prompt(question: string): Promi }); }); } diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index f90d489b0204..22ca7ef04323 100644 --- 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 -@@ -297,10 +297,15 @@ function packageTask(type: string, platf +@@ -344,10 +344,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { From 1e160477beaca340a07d5dc380d3f468ddd2d8d8 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 3 Jul 2026 06:05:31 +1000 Subject: [PATCH 039/129] Update Helm chart and changelog with 4.127.0 (#7882) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64b0fbf57649..8d75ad4d5680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.127.0](https://github.com/coder/code-server/releases/tag/v4.127.0) - 2026-07-02 + Code v1.127.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 70a00e8e2272..46a363b985f5 100644 --- 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.41.0 +version: 3.42.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.126.0 +appVersion: 4.127.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 1fa2e7fb1bb3..b96ed4486cb2 100644 --- 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.126.0' + tag: '4.127.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From aed61bf6abec631c87b8371f701d10d4e746d5b0 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 2 Jul 2026 12:26:47 -0800 Subject: [PATCH 040/129] Remove @schemastore/package Providing our own type is trivial. --- package-lock.json | 8 -------- package.json | 1 - src/node/constants.ts | 10 +++++++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b723da89b86..91807c30f6ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,6 @@ "@eslint/compat": "^1.2.0", "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.12.0", - "@schemastore/package": "^0.0.10", "@types/compression": "^1.7.3", "@types/cookie-parser": "^1.4.4", "@types/eslint__js": "^8.42.3", @@ -438,13 +437,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@schemastore/package": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@schemastore/package/-/package-0.0.10.tgz", - "integrity": "sha512-D3LxMCnkgsb4LO5sDKf6E+yahM2SqpEHmkqMPDSJis5Cy/j2MgWo/g/iq0lECK0mrPWfx3hqKm2ZJlqxwbRJQA==", - "dev": true, - "license": "MIT" - }, "node_modules/@textlint/ast-node-types": { "version": "15.7.1", "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.7.1.tgz", diff --git a/package.json b/package.json index 170d7295247d..dbebbc7c370d 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "@eslint/compat": "^1.2.0", "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.12.0", - "@schemastore/package": "^0.0.10", "@types/compression": "^1.7.3", "@types/cookie-parser": "^1.4.4", "@types/eslint__js": "^8.42.3", diff --git a/src/node/constants.ts b/src/node/constants.ts index bb6873dfa113..06281c6889cf 100644 --- a/src/node/constants.ts +++ b/src/node/constants.ts @@ -1,9 +1,13 @@ import { logger } from "@coder/logger" -import type { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package" import * as os from "os" import * as path from "path" -export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJsonFiles { +type PackageJson = { + version: string + commit: string +} + +export function getPackageJson(relativePath: string): PackageJson { let pkg = {} try { pkg = require(relativePath) @@ -11,7 +15,7 @@ export function getPackageJson(relativePath: string): JSONSchemaForNPMPackageJso logger.warn(error.message) } - return pkg + return pkg as PackageJson } export const rootPath = path.resolve(__dirname, "../..") From d103d5057a7cb9beeacb4ea98407ea59398209c0 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 9 Jul 2026 22:58:44 -0800 Subject: [PATCH 041/129] Fix update script using old Node version It needs to parse the version *after* the VS Code update, otherwise it is just pulling whatever the previous version was. That means we cannot use it in the step title without some refactoring; opted to just omit it for now. --- ci/build/update-vscode.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 26a43cd9b4cb..bc4eddbe068c 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -42,6 +42,8 @@ function refresh_patches() { function update_node() { local node_version node_version=$(cat .node-version) + local target_node_version + target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') if [[ $node_version == "$target_node_version" ]] ; then echo "Already set to $target_node_version" else @@ -116,9 +118,6 @@ function main() { source ./ci/lib.sh - local target_node_version - target_node_version=$(grep target lib/vscode/remote/.npmrc | awk -F= '{print $2}' | tr -d '"') - declare -a steps # If version is not set, assume we are already at the target version and the @@ -141,7 +140,7 @@ function main() { fi steps+=( - "Set Node version to $target_node_version" "update_node" + "Update Node version" "update_node" "Update CSP webview hash" "update_csp" "Add changelog note" "add_changelog" ) From cb22f74650a539d6f824d5944ec34d9e74844f66 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Sat, 11 Jul 2026 06:08:44 +1000 Subject: [PATCH 042/129] Update Code to 1.128.0 (#7889) --- .node-version | 2 +- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.node-version b/.node-version index 5bf4400f2292..1dd37d53743d 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.15.0 +24.17.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d75ad4d5680..6aff1d124869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.128.0 + +### Changed + +- Update to Code 1.128.0 + ## [4.127.0](https://github.com/coder/code-server/releases/tag/v4.127.0) - 2026-07-02 Code v1.127.0 diff --git a/lib/vscode b/lib/vscode index a22d00300655..fc3def6774c7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit a22d00300655c17490ce63dffc28bcdcedcd82c4 +Subproject commit fc3def6774c76082adf699d366f31a557ce5573f From 421e7eb0848eba9dcf22b19525db53d0bb2d0336 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 14 Jul 2026 02:56:29 +1000 Subject: [PATCH 043/129] Update Helm chart and changelog with 4.128.0 (#7891) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aff1d124869..57416d3c64f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.128.0](https://github.com/coder/code-server/releases/tag/v4.128.0) - 2026-07-11 + Code v1.128.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 46a363b985f5..6d1bda0f3678 100644 --- 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.42.0 +version: 3.43.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.127.0 +appVersion: 4.128.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index b96ed4486cb2..05954e11926e 100644 --- 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.127.0' + tag: '4.128.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 3e76a04b1b8d9cf2795777d77f63bef143779bc6 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 16 Jul 2026 12:33:43 -0800 Subject: [PATCH 044/129] Fix automatic CSP hash update The problem was that whenever the hashe needed an update, the current patch would create a conflict which cannot be easily auto-resolved. Instead, put the hashes in a separate patch that is deleted and regenerated each time, avoiding the conflicts. Also the web worker iframe hash was not being updated. --- ci/build/update-vscode.sh | 85 +++++++++++++++++++++------------------ ci/lib.sh | 10 +++-- patches/csp-hashes.diff | 26 ++++++++++++ patches/series | 1 + patches/webview.diff | 31 -------------- 5 files changed, 79 insertions(+), 74 deletions(-) create mode 100644 patches/csp-hashes.diff diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index bc4eddbe068c..32b7fc1a2d1f 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail function unapply_patches() { local -i exit_code=0 - quiet quilt pop -af || exit_code=$? + quiet quilt pop -af 2>&1 || exit_code=$? case $exit_code in # Sucessfully unapplied. 0) ;; @@ -15,6 +15,19 @@ function unapply_patches() { esac } +function apply_patches() { + local -i exit_code=0 + quiet quilt push -a 2>&1 || exit_code=$? + case $exit_code in + # Sucessfully applied. + 0) ;; + # No more patches to apply. + 2) ;; + # Some error. + *) return $exit_code ;; + esac +} + function update_vscode() { pushd lib/vscode if ! git checkout 2>&1 "$target_vscode_version" ; then @@ -28,8 +41,8 @@ function update_vscode() { function refresh_patches() { local -i exit_code=0 - while quiet quilt push ; ! (( exit_code=$? )) ; do - quilt refresh + while quiet quilt push 2>&1 ; ! (( exit_code=$? )) ; do + quilt refresh 2>&1 done case $exit_code in # No more patches to apply. @@ -56,50 +69,41 @@ function get-webview-script-hash() { local html html=$(<"$1") local start_tag='" html=${html##*"$start_tag"} html=${html%%"$end_tag"*} echo -n "$html" | openssl sha256 -binary | openssl base64 } +function delete_csp() { + quilt delete csp-hashes.diff +} + function update_csp() { - local current - current=$(quilt top 2>/dev/null || echo "") - local patch_action="" - echo "Currently at ${current:-base}" - if [[ $current != */webview.diff ]] ; then - echo "Moving to patches/webview.diff..." - local -i exit_code=0 - if quilt applied 2>/dev/null | grep --quiet webview.diff ; then - quiet quilt pop webview || exit_code=$? - patch_action=pop - else - quiet quilt push webview || exit_code=$? - patch_action=push - fi - case $exit_code in - # Successfully moved. - 0) ;; - # Some error. - *) return $exit_code ;; - esac - fi + apply_patches - local file=lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html - local hash - hash=$(get-webview-script-hash "$file") - echo "Calculated hash as $hash" - # Use octothorpe as a delimiter since the hash may contain a slash. - sed -i.bak "s#script-src 'sha256-[^']\+'#script-src 'sha256-$hash'#" "$file" - quilt refresh + local files=( + ./lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html + ./lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html + ) - if [[ $patch_action != "" ]] ; then - echo "Moving back to ${current:-base}..." - case $patch_action in - pop) quiet quilt push "$current" ;; - push) quiet quilt pop "${current:--a}" ;; - esac - fi + quilt new csp-hashes.diff + + local file + for file in "${files[@]}" ; do + quilt add "$file" + + local hash + hash=$(get-webview-script-hash "$file") + echo "Calculated hash as $hash" + # Use octothorpe as a delimiter since the hash may contain a slash. + sed -i.bak "s#'sha256-[^']\+'#'sha256-$hash'#" "$file" + done + + quilt refresh } function add_changelog() { @@ -120,6 +124,9 @@ function main() { declare -a steps + # Hashes are always regenerated to avoid having to resolve conflicts.. + steps+=("Revert CSP hashes" "delete_csp") + # If version is not set, assume we are already at the target version and the # user is just trying to resolve conflics. local target_vscode_version @@ -141,7 +148,7 @@ function main() { steps+=( "Update Node version" "update_node" - "Update CSP webview hash" "update_csp" + "Regenerate CSP hashes" "update_csp" "Add changelog note" "add_changelog" ) diff --git a/ci/lib.sh b/ci/lib.sh index df38a9552891..41b75d65ce85 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -85,18 +85,20 @@ run-steps() { while (( $# )) ; do local name=$1 ; shift local fn=$1 ; shift + echo "$name..." # Only run if an earlier step has not failed. + # For all failed steps, write out an empty checkbox. if [[ $failed == 0 ]] ; then - echo "$name..." if $fn | indent ; then echo "- [X] $name" >> .cache/checklist else ((failed++)) + echo "- [-] $name" >> .cache/checklist + echo "Failed" | indent fi - fi - # For all failed steps, write out an empty checkbox. - if [[ $failed != 0 ]] ; then + else echo "- [ ] $name" >> .cache/checklist + echo "Skipped" | indent fi done if [[ $failed != 0 ]] ; then diff --git a/patches/csp-hashes.diff b/patches/csp-hashes.diff new file mode 100644 index 000000000000..6435caa92e2e --- /dev/null +++ b/patches/csp-hashes.diff @@ -0,0 +1,26 @@ +Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +=================================================================== +--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html ++++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +@@ -5,7 +5,7 @@ + + + ++ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + + + + + diff --git a/patches/series b/patches/series index 6f438da313bf..5b548e3900dd 100644 --- a/patches/series +++ b/patches/series @@ -24,3 +24,4 @@ trusted-domains.diff signature-verification.diff copilot.diff app-name.diff +csp-hashes.diff diff --git a/patches/webview.diff b/patches/webview.diff index fd5349d73198..24ffef3dcb5b 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -3,9 +3,6 @@ Serve webviews from the same origin Normally webviews are served from vscode-webview.net but we would rather them be self-hosted. -When doing this CSP will block resources (for example when viewing images) so -add 'self' to the CSP to fix that. - Additionally the service worker defaults to handling *all* requests made to the current host but when self-hosting the webview this will end up including the webview HTML itself which means these requests will fail since the communication @@ -20,16 +17,6 @@ webview host is separate by default but we serve on the same host). To test, open a few types of webviews (images, markdown, extension details, etc). -Make sure to update the hash. To do so: -1. run code-server -2. open any webview (i.e. preview Markdown) -3. see error in console and copy hash - -That will test the hash change in pre/index.html - -Double-check the console to make sure there are no console errors for the webWorkerExtensionHostIframe -which also requires a hash change. - parentOriginHash changes This fixes webviews from not working properly due to a change upstream. @@ -66,15 +53,6 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html -@@ -5,7 +5,7 @@ - - - -+ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> - - - - - @@ -25,6 +25,13 @@ // validation not requested return start(); From 77baee7fe06f7031d45e6acf903c9b4b329e10c4 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 17 Jul 2026 17:05:13 +1000 Subject: [PATCH 045/129] Update Code to 1.129.0 (#7897) --- .node-version | 2 +- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/csp-hashes.diff | 4 ++-- patches/proposed-api.diff | 17 ++++++++--------- patches/webview.diff | 4 ++-- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.node-version b/.node-version index 1dd37d53743d..ca5c350055cc 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.17.0 +24.18.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 57416d3c64f0..f197b7bad3f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.129.0 + +### Changed + +- Update to Code 1.129.0 + ## [4.128.0](https://github.com/coder/code-server/releases/tag/v4.128.0) - 2026-07-11 Code v1.128.0 diff --git a/lib/vscode b/lib/vscode index fc3def6774c7..125df4672b8a 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit fc3def6774c76082adf699d366f31a557ce5573f +Subproject commit 125df4672b8a6a34975303c6b0baa124e560a4f7 diff --git a/patches/csp-hashes.diff b/patches/csp-hashes.diff index 6435caa92e2e..0202248875e8 100644 --- a/patches/csp-hashes.diff +++ b/patches/csp-hashes.diff @@ -19,8 +19,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWor diff --git a/patches/proposed-api.diff b/patches/proposed-api.diff index daf7169f1436..3b2286b043e7 100644 --- a/patches/proposed-api.diff +++ b/patches/proposed-api.diff @@ -10,18 +10,17 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts -@@ -321,10 +321,7 @@ function extensionDescriptionArrayToMap( +@@ -324,6 +324,10 @@ function extensionDescriptionArrayToMap( } export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean { -- if (!extension.enabledApiProposals) { -- return false; -- } -- return true;// extension.enabledApiProposals.includes(proposal); -+ return true - } - - export function checkProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): void { ++ return true; ++} ++ ++export function _isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean { + if (!extension.enabledApiProposals) { + return false; + } Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts diff --git a/patches/webview.diff b/patches/webview.diff index 24ffef3dcb5b..e3d82c35839c 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -79,8 +79,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWor =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html +++ code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html -@@ -25,6 +25,13 @@ - // validation not requested +@@ -34,6 +34,13 @@ + } return start(); } + From 22b0a3eeabd7f34a1185839553b88f81f1718ceb Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Sat, 18 Jul 2026 05:33:10 +1000 Subject: [PATCH 046/129] Update Helm chart and changelog with 4.129.0 (#7898) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f197b7bad3f0..eb8495b6aac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.129.0](https://github.com/coder/code-server/releases/tag/v4.129.0) - 2026-07-17 + Code v1.129.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 6d1bda0f3678..9f959fe9a729 100644 --- 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.43.0 +version: 3.44.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.128.0 +appVersion: 4.129.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 05954e11926e..472813165da9 100644 --- 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.128.0' + tag: '4.129.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 227d08660bc1381a71d26aa68a95d07577ea945a Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 21 Jul 2026 05:00:27 +1000 Subject: [PATCH 047/129] Update Code to 1.129.1 (#7899) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8495b6aac8..8b9e72db645a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.129.1 + +### Changed + +- Update to Code 1.129.1 + ## [4.129.0](https://github.com/coder/code-server/releases/tag/v4.129.0) - 2026-07-17 Code v1.129.0 diff --git a/lib/vscode b/lib/vscode index 125df4672b8a..8a7abeba6e03 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 125df4672b8a6a34975303c6b0baa124e560a4f7 +Subproject commit 8a7abeba6e03ea3af87bfbce9a1b7e48fed567b8 From 31e6279646917de4a3bef76f3f55a0b746aaad18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 14:03:57 -0800 Subject: [PATCH 048/129] chore: bump softprops/action-gh-release from 3.0.0 to 3.0.1 (#7878) --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ce69cd72c9f7..417aa950963c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -110,7 +110,7 @@ jobs: - run: | sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes if: ${{ matrix.vscode_arch == 'x64' }} - - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 if: ${{ matrix.vscode_arch == 'x64' }} with: draft: true @@ -123,7 +123,7 @@ jobs: # Platform-specific release. - run: KEEP_MODULES=1 npm run release - run: npm run package - - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 with: draft: true discussion_category_name: "📣 Announcements" @@ -189,7 +189,7 @@ jobs: - run: npm run test:native - run: npm run package - - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 + - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 with: draft: true discussion_category_name: "📣 Announcements" From 1e2b734be89fb5f2222929f49a5cb425579f2c1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 14:04:23 -0800 Subject: [PATCH 049/129] chore: bump awalsh128/cache-apt-pkgs-action from 1.6.1 to 1.6.3 (#7877) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e12411acca60..d8898d3be5c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -163,7 +163,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest + - uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 417aa950963c..687a1cae7409 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: steps: - run: sudo apt update && sudo apt install -y libkrb5-dev - - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest + - uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # latest with: packages: quilt version: 1.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 461a31e1b40d..308714ba5ec8 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -47,7 +47,7 @@ jobs: echo done=false >> $GITHUB_OUTPUT fi - - uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest + - uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # latest if: steps.check.outputs.done == 'false' with: packages: quilt From c2337fec2d867c12f09eaf6b4db5e1c93150f8d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:12:19 -0800 Subject: [PATCH 050/129] chore: bump azure/setup-helm from 5.0.0 to 5.0.1 (#7873) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d8898d3be5c3..401003e5dd3b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,7 +90,7 @@ jobs: if: needs.changes.outputs.helm == 'true' steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 + - uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} version: "v3.19.2" From b99ce9a992da2468051034a9b0167c6f6a36d1b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:12:59 -0800 Subject: [PATCH 051/129] chore: bump actions/cache from 5.0.5 to 6.1.0 (#7875) --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 401003e5dd3b..a3c918abb3e7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -191,7 +191,7 @@ jobs: # embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild. - name: Fetch prebuilt linux-x64 Code package from cache id: cache-vscode - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: lib/vscode-reh-web-linux-x64 key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }} @@ -256,7 +256,7 @@ jobs: steps: - name: Cache Caddy - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 id: caddy-cache with: path: | From 3ed5f9744836dd135980650dd6c85a893007ff6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:14:19 -0800 Subject: [PATCH 052/129] chore: bump ws from 7.5.10 to 7.5.13 in /test (#7901) --- test/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 422c6c393fa4..6032ad15f1ab 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -4937,9 +4937,9 @@ } }, "node_modules/ws": { - "version": "7.5.10", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", - "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "version": "7.5.13", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.13.tgz", + "integrity": "sha512-rsKI6xDBFVf4r/x8XyChGK04QR/XHroxs/jUcoWvtEZM8TPU/X/uIY9B1CsSzYws9ZJb/6bbBu7dPhFW00CAoA==", "dev": true, "license": "MIT", "engines": { From 1dabd152beeca3d8ac40e98dc1a2e4c520a8a038 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 19:18:19 +0000 Subject: [PATCH 053/129] chore: bump actions/checkout from 6.0.3 to 7.0.1 (#7874) --- .github/workflows/build.yaml | 20 ++++++++++---------- .github/workflows/installer.yaml | 6 +++--- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/release.yaml | 4 ++-- .github/workflows/scripts.yaml | 4 ++-- .github/workflows/security.yaml | 6 +++--- .github/workflows/trivy-docker.yaml | 2 +- .github/workflows/update.yaml | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a3c918abb3e7..f9cf0e7064dd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: docs: ${{ steps.filter.outputs.docs }} helm: ${{ steps.filter.outputs.helm }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: filter with: @@ -55,7 +55,7 @@ jobs: name: Run prettier check runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -72,7 +72,7 @@ jobs: needs: changes if: needs.changes.outputs.docs == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -89,7 +89,7 @@ jobs: needs: changes if: needs.changes.outputs.helm == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -103,7 +103,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -121,7 +121,7 @@ jobs: if: needs.changes.outputs.ci == 'true' steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Check workflow files run: | bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9 @@ -134,7 +134,7 @@ jobs: needs: changes if: needs.changes.outputs.code == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -168,7 +168,7 @@ jobs: packages: quilt version: 1.0 - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true - run: quilt push -a @@ -219,7 +219,7 @@ jobs: if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -269,7 +269,7 @@ jobs: mkdir -p ~/.cache/caddy tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version diff --git a/.github/workflows/installer.yaml b/.github/workflows/installer.yaml index 9b4ab9018ff1..1777844dd11b 100644 --- a/.github/workflows/installer.yaml +++ b/.github/workflows/installer.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install code-server run: ./install.sh @@ -44,7 +44,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install curl run: apk add curl @@ -67,7 +67,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install code-server run: ./install.sh diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 76a7c78533bc..95299ce9e93b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -33,7 +33,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version-file: .node-version @@ -64,7 +64,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - name: Checkout code-server-aur repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: repository: "cdrci/code-server-aur" token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} @@ -108,7 +108,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 @@ -149,7 +149,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - run: ./ci/build/update-repo.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 687a1cae7409..fc4a126fb125 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -76,7 +76,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true - run: quilt push -a @@ -170,7 +170,7 @@ jobs: version=4${version:1} echo "VERSION=$version" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true - run: quilt push -a diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml index 1c671c48fa90..180975866b12 100644 --- a/.github/workflows/scripts.yaml +++ b/.github/workflows/scripts.yaml @@ -41,7 +41,7 @@ jobs: container: "alpine:3.17" steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install test utilities run: apk add bats checkbashisms @@ -58,7 +58,7 @@ jobs: timeout-minutes: 5 steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Install lint utilities run: sudo apt install shellcheck diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 7671a094e6d5..fc1664965f55 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -25,7 +25,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: fetch-depth: 0 @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: fetch-depth: 0 @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 26bf15886948..8ceb95d60b04 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Run Trivy vulnerability scanner in image mode uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 308714ba5ec8..b54826c79f70 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -28,7 +28,7 @@ jobs: run: | echo "VERSION=${TAG#v}" >> $GITHUB_ENV - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 with: submodules: true From 5cf68f624139e5a8e1b9d9fd4588815ad1c2ff2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:45:28 -0800 Subject: [PATCH 054/129] Bump prettier from 3.8.3 to 3.9.4 (#7876) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91807c30f6ba..60ef2224b56a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^17.6.0", - "prettier": "3.8.3", + "prettier": "3.9.4", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", @@ -5144,9 +5144,9 @@ } }, "node_modules/prettier": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", - "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz", + "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index dbebbc7c370d..144b9232aa36 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^17.6.0", - "prettier": "3.8.3", + "prettier": "3.9.4", "prettier-plugin-sh": "^0.18.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", From 197ef3e8da8ee99ed6ca8f1a630157527e6d448f Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 24 Jul 2026 05:09:58 +1000 Subject: [PATCH 055/129] Update Code to 1.130.0 (#7904) --- CHANGELOG.md | 4 ++-- lib/vscode | 2 +- patches/csp-hashes.diff | 4 ++-- patches/webview.diff | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b9e72db645a..af670e891e49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,11 +22,11 @@ Code v99.99.999 ## Unreleased -Code v1.129.1 +Code v1.130.0 ### Changed -- Update to Code 1.129.1 +- Update to Code 1.130.0 ## [4.129.0](https://github.com/coder/code-server/releases/tag/v4.129.0) - 2026-07-17 diff --git a/lib/vscode b/lib/vscode index 8a7abeba6e03..1b6a188127ee 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 8a7abeba6e03ea3af87bfbce9a1b7e48fed567b8 +Subproject commit 1b6a188127eeaf9194f945eb6eb89a657e93c54c diff --git a/patches/csp-hashes.diff b/patches/csp-hashes.diff index 0202248875e8..422ca3b61e6e 100644 --- a/patches/csp-hashes.diff +++ b/patches/csp-hashes.diff @@ -6,8 +6,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-A6/szVNdTzyi4hDa+9OLbzS8tSd2iUV4CqimLNWex2Y=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-FFQoOVVa2tOE3uqUvirwaMNT20TZmrHcL2aaOjJ8BUo=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-24QqbpzqcqSyIGvg/ZwFRy5pPlhmVBa8CkUREEIUnBw=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> { From 14bdb36f9217671bff9e9389f812c9ac9de575c0 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:18:12 +1000 Subject: [PATCH 056/129] Update Helm chart and changelog with 4.130.0 (#7906) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af670e891e49..a48f68ca339b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.130.0](https://github.com/coder/code-server/releases/tag/v4.130.0) - 2026-07-24 + Code v1.130.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 9f959fe9a729..364613f64740 100644 --- 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.44.0 +version: 3.45.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.129.0 +appVersion: 4.130.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 472813165da9..0abb6f35361a 100644 --- 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.129.0' + tag: '4.130.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From f3aca85d0246077eb0f25e76996e9400b7fb2f3b Mon Sep 17 00:00:00 2001 From: Anupam Mediratta Date: Fri, 31 Jul 2026 00:48:50 +0530 Subject: [PATCH 057/129] fix: add cooldown to dependabot config (#7910) --- .github/dependabot.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 7cc5663e9f42..aabb28ecc8d9 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -6,6 +6,8 @@ updates: interval: "monthly" time: "06:00" timezone: "America/Chicago" + cooldown: + default-days: 7 labels: [] commit-message: prefix: "chore" @@ -16,6 +18,8 @@ updates: interval: "monthly" time: "06:00" timezone: "America/Chicago" + cooldown: + default-days: 7 labels: [] ignore: # Ignore patch updates for all dependencies From 9edf867909fbd8f72871ee47d926fc6572c7267c Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 23 Jul 2026 10:55:57 -0800 Subject: [PATCH 058/129] Remove dash partially completed update step Not sure why I assumed this would render. --- ci/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/lib.sh b/ci/lib.sh index 41b75d65ce85..7c1f0d9e5914 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -93,7 +93,7 @@ run-steps() { echo "- [X] $name" >> .cache/checklist else ((failed++)) - echo "- [-] $name" >> .cache/checklist + echo "- [ ] $name" >> .cache/checklist echo "Failed" | indent fi else From b95360f302a257d98e06e84d2764741abf46756f Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 23 Jul 2026 10:56:35 -0800 Subject: [PATCH 059/129] Continue update even if csp patch is missing This can happen if you run the update multiple times and it was already deleted from another run but not regenerated yet due to an early failure like from a conflict. --- ci/build/update-vscode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index 32b7fc1a2d1f..b3b4857d2eb4 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -79,7 +79,7 @@ function get-webview-script-hash() { } function delete_csp() { - quilt delete csp-hashes.diff + quilt delete csp-hashes.diff || true } function update_csp() { From a3fc2899bd0fcd388253c0e79ce33b8acd48c688 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 31 Jul 2026 06:25:04 +1000 Subject: [PATCH 060/129] Update Code to 1.131.0 (#7912) --- lib/vscode | 2 +- patches/base-path.diff | 10 +++++----- patches/copilot.diff | 2 +- patches/display-language.diff | 8 ++++---- patches/external-file-actions.diff | 10 +++++----- patches/getting-started.diff | 8 ++++---- patches/integration.diff | 4 ++-- patches/local-storage.diff | 2 +- patches/logout.diff | 4 ++-- patches/marketplace.diff | 4 ++-- patches/proxy-uri.diff | 6 +++--- patches/service-worker.diff | 4 ++-- patches/telemetry.diff | 4 ++-- patches/trusted-domains.diff | 4 ++-- patches/unique-db.diff | 2 +- patches/update-check.diff | 6 +++--- patches/webview.diff | 2 +- 17 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/vscode b/lib/vscode index 1b6a188127ee..3a03d6f72d62 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 1b6a188127eeaf9194f945eb6eb89a657e93c54c +Subproject commit 3a03d6f72d628a7741c29f456b4ddbb5ae68502c diff --git a/patches/base-path.diff b/patches/base-path.diff index 9191effe8ed5..2daa529c6080 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -144,9 +144,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts codeServerVersion: this._productService.codeServerVersion, + rootEndpoint: rootBase, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { - ...this._productService.extensionsGallery, -@@ -401,7 +408,9 @@ export class WebClientServer { +@@ -402,7 +409,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -438,7 +447,7 @@ export class WebClientServer { +@@ -439,7 +448,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -511,3 +520,70 @@ export class WebClientServer { +@@ -512,3 +521,70 @@ export class WebClientServer { return void res.end(data); } } @@ -241,7 +241,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -85,6 +85,7 @@ export interface IAgentSdkProductConfig +@@ -98,6 +98,7 @@ export interface IDictationRuntimeProduc export interface IProductConfiguration { readonly codeServerVersion?: string diff --git a/patches/copilot.diff b/patches/copilot.diff index c525d33a24fa..c66ccdb09cbe 100644 --- 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'; -@@ -483,6 +484,116 @@ export function packageCopilotExtensionS +@@ -491,6 +492,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } diff --git a/patches/display-language.diff b/patches/display-language.diff index 3ff62227f3e8..c46fdcc85fa0 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -399,14 +400,22 @@ export class WebClientServer { +@@ -400,14 +401,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); @@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } // Prefers to run on UI -@@ -2284,17 +2281,6 @@ export class SetLanguageAction extends E +@@ -2282,17 +2279,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 { -@@ -2311,7 +2297,6 @@ export class ClearLanguageAction extends +@@ -2309,7 +2295,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${this.EnabledClass} disabled`; constructor( @@ -317,7 +317,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -2321,17 +2306,6 @@ export class ClearLanguageAction extends +@@ -2319,17 +2304,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index abbfac2cb32a..a877d8d798b3 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -383,6 +383,8 @@ export class WebClientServer { +@@ -384,6 +384,8 @@ export class WebClientServer { serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, @@ -129,8 +129,8 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts 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 } from '../../platform/contextkey/common/contextkeys.js'; --import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsSessionsWindowContext } from '../common/contextkeys.js'; -+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsSessionsWindowContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../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'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; -import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.js'; @@ -138,7 +138,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from '../../platform/workspace/common/workspace.js'; import { IWorkbenchLayoutService, Parts, positionToString } from '../services/layout/browser/layoutService.js'; import { getRemoteName } from '../../platform/remote/common/remoteHosts.js'; -@@ -69,7 +69,7 @@ export class WorkbenchContextKeysHandler +@@ -70,7 +70,7 @@ export class WorkbenchContextKeysHandler @IContextKeyService private readonly contextKeyService: IContextKeyService, @IWorkspaceContextService private readonly contextService: IWorkspaceContextService, @IConfigurationService private readonly configurationService: IConfigurationService, @@ -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, -@@ -202,6 +202,10 @@ export class WorkbenchContextKeysHandler +@@ -205,6 +205,10 @@ export class WorkbenchContextKeysHandler this.auxiliaryBarMaximizedContext = AuxiliaryBarMaximizedContext.bindTo(this.contextKeyService); this.auxiliaryBarMaximizedContext.set(this.layoutService.isAuxiliaryBarMaximized()); diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 9d50f8f47d35..25d1a74de3c7 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -387,6 +387,7 @@ export class WebClientServer { +@@ -388,6 +388,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], @@ -217,12 +217,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts 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 } from '../../platform/contextkey/common/contextkeys.js'; --import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsSessionsWindowContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js'; -+import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, AuxiliaryBarMaximizedContext, InAutomationContext, IsSessionsWindowContext, IsEnabledFileDownloads, IsEnabledFileUploads, IsEnabledCoderGettingStarted, } 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 { 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'; -@@ -205,6 +205,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) diff --git a/patches/integration.diff b/patches/integration.diff index 2d4507fe2bd2..954987aa4102 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -186,7 +186,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -84,6 +84,8 @@ export interface IAgentSdkProductConfig +@@ -97,6 +97,8 @@ export interface IDictationRuntimeProduc } export interface IProductConfiguration { @@ -257,8 +257,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const productConfiguration: Partial> = { + codeServerVersion: this._productService.codeServerVersion, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { - ...this._productService.extensionsGallery, Index: code-server/lib/vscode/src/server-main.ts =================================================================== --- code-server.orig/lib/vscode/src/server-main.ts diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 87710698a9ca..23800eba3820 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -378,6 +378,7 @@ export class WebClientServer { +@@ -379,6 +379,7 @@ export class WebClientServer { remoteAuthority, serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', diff --git a/patches/logout.diff b/patches/logout.diff index 5af694506d6c..cab0d5e03beb 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -87,6 +87,7 @@ export interface IProductConfiguration { +@@ -100,6 +100,7 @@ export interface IProductConfiguration { readonly codeServerVersion?: string readonly rootEndpoint?: string readonly updateEndpoint?: string @@ -46,8 +46,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, + logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, - }; Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 539ba28bb7ca..45276e5cb9a8 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -49,10 +49,10 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority }); -@@ -362,14 +361,7 @@ export class WebClientServer { - codeServerVersion: this._productService.codeServerVersion, +@@ -363,14 +362,7 @@ export class WebClientServer { rootEndpoint: rootBase, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, - extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { - ...this._productService.extensionsGallery, - resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({ diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index ef98ae832064..0ac22e4d7d3b 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -88,6 +88,7 @@ export interface IProductConfiguration { +@@ -101,6 +101,7 @@ export interface IProductConfiguration { readonly rootEndpoint?: string readonly updateEndpoint?: string readonly logoutEndpoint?: string @@ -77,8 +77,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, + proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/', embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, - }; Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts @@ -148,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 -@@ -83,8 +83,8 @@ export class ForwardedPortsView extends +@@ -84,8 +84,8 @@ export class ForwardedPortsView extends private async enableForwardedPortsFeatures() { this.contextKeyListener.clear(); diff --git a/patches/service-worker.diff b/patches/service-worker.diff index 0204d57dd904..a80046e32b06 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -89,6 +89,10 @@ export interface IProductConfiguration { +@@ -102,6 +102,10 @@ export interface IProductConfiguration { readonly updateEndpoint?: string readonly logoutEndpoint?: string readonly proxyEndpointTemplate?: string @@ -63,5 +63,5 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + path: rootBase + '/_static/out/browser/serviceWorker.js', + }, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, - }; diff --git a/patches/telemetry.diff b/patches/telemetry.diff index cd17a28bbfcb..b189a809c372 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -141,13 +141,13 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + enableTelemetry: this._productService.enableTelemetry, + telemetryEndpoint: this._productService.telemetryEndpoint, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, - }; Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -93,6 +93,7 @@ export interface IProductConfiguration { +@@ -106,6 +106,7 @@ export interface IProductConfiguration { readonly path: string; readonly scope: string; } diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index f6ca9dc5fc01..9a9e19c80846 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -39,9 +39,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, -@@ -372,6 +380,7 @@ export class WebClientServer { - telemetryEndpoint: this._productService.telemetryEndpoint, +@@ -373,6 +381,7 @@ export class WebClientServer { embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, + linkProtectionTrustedDomains, }; diff --git a/patches/unique-db.diff b/patches/unique-db.diff index 9d4f2ae39913..10d7d19b2606 100644 --- a/patches/unique-db.diff +++ b/patches/unique-db.diff @@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS export class BrowserStorageService extends AbstractStorageService { -@@ -328,7 +329,11 @@ export class IndexedDBStorageDatabase ex +@@ -354,7 +355,11 @@ export class IndexedDBStorageDatabase ex } static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise { diff --git a/patches/update-check.diff b/patches/update-check.diff index 6cadd81e3ef7..ab10947a8815 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -93,7 +93,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -86,6 +86,7 @@ export interface IAgentSdkProductConfig +@@ -99,6 +99,7 @@ export interface IDictationRuntimeProduc export interface IProductConfiguration { readonly codeServerVersion?: string readonly rootEndpoint?: string @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts readonly version: string; readonly date?: string; -@@ -138,6 +139,7 @@ export interface IProductConfiguration { +@@ -151,6 +152,7 @@ export interface IProductConfiguration { readonly resourceUrlTemplate: string; readonly nlsBaseUrl: string; readonly accessSKUs?: string[]; @@ -119,8 +119,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts rootEndpoint: rootBase, + updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, - }; Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts diff --git a/patches/webview.diff b/patches/webview.diff index b7d5893302cc..3ae96265ad53 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -374,6 +374,7 @@ export class WebClientServer { +@@ -375,6 +375,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, serverBasePath: basePath, From 4cf9c11e3fd8cebda7448e6a0b535aee09d4379b Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 30 Jul 2026 14:13:33 -0800 Subject: [PATCH 061/129] Update changelog with 1.131.0 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a48f68ca339b..809463baf825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.131.0 + +### Changed + +- Update to Code 1.131.0 + ## [4.130.0](https://github.com/coder/code-server/releases/tag/v4.130.0) - 2026-07-24 Code v1.130.0 From 924bfac9fd89c5a45f2706f0db71cbb53ae152bf Mon Sep 17 00:00:00 2001 From: Vishal Doshi Date: Fri, 31 Jul 2026 06:14:17 +0800 Subject: [PATCH 062/129] Document opening a file at a line via the payload query parameter (#7909) --- docs/FAQ.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/FAQ.md b/docs/FAQ.md index 4951acb9e8e5..656b45978fe3 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -17,6 +17,7 @@ - [Where is VS Code configuration stored?](#where-is-vs-code-configuration-stored) - [How can I reuse my VS Code configuration?](#how-can-i-reuse-my-vs-code-configuration) - [How does code-server decide what workspace or folder to open?](#how-does-code-server-decide-what-workspace-or-folder-to-open) +- [Can I open a file at a specific line from a URL?](#can-i-open-a-file-at-a-specific-line-from-a-url) - [How do I access my Documents/Downloads/Desktop folders in code-server on macOS?](#how-do-i-access-my-documentsdownloadsdesktop-folders-in-code-server-on-macos) - [How do I direct server-side requests through a proxy?](#how-do-i-direct-server-side-requests-through-a-proxy) - [How do I debug issues with code-server?](#how-do-i-debug-issues-with-code-server) @@ -230,6 +231,39 @@ code-server tries the following in this order: 3. The workspace or directory passed via the command line 4. The last opened workspace or directory +## Can I open a file at a specific line from a URL? + +Yes. In addition to `workspace` and `folder`, code-server supports VS Code's +`payload` query parameter, which can open a specific file — optionally at a +line and column — once the workbench loads. + +`payload` is a URL-encoded JSON array of `[key, value]` string pairs. The +`openFile` key takes a `vscode-remote:///` URI, where +`` is the host you use to reach code-server. Add +`["gotoLineMode","true"]` to have a trailing `:line[:column]` suffix on the +path interpreted as a cursor position: + +```text +https://code.example.com/?folder=/home/coder/project&payload=[["gotoLineMode","true"],["openFile","vscode-remote://code.example.com/home/coder/project/src/app.py:10:5"]] +``` + +(with the `payload` value URL-encoded). Notes: + +- Paths must be absolute; there is no form relative to `folder`. +- This is upstream VS Code web behavior (the same mechanism vscode.dev uses), + so it works without any code-server-specific configuration. + +For example, to generate links from a shell: + +```sh +#!/bin/sh +# usage: code-link [line[:column]] +HOST=code.example.com +payload="[[\"gotoLineMode\",\"true\"],[\"openFile\",\"vscode-remote://$HOST$1${2:+:$2}\"]]" +printf 'https://%s/?folder=%s&payload=%s\n' "$HOST" "$(dirname "$1")" \ + "$(printf '%s' "$payload" | jq -sRr @uri)" +``` + ## How do I access my Documents/Downloads/Desktop folders in code-server on macOS? Newer versions of macOS require permission through a non-UNIX mechanism for From eb4ba56acbbbc64f6e6ca5d00588ca84ace913bb Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 31 Jul 2026 08:37:01 +1000 Subject: [PATCH 063/129] Update Helm chart and changelog with 4.131.0 (#7922) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 809463baf825..a485bd6b8144 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.131.0](https://github.com/coder/code-server/releases/tag/v4.131.0) - 2026-07-30 + Code v1.131.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 364613f64740..806c00ee5f9a 100644 --- 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.45.0 +version: 3.46.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.130.0 +appVersion: 4.131.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 0abb6f35361a..7deaf228a1fa 100644 --- 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.130.0' + tag: '4.131.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 4f736648800a4be95775aa0f59e44025999e1b46 Mon Sep 17 00:00:00 2001 From: Anupam Mediratta Date: Mon, 3 Aug 2026 21:54:25 +0530 Subject: [PATCH 064/129] Require auth for mint key endpoint (#7923) The client combines the key from this endpoint to then encrypt secrets into browser storage. --- src/node/routes/vscode.ts | 2 +- test/unit/node/routes/vscode.test.ts | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/node/routes/vscode.ts b/src/node/routes/vscode.ts index 3ff64a179604..f8c048c6f036 100644 --- a/src/node/routes/vscode.ts +++ b/src/node/routes/vscode.ts @@ -210,7 +210,7 @@ router.get("/manifest.json", async (req, res) => { }) let mintKeyPromise: Promise | undefined -router.post("/mint-key", async (req, res) => { +router.post("/mint-key", ensureAuthenticated, async (req, res) => { if (!mintKeyPromise) { mintKeyPromise = new Promise(async (resolve) => { const keyPath = path.join(req.args["user-data-dir"], "serve-web-key-half") diff --git a/test/unit/node/routes/vscode.test.ts b/test/unit/node/routes/vscode.test.ts index a5a4fb72da7a..80feefd99be2 100644 --- a/test/unit/node/routes/vscode.test.ts +++ b/test/unit/node/routes/vscode.test.ts @@ -4,11 +4,19 @@ import * as integration from "../../../utils/integration" describe("vscode", () => { let codeServer: httpserver.HttpServer | undefined + // TODO: Support setting this as an argument for tests. + const previousEnvPassword = process.env.PASSWORD beforeEach(() => { + process.env.PASSWORD = "test" mockLogger() }) afterEach(async () => { + if (typeof previousEnvPassword !== "undefined") { + process.env.PASSWORD = previousEnvPassword + } else { + delete process.env.PASSWORD + } if (codeServer) { await codeServer.dispose() codeServer = undefined @@ -27,4 +35,10 @@ describe("vscode", () => { }) }).rejects.toThrow() }) + + it("should require auth", async () => { + codeServer = await integration.setup(["--auth=password"], "") + let resp = await codeServer.fetch("/mint-key", { method: "POST" }) + expect(resp.status).toBe(401) + }) }) From 2a1c2637cd30a5bbe26bb6ac26af9eef3efa4c60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2026 08:25:52 -0800 Subject: [PATCH 065/129] Bump js-yaml from 4.2.0 to 4.3.0 (#7900) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60ef2224b56a..dcfc50643d9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4140,9 +4140,9 @@ "license": "ISC" }, "node_modules/js-yaml": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", - "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", + "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", "funding": [ { "type": "github", From 7ff34158a105ac9f987ebdeb0ed4006c04ed0abc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2026 08:26:26 -0800 Subject: [PATCH 066/129] Bump body-parser from 2.2.2 to 2.3.0 (#7902) --- package-lock.json | 58 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index dcfc50643d9f..a2e21ebc5635 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1633,20 +1633,20 @@ } }, "node_modules/body-parser": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", - "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz", + "integrity": "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==", "license": "MIT", "dependencies": { "bytes": "^3.1.2", - "content-type": "^1.0.5", + "content-type": "^2.0.0", "debug": "^4.4.3", - "http-errors": "^2.0.0", - "iconv-lite": "^0.7.0", + "http-errors": "^2.0.1", + "iconv-lite": "^0.7.2", "on-finished": "^2.4.1", - "qs": "^6.14.1", - "raw-body": "^3.0.1", - "type-is": "^2.0.1" + "qs": "^6.15.2", + "raw-body": "^3.0.2", + "type-is": "^2.1.0" }, "engines": { "node": ">=18" @@ -1656,6 +1656,19 @@ "url": "https://opencollective.com/express" } }, + "node_modules/body-parser/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/boundary": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/boundary/-/boundary-2.0.0.tgz", @@ -6127,17 +6140,34 @@ } }, "node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz", + "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==", "license": "MIT", "dependencies": { - "content-type": "^1.0.5", + "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" }, "engines": { - "node": ">= 0.6" + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/type-is/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/typed-array-buffer": { From 1a370bb60624d560c059e09c3681f2e00a47278d Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Aug 2026 10:49:39 -0800 Subject: [PATCH 067/129] Update Node types to 24 --- package-lock.json | 18 +++++++++--------- package.json | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2e21ebc5635..c1e366c77ef2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "@types/express": "^5.0.0", "@types/http-proxy": "1.17.7", "@types/js-yaml": "^4.0.6", - "@types/node": "22.x", + "@types/node": "24.x", "@types/pem": "^1.14.1", "@types/proxy-from-env": "^1.0.1", "@types/safe-compare": "^1.1.0", @@ -65,7 +65,7 @@ "typescript-eslint": "^8.8.0" }, "engines": { - "node": "22" + "node": "24" } }, "node_modules/@coder/logger": { @@ -652,13 +652,13 @@ } }, "node_modules/@types/node": { - "version": "22.19.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.13.tgz", - "integrity": "sha512-akNQMv0wW5uyRpD2v2IEyRSZiR+BeGuoB6L310EgGObO44HSMNT8z1xzio28V8qOrgYaopIDNA18YgdXd+qTiw==", + "version": "24.13.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.3.tgz", + "integrity": "sha512-Dh8vAsV36ig5wa9OX4pXvMc9D3Veibfw2wix0CUwYODLD8nkj9UsLjASr49nPg+2eKzxhBV+v7L8pXvT4e639Q==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~7.18.0" } }, "node_modules/@types/pem": { @@ -6306,9 +6306,9 @@ } }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index 144b9232aa36..fc610fb8894d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/express": "^5.0.0", "@types/http-proxy": "1.17.7", "@types/js-yaml": "^4.0.6", - "@types/node": "22.x", + "@types/node": "24.x", "@types/pem": "^1.14.1", "@types/proxy-from-env": "^1.0.1", "@types/safe-compare": "^1.1.0", @@ -88,7 +88,7 @@ "xdg-basedir": "^4.0.0" }, "resolutions": { - "@types/node": "22.x" + "@types/node": "24.x" }, "bin": { "code-server": "out/node/entry.js" @@ -103,7 +103,7 @@ "remote-development" ], "engines": { - "node": "22" + "node": "24" }, "jest": { "transform": { From f8363149543c35f13e793a2703737be07baa1ce1 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Aug 2026 12:35:13 -0800 Subject: [PATCH 068/129] Use const for unmutated let --- test/unit/node/routes/vscode.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/node/routes/vscode.test.ts b/test/unit/node/routes/vscode.test.ts index 80feefd99be2..a835ba96e2dd 100644 --- a/test/unit/node/routes/vscode.test.ts +++ b/test/unit/node/routes/vscode.test.ts @@ -38,7 +38,7 @@ describe("vscode", () => { it("should require auth", async () => { codeServer = await integration.setup(["--auth=password"], "") - let resp = await codeServer.fetch("/mint-key", { method: "POST" }) + const resp = await codeServer.fetch("/mint-key", { method: "POST" }) expect(resp.status).toBe(401) }) }) From 208c81a07236372a145913138d8fe56e920270b5 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Aug 2026 12:26:01 -0800 Subject: [PATCH 069/129] Fix mistakenly encoding cookies to proxy We use the cookie parser to remove the code-server token but by default it encodes using encodeURIComponent, which encodes more than is strictly necessary and can break proxied applications. Now we pass the cookies through unchanged (other than removing the code-server token). Fixes #7927. --- CHANGELOG.md | 6 +++++ src/node/proxy.ts | 30 ++++++++++++++++++------- test/unit/node/proxy.test.ts | 43 ++++++++++++++++++++++++++---------- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a485bd6b8144..82d108e318be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +### Fixed + +- When proxying, cookies were being decoded and re-encoded, which could cause + issues for applications that encode differently. Cookies are now passed + through unchanged (aside from stripping out code-server's session token). + ## [4.131.0](https://github.com/coder/code-server/releases/tag/v4.131.0) - 2026-07-30 Code v1.131.0 diff --git a/src/node/proxy.ts b/src/node/proxy.ts index 8282729cc34d..2d9056996d53 100644 --- a/src/node/proxy.ts +++ b/src/node/proxy.ts @@ -20,17 +20,31 @@ proxy.on("error", (error, _, res) => { } }) +function identity(val: T): T { + return val +} + // Strip the code-server cookie if it exists to avoid transmitting the cookie // to potentially malicious local ports. proxy.on("proxyReq", (preq, req) => { - const cookieSessionName = getCookieSessionName((req as Request).args["cookie-suffix"]) - preq.setHeader( - "Cookie", - cookie.stringifyCookie({ - ...(req as Request).cookies, - [cookieSessionName]: undefined, - }), - ) + if (req.headers.cookie) { + const cookieSessionName = getCookieSessionName((req as Request).args["cookie-suffix"]) + // Encoding and decoding are no-ops; we just want to remove the token + // without changing anything else about the cookies because not all + // applications encode/decode the same way `cookie` here does. + preq.setHeader( + "Cookie", + cookie.stringifyCookie( + { + ...cookie.parseCookie(req.headers.cookie, { decode: identity }), + [cookieSessionName]: undefined, + }, + { + encode: identity, + }, + ), + ) + } }) // Intercept the response to rewrite absolute redirects against the base path. diff --git a/test/unit/node/proxy.test.ts b/test/unit/node/proxy.test.ts index 94945cb94eaa..4c3320a07b93 100644 --- a/test/unit/node/proxy.test.ts +++ b/test/unit/node/proxy.test.ts @@ -298,25 +298,44 @@ describe("proxy", () => { process.env.HASHED_PASSWORD = token codeServer = await integration.setup(["--auth=password"]) - // Set up a listener that just prints the cookies it got. e.get("/wsup/cookies", (req, res) => { res.writeHead(HttpCode.Ok, { "Content-Type": "text/plain" }) res.end(req.headers.cookie) }) - // Send the token along with other cookies which should be preserved. - // Encode one to make sure they are being re-encoded properly. - const value = "hello=there" - const encodedValue = encodeURIComponent(value) - const resp = await codeServer.fetch(proxyPath + "/cookies", { - headers: { - cookie: `cookie1=${encodedValue}; code-server-session=${token}; cookie2=hello;`, - }, + const cookies = [ + "cookie2=hello", + // Cookies should pass through unchanged, neither encoded nor decoded. + `cookie1=${encodeURIComponent("hello=there")}`, + "cookie3=foo|bar", + `cookie4=${encodeURIComponent("foo|bar")}`, + `cookie5=${encodeURIComponent("bar;baz")}`, + ] + + // Test each slot to ensure the token is found anywhere. + for (let i = 0; i <= cookies.length; ++i) { + const left = cookies.slice(0, i) + const right = cookies.slice(i) + const resp = await codeServer.fetch(proxyPath + "/cookies", { + headers: { + cookie: [...left, `code-server-session=${token}`, ...right].join("; "), + }, + }) + expect(resp.status).toBe(200) + expect(await resp.text()).toBe(cookies.join("; ")) + } + }) + + it("should proxy when no cookies", async () => { + codeServer = await integration.setup(["--auth=none"]) + + e.get("/wsup/cookies", (req, res) => { + res.writeHead(HttpCode.Ok, { "Content-Type": "text/plain" }) + res.end(req.headers.cookie || "no cookies") }) - // The proxied listener should not have printed the code-server token. + const resp = await codeServer.fetch(proxyPath + "/cookies") expect(resp.status).toBe(200) - const text = await resp.text() - expect(text).toBe(`cookie1=${encodedValue}; cookie2=hello`) + expect(await resp.text()).toBe("no cookies") }) }) From 41cbd28c448f3be681dab2237284100cfe89b3d2 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 7 Aug 2026 08:13:49 +1000 Subject: [PATCH 070/129] Update Code to 1.132.0 (#7933) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/base-path.diff | 6 +++--- patches/display-language.diff | 12 ++++++------ patches/external-file-actions.diff | 10 +++++----- patches/getting-started.diff | 2 +- patches/local-storage.diff | 2 +- patches/proxy-uri.diff | 2 +- patches/webview.diff | 2 +- 9 files changed, 25 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82d108e318be..670d4f1b627e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.132.0 + +### Changed + +- Update to Code 1.132.0 + ### Fixed - When proxying, cookies were being decoded and re-encoded, which could cause diff --git a/lib/vscode b/lib/vscode index 3a03d6f72d62..df53daabb18c 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 3a03d6f72d628a7741c29f456b4ddbb5ae68502c +Subproject commit df53daabb18cd157bdb08c7f01c34df936cf12f4 diff --git a/patches/base-path.diff b/patches/base-path.diff index 2daa529c6080..e065145ad47d 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { -@@ -402,7 +409,9 @@ export class WebClientServer { +@@ -403,7 +410,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -439,7 +448,7 @@ export class WebClientServer { +@@ -440,7 +449,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -512,3 +521,70 @@ export class WebClientServer { +@@ -513,3 +522,70 @@ export class WebClientServer { return void res.end(data); } } diff --git a/patches/display-language.diff b/patches/display-language.diff index c46fdcc85fa0..8a8297438976 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -400,14 +401,22 @@ export class WebClientServer { +@@ -401,14 +402,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); @@ -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 -@@ -474,9 +474,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; } -@@ -781,7 +778,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 -@@ -2282,17 +2279,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 { -@@ -2309,7 +2295,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); -@@ -2319,17 +2304,6 @@ export class ClearLanguageAction extends +@@ -2318,17 +2303,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index a877d8d798b3..92e5c0a0c4ef 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -27,7 +27,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -312,6 +312,16 @@ export interface IWorkbenchConstructionO +@@ -319,6 +319,16 @@ export interface IWorkbenchConstructionO */ readonly userDataPath?: string @@ -166,12 +166,12 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js'; import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js'; import { Schemas } from '../../../../base/common/network.js'; --import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; -+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; +-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ActiveEditorDirtyContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; ++import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ActiveEditorDirtyContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js'; import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js'; import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; import { ThemeIcon } from '../../../../base/common/themables.js'; -@@ -571,13 +571,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -573,13 +573,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo id: DOWNLOAD_COMMAND_ID, title: DOWNLOAD_LABEL }, @@ -195,7 +195,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions ) })); -@@ -589,6 +592,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo +@@ -591,6 +594,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo title: UPLOAD_LABEL, }, when: ContextKeyExpr.and( diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 25d1a74de3c7..21136dfbc358 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -322,6 +322,11 @@ export interface IWorkbenchConstructionO +@@ -329,6 +329,11 @@ export interface IWorkbenchConstructionO */ readonly isEnabledFileUploads?: boolean diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 23800eba3820..44a524ec21a8 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts -@@ -307,6 +307,11 @@ export interface IWorkbenchConstructionO +@@ -314,6 +314,11 @@ export interface IWorkbenchConstructionO */ readonly configurationDefaults?: Record; diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index 0ac22e4d7d3b..ebe175381ec5 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -148,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 -@@ -84,8 +84,8 @@ export class ForwardedPortsView extends +@@ -99,8 +99,8 @@ export class ForwardedPortsView extends private async enableForwardedPortsFeatures() { this.contextKeyListener.clear(); diff --git a/patches/webview.diff b/patches/webview.diff index 3ae96265ad53..0ba1da5b2c96 100644 --- 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 -@@ -226,7 +226,7 @@ export class BrowserWorkbenchEnvironment +@@ -234,7 +234,7 @@ export class BrowserWorkbenchEnvironment @memoize get webviewExternalEndpoint(): string { From 313bf0359b4d391ba18f1fa131aad8a583bc2919 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Aug 2026 14:45:38 -0800 Subject: [PATCH 071/129] Bump ip-address from 10.2.0 to 10.4.0 (#7931) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c1e366c77ef2..bcb67b113d19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3660,9 +3660,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "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" From 29785ddfba7c6614e1fe2873b13361dea7648a8a Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 11 Aug 2026 04:20:19 +1000 Subject: [PATCH 072/129] Update Helm chart and changelog with 4.132.0 (#7937) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 670d4f1b627e..cb962e813d8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.132.0](https://github.com/coder/code-server/releases/tag/v4.132.0) - 2026-08-10 + Code v1.132.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 806c00ee5f9a..18731f507eec 100644 --- 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.46.0 +version: 3.47.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.131.0 +appVersion: 4.132.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 7deaf228a1fa..fe92c69bbe61 100644 --- 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.131.0' + tag: '4.132.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 51f90a376b42e217b38937410fe2855e0c1db87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=91=AB=E4=BA=BF?= <98445030+zhaoxinyi02@users.noreply.github.com> Date: Tue, 11 Aug 2026 02:22:48 +0800 Subject: [PATCH 073/129] docs(helm): remove duplicated 'the' in persistence example (#7936) --- docs/helm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/helm.md b/docs/helm.md index cf33d82892cf..864a1940cbf4 100644 --- a/docs/helm.md +++ b/docs/helm.md @@ -105,7 +105,7 @@ $ helm upgrade --install code-server \ --set persistence.enabled=false ``` -The above command sets the the persistence storage to false. +The above command sets the persistence storage to false. Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, From 596dbf3416413e04d0fad3f43baff8add2902399 Mon Sep 17 00:00:00 2001 From: Alexander Freiherr von Buddenbrock Date: Mon, 17 Aug 2026 19:03:55 +0200 Subject: [PATCH 074/129] Update files to reflect the new node.js v24 (#7949) With the update to node.js v24 in vscode and package.json some files have not been updated and still referenced version 22.x. --- ci/build/npm-postinstall.sh | 4 ++-- docs/CONTRIBUTING.md | 2 +- docs/android.md | 6 +++--- docs/npm.md | 5 ++--- docs/termux.md | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index 9476722648f8..b4ff69e66ebc 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -65,8 +65,8 @@ main() { echo "USE AT YOUR OWN RISK!" fi - if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-22}" ]; then - echo "ERROR: code-server currently requires node v22." + if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-24}" ]; then + echo "ERROR: code-server currently requires node v24." if [ -n "$FORCE_NODE_VERSION" ]; then echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION." fi diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index a2087ff17672..d857b20c3850 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -31,7 +31,7 @@ The prerequisites for contributing to code-server are almost the same as those for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). Here is what is needed: -- `node` v22.x +- `node` v24.x - `git` v2.x or greater - [`git-lfs`](https://git-lfs.github.com) - [`npm`](https://www.npmjs.com/) diff --git a/docs/android.md b/docs/android.md index 0b1dc24abf6e..4541bc7b5fee 100644 --- a/docs/android.md +++ b/docs/android.md @@ -11,11 +11,11 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` 6. Exit the terminal using `exit` and then reopen the terminal -7. Install and use Node.js 22: +7. Install and use Node.js 24: ```shell -nvm install 22 -nvm use 22 +nvm install 24 +nvm use 24 ``` 8. Install code-server globally on device with: `npm install --global code-server` diff --git a/docs/npm.md b/docs/npm.md index 8d3afd0be06a..1ad36a0e120d 100644 --- a/docs/npm.md +++ b/docs/npm.md @@ -29,8 +29,7 @@ includes installing instructions based on your operating system. ## Node.js version -We use the same major version of Node.js shipped with Code's remote, which is -currently `22.x`. VS Code also [lists Node.js +We use Node.js `24.x`. VS Code also [lists Node.js requirements](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites). Using other versions of Node.js [may lead to unexpected @@ -78,7 +77,7 @@ Proceed to [installing](#installing) ## FreeBSD ```sh -pkg install -y git python npm-node22 pkgconf +pkg install -y git python npm-node24 pkgconf pkg install -y libinotify ``` diff --git a/docs/termux.md b/docs/termux.md index db81cb57d1e1..a13ce86116ca 100644 --- a/docs/termux.md +++ b/docs/termux.md @@ -57,7 +57,7 @@ npm config set python python3 node -v ``` -you will get Node version `v22` +you will get Node version `v24` 5. Now install code-server following our guide on [installing with npm](./npm.md) From d2f7a122522456b351e9b3ddd39e4f3fb9fd5318 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:06:00 +1000 Subject: [PATCH 075/129] Update Code to 1.133.0 (#7942) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/display-language.diff | 8 ++++---- patches/integration.diff | 2 +- patches/marketplace.diff | 6 +++--- patches/telemetry.diff | 18 +++++------------- 6 files changed, 20 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb962e813d8e..1bb80543b31d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.133.0 + +### Changed + +- Update to Code 1.133.0 + ## [4.132.0](https://github.com/coder/code-server/releases/tag/v4.132.0) - 2026-08-10 Code v1.132.0 diff --git a/lib/vscode b/lib/vscode index df53daabb18c..a5b500951314 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit df53daabb18cd157bdb08c7f01c34df936cf12f4 +Subproject commit a5b500951314efd502d07465bd138dfbd714a960 diff --git a/patches/display-language.diff b/patches/display-language.diff index 8a8297438976..4c52e9d0f123 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -9,16 +9,16 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts -@@ -12,7 +12,7 @@ import * as path from '../../base/common - import { IURITransformer } from '../../base/common/uriIpc.js'; +@@ -13,7 +13,7 @@ import { IURITransformer } from '../../b + import { generateUuid } from '../../base/common/uuid.js'; import { getMachineId, getSqmMachineId, getDevDeviceId } from '../../base/node/id.js'; import { Promises } from '../../base/node/pfs.js'; -import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../base/parts/ipc/common/ipc.js'; +import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from '../../base/parts/ipc/common/ipc.js'; import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; + import { createRandomIPCHandle } from '../../base/parts/ipc/node/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; - import { ConfigurationService } from '../../platform/configuration/common/configurationService.js'; -@@ -358,6 +358,9 @@ export async function setupServerService +@@ -417,6 +417,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); diff --git a/patches/integration.diff b/patches/integration.diff index 954987aa4102..dda81c7469e3 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts import { IProgressService } from '../../platform/progress/common/progress.js'; import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js'; import { dirname, joinPath } from '../../base/common/resources.js'; -@@ -139,6 +140,9 @@ export class BrowserMain extends Disposa +@@ -140,6 +141,9 @@ export class BrowserMain extends Disposa // Startup const instantiationService = workbench.startup(); diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 45276e5cb9a8..6f838e0f23a2 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -19,9 +19,9 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts +++ code-server/lib/vscode/src/vs/platform/product/common/product.ts -@@ -49,6 +49,17 @@ else if (globalThis._VSCODE_PRODUCT_JSON - version: pkg.version - }); +@@ -65,6 +65,17 @@ else if (globalThis._VSCODE_PRODUCT_JSON + Object.assign(product, { copilotVersions: { runtime, sdk } }); + } } + + Object.assign(product, { diff --git a/patches/telemetry.diff b/patches/telemetry.diff index b189a809c372..1fd2f693fdfe 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -12,15 +12,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts -@@ -4,6 +4,7 @@ - *--------------------------------------------------------------------------------------------*/ - - import { hostname, release } from 'os'; -+import { promises as fs } from 'fs'; - import { Emitter, Event } from '../../base/common/event.js'; - import { DisposableStore, toDisposable } from '../../base/common/lifecycle.js'; - import { Schemas } from '../../base/common/network.js'; -@@ -65,6 +66,7 @@ import { IExtensionsScannerService } fro +@@ -68,6 +68,7 @@ import { IExtensionsScannerService } fro import { ExtensionsScannerService } from './extensionsScannerService.js'; import { IExtensionsProfileScannerService } from '../../platform/extensionManagement/common/extensionsProfileScannerService.js'; import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js'; @@ -28,18 +20,18 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from '../../platform/policy/common/policy.js'; import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js'; import { LoggerService } from '../../platform/log/node/loggerService.js'; -@@ -176,11 +178,23 @@ export async function setupServerService +@@ -179,11 +180,23 @@ export async function setupServerService const requestService = new RequestService('remote', configurationService, environmentService, logService); services.set(IRequestService, requestService); + let isContainer = undefined; + try { -+ await fs.stat('/run/.containerenv'); ++ await fs.promises.stat('/run/.containerenv'); + isContainer = true; + } catch (error) { /* Does not exist, probably. */ } + if (!isContainer) { + try { -+ const content = await fs.readFile('/proc/self/cgroup', 'utf8') ++ const content = await fs.promises.readFile('/proc/self/cgroup', 'utf8') + isContainer = content.includes('docker'); + } catch (error) { /* Permission denied, probably. */ } + } @@ -159,7 +151,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts +++ code-server/lib/vscode/src/vs/platform/product/common/product.ts -@@ -58,7 +58,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON +@@ -113,7 +113,8 @@ else { resourceUrlTemplate: "https://open-vsx.org/vscode/asset/{publisher}/{name}/{version}/Microsoft.VisualStudio.Code.WebResources/{path}", controlUrl: "", recommendationsUrl: "", From c22dc74d53e0c07e0bbba3aa3eefb2c86f682f30 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 18 Aug 2026 09:58:30 +1000 Subject: [PATCH 076/129] Update Helm chart and changelog with 4.133.0 (#7951) --- .github/workflows/build.yaml | 8 +++----- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 6 +++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f9cf0e7064dd..2950d0ac8de7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,12 +90,10 @@ jobs: if: needs.changes.outputs.helm == 'true' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1 + - uses: bmuschko/setup-kubeconform@e5d264ec1eafe2314e750c429a9da7639dd5a003 # v1.1.0 with: - token: ${{ secrets.GITHUB_TOKEN }} - version: "v3.19.2" - - run: helm plugin install https://github.com/instrumenta/helm-kubeval - - run: helm kubeval ci/helm-chart + kubeconform-version: "0.8.0" + - run: kubeconform ci/helm-chart lint-ts: name: Lint TypeScript files diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb80543b31d..e7768348d00b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.133.0](https://github.com/coder/code-server/releases/tag/v4.133.0) - 2026-08-17 + Code v1.133.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 18731f507eec..99c540e33719 100644 --- 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.47.0 +version: 3.48.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.132.0 +appVersion: 4.133.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index fe92c69bbe61..9d07b928e53b 100644 --- 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.132.0' + tag: '4.133.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a @@ -34,6 +34,10 @@ serviceAccount: # Specifies annotations for deployment annotations: {} +# code-server.labels -- The Deployment labels. See: +# https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +labels: {} + podAnnotations: {} podSecurityContext: {} From 876304f95fe8a31d5dae791eceab330c1262c201 Mon Sep 17 00:00:00 2001 From: Anthony Holten Date: Wed, 19 Aug 2026 17:18:20 -0400 Subject: [PATCH 077/129] Remove --unsafe-perm flag from install scripts (#7953) npm 12 rejects unknown CLI flags, so the npm install path crashes with EUNKNOWNCONFIG before installing. The flag has been a no-op since npm 7; remove it from install.sh and the postinstall guard. --- ci/build/npm-postinstall.sh | 16 +--------------- install.sh | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index b4ff69e66ebc..3c2bcb2dbff0 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -76,20 +76,6 @@ main() { exit 1 fi - # Under npm, if we are running as root, we need --unsafe-perm otherwise - # post-install scripts will not have sufficient permissions to do their thing. - if is_root; then - case "${npm_config_user_agent-}" in npm*) - if [ "${npm_config_unsafe_perm-}" != "true" ]; then - echo "Please pass --unsafe-perm to npm to install code-server" - echo "Otherwise post-install scripts will not have permissions to run" - echo "See https://docs.npmjs.com/misc/config#unsafe-perm" - echo "See https://stackoverflow.com/questions/49084929/npm-sudo-global-installation-unsafe-perm" - exit 1 - fi - ;; - esac - fi if ! vscode_install; then echo "You may not have the required dependencies to build the native modules." @@ -110,7 +96,7 @@ install_with_yarn_or_npm() { # end-user we want to keep using whatever package manager is in use. case "${npm_config_user_agent-}" in npm*) - if ! npm install --unsafe-perm --omit=dev; then + if ! npm install --omit=dev; then return 1 fi ;; diff --git a/install.sh b/install.sh index 81c1ce68edcd..28580a871b53 100755 --- a/install.sh +++ b/install.sh @@ -436,7 +436,7 @@ install_npm() { fi echoh "Installing with npm." echoh - "$sh_c" "$NPM_PATH" install -g "code-server@$VERSION" --unsafe-perm + "$sh_c" "$NPM_PATH" install -g "code-server@$VERSION" NPM_BIN_DIR="\$($NPM_PATH bin -g)" echo_npm_postinstall return fi From f69d40ce6fc2a175f23df040d3727030e3e7b964 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:21:37 -0800 Subject: [PATCH 078/129] Bump js-yaml from 4.3.0 to 4.3.1 (#7935) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bcb67b113d19..b241359a8ed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4153,9 +4153,9 @@ "license": "ISC" }, "node_modules/js-yaml": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", - "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", + "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", "funding": [ { "type": "github", From 30852bb006cb3924c6a1fefac41f66babb01ff77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:22:13 -0800 Subject: [PATCH 079/129] chore: bump actions/setup-node from 6.4.0 to 7.0.0 (#7921) --- .github/workflows/build.yaml | 14 +++++++------- .github/workflows/publish.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- .github/workflows/security.yaml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2950d0ac8de7..563f0488851e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -56,7 +56,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -73,7 +73,7 @@ jobs: if: needs.changes.outputs.docs == 'true' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -102,7 +102,7 @@ jobs: if: needs.changes.outputs.code == 'true' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -133,7 +133,7 @@ jobs: if: needs.changes.outputs.code == 'true' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -170,7 +170,7 @@ jobs: with: submodules: true - run: quilt push -a - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -218,7 +218,7 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -268,7 +268,7 @@ jobs: tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 95299ce9e93b..6a0961ca6d7d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -34,7 +34,7 @@ jobs: echo "VERSION=${TAG#v}" >> $GITHUB_ENV - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fc4a126fb125..7a7b8220ddb6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -80,7 +80,7 @@ jobs: with: submodules: true - run: quilt push -a - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm @@ -174,7 +174,7 @@ jobs: with: submodules: true - run: quilt push -a - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version cache: npm diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index fc1664965f55..50db9b300711 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 - name: Install Node.js - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 with: node-version-file: .node-version From b9653442b37cd74e99b541629fea55308b5e600c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:22:48 -0800 Subject: [PATCH 080/129] chore: bump softprops/action-gh-release from 3.0.1 to 3.0.2 (#7920) --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7a7b8220ddb6..177528aab5f4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -110,7 +110,7 @@ jobs: - run: | sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes if: ${{ matrix.vscode_arch == 'x64' }} - - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 + - uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2 if: ${{ matrix.vscode_arch == 'x64' }} with: draft: true @@ -123,7 +123,7 @@ jobs: # Platform-specific release. - run: KEEP_MODULES=1 npm run release - run: npm run package - - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 + - uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2 with: draft: true discussion_category_name: "📣 Announcements" @@ -189,7 +189,7 @@ jobs: - run: npm run test:native - run: npm run package - - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1 + - uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2 with: draft: true discussion_category_name: "📣 Announcements" From fb43d02d100d1e79d4ff02622704f29cde2f7928 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:23:12 -0800 Subject: [PATCH 081/129] chore: bump docker/login-action from 4.2.0 to 4.6.0 (#7919) --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 6a0961ca6d7d..bba68eeacacf 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -112,11 +112,11 @@ jobs: - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 - - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 + - uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 + - uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0 with: registry: ghcr.io username: ${{ github.actor }} From 02badb20561317093b2cef18978101e9794a930c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:24:38 -0800 Subject: [PATCH 082/129] chore: bump github/codeql-action/init from 4.36.2 to 4.37.6 (#7918) --- .github/workflows/security.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 50db9b300711..ab5b457f8d38 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -80,7 +80,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4 with: config-file: ./.github/codeql-config.yml languages: javascript From 2edeb1c99128c5a9c0cea200c710a96a120323c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:28:08 -0800 Subject: [PATCH 083/129] chore: bump github/codeql-action/upload-sarif from 4.36.2 to 4.37.6 (#7917) --- .github/workflows/security.yaml | 2 +- .github/workflows/trivy-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index ab5b457f8d38..79c53f3f609a 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -62,7 +62,7 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4 with: sarif_file: "trivy-repo-results.sarif" diff --git a/.github/workflows/trivy-docker.yaml b/.github/workflows/trivy-docker.yaml index 8ceb95d60b04..45ff9474371d 100644 --- a/.github/workflows/trivy-docker.yaml +++ b/.github/workflows/trivy-docker.yaml @@ -58,6 +58,6 @@ jobs: severity: "HIGH,CRITICAL" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4 with: sarif_file: "trivy-image-results.sarif" From 04ce2301a78153d824e9c9e6e2dcc17c1453a89e Mon Sep 17 00:00:00 2001 From: Fernando Softov Date: Wed, 19 Aug 2026 17:44:48 -0400 Subject: [PATCH 084/129] Add VSCODE_OPTIONS and --vscode-option for Code flags (#1528) (#7952) --- src/node/cli.ts | 62 ++++++++++++++++++++++++++++++++++++-- test/unit/node/cli.test.ts | 50 ++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/node/cli.ts b/src/node/cli.ts index 0946c8e04344..d91f4e6a89b3 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -97,6 +97,7 @@ export interface UserProvidedArgs extends UserProvidedCodeArgs { "abs-proxy-base-path"?: string i18n?: string "idle-timeout-seconds"?: number + "vscode-option"?: string[] /* Positional arguments. */ _?: string[] } @@ -322,6 +323,13 @@ export const options: Options> = { "Override the reconnection grace time in seconds. Clients who disconnect for longer than this duration will need to \n" + "reload the window. Defaults to 10800 (3 hours).", }, + "vscode-option": { + type: "string[]", + description: + "Pass an option straight through to the VS Code server as flag=value, or as a bare flag for a \n" + + "boolean. Repeatable; repeating the same flag builds an array. Use this to reach VS Code options \n" + + "code-server does not model itself, e.g. --vscode-option enable-sandbox --vscode-option agents=true.", + }, } export const optionDescriptions = (opts: Partial>> = options): string[] => { @@ -643,6 +651,15 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config args["reconnection-grace-time"] = process.env.CODE_SERVER_RECONNECTION_GRACE_TIME } + // Space-separated, like NODE_OPTIONS. Appended to any flags rather than + // replacing them so the two can be combined. + if (process.env.VSCODE_OPTIONS) { + args["vscode-option"] = [ + ...(args["vscode-option"] ?? []), + ...process.env.VSCODE_OPTIONS.split(/\s+/).filter((option) => option), + ] + } + if (process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS) { if (isNaN(Number(process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS))) { logger.info("CODE_SERVER_IDLE_TIMEOUT_SECONDS must be a number") @@ -909,17 +926,58 @@ export interface CodeArgs extends UserProvidedCodeArgs { log?: string[] } +/** + * Expand --vscode-option entries into VS Code server arguments. + * + * An entry is `flag=value`, or a bare `flag` meaning true. A leading `--` on + * the flag is optional, so both spellings people reach for work. Repeating a + * flag collects the values into an array, since several VS Code options take + * one. + * + * `true` and `false` become booleans rather than strings. VS Code tests these + * flags for truthiness and the string "false" is truthy, so passing it along + * verbatim would quietly do the opposite of what was asked. + */ +export const parseVscodeOptions = (entries: string[]): Record => { + const parsed: Record = {} + + for (const entry of entries) { + const [flag, rawValue] = splitOnFirstEquals(entry.replace(/^--/, "")) + if (!flag) { + throw new Error(`--vscode-option requires a flag name (got "${entry}")`) + } + + const value: string | boolean = + typeof rawValue === "undefined" || rawValue === "true" ? true : rawValue === "false" ? false : rawValue + + const existing = parsed[flag] + if (typeof existing === "undefined") { + parsed[flag] = value + } else if (Array.isArray(existing)) { + existing.push(String(value)) + } else { + parsed[flag] = [String(existing), String(value)] + } + } + + return parsed +} + /** * Convert our arguments to equivalent VS Code server arguments. * Does not add any extra arguments. */ export const toCodeArgs = async (args: DefaultedArgs): Promise => { + // The passthrough option is ours; VS Code has no idea what it is. + const { "vscode-option": vscodeOptions, ...rest } = args return { - ...args, + ...rest, /** Type casting. */ help: !!args.help, version: !!args.version, port: args.port?.toString(), log: args.log ? [args.log] : undefined, - } + // Last, so that reaching an option code-server does model still works. + ...parseVscodeOptions(vscodeOptions ?? []), + } as CodeArgs } diff --git a/test/unit/node/cli.test.ts b/test/unit/node/cli.test.ts index 85e16f38ca99..53eb066c1e70 100644 --- a/test/unit/node/cli.test.ts +++ b/test/unit/node/cli.test.ts @@ -51,6 +51,7 @@ describe("parser", () => { delete process.env.CODE_SERVER_RECONNECTION_GRACE_TIME delete process.env.VSCODE_PROXY_URI delete process.env.CS_DISABLE_PROXY + delete process.env.VSCODE_OPTIONS console.log = jest.fn() }) @@ -413,6 +414,17 @@ describe("parser", () => { }) }) + it("should use env var VSCODE_OPTIONS", async () => { + process.env.VSCODE_OPTIONS = "--enable-sandbox agents=true" + const args = parse(["--vscode-option", "verbose-logging"]) + + const defaultArgs = await setDefaults(args) + expect(defaultArgs).toEqual({ + ...defaults, + "vscode-option": ["verbose-logging", "--enable-sandbox", "agents=true"], + }) + }) + it("should use env var CS_DISABLE_GETTING_STARTED_OVERRIDE", async () => { process.env.CS_DISABLE_GETTING_STARTED_OVERRIDE = "1" const args = parse([]) @@ -1006,6 +1018,44 @@ describe("toCodeArgs", () => { _: [file], }) }) + + it("should pass through --vscode-option", async () => { + const args = parse([ + "--vscode-option", + "enable-sandbox", + "--vscode-option", + "agents=true", + "--vscode-option", + "enable-smoke-test-driver=false", + ]) + expect(await toCodeArgs(await setDefaults(args))).toStrictEqual({ + ...vscodeDefaults, + "enable-sandbox": true, + agents: true, + "enable-smoke-test-driver": false, + }) + }) + + it("should collect a repeated --vscode-option into an array", async () => { + const args = parse([ + "--vscode-option", + "locate-extension=a", + "--vscode-option", + "locate-extension=b", + "--vscode-option", + "locate-extension=c", + ]) + expect(await toCodeArgs(await setDefaults(args))).toStrictEqual({ + ...vscodeDefaults, + "locate-extension": ["a", "b", "c"], + }) + }) + + it("should error if --vscode-option has no flag", async () => { + await expect(toCodeArgs(await setDefaults(parse(["--vscode-option", "=nothing"])))).rejects.toThrow( + "--vscode-option requires a flag name", + ) + }) }) describe("optionDescriptions", () => { From fa4426393e7de2a59dae207f3b7c51108713e5ad Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 19 Aug 2026 14:31:06 -0800 Subject: [PATCH 085/129] Run unit tests when npm deps change --- .github/workflows/build.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 563f0488851e..62424f13e196 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,8 @@ jobs: outputs: ci: ${{ steps.filter.outputs.ci }} code: ${{ steps.filter.outputs.code }} - deps: ${{ steps.filter.outputs.deps }} + npm: ${{ steps.filter.outputs.npm }} + vscode: ${{ steps.filter.outputs.vscode }} docs: ${{ steps.filter.outputs.docs }} helm: ${{ steps.filter.outputs.helm }} steps: @@ -42,11 +43,12 @@ jobs: code: - "src/**" - "test/**" - deps: - - "lib/**" - - "patches/**" + npm: - "package-lock.json" - "test/package-lock.json" + vscode: + - "lib/**" + - "patches/**" - id: debug run: | echo "${{ toJSON(steps.filter )}}" @@ -130,7 +132,7 @@ jobs: name: Run unit tests runs-on: ubuntu-22.04 needs: changes - if: needs.changes.outputs.code == 'true' + if: needs.changes.outputs.code == 'true' || needs.changes.outputs.npm == 'true' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6 @@ -214,7 +216,7 @@ jobs: env: LOG_LEVEL: debug needs: [changes, build] - if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' + if: needs.changes.outputs.code == 'true' || needs.changes.outputs.npm == 'true' || needs.changes.outputs.vscode == 'true' || needs.changes.outputs.ci == 'true' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 @@ -250,7 +252,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} LOG_LEVEL: debug needs: [changes, build] - if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true' + if: needs.changes.outputs.code == 'true' || needs.changes.outputs.npm == 'true' || needs.changes.outputs.vscode == 'true' || needs.changes.outputs.ci == 'true' steps: - name: Cache Caddy From 0a7b4b1e16a5aa33aa52683bc33822457e812f87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 22:45:03 +0000 Subject: [PATCH 086/129] Bump brace-expansion (#7958) --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index b241359a8ed4..594fe6a7cefd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -953,16 +953,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", - "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", + "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { @@ -1677,9 +1677,9 @@ "license": "BSD-2-Clause" }, "node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", + "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": { From 1735f6d3fb853a35ad455e28e50898627d21235e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 14:45:44 -0800 Subject: [PATCH 087/129] Bump brace-expansion from 1.1.11 to 1.1.18 in /test (#7957) --- test/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 6032ad15f1ab..22e2eac20f74 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -1498,9 +1498,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "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": { From 7833136337c79117f74dec9a033646d20c5275db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 14:53:50 -0800 Subject: [PATCH 088/129] Bump js-yaml from 4.3.1 to 5.2.3 (#7916) --- package-lock.json | 33 ++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 594fe6a7cefd..90f56ca5b59f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", "i18next": "^26.3.1", - "js-yaml": "^4.1.0", + "js-yaml": "^5.2.3", "limiter": "^2.1.0", "pem": "^1.14.8", "proxy-agent": "^6.3.1", @@ -268,6 +268,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", + "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@eslint/js": { "version": "9.39.3", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.3.tgz", @@ -4153,9 +4176,9 @@ "license": "ISC" }, "node_modules/js-yaml": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", - "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.3.tgz", + "integrity": "sha512-n+mUVyUX5bVv7G/G2zyIHOhdxfuU1dY2NOFzTQUWiMUbFss8b57NFlgCCaggU78wSw5KVS9cllzeLyzyR+n5nw==", "funding": [ { "type": "github", @@ -4171,7 +4194,7 @@ "argparse": "^2.0.1" }, "bin": { - "js-yaml": "bin/js-yaml.js" + "js-yaml": "bin/js-yaml.mjs" } }, "node_modules/json-buffer": { diff --git a/package.json b/package.json index fc610fb8894d..1f9ea92c1d3a 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "http-proxy": "^1.18.1", "httpolyglot": "^0.1.2", "i18next": "^26.3.1", - "js-yaml": "^4.1.0", + "js-yaml": "^5.2.3", "limiter": "^2.1.0", "pem": "^1.14.8", "proxy-agent": "^6.3.1", From 2d5dbf0b77d88176e6d6ef828819bbaadb6955fb Mon Sep 17 00:00:00 2001 From: Asher Date: Wed, 19 Aug 2026 14:57:37 -0800 Subject: [PATCH 089/129] Update codeql actions to 4.37.6 One was updated by Dependabot, but not the others. --- .github/workflows/security.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 79c53f3f609a..4b7dec8026a8 100644 --- 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@5595ccaf912efad79be6eef63a5619ff05969be3 # v4 + uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 with: config-file: ./.github/codeql-config.yml languages: javascript - name: Autobuild - uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6 From 4cb856c47572a83e1ce294c15a7400c3477a3ad6 Mon Sep 17 00:00:00 2001 From: Robert Gingras Date: Thu, 20 Aug 2026 17:24:49 -0400 Subject: [PATCH 090/129] Add --socket-fd CLI option (#7940) --- docs/FAQ.md | 39 ++++++++++++++++++++++++++++++++ src/node/app.ts | 15 +++++++++---- src/node/cli.ts | 5 +++++ test/unit/node/app.test.ts | 46 +++++++++++++++++++++++++++++++++++++- 4 files changed, 100 insertions(+), 5 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index 656b45978fe3..c492c73b2c59 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -41,6 +41,7 @@ - [How do I disable the proxy?](#how-do-i-disable-the-proxy) - [How do I disable file download?](#how-do-i-disable-file-download) - [Why do web views not work?](#why-do-web-views-not-work) +- [Can I run code-server with systemd socket activation?](#can-i-run-code-server-with-systemd-socket-activation) @@ -560,3 +561,41 @@ To fix this, you must either: create and trust a certificate manually). - Disable security if your browser allows it. For example, in Chromium see `chrome://flags/#unsafely-treat-insecure-origin-as-secure` + +## Can I run code-server with systemd socket activation? + +Yes. Pass the inherited socket to code-server with `--socket-fd`. systemd +passes the first listening socket as file descriptor `3`. + +Create a socket unit, `~/.config/systemd/user/code-server.socket`: + +```ini +[Socket] +ListenStream=8080 + +[Install] +WantedBy=sockets.target +``` + +And a matching service unit, `~/.config/systemd/user/code-server.service`: + +```ini +[Service] +ExecStart=/usr/bin/code-server --socket-fd 3 +``` + +Then enable and start the socket: + +```bash +systemctl --user enable --now code-server.socket +``` + +code-server will start on the first connection and listen on the socket +systemd created. `--socket-fd` takes precedence over `--socket` and +`--bind-addr`/`--port`/`--host`, and `--socket-mode` is ignored because +systemd owns the socket's permissions. + +Socket activation only changes how code-server binds; your usual +authentication still applies (it keeps prompting for the configured password +unless you set `--auth none`), so keep authentication enabled when exposing the +server. diff --git a/src/node/app.ts b/src/node/app.ts index 2043e3fd4bc0..82b1d2733f13 100644 --- a/src/node/app.ts +++ b/src/node/app.ts @@ -13,7 +13,8 @@ import { EditorSessionManager, makeEditorSessionManagerServer } from "./vscodeSo import { handleUpgrade } from "./wsRouter" type SocketOptions = { socket: string; "socket-mode"?: string } -type ListenOptions = DefaultedArgs | SocketOptions +type FdOptions = { "socket-fd": number } +type ListenOptions = DefaultedArgs | SocketOptions | FdOptions export interface App extends Disposable { /** Handles regular HTTP requests. */ @@ -30,8 +31,12 @@ const isSocketOpts = (opts: ListenOptions): opts is SocketOptions => { return !!(opts as SocketOptions).socket || !(opts as DefaultedArgs).host } +export const isFdOpts = (opts: ListenOptions): opts is FdOptions => { + return typeof (opts as FdOptions)["socket-fd"] === "number" +} + export const listen = async (server: http.Server, opts: ListenOptions) => { - if (isSocketOpts(opts)) { + if (!isFdOpts(opts) && isSocketOpts(opts)) { try { await fs.unlink(opts.socket) } catch (error: any) { @@ -46,7 +51,9 @@ export const listen = async (server: http.Server, opts: ListenOptions) => { server.on("error", (err) => util.logError(logger, "http server error", err)) resolve() } - if (isSocketOpts(opts)) { + if (isFdOpts(opts)) { + server.listen({ fd: opts["socket-fd"] }, onListen) + } else if (isSocketOpts(opts)) { server.listen(opts.socket, onListen) } else { // [] is the correct format when using :: but Node errors with them. @@ -56,7 +63,7 @@ export const listen = async (server: http.Server, opts: ListenOptions) => { // NOTE@jsjoeio: we need to chmod after the server is finished // listening. Otherwise, the socket may not have been created yet. - if (isSocketOpts(opts)) { + if (!isFdOpts(opts) && isSocketOpts(opts)) { if (opts["socket-mode"]) { await fs.chmod(opts.socket, opts["socket-mode"]) } diff --git a/src/node/cli.ts b/src/node/cli.ts index d91f4e6a89b3..926f6ff1fdef 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -83,6 +83,7 @@ export interface UserProvidedArgs extends UserProvidedCodeArgs { open?: boolean "bind-addr"?: string socket?: string + "socket-fd"?: number "socket-mode"?: string "trusted-origins"?: string[] version?: boolean @@ -236,6 +237,10 @@ export const options: Options> = { port: { type: "number", description: "" }, socket: { type: "string", path: true, description: "Path to a socket (bind-addr will be ignored)." }, + "socket-fd": { + type: "number", + description: "File descriptor of a pre-bound, listening socket to use (for systemd socket activation).", + }, "socket-mode": { type: "string", description: "File mode of the socket." }, "trusted-origins": { type: "string[]", diff --git a/test/unit/node/app.test.ts b/test/unit/node/app.test.ts index e56ed77bda20..54e245aec86c 100644 --- a/test/unit/node/app.test.ts +++ b/test/unit/node/app.test.ts @@ -3,7 +3,7 @@ import { promises } from "fs" import * as http from "http" import * as https from "https" import * as path from "path" -import { createApp, ensureAddress, handleArgsSocketCatchError, listen } from "../../../src/node/app" +import { createApp, ensureAddress, handleArgsSocketCatchError, isFdOpts, listen } from "../../../src/node/app" import { OptionalString, setDefaults } from "../../../src/node/cli" import { generateCertificate } from "../../../src/node/util" import { clean, mockLogger, getAvailablePort, tmpdir } from "../../utils/helpers" @@ -261,3 +261,47 @@ describe("listen", () => { } }) }) + +describe("listen (socket-fd)", () => { + // Wrap a bound-but-not-yet-listening TCP socket so we get a real file + // descriptor that listen({ fd }) can adopt, mirroring the systemd socket + // activation case where the process inherits an fd and calls listen(2) on it. + // Using a live net.Server's fd instead fails with EEXIST because the socket + // is already listening in-process. + // eslint-disable-next-line @typescript-eslint/no-var-requires + const { TCP, constants: TCPConstants } = (process as any).binding("tcp_wrap") + + let inherited: any + let httpServer: http.Server + let unlinkSpy: jest.SpyInstance + + beforeEach(async () => { + mockLogger() + unlinkSpy = jest.spyOn(promises, "unlink") + inherited = new TCP(TCPConstants.SERVER) + inherited.bind("127.0.0.1", 0) + httpServer = http.createServer() + }) + + afterEach(() => { + httpServer.close() + try { + inherited.close() + } catch { + // The fd is adopted by httpServer.close() above; ignore double-close. + } + jest.clearAllMocks() + }) + + it("isFdOpts detects a numeric socket-fd", () => { + expect(isFdOpts({ "socket-fd": 3 })).toBe(true) + expect(isFdOpts({ socket: "/tmp/x.sock" } as any)).toBe(false) + }) + + it("listens on an inherited fd without unlinking", async () => { + const fd = inherited.fd as number + await listen(httpServer, { "socket-fd": fd }) + expect(httpServer.address()).not.toBeNull() + expect(unlinkSpy).not.toHaveBeenCalled() + }) +}) From 88c2b7432e938f6918f21ff8d9dbfc641cd933d0 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 21 Aug 2026 07:45:25 +1000 Subject: [PATCH 091/129] Update Code to 1.134.0 (#7954) --- .node-version | 2 +- CHANGELOG.md | 21 +++++++++++++++++++++ lib/vscode | 2 +- patches/app-name.diff | 2 +- patches/base-path.diff | 18 +++++++++--------- patches/clipboard.diff | 2 +- patches/display-language.diff | 4 ++-- patches/external-file-actions.diff | 4 ++-- patches/getting-started.diff | 4 ++-- patches/integration.diff | 4 ++-- patches/local-storage.diff | 2 +- patches/logout.diff | 2 +- patches/marketplace.diff | 4 ++-- patches/proxy-uri.diff | 2 +- patches/service-worker.diff | 2 +- patches/telemetry.diff | 4 ++-- patches/trusted-domains.diff | 4 ++-- patches/update-check.diff | 2 +- patches/webview.diff | 2 +- 19 files changed, 54 insertions(+), 33 deletions(-) diff --git a/.node-version b/.node-version index ca5c350055cc..8dfc5cb1af4f 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.18.0 +24.18.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index e7768348d00b..6d2afe08f929 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,27 @@ Code v99.99.999 ## Unreleased +Code v1.134.0 + +### Added + +- New `--socket-fd` flag that can be used to listen on a file descriptor. In + particular, this allows using code-server with systemd's socket activation. +- New `--vscode-option` repeatable flag that can be used to pass through options + to VS Code. It requires `flag=value` or simply `flag` for booleans. For + example: `--vscode-option enable-sandbox --vscode-option agents=true`. The + `VSCODE_OPTIONS` environment variable may also be used. For example: + `VSCODE_OPTIONS="enable-sandbox agents=true"`. Note that this code-server + simply splits this variable on spaces and is not aware of quoting. + +### Changed + +- Update to Code 1.134.0 +- Remove `--unsafe-perm` from installation scripts. This flag results in an + error when used with npm since v12 and has been a no-op since v7. If you are + installing with a version of npm older than v7 as root, installation may not + work correctly. + ## [4.133.0](https://github.com/coder/code-server/releases/tag/v4.133.0) - 2026-08-17 Code v1.133.0 diff --git a/lib/vscode b/lib/vscode index a5b500951314..474a349ad5b7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit a5b500951314efd502d07465bd138dfbd714a960 +Subproject commit 474a349ad5b745e512ef86b864d1c74f7264dd7a diff --git a/patches/app-name.diff b/patches/app-name.diff index 32cb90ed0c28..cb292b8baef9 100644 --- a/patches/app-name.diff +++ b/patches/app-name.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -366,8 +366,11 @@ export class WebClientServer { +@@ -363,8 +363,11 @@ export class WebClientServer { linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains); } diff --git a/patches/base-path.diff b/patches/base-path.diff index e065145ad47d..8ad6c7a5ba57 100644 --- 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 -@@ -245,7 +245,9 @@ class RemoteAuthoritiesImpl { +@@ -251,7 +251,9 @@ class RemoteAuthoritiesImpl { return URI.from({ scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource, authority: `${host}:${port}`, @@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -265,7 +265,9 @@ export class WebClientServer { +@@ -264,7 +264,9 @@ export class WebClientServer { }; // Prefix routes with basePath for clients @@ -120,9 +120,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts + const vscodeBase = relativePath(getOriginalUrl(req)) + const basePath = vscodeBase || getFirstHeader('x-forwarded-prefix') || this._basePath; - const queryConnectionToken = parsedUrl.query[connectionTokenQueryName]; - if (typeof queryConnectionToken === 'string') { -@@ -304,10 +306,14 @@ export class WebClientServer { + const queryConnectionTokens = parsedUrl.searchParams.getAll(connectionTokenQueryName); + if (queryConnectionTokens.length === 1) { +@@ -301,10 +303,14 @@ export class WebClientServer { }; const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']); @@ -138,7 +138,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts ); if (!remoteAuthority) { return serveError(req, res, 400, `Bad request.`); -@@ -354,6 +360,7 @@ export class WebClientServer { +@@ -351,6 +357,7 @@ export class WebClientServer { const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { -@@ -403,7 +410,9 @@ export class WebClientServer { +@@ -400,7 +407,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -440,7 +449,7 @@ export class WebClientServer { +@@ -437,7 +446,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -513,3 +522,70 @@ export class WebClientServer { +@@ -510,3 +519,70 @@ export class WebClientServer { return void res.end(data); } } diff --git a/patches/clipboard.diff b/patches/clipboard.diff index d4658b231494..0b37edd057b5 100644 --- 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 -@@ -146,6 +146,7 @@ export interface NativeParsedArgs { +@@ -147,6 +147,7 @@ export interface NativeParsedArgs { 'disable-chromium-sandbox'?: boolean; sandbox?: boolean; 'enable-coi'?: boolean; diff --git a/patches/display-language.diff b/patches/display-language.diff index 4c52e9d0f123..446e9e699273 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -153,7 +153,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -25,6 +25,7 @@ import { URI } from '../../base/common/u +@@ -24,6 +24,7 @@ import { URI } from '../../base/common/u import { streamToBuffer } from '../../base/common/buffer.js'; import { IProductConfiguration } from '../../base/common/product.js'; import { isString, Mutable } from '../../base/common/types.js'; @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -401,14 +402,22 @@ export class WebClientServer { +@@ -398,14 +399,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 92e5c0a0c4ef..b917b4367518 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -384,6 +384,8 @@ export class WebClientServer { +@@ -381,6 +381,8 @@ export class WebClientServer { serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, @@ -207,7 +207,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts -@@ -40,6 +40,9 @@ export const EmbedderIdentifierContext = +@@ -42,6 +42,9 @@ export const EmbedderIdentifierContext = export const InAutomationContext = new RawContextKey('inAutomation', false, localize('inAutomation', "Whether VS Code is running under automation/smoke test")); diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 21136dfbc358..5baf31b5a79c 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -388,6 +388,7 @@ export class WebClientServer { +@@ -385,6 +385,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], @@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts +++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts -@@ -42,6 +42,7 @@ export const InAutomationContext = new R +@@ -44,6 +44,7 @@ export const InAutomationContext = new R export const IsEnabledFileDownloads = new RawContextKey('isEnabledFileDownloads', true, true); export const IsEnabledFileUploads = new RawContextKey('isEnabledFileUploads', true, true); diff --git a/patches/integration.diff b/patches/integration.diff index dda81c7469e3..d2c6eb54f89f 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -251,7 +251,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -353,6 +353,7 @@ export class WebClientServer { +@@ -350,6 +350,7 @@ export class WebClientServer { } : undefined; const productConfiguration: Partial> = { @@ -326,7 +326,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialog.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialog.ts +++ code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialog.ts -@@ -47,8 +47,11 @@ export function createWorkbenchDialogOpt +@@ -54,8 +54,11 @@ export function createWorkbenchDialogOpt export function createBrowserAboutDialogDetails(productService: IProductService): { title: string; details: string; detailsToCopy: string } { const detailString = (useAgo: boolean): string => { diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 44a524ec21a8..95406a39d6a2 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -379,6 +379,7 @@ export class WebClientServer { +@@ -376,6 +376,7 @@ export class WebClientServer { remoteAuthority, serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', diff --git a/patches/logout.diff b/patches/logout.diff index cab0d5e03beb..1be5886bf722 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -361,6 +361,7 @@ export class WebClientServer { +@@ -358,6 +358,7 @@ export class WebClientServer { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, diff --git a/patches/marketplace.diff b/patches/marketplace.diff index 6f838e0f23a2..a859bc4857d8 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -346,7 +346,6 @@ export class WebClientServer { +@@ -343,7 +343,6 @@ export class WebClientServer { const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH); const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH); @@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority }); -@@ -363,14 +362,7 @@ export class WebClientServer { +@@ -360,14 +359,7 @@ export class WebClientServer { rootEndpoint: rootBase, embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index ebe175381ec5..3836339a2797 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -362,6 +362,7 @@ export class WebClientServer { +@@ -359,6 +359,7 @@ export class WebClientServer { rootEndpoint: rootBase, updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, diff --git a/patches/service-worker.diff b/patches/service-worker.diff index a80046e32b06..c8ad4e97a82a 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -363,6 +363,10 @@ export class WebClientServer { +@@ -360,6 +360,10 @@ export class WebClientServer { updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/', diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 1fd2f693fdfe..f34893cb75e0 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -367,6 +367,8 @@ export class WebClientServer { +@@ -364,6 +364,8 @@ export class WebClientServer { scope: vscodeBase + '/', path: rootBase + '/_static/out/browser/serviceWorker.js', }, @@ -151,7 +151,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts +++ code-server/lib/vscode/src/vs/platform/product/common/product.ts -@@ -113,7 +113,8 @@ else { +@@ -74,7 +74,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON resourceUrlTemplate: "https://open-vsx.org/vscode/asset/{publisher}/{name}/{version}/Microsoft.VisualStudio.Code.WebResources/{path}", controlUrl: "", recommendationsUrl: "", diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index 9a9e19c80846..efed9f155150 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -24,7 +24,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -358,6 +358,14 @@ export class WebClientServer { +@@ -355,6 +355,14 @@ export class WebClientServer { scopes: [['user:email'], ['repo']] } : undefined; @@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, -@@ -373,6 +381,7 @@ export class WebClientServer { +@@ -370,6 +378,7 @@ export class WebClientServer { embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, diff --git a/patches/update-check.diff b/patches/update-check.diff index ab10947a8815..2ead1c86bd06 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -360,6 +360,7 @@ export class WebClientServer { +@@ -357,6 +357,7 @@ export class WebClientServer { const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, diff --git a/patches/webview.diff b/patches/webview.diff index 0ba1da5b2c96..fc81d6ab62e3 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -375,6 +375,7 @@ export class WebClientServer { +@@ -372,6 +372,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, serverBasePath: basePath, From 92f44d9c7b20a6186d93251d305105a5325e0589 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 24 Aug 2026 13:44:38 -0800 Subject: [PATCH 092/129] Fix changelog typo --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2afe08f929..424d08b59d1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,8 +32,8 @@ Code v1.134.0 to VS Code. It requires `flag=value` or simply `flag` for booleans. For example: `--vscode-option enable-sandbox --vscode-option agents=true`. The `VSCODE_OPTIONS` environment variable may also be used. For example: - `VSCODE_OPTIONS="enable-sandbox agents=true"`. Note that this code-server - simply splits this variable on spaces and is not aware of quoting. + `VSCODE_OPTIONS="enable-sandbox agents=true"`. Note that code-server simply + splits this variable on spaces and is not aware of quoting. ### Changed From e08e907889dc0570481defb613fe120837f4f294 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Tue, 25 Aug 2026 08:00:49 +1000 Subject: [PATCH 093/129] Update Helm chart and changelog with 4.134.0 (#7961) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 424d08b59d1b..dd51a086500c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.134.0](https://github.com/coder/code-server/releases/tag/v4.134.0) - 2026-08-24 + Code v1.134.0 ### Added diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 99c540e33719..53e80ce32bc7 100644 --- 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.48.0 +version: 3.49.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.133.0 +appVersion: 4.134.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 9d07b928e53b..db5f28fbfea1 100644 --- 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.133.0' + tag: '4.134.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From de89acbcdce9d9b870008a270c9f6466993d91f4 Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Thu, 27 Aug 2026 08:54:52 +1000 Subject: [PATCH 094/129] Update Code to 1.135.0 (#7963) --- CHANGELOG.md | 6 ++++++ lib/vscode | 2 +- patches/app-name.diff | 2 +- patches/base-path.diff | 12 ++++++------ patches/clipboard.diff | 4 ++-- patches/display-language.diff | 2 +- patches/external-file-actions.diff | 2 +- patches/getting-started.diff | 2 +- patches/integration.diff | 2 +- patches/local-storage.diff | 2 +- patches/logout.diff | 2 +- patches/marketplace.diff | 4 ++-- patches/proxy-uri.diff | 2 +- patches/service-worker.diff | 2 +- patches/telemetry.diff | 2 +- patches/trusted-domains.diff | 4 ++-- patches/update-check.diff | 2 +- patches/webview.diff | 2 +- 18 files changed, 31 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd51a086500c..1123e72c75be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.135.0 + +### Changed + +- Update to Code 1.135.0 + ## [4.134.0](https://github.com/coder/code-server/releases/tag/v4.134.0) - 2026-08-24 Code v1.134.0 diff --git a/lib/vscode b/lib/vscode index 474a349ad5b7..08d4889f9ec4 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 474a349ad5b745e512ef86b864d1c74f7264dd7a +Subproject commit 08d4889f9ec4a1685d257b9b95de036c8e1ce1e5 diff --git a/patches/app-name.diff b/patches/app-name.diff index cb292b8baef9..49ad18e64d58 100644 --- a/patches/app-name.diff +++ b/patches/app-name.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -363,8 +363,11 @@ export class WebClientServer { +@@ -362,8 +362,11 @@ export class WebClientServer { linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains); } diff --git a/patches/base-path.diff b/patches/base-path.diff index 8ad6c7a5ba57..dc8cd7b38df1 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -264,7 +264,9 @@ export class WebClientServer { +@@ -263,7 +263,9 @@ export class WebClientServer { }; // Prefix routes with basePath for clients @@ -122,7 +122,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const queryConnectionTokens = parsedUrl.searchParams.getAll(connectionTokenQueryName); if (queryConnectionTokens.length === 1) { -@@ -301,10 +303,14 @@ export class WebClientServer { +@@ -300,10 +302,14 @@ export class WebClientServer { }; const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']); @@ -138,7 +138,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts ); if (!remoteAuthority) { return serveError(req, res, 400, `Bad request.`); -@@ -351,6 +357,7 @@ export class WebClientServer { +@@ -350,6 +356,7 @@ export class WebClientServer { const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { -@@ -400,7 +407,9 @@ export class WebClientServer { +@@ -399,7 +406,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -437,7 +446,7 @@ export class WebClientServer { +@@ -436,7 +445,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -510,3 +519,70 @@ export class WebClientServer { +@@ -509,3 +518,70 @@ export class WebClientServer { return void res.end(data); } } diff --git a/patches/clipboard.diff b/patches/clipboard.diff index 0b37edd057b5..9fcaa3b26cdb 100644 --- a/patches/clipboard.diff +++ b/patches/clipboard.diff @@ -102,7 +102,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/server.cli.ts +++ code-server/lib/vscode/src/vs/server/node/server.cli.ts -@@ -77,6 +77,7 @@ const isSupportedForPipe = (optionId: ke +@@ -78,6 +78,7 @@ const isSupportedForPipe = (optionId: ke case 'verbose': case 'remote': case 'locate-shell-integration-path': @@ -110,7 +110,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts return true; default: return false; -@@ -300,6 +301,22 @@ export async function main(desc: Product +@@ -307,6 +308,22 @@ export async function main(desc: Product } } } else { diff --git a/patches/display-language.diff b/patches/display-language.diff index 446e9e699273..ce8720699a2d 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -398,14 +399,22 @@ export class WebClientServer { +@@ -397,14 +398,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index b917b4367518..a726263d4916 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -381,6 +381,8 @@ export class WebClientServer { +@@ -380,6 +380,8 @@ export class WebClientServer { serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 5baf31b5a79c..fe3ca8d89f05 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -385,6 +385,7 @@ export class WebClientServer { +@@ -384,6 +384,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], diff --git a/patches/integration.diff b/patches/integration.diff index d2c6eb54f89f..e25b68ded811 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -251,7 +251,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -350,6 +350,7 @@ export class WebClientServer { +@@ -349,6 +349,7 @@ export class WebClientServer { } : undefined; const productConfiguration: Partial> = { diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 95406a39d6a2..84f1f5953721 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -376,6 +376,7 @@ export class WebClientServer { +@@ -375,6 +375,7 @@ export class WebClientServer { remoteAuthority, serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', diff --git a/patches/logout.diff b/patches/logout.diff index 1be5886bf722..35fdd0121585 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -358,6 +358,7 @@ export class WebClientServer { +@@ -357,6 +357,7 @@ export class WebClientServer { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, diff --git a/patches/marketplace.diff b/patches/marketplace.diff index a859bc4857d8..77aac5c15833 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -343,7 +343,6 @@ export class WebClientServer { +@@ -342,7 +342,6 @@ export class WebClientServer { const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH); const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH); @@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority }); -@@ -360,14 +359,7 @@ export class WebClientServer { +@@ -359,14 +358,7 @@ export class WebClientServer { rootEndpoint: rootBase, embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index 3836339a2797..6f9dfa9ea615 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -359,6 +359,7 @@ export class WebClientServer { +@@ -358,6 +358,7 @@ export class WebClientServer { rootEndpoint: rootBase, updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, diff --git a/patches/service-worker.diff b/patches/service-worker.diff index c8ad4e97a82a..931b34d4a2d2 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -360,6 +360,10 @@ export class WebClientServer { +@@ -359,6 +359,10 @@ export class WebClientServer { updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/', diff --git a/patches/telemetry.diff b/patches/telemetry.diff index f34893cb75e0..6ef0c2fc414f 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -364,6 +364,8 @@ export class WebClientServer { +@@ -363,6 +363,8 @@ export class WebClientServer { scope: vscodeBase + '/', path: rootBase + '/_static/out/browser/serviceWorker.js', }, diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index efed9f155150..4ec5b785b229 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -24,7 +24,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -355,6 +355,14 @@ export class WebClientServer { +@@ -354,6 +354,14 @@ export class WebClientServer { scopes: [['user:email'], ['repo']] } : undefined; @@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, -@@ -370,6 +378,7 @@ export class WebClientServer { +@@ -369,6 +377,7 @@ export class WebClientServer { embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, diff --git a/patches/update-check.diff b/patches/update-check.diff index 2ead1c86bd06..4a63b24f38fe 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -357,6 +357,7 @@ export class WebClientServer { +@@ -356,6 +356,7 @@ export class WebClientServer { const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, diff --git a/patches/webview.diff b/patches/webview.diff index fc81d6ab62e3..881497219308 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -372,6 +372,7 @@ export class WebClientServer { +@@ -371,6 +371,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, serverBasePath: basePath, From 2b2f8b3d5c64e2f0bda876e4b1a95a79067ca01a Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Fri, 28 Aug 2026 05:46:21 +1000 Subject: [PATCH 095/129] Update Helm chart and changelog with 4.135.0 (#7964) --- CHANGELOG.md | 2 ++ ci/helm-chart/Chart.yaml | 4 ++-- ci/helm-chart/values.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1123e72c75be..d23d66309e32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Code v99.99.999 ## Unreleased +## [4.135.0](https://github.com/coder/code-server/releases/tag/v4.135.0) - 2026-08-27 + Code v1.135.0 ### Changed diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 53e80ce32bc7..36972d9eaaae 100644 --- 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.49.0 +version: 3.50.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.134.0 +appVersion: 4.135.0 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index db5f28fbfea1..b6f98358e519 100644 --- 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.134.0' + tag: '4.135.0' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a From 11699e6cd72f4dfdb8c91e8abf3ea5e4fd54a206 Mon Sep 17 00:00:00 2001 From: denusklo <79653229+denusklo@users.noreply.github.com> Date: Sat, 5 Sep 2026 02:46:24 +0800 Subject: [PATCH 096/129] Guard FORCE_NODE_VERSION in the version error path (#7983) Installing on the wrong node version dies with "FORCE_NODE_VERSION: unbound variable" instead of explaining itself. The script runs under set -u and this is the one place the variable is read bare; the three other reads all default it. --- ci/build/npm-postinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index 3c2bcb2dbff0..29e46b388220 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -67,7 +67,7 @@ main() { if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-24}" ]; then echo "ERROR: code-server currently requires node v24." - if [ -n "$FORCE_NODE_VERSION" ]; then + if [ -n "${FORCE_NODE_VERSION:-}" ]; then echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION." fi echo "We have detected that you are on node v$major_node_version" From 62284ed549bc41236d62c789a071120aea206a78 Mon Sep 17 00:00:00 2001 From: denusklo <79653229+denusklo@users.noreply.github.com> Date: Sat, 5 Sep 2026 04:06:30 +0800 Subject: [PATCH 097/129] Run mklink through cmd so windows postinstall works (#7982) npm install fails on Windows in postinstall with "mklink: command not found". mklink is a cmd.exe builtin rather than an executable, so the sh running this script cannot exec it, and every symlink the install needs is made this way. The doubled slashes are the usual MSYS escaping, and are safe here because this branch only runs when the OS was detected as cygwin or mingw. --- ci/build/npm-postinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh index 29e46b388220..856f1acfa9eb 100755 --- a/ci/build/npm-postinstall.sh +++ b/ci/build/npm-postinstall.sh @@ -18,7 +18,7 @@ symlink() { dest="$2" rm -rf "$dest" case $OS in - windows) mklink /J "$dest" "$source" ;; + windows) cmd //c mklink //J "$dest" "$source" ;; *) ln -s "$source" "$dest" ;; esac } From 00672a55224585de8ca555227985d0b74166a5bc Mon Sep 17 00:00:00 2001 From: cdrci <78873720+cdrci@users.noreply.github.com> Date: Wed, 9 Sep 2026 02:32:03 +1000 Subject: [PATCH 098/129] Update Code to 1.136.1 (#7981) * Update Code to 1.136.1 * Do not click on tab during test file opens It will already be the selected tab, and if any other tab is already open (like the welcome tab), it will click that instead. We disable the welcome page so this is not supposed to actually matter, but that Setting appears not to be working. Also add the quick input widget selector in the disabled downloads test, since if the widget never shows up it would mistakenly pass. --- CHANGELOG.md | 6 +++ lib/vscode | 2 +- patches/app-name.diff | 6 +-- patches/base-path.diff | 67 +++++++++++++++--------------- patches/display-language.diff | 14 +++---- patches/external-file-actions.diff | 6 +-- patches/getting-started.diff | 6 +-- patches/integration.diff | 39 +++++++++-------- patches/local-storage.diff | 2 +- patches/logout.diff | 6 +-- patches/marketplace.diff | 4 +- patches/proxy-uri.diff | 2 +- patches/service-worker.diff | 2 +- patches/telemetry.diff | 2 +- patches/trusted-domains.diff | 8 ++-- patches/update-check.diff | 8 ++-- patches/webview.diff | 2 +- test/e2e/downloads.test.ts | 3 +- 18 files changed, 98 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d23d66309e32..52c204b4d544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.136.1 + +### Changed + +- Update to Code 1.136.1 + ## [4.135.0](https://github.com/coder/code-server/releases/tag/v4.135.0) - 2026-08-27 Code v1.135.0 diff --git a/lib/vscode b/lib/vscode index 08d4889f9ec4..a44adf7f53e0 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 08d4889f9ec4a1685d257b9b95de036c8e1ce1e5 +Subproject commit a44adf7f53e00964ab890f9f8758a334f1fc15bc diff --git a/patches/app-name.diff b/patches/app-name.diff index 49ad18e64d58..2d6d6a0e28b3 100644 --- a/patches/app-name.diff +++ b/patches/app-name.diff @@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts +++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts -@@ -24,6 +24,7 @@ export const serverOptions: OptionDescri +@@ -40,6 +40,7 @@ export const serverOptions: OptionDescri 'disable-getting-started-override': { type: 'boolean' }, 'locale': { type: 'string' }, 'link-protection-trusted-domains': { type: 'string[]' }, @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -124,6 +125,7 @@ export interface ServerParsedArgs { +@@ -140,6 +141,7 @@ export interface ServerParsedArgs { 'disable-getting-started-override'?: boolean, 'locale'?: string 'link-protection-trusted-domains'?: string[], @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -362,8 +362,11 @@ export class WebClientServer { +@@ -407,8 +407,11 @@ export class WebClientServer { linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains); } diff --git a/patches/base-path.diff b/patches/base-path.diff index dc8cd7b38df1..858b48f43692 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -36,8 +36,8 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html -@@ -27,9 +27,9 @@ - +@@ -29,9 +29,9 @@ + - @@ -49,15 +49,15 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ - - -