chat - entitlements service cleanup (microsoft#264284)

Author: bpasero

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -1249,9 +1249,9 @@ export function registerChatActions() {
 				f1: true,
 				precondition: ContextKeyExpr.and(
 					ContextKeyExpr.or(
-						ChatContextKeys.Entitlement.free,
-						ChatContextKeys.Entitlement.pro,
-						ChatContextKeys.Entitlement.proPlus
+						ChatContextKeys.Entitlement.planFree,
+						ChatContextKeys.Entitlement.planPro,
+						ChatContextKeys.Entitlement.planProPlus
 					),
 					nonEnterpriseCopilotUsers
 				),

src/vs/workbench/contrib/chat/browser/actions/manageModelsActions.ts

@@ -36,9 +36,9 @@ export class ManageModelsAction extends Action2 {
 			title: localize2('manageLanguageModels', 'Manage Language Models...'),
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(
-				ChatContextKeys.Entitlement.free,
-				ChatContextKeys.Entitlement.pro,
-				ChatContextKeys.Entitlement.proPlus,
+				ChatContextKeys.Entitlement.planFree,
+				ChatContextKeys.Entitlement.planPro,
+				ChatContextKeys.Entitlement.planProPlus,
 				ChatContextKeys.Entitlement.internal
 			)),
 			f1: true

src/vs/workbench/contrib/chat/browser/chatSetup.ts

@@ -1039,15 +1039,15 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 						ChatContextKeys.Setup.hidden.negate(),
 						ContextKeyExpr.or(
 							ChatContextKeys.Entitlement.canSignUp,
-							ChatContextKeys.Entitlement.free
+							ChatContextKeys.Entitlement.planFree
 						)
 					),
 					menu: {
 						id: MenuId.ChatTitleBarMenu,
 						group: 'a_first',
 						order: 1,
 						when: ContextKeyExpr.and(
-							ChatContextKeys.Entitlement.free,
+							ChatContextKeys.Entitlement.planFree,
 							ContextKeyExpr.or(
 								ChatContextKeys.chatQuotaExceeded,
 								ChatContextKeys.completionsQuotaExceeded
@@ -1094,8 +1094,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					precondition: ContextKeyExpr.and(
 						ChatContextKeys.Setup.hidden.negate(),
 						ContextKeyExpr.or(
-							ChatContextKeys.Entitlement.pro,
-							ChatContextKeys.Entitlement.proPlus,
+							ChatContextKeys.Entitlement.planPro,
+							ChatContextKeys.Entitlement.planProPlus,
 						)
 					),
 					menu: {
@@ -1104,8 +1104,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 						order: 1,
 						when: ContextKeyExpr.and(
 							ContextKeyExpr.or(
-								ChatContextKeys.Entitlement.pro,
-								ChatContextKeys.Entitlement.proPlus,
+								ChatContextKeys.Entitlement.planPro,
+								ChatContextKeys.Entitlement.planProPlus,
 							),
 							ContextKeyExpr.or(
 								ChatContextKeys.chatQuotaExceeded,

src/vs/workbench/contrib/chat/common/chatContextKeys.ts

@@ -72,17 +72,18 @@ export namespace ChatContextKeys {
 	};
 
 	export const Entitlement = {
-		internal: new RawContextKey<boolean>('chatEntitlementInternal', false, true), 	// True when user is a chat internal user.
-		gitHubInternal: new RawContextKey<boolean>('chatEntitlementGitHubInternal', false, true), // True when user is a GitHub internal user.
-		microsoftInternal: new RawContextKey<boolean>('chatEntitlementMicrosoftInternal', false, true), // True when user is a Microsoft internal user.
-		signedOut: new RawContextKey<boolean>('chatEntitlementSignedOut', false, true), // True when user is signed out.
-		canSignUp: new RawContextKey<boolean>('chatPlanCanSignUp', false, true), 		// True when user can sign up to be a chat free user.
-		free: new RawContextKey<boolean>('chatPlanFree', false, true),					// True when user is a chat free user.
-		pro: new RawContextKey<boolean>('chatPlanPro', false, true),					// True when user is a chat pro user.
-		proPlus: new RawContextKey<boolean>('chatPlanProPlus', false, true), 			// True when user is a chat pro plus user.
-		business: new RawContextKey<boolean>('chatPlanBusiness', false, true), 			// True when user is a chat business user.
-		enterprise: new RawContextKey<boolean>('chatPlanEnterprise', false, true), 		// True when user is a chat enterprise user.
-		sku: new RawContextKey<string>('chatEntitlementSku', undefined, true), 			// The raw SKU string from the entitlement service.
+		signedOut: new RawContextKey<boolean>('chatEntitlementSignedOut', false, true), 				// True when user is signed out.
+		canSignUp: new RawContextKey<boolean>('chatPlanCanSignUp', false, true), 						// True when user can sign up to be a chat free user.
+
+		planFree: new RawContextKey<boolean>('chatPlanFree', false, true),								// True when user is a chat free user.
+		planPro: new RawContextKey<boolean>('chatPlanPro', false, true),								// True when user is a chat pro user.
+		planProPlus: new RawContextKey<boolean>('chatPlanProPlus', false, true), 						// True when user is a chat pro plus user.
+		planBusiness: new RawContextKey<boolean>('chatPlanBusiness', false, true), 						// True when user is a chat business user.
+		planEnterprise: new RawContextKey<boolean>('chatPlanEnterprise', false, true), 					// True when user is a chat enterprise user.
+
+		organisations: new RawContextKey<string[]>('chatEntitlementOrganisations', undefined, true), 	// The organizations the user belongs to.
+		internal: new RawContextKey<boolean>('chatEntitlementInternal', false, true), 					// True when user belongs to internal organisation.
+		sku: new RawContextKey<string>('chatEntitlementSku', undefined, true), 							// The SKU of the user.
 	};
 
 	export const chatQuotaExceeded = new RawContextKey<boolean>('chatQuotaExceeded', false, true);