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: "",