From ede14c73ef47fd1cf373412413f07a7ddfb7d326 Mon Sep 17 00:00:00 2001 From: cdrci Date: Thu, 28 May 2026 19:07:53 +0000 Subject: [PATCH 1/5] Update Code to 1.122.0 --- lib/vscode | 2 +- patches/display-language.diff | 2 +- patches/sourcemaps.diff | 2 +- patches/webview.diff | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/vscode b/lib/vscode index 987c95975162..6a49527b96e3 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 987c9597516278c9fcf10d963a0592ce1384ab93 +Subproject commit 6a49527b96e326fe62fbdb56f60e16877c9aa724 diff --git a/patches/display-language.diff b/patches/display-language.diff index 1517e8eb4da8..526272fe5775 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'; -@@ -358,6 +358,9 @@ export async function setupServerService +@@ -359,6 +359,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index d9c89634593c..615edca9dad4 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 -@@ -261,10 +261,15 @@ function packageTask(type: string, platf +@@ -255,10 +255,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { diff --git a/patches/webview.diff b/patches/webview.diff index 59fe37de2b04..a1ce247be496 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts +++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts -@@ -223,7 +223,7 @@ export class BrowserWorkbenchEnvironment +@@ -226,7 +226,7 @@ export class BrowserWorkbenchEnvironment @memoize get webviewExternalEndpoint(): string { From bf013eef829b28629641e6401e90d572add096ae Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 28 May 2026 11:24:25 -0800 Subject: [PATCH 2/5] Finish update --- CHANGELOG.md | 6 ++++++ patches/app-name.diff | 2 +- patches/copilot.diff | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d58496da7ad1..065aa3d39a02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.122.0 + +### Changed + +- Update to Code 1.122.0 + ## [4.121.0](https://github.com/coder/code-server/releases/tag/v4.121.0) - 2026-05-20 Code v1.121.0 diff --git a/patches/app-name.diff b/patches/app-name.diff index 5675d1646098..32cb90ed0c28 100644 --- a/patches/app-name.diff +++ b/patches/app-name.diff @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts /* ----- server setup ----- */ -@@ -120,6 +121,7 @@ export interface ServerParsedArgs { +@@ -124,6 +125,7 @@ export interface ServerParsedArgs { 'disable-getting-started-override'?: boolean, 'locale'?: string 'link-protection-trusted-domains'?: string[], diff --git a/patches/copilot.diff b/patches/copilot.diff index 3a847cef05bc..9c9a6896e53e 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -2,8 +2,8 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.extensions.ts +++ code-server/lib/vscode/build/gulpfile.extensions.ts -@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil - gulp.task(compileCopilotExtensionBuildTask); +@@ -291,6 +291,29 @@ export const compileCopilotExtensionBuil + task.task(compileCopilotExtensionBuildTask); /** + * Compiles the built-in copilot extension with proper `.vscodeignore` filtering @@ -36,15 +36,15 @@ Index: code-server/lib/vscode/build/lib/extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/lib/extensions.ts +++ code-server/lib/vscode/build/lib/extensions.ts -@@ -24,6 +24,7 @@ import { getProductionDependencies } fro +@@ -21,6 +21,7 @@ import { getProductionDependencies } fro import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts'; import { fetchUrls, fetchGithub } from './fetch.ts'; import { createTsgoStream, spawnTsgo } from './tsgo.ts'; +import { prepareBuiltInCopilotRipgrepShim } from './copilot.ts'; - import vzip from 'gulp-vinyl-zip'; + import watcher from './watch/index.ts'; import { createRequire } from 'module'; -@@ -492,6 +493,116 @@ export function packageCopilotExtensionS +@@ -483,6 +484,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } From 7f22d696ee58572829af7f0ec6c43a4de53fa427 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 28 May 2026 11:30:09 -0800 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 065aa3d39a02..de3c5486052d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,15 @@ Code v1.122.0 - Update to Code 1.122.0 +### Fixed + +- `--app-name` will now affect window titles within the editor (it is now used + as the value for `${appName}` in the title template). + +### Added + +- App name can now be set with the `CODE_SERVER_APP_NAME` environment variable. + ## [4.121.0](https://github.com/coder/code-server/releases/tag/v4.121.0) - 2026-05-20 Code v1.121.0 From 59dff3f81fcd6ec6510eba68d2904b030e644e00 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 28 May 2026 11:32:32 -0800 Subject: [PATCH 4/5] Fix copilot task --- patches/copilot.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/copilot.diff b/patches/copilot.diff index 9c9a6896e53e..c525d33a24fa 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -26,7 +26,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts + return Promise.resolve(); + }) +)); -+gulp.task(compileCopilotExtensionFullBuildTask); ++task.task(compileCopilotExtensionFullBuildTask); + +/** * Compiles the extensions for the build. From 19795d6aa27ead0831ed4a7db79694160f7d1b0e Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 28 May 2026 11:49:19 -0800 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de3c5486052d..4e430b4c3bb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,8 @@ Code v1.122.0 ### Fixed - `--app-name` will now affect window titles within the editor (it is now used - as the value for `${appName}` in the title template). + as the value for `${appName}` in the title template) as well as some other + places like the help > about dialog. ### Added