From f7de31a582fc759b42d49e99b3ecafcdab89ebeb Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Fri, 7 Nov 2025 15:28:08 +0100 Subject: [PATCH] feat(1.106): update patches --- patches/disable-copilot.patch | 40 ++++++++++++++--------------- patches/helper/settings.patch | 13 +++++----- patches/linux/update-xdg-path.patch | 8 +++--- patches/policies.patch | 16 ++++++------ upstream/insider.json | 2 +- 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/patches/disable-copilot.patch b/patches/disable-copilot.patch index c59e160..83afbfc 100644 --- a/patches/disable-copilot.patch +++ b/patches/disable-copilot.patch @@ -1,5 +1,5 @@ diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -index e834924..2f5bdf8 100644 +index f425d24..ef3ba1f 100644 --- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts +++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts @@ -181,3 +181,4 @@ abstract class OpenChatGlobalAction extends Action2 { @@ -13,37 +13,37 @@ index e834924..2f5bdf8 100644 - ChatContextKeys.Setup.installed, + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.disabled.negate(), -@@ -1631,3 +1632,4 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, { +@@ -1629,3 +1630,4 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, { ChatContextKeys.Setup.hidden.negate(), - ChatContextKeys.Setup.disabled.negate() + ChatContextKeys.Setup.disabled.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate() ), -@@ -1648,3 +1650,4 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, { +@@ -1646,3 +1648,4 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, { ChatContextKeys.Setup.hidden.negate(), - ChatContextKeys.Setup.disabled.negate() + ChatContextKeys.Setup.disabled.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate() ), -@@ -1665,3 +1668,4 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction { +@@ -1663,3 +1666,4 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction { ChatContextKeys.Setup.hidden.negate(), - ChatContextKeys.Setup.disabled.negate() + ChatContextKeys.Setup.disabled.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate() ), -@@ -1806,3 +1810,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, { +@@ -1804,3 +1808,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, { ChatContextKeys.Setup.hidden.negate(), - ChatContextKeys.Setup.disabled.negate() + ChatContextKeys.Setup.disabled.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate() ) -@@ -1839,3 +1844,3 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, { +@@ -1837,3 +1842,3 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, { ChatContextKeys.Setup.disabled.negate(), - ChatContextKeys.Setup.installed.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ); diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts -index a7cb31f..fb74640 100644 +index bfcab77..f0013a4 100644 --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts @@ -179,3 +179,3 @@ configurationRegistry.registerConfiguration({ @@ -51,7 +51,7 @@ index a7cb31f..fb74640 100644 - default: true + default: false }, -@@ -705,3 +705,3 @@ configurationRegistry.registerConfiguration({ +@@ -701,3 +701,3 @@ configurationRegistry.registerConfiguration({ description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."), - default: false, + default: true, @@ -76,10 +76,10 @@ index a1c2acb..e41068d 100644 + ChatContextKeys.extensionInvalid.negate() ) diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts -index 45215b1..b485099 100644 +index 1053f71..586705d 100644 --- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts +++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts -@@ -1024,7 +1024,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr +@@ -1020,7 +1020,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr f1: true, - precondition: ContextKeyExpr.or( - ChatContextKeys.Setup.hidden, @@ -94,30 +94,30 @@ index 45215b1..b485099 100644 + ), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Entitlement.canSignUp -@@ -1140,3 +1142,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr +@@ -1136,3 +1138,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr ChatContextKeys.Setup.hidden.negate(), - ChatContextKeys.Setup.installed.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Entitlement.signedOut -@@ -1167,2 +1169,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr +@@ -1163,2 +1165,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr ChatContextKeys.Setup.hidden.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ContextKeyExpr.or( -@@ -1223,2 +1226,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr +@@ -1219,2 +1222,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr ChatContextKeys.Setup.hidden.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ContextKeyExpr.or( -@@ -1439,3 +1443,3 @@ export class ChatTeardownContribution extends Disposable implements IWorkbenchCo +@@ -1435,3 +1439,3 @@ export class ChatTeardownContribution extends Disposable implements IWorkbenchCo order: 1, - when: ChatContextKeys.Setup.installed.negate() + when: ContextKeyExpr.has('config.chat.disableAIFeatures').negate() } diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts -index 44b987f..0d2bb2c 100644 +index 1a4419a..eaa7466 100644 --- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts +++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts -@@ -48,2 +48,3 @@ import { AGENT_SESSIONS_VIEWLET_ID } from '../common/constants.js'; - import { ChatUsageWidget } from './chatManagement/chatUsageWidget.js'; +@@ -49,2 +49,3 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js'; + import { AGENT_SESSIONS_VIEWLET_ID } from '../common/constants.js'; +import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js'; @@ -129,2 +130,3 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu @@ -158,7 +158,7 @@ index 7eb3689..be00ca2 100644 + when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()), weight: 40, diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts -index 8ac7137..aff1630 100644 +index 606bda0..191df32 100644 --- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts +++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts @@ -685,3 +685,3 @@ registerAction2(class extends Action2 { @@ -167,10 +167,10 @@ index 8ac7137..aff1630 100644 + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ContextKeyExpr.equals('git.activeResourceHasMergeConflicts', true) diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts -index 1b01178..73a7fd4 100644 +index 4d8907e..7df25af 100644 --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts -@@ -1360,3 +1360,3 @@ registerAction2(class extends Action2 { +@@ -1361,3 +1361,3 @@ registerAction2(class extends Action2 { ChatContextKeys.Setup.disabled.negate(), - ChatContextKeys.Setup.installed.negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), diff --git a/patches/helper/settings.patch b/patches/helper/settings.patch index 090ee34..946baf7 100644 --- a/patches/helper/settings.patch +++ b/patches/helper/settings.patch @@ -1,8 +1,8 @@ diff --git a/.vscode/settings.json b/.vscode/settings.json -index 31b1c4a..f808aa6 100644 +index f394c8a..c615121 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json -@@ -17,23 +17,23 @@ +@@ -23,22 +23,22 @@ }, "[typescript]": { "editor.defaultFormatter": "vscode.typescript-language-features", @@ -22,7 +22,6 @@ index 31b1c4a..f808aa6 100644 "[github-issues]": { "editor.wordWrap": "on" }, - // --- Files --- - "files.trimTrailingWhitespace": true, - "files.insertFinalNewline": true, @@ -31,7 +30,7 @@ index 31b1c4a..f808aa6 100644 "files.exclude": { ".git": true, ".build": true, -@@ -42,9 +42,9 @@ +@@ -47,9 +47,9 @@ ".vscode-test": true, "cli/target": true, "build/**/*.js.map": true, @@ -44,7 +43,7 @@ index 31b1c4a..f808aa6 100644 }, "files.associations": { "cglicenses.json": "jsonc", -@@ -55,7 +55,7 @@ +@@ -60,7 +60,7 @@ "**/yarn.lock": true, "**/package-lock.json": true, "**/Cargo.lock": true, @@ -53,11 +52,11 @@ index 31b1c4a..f808aa6 100644 "out/**": true, "out-build/**": true, "out-vscode/**": true, -@@ -71,6 +71,7 @@ +@@ -76,6 +76,7 @@ "build/builtin/*.js": true, "build/monaco/*.js": true, "build/npm/*.js": true, + "build/**/*.js": true, "build/*.js": true }, - + // --- Search --- diff --git a/patches/linux/update-xdg-path.patch b/patches/linux/update-xdg-path.patch index 6068c10..1c11a65 100644 --- a/patches/linux/update-xdg-path.patch +++ b/patches/linux/update-xdg-path.patch @@ -12,11 +12,11 @@ index a7142fe..526ca17 100644 + } } diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts -index 629f2c4..ec1acba 100644 +index e58f678..add8048 100644 --- a/src/vs/base/parts/ipc/node/ipc.net.ts +++ b/src/vs/base/parts/ipc/node/ipc.net.ts -@@ -774,3 +774,3 @@ function unmask(buffer: VSBuffer, mask: number): void { +@@ -839,3 +839,3 @@ function unmask(buffer: VSBuffer, mask: number): void { // Related to https://github.com/microsoft/vscode/issues/30624 --export const XDG_RUNTIME_DIR = process.env['XDG_RUNTIME_DIR']; -+export const XDG_RUNTIME_DIR = (!!process.env.FLATPAK_ID ? join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID) : process.env['XDG_RUNTIME_DIR']); +-export const XDG_RUNTIME_DIR = process.env['XDG_RUNTIME_DIR']; ++export const XDG_RUNTIME_DIR = !!process.env.FLATPAK_ID ? join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID) : process.env['XDG_RUNTIME_DIR']; diff --git a/patches/policies.patch b/patches/policies.patch index 1449a96..39747d0 100644 --- a/patches/policies.patch +++ b/patches/policies.patch @@ -22,22 +22,22 @@ index 0459b46..49f3c66 100644 +!@vscodium/policy-watcher/build/Release/vscodium-policy-watcher.node diff --git a/eslint.config.js b/eslint.config.js -index 6c74dc2..f721334 100644 +index 69a9a69..9a3d7ed 100644 --- a/eslint.config.js +++ b/eslint.config.js -@@ -1854,3 +1854,3 @@ export default tseslint.config( +@@ -1724,3 +1724,3 @@ export default tseslint.config( '@vscode/iconv-lite-umd', - '@vscode/policy-watcher', + '@vscodium/policy-watcher', '@vscode/proxy-agent', diff --git a/package-lock.json b/package-lock.json -index 34bf479..4345179 100644 +index 2ffd231..70d78f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,3 +18,2 @@ "@vscode/iconv-lite-umd": "0.7.1", - "@vscode/policy-watcher": "^1.3.2", - "@vscode/proxy-agent": "^0.35.0", + "@vscode/proxy-agent": "^0.36.0", @@ -29,2 +28,3 @@ "@vscode/windows-registry": "^1.1.0", + "@vscodium/policy-watcher": "^1.3.2-252465", @@ -65,7 +65,7 @@ index 34bf479..4345179 100644 - } - }, "node_modules/@vscode/proxy-agent": { -@@ -3409,2 +3389,22 @@ +@@ -3412,2 +3392,22 @@ }, + "node_modules/@vscodium/policy-watcher": { + "version": "1.3.2-252465", @@ -89,14 +89,14 @@ index 34bf479..4345179 100644 + }, "node_modules/@webassemblyjs/ast": { diff --git a/package.json b/package.json -index 31532a6..d726b8c 100644 +index 32047ab..ecbce6b 100644 --- a/package.json +++ b/package.json @@ -80,3 +80,3 @@ "@vscode/iconv-lite-umd": "0.7.1", - "@vscode/policy-watcher": "^1.3.2", + "@vscodium/policy-watcher": "^1.3.2-252465", - "@vscode/proxy-agent": "^0.35.0", + "@vscode/proxy-agent": "^0.36.0", diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt index ee0a24b..881ce36 100644 --- a/src/vs/base/test/node/uri.perf.data.txt @@ -197,7 +197,7 @@ index ee0a24b..881ce36 100644 +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts -index 2a6acba..167d759 100644 +index 5099915..98a2041 100644 --- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts +++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts @@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => { diff --git a/upstream/insider.json b/upstream/insider.json index 7b1ac71..9760f86 100644 --- a/upstream/insider.json +++ b/upstream/insider.json @@ -1,4 +1,4 @@ { "tag": "1.106.0", - "commit": "13330e1420d478afab7ce453f6d1e307abf7412e" + "commit": "828519ca2437c1d96a6ad4923754ac666377ac99" }