From 23c5c4d1cf0ff2d84196ab9a86d2ebb292b9dfd4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@gmail.com>
Date: Mon, 1 Dec 2025 18:05:18 +0100
Subject: [PATCH] chat - make `signInWithAlternateScopes` default (#280355)

---
 product.json                                         | 12 ++++++------
 .../contrib/chat/browser/chat.contribution.ts        |  9 ---------
 .../services/chat/common/chatEntitlementService.ts   |  9 +--------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/product.json b/product.json
index f088e15a772..53c12af2716 100644
--- a/product.json
+++ b/product.json
@@ -116,17 +116,17 @@
 		},
 		"providerUriSetting": "github-enterprise.uri",
 		"providerScopes": [
-			[
-				"user:email"
-			],
-			[
-				"read:user"
-			],
 			[
 				"read:user",
 				"user:email",
 				"repo",
 				"workflow"
+			],
+			[
+				"user:email"
+			],
+			[
+				"read:user"
 			]
 		],
 		"entitlementUrl": "https://api.github.com/copilot_internal/user",
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index f1d6aa5731d..9cc9b4602e2 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -791,15 +791,6 @@ configurationRegistry.registerConfiguration({
 				mode: 'auto'
 			}
 		},
-		'chat.signInWithAlternateScopes': { // TODO@bpasero remove me eventually
-			type: 'boolean',
-			description: nls.localize('chat.signInWithAlternateScopes', "Controls whether sign-in with alternate scopes is used."),
-			default: false,
-			tags: ['experimental'],
-			experiment: {
-				mode: 'auto'
-			}
-		},
 		'chat.extensionUnification.enabled': {
 			type: 'boolean',
 			description: nls.localize('chat.extensionUnification.enabled', "Enables the unification of GitHub Copilot extensions. When enabled, all GitHub Copilot functionality is served from the GitHub Copilot Chat extension. When disabled, the GitHub Copilot and GitHub Copilot Chat extensions operate independently."),
diff --git a/src/vs/workbench/services/chat/common/chatEntitlementService.ts b/src/vs/workbench/services/chat/common/chatEntitlementService.ts
index 26857f975f8..aba9ad9403c 100644
--- a/src/vs/workbench/services/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/services/chat/common/chatEntitlementService.ts
@@ -1056,14 +1056,7 @@ export class ChatEntitlementRequests extends Disposable {
 	async signIn(options?: { useSocialProvider?: string; additionalScopes?: readonly string[] }) {
 		const providerId = ChatEntitlementRequests.providerId(this.configurationService);
 
-		let defaultProviderScopes: string[];
-		if (this.configurationService.getValue<unknown>('chat.signInWithAlternateScopes') === true) {
-			defaultProviderScopes = defaultChat.providerScopes.at(-1) ?? [];
-		} else {
-			defaultProviderScopes = defaultChat.providerScopes.at(0) ?? [];
-		}
-
-		const scopes = options?.additionalScopes ? distinct([...defaultProviderScopes, ...options.additionalScopes]) : defaultProviderScopes;
+		const scopes = options?.additionalScopes ? distinct([...defaultChat.providerScopes[0], ...options.additionalScopes]) : defaultChat.providerScopes[0];
 		const session = await this.authenticationService.createSession(
 			providerId,
 			scopes,