From 2d05080af99d5a849328a69d8e7986facc39545f Mon Sep 17 00:00:00 2001 From: Feiyang Liu Date: Fri, 6 Feb 2026 10:02:16 +0000 Subject: [PATCH] remove presence of copilot in code editor --- patches/common/remove-ask-vscode.diff | 54 --------------- patches/common/remove-builtin-extensions.diff | 66 +++++++++++++++++++ patches/sagemaker.series | 1 - patches/web-embedded-with-terminal.series | 1 - patches/web-embedded.series | 1 - patches/web-server.series | 1 - 6 files changed, 66 insertions(+), 58 deletions(-) delete mode 100644 patches/common/remove-ask-vscode.diff diff --git a/patches/common/remove-ask-vscode.diff b/patches/common/remove-ask-vscode.diff deleted file mode 100644 index 096c8e8..0000000 --- a/patches/common/remove-ask-vscode.diff +++ /dev/null @@ -1,54 +0,0 @@ -Index: third-party-src/src/vs/workbench/browser/actions/helpActions.ts -=================================================================== ---- third-party-src.orig/src/vs/workbench/browser/actions/helpActions.ts -+++ third-party-src/src/vs/workbench/browser/actions/helpActions.ts -@@ -16,7 +16,6 @@ import { ServicesAccessor } from '../../../platform/instantiation/common/instant - import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js'; - import { Categories } from '../../../platform/action/common/actionCommonCategories.js'; - import { ICommandService } from '../../../platform/commands/common/commands.js'; --import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js'; - - class KeybindingsReferenceAction extends Action2 { - -@@ -332,35 +331,6 @@ class GetStartedWithAccessibilityFeatures extends Action2 { - } - } - --class AskVSCodeCopilot extends Action2 { -- static readonly ID = 'workbench.action.askVScode'; -- -- constructor() { -- super({ -- id: AskVSCodeCopilot.ID, -- title: localize2('askVScode', 'Ask @vscode'), -- category: Categories.Help, -- f1: true, -- precondition: ContextKeyExpr.equals('chatSetupHidden', false) -- }); -- } -- -- async run(accessor: ServicesAccessor): Promise { -- const commandService = accessor.get(ICommandService); -- commandService.executeCommand('workbench.action.chat.open', { mode: 'ask', query: '@vscode ', isPartialQuery: true }); -- } --} -- --MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, { -- command: { -- id: AskVSCodeCopilot.ID, -- title: localize2('askVScode', 'Ask @vscode'), -- }, -- order: 7, -- group: '1_welcome', -- when: ContextKeyExpr.equals('chatSetupHidden', false) --}); -- - // --- Actions Registration - - if (KeybindingsReferenceAction.AVAILABLE) { -@@ -400,5 +370,3 @@ if (OpenPrivacyStatementUrlAction.AVAILABLE) { - } - - registerAction2(GetStartedWithAccessibilityFeatures); -- --registerAction2(AskVSCodeCopilot); diff --git a/patches/common/remove-builtin-extensions.diff b/patches/common/remove-builtin-extensions.diff index 3c3a35a..21733d9 100644 --- a/patches/common/remove-builtin-extensions.diff +++ b/patches/common/remove-builtin-extensions.diff @@ -215,3 +215,69 @@ Index: third-party-src/src/vs/workbench/services/assignment/common/assignmentFil } private updateCopilotEntitlementInfo() { +Index: third-party-src/src/vs/workbench/contrib/chat/browser/chat.contribution.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/contrib/chat/browser/chat.contribution.ts ++++ third-party-src/src/vs/workbench/contrib/chat/browser/chat.contribution.ts +@@ -800,8 +800,9 @@ configurationRegistry.registerConfigurat + 'chat.disableAIFeatures': { + type: 'boolean', + description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."), +- default: false, +- scope: ConfigurationScope.WINDOW ++ default: true, ++ scope: ConfigurationScope.WINDOW, ++ included: false + }, + 'chat.allowAnonymousAccess': { // TODO@bpasero remove me eventually + type: 'boolean', +Index: third-party-src/src/vs/workbench/services/chat/common/chatEntitlementService.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/services/chat/common/chatEntitlementService.ts ++++ third-party-src/src/vs/workbench/services/chat/common/chatEntitlementService.ts +@@ -1199,14 +1199,11 @@ export class ChatEntitlementContext exte + } + + private withConfiguration(state: IChatEntitlementContextState): IChatEntitlementContextState { +- if (this.configurationService.getValue(ChatEntitlementContext.CHAT_DISABLED_CONFIGURATION_KEY) === true) { +- return { +- ...state, +- hidden: true // Setting always wins: if AI is disabled, set `hidden: true` +- }; +- } +- +- return state; ++ // Always hide AI features in this build ++ return { ++ ...state, ++ hidden: true ++ }; + } + + update(context: { installed: boolean; disabled: boolean; untrusted: boolean }): Promise; +Index: third-party-src/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts ++++ third-party-src/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts +@@ -713,7 +713,7 @@ export function registerChatActions() { + super({ + id: 'workbench.action.chat.showExtensionsUsingCopilot', + title: localize2('showCopilotUsageExtensions', "Show Extensions using Copilot"), +- f1: true, ++ f1: false, + category: EXTENSIONS_CATEGORY, + precondition: ChatContextKeys.enabled + }); +Index: third-party-src/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts +=================================================================== +--- third-party-src.orig/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts ++++ third-party-src/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts +@@ -184,7 +184,7 @@ export class ChatSetupContribution exten + id: CHAT_SETUP_ACTION_ID, + title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL, + category: CHAT_CATEGORY, +- f1: true, ++ f1: false, + precondition: ContextKeyExpr.or( + ChatContextKeys.Setup.hidden, + ChatContextKeys.Setup.disabled, diff --git a/patches/sagemaker.series b/patches/sagemaker.series index f81bc42..6565c37 100644 --- a/patches/sagemaker.series +++ b/patches/sagemaker.series @@ -18,7 +18,6 @@ common/build.diff common/integration.diff common/replace-gulp-untar.diff common/fix-ts-rootdir-webpack.diff -common/remove-ask-vscode.diff web-server/suppress-known-errors-build-integration.diff web-server/local-storage.diff web-server/base-path.diff diff --git a/patches/web-embedded-with-terminal.series b/patches/web-embedded-with-terminal.series index cd3673b..9a0cdc9 100644 --- a/patches/web-embedded-with-terminal.series +++ b/patches/web-embedded-with-terminal.series @@ -18,7 +18,6 @@ common/build.diff common/integration.diff common/replace-gulp-untar.diff common/fix-ts-rootdir-webpack.diff -common/remove-ask-vscode.diff web-embedded/readd-workbench.diff web-embedded/suppress-known-errors-build-integration.diff web-embedded/disable-built-in-walkthroughs-from-c.diff diff --git a/patches/web-embedded.series b/patches/web-embedded.series index 1266044..3eb9dff 100644 --- a/patches/web-embedded.series +++ b/patches/web-embedded.series @@ -18,7 +18,6 @@ common/build.diff common/integration.diff common/replace-gulp-untar.diff common/fix-ts-rootdir-webpack.diff -common/remove-ask-vscode.diff web-embedded/readd-workbench.diff web-embedded/suppress-known-errors-build-integration.diff web-embedded/disable-built-in-walkthroughs-from-c.diff diff --git a/patches/web-server.series b/patches/web-server.series index ec527e1..920c59f 100644 --- a/patches/web-server.series +++ b/patches/web-server.series @@ -18,7 +18,6 @@ common/build.diff common/integration.diff common/replace-gulp-untar.diff common/fix-ts-rootdir-webpack.diff -common/remove-ask-vscode.diff web-server/suppress-known-errors-build-integration.diff web-server/local-storage.diff web-server/base-path.diff