@codingame/monaco-vscode-api 32.0.2 → 33.0.4

package/vscode/src/vs/workbench/services/accounts/browser/defaultAccount.js

@@ -424,7 +424,7 @@ let DefaultAccountProvider = class DefaultAccountProvider extends Disposable {
                 policyData = policyData ?? {};
                 policyData.chat_agent_enabled = tokenEntitlementsData.policyData.chat_agent_enabled;
                 policyData.chat_preview_features_enabled = tokenEntitlementsData.policyData.chat_preview_features_enabled;
-                policyData.session_search = tokenEntitlementsData.policyData.session_search;
+                policyData.cloud_session_storage_enabled = tokenEntitlementsData.policyData.cloud_session_storage_enabled;
                 policyData.mcp = tokenEntitlementsData.policyData.mcp;
                 if (policyData.mcp) {
                     const mcpRegistryResult = await this.getMcpRegistryProvider(sessions, accountPolicyData, options);
@@ -568,7 +568,7 @@ let DefaultAccountProvider = class DefaultAccountProvider extends Disposable {
                         chat_preview_features_enabled: tokenMap.get("editor_preview_features") !== "0",
                         chat_agent_enabled: tokenMap.get("agent_mode") !== "0",
                         mcp: tokenMap.get("mcp") === "1",
-                        session_search: Number(tokenMap.get("session_search") ?? "0")
+                        cloud_session_storage_enabled: ( tokenMap.has("cloud_session_storage_enabled")) ? tokenMap.get("cloud_session_storage_enabled") === "1" : undefined
                     },
                     copilotTokenInfo: {
                         sn: tokenMap.get("sn"),
@@ -801,6 +801,17 @@ let DefaultAccountProvider = class DefaultAccountProvider extends Disposable {
             enterprise: false
         };
     }
+    resolveGitHubUrl(path) {
+        if (this.getDefaultAccountAuthenticationProvider().enterprise) {
+            try {
+                const enterpriseUrl = this.getEnterpriseUrl();
+                if (enterpriseUrl) {
+                    return `${enterpriseUrl.protocol}//${enterpriseUrl.host}/${path}`;
+                }
+            } catch {}
+        }
+        return `https://github.com/${path}`;
+    }
     getEnterpriseUrl() {
         const value = this.configurationService.getValue(
             this.defaultAccountConfig.authenticationProvider.enterpriseProviderUriSetting
@@ -859,7 +870,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DEFAULT_ACCOUNT_SIGN_IN_COMMAND,
-            title: ( localize2(16203, "Sign In"))
+            title: ( localize2(16335, "Sign In"))
         });
     }
     async run(accessor) {

package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js

@@ -16,7 +16,7 @@ import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
 import { match } from '../../../../base/common/glob.js';
 import { parseWWWAuthenticateHeader } from '../../../../base/common/oauth.js';
-import { raceTimeout, raceCancellation } from '../../../../base/common/async.js';
+import { raceCancellation, raceTimeout } from '../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 
 function getAuthenticationProviderActivationEvent(id) {
@@ -42,23 +42,23 @@ const authenticationDefinitionSchema = {
     properties: {
         id: {
             type: "string",
-            description: ( localize(16362, "The id of the authentication provider."))
+            description: ( localize(16494, "The id of the authentication provider."))
         },
         label: {
             type: "string",
-            description: ( localize(16363, "The human readable name of the authentication provider."))
+            description: ( localize(16495, "The human readable name of the authentication provider."))
         },
         authorizationServerGlobs: {
             type: "array",
             items: {
                 type: "string",
                 description: ( localize(
-                    16364,
+                    16496,
                     "A list of globs that match the authorization servers that this provider supports."
                 ))
             },
             description: ( localize(
-                16365,
+                16497,
                 "A list of globs that match the authorization servers that this provider supports."
             ))
         }
@@ -67,7 +67,7 @@ const authenticationDefinitionSchema = {
 const authenticationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "authentication",
     jsonSchema: {
-        description: ( localize(16366, "Contributes authentication")),
+        description: ( localize(16498, "Contributes authentication")),
         type: "array",
         items: authenticationDefinitionSchema
     },
@@ -145,11 +145,11 @@ let AuthenticationService = class AuthenticationService extends Disposable {
             added.forEach(point => {
                 for (const provider of point.value) {
                     if (isFalsyOrWhitespace(provider.id)) {
-                        point.collector.error(( localize(16367, "An authentication contribution must specify an id.")));
+                        point.collector.error(( localize(16499, "An authentication contribution must specify an id.")));
                         continue;
                     }
                     if (isFalsyOrWhitespace(provider.label)) {
-                        point.collector.error(( localize(16368, "An authentication contribution must specify a label.")));
+                        point.collector.error(( localize(16500, "An authentication contribution must specify a label.")));
                         continue;
                     }
                     if (!( this.declaredProviders.some(p => p.id === provider.id))) {
@@ -157,7 +157,7 @@ let AuthenticationService = class AuthenticationService extends Disposable {
                         this._logService.debug(`Declared authentication provider: ${provider.id}`);
                     } else {
                         point.collector.error(( localize(
-                            16369,
+                            16501,
                             "This authentication id '{0}' has already been registered",
                             provider.id
                         )));
@@ -176,14 +176,14 @@ let AuthenticationService = class AuthenticationService extends Disposable {
     }
     registerDeclaredAuthenticationProvider(provider) {
         if (isFalsyOrWhitespace(provider.id)) {
-            throw ( new Error(( localize(16367, "An authentication contribution must specify an id."))));
+            throw ( new Error(( localize(16499, "An authentication contribution must specify an id."))));
         }
         if (isFalsyOrWhitespace(provider.label)) {
-            throw ( new Error(( localize(16368, "An authentication contribution must specify a label."))));
+            throw ( new Error(( localize(16500, "An authentication contribution must specify a label."))));
         }
         if (( this.declaredProviders.some(p => p.id === provider.id))) {
             throw ( new Error(( localize(
-                16369,
+                16501,
                 "This authentication id '{0}' has already been registered",
                 provider.id
             ))));
@@ -400,23 +400,29 @@ let AuthenticationService = class AuthenticationService extends Disposable {
         return false;
     }
     async tryActivateProvider(providerId, activateImmediate) {
-        await this._extensionService.activateByEvent(
-            getAuthenticationProviderActivationEvent(providerId),
-            activateImmediate ? ActivationKind.Immediate : ActivationKind.Normal
-        );
-        let provider = this._authenticationProviders.get(providerId);
-        if (provider) {
-            return provider;
-        }
-        if (this._disposedSource.token.isCancellationRequested) {
-            throw ( new Error("Authentication service is disposed."));
-        }
         const store = ( new DisposableStore());
         try {
-            const result = await raceTimeout(raceCancellation(Event.toPromise(
+            const activationPromise = this._extensionService.activateByEvent(
+                getAuthenticationProviderActivationEvent(providerId),
+                activateImmediate ? ActivationKind.Immediate : ActivationKind.Normal
+            );
+            let provider = this._authenticationProviders.get(providerId);
+            if (provider) {
+                return provider;
+            }
+            if (this._disposedSource.token.isCancellationRequested) {
+                throw ( new Error("Authentication service is disposed."));
+            }
+            const providerRegistered = raceCancellation(Event.toPromise(
                 Event.filter(this.onDidRegisterAuthenticationProvider, e => e.id === providerId, store),
                 store
-            ), this._disposedSource.token), 5000);
+            ), this._disposedSource.token);
+            await Promise.race([activationPromise, providerRegistered]);
+            provider = this._authenticationProviders.get(providerId);
+            if (provider) {
+                return provider;
+            }
+            const result = await raceTimeout(providerRegistered, 5000);
             provider = this._authenticationProviders.get(providerId);
             if (provider) {
                 return provider;

package/vscode/src/vs/workbench/services/authentication/common/authentication.d.ts

@@ -41,6 +41,11 @@ export interface IAuthenticationCreateSessionOptions {
      * the provider can use this authorization server, then it is passed down to the auth provider.
      */
     authorizationServer?: URI;
+    /**
+     * When specified, the authentication provider will request a token bound to this resource URI
+     * (RFC 8707 resource indicator).
+     */
+    resource?: string;
     /**
      * Allows the authentication provider to take in additional parameters.
      * It is up to the provider to define what these parameters are and handle them.
@@ -93,6 +98,11 @@ export interface IAuthenticationGetSessionsOptions {
      * the provider can use this authorization server, then it is passed down to the auth provider.
      */
     authorizationServer?: URI;
+    /**
+     * When specified, the authentication provider will request a token bound to this resource URI
+     * (RFC 8707 resource indicator).
+     */
+    resource?: string;
     /**
      * Allows the authentication provider to take in additional parameters.
      * It is up to the provider to define what these parameters are and handle them.
@@ -133,6 +143,11 @@ export interface IAuthenticationProviderSessionOptions {
      * attempt to return sessions that are only related to this authorization server.
      */
     authorizationServer?: URI;
+    /**
+     * When specified, the authentication provider will request a token bound to this resource URI
+     * (RFC 8707 resource indicator).
+     */
+    resource?: string;
     /**
      * Allows the authentication provider to take in additional parameters.
      * It is up to the provider to define what these parameters are and handle them.

package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js

@@ -137,7 +137,7 @@ let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
     preventUnload(e) {
         e.preventDefault();
         e.returnValue = ( localize(
-            16370,
+            16502,
             "Changes that you made may not be saved. Please check press 'Cancel' and try again."
         ));
     }
@@ -205,7 +205,7 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         mark("code/auxiliaryWindow/willOpen");
         const targetWindow = await this.openWindow(options);
         if (!targetWindow) {
-            throw ( new Error(( localize(16371, "Unable to open a new window."))));
+            throw ( new Error(( localize(16503, "Unable to open a new window."))));
         }
         const resolvedWindowId = await this.resolveWindowId(targetWindow);
         ensureCodeWindow(targetWindow, resolvedWindowId);
@@ -296,20 +296,20 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
             return (await this.dialogService.prompt({
                 type: Severity$1.Warning,
                 message: ( localize(
-                    16372,
+                    16504,
                     "The browser blocked opening a new window. Press 'Retry' to try again."
                 )),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            16373,
+                            16505,
                             "Please allow pop-ups for this website in your [browser settings]({0}).",
                             "https://aka.ms/allow-vscode-popup"
                         )), true))
                     }]
                 },
                 buttons: [{
-                    label: ( localize(16374, "&&Retry")),
+                    label: ( localize(16506, "&&Retry")),
                     run: () => this.openWindow(options)
                 }],
                 cancelButton: true

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.d.ts

@@ -18,7 +18,7 @@ import { IWorkbenchEnvironmentService } from "../../environment/common/environme
 import { ILifecycleService } from "../../lifecycle/common/lifecycle.service.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { IDefaultAccountService } from "../../../../platform/defaultAccount/common/defaultAccount.service.js";
-import { IDefaultAccount, IEntitlementsData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/base/common/defaultAccount";
+import { IDefaultAccount, IEntitlementsData } from "../../../../base/common/defaultAccount.js";
 import { IChatEntitlementService } from "./chatEntitlementService.service.js";
 export declare namespace ChatEntitlementContextKeys {
     const Setup: {
@@ -48,6 +48,8 @@ export declare namespace ChatEntitlementContextKeys {
     const chatQuotaExceeded: RawContextKey<boolean>;
     const completionsQuotaExceeded: RawContextKey<boolean>;
     const chatAnonymous: RawContextKey<boolean>;
+    const clientByokEnabled: RawContextKey<boolean>;
+    const hasByokModels: RawContextKey<boolean>;
 }
 export declare enum ChatEntitlement {
     /** Signed out */
@@ -142,10 +144,12 @@ export declare class ChatEntitlementService extends Disposable implements IChatE
     private readonly configurationService;
     private readonly telemetryService;
     private readonly logService;
+    private readonly storageService;
     _serviceBrand: undefined;
+    private static readonly CACHED_UBB_STORAGE_KEY;
     readonly context: Lazy<ChatEntitlementContext> | undefined;
     readonly requests: Lazy<ChatEntitlementRequests> | undefined;
-    constructor(instantiationService: IInstantiationService, productService: IProductService, environmentService: IWorkbenchEnvironmentService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, telemetryService: ITelemetryService, logService: ILogService);
+    constructor(instantiationService: IInstantiationService, productService: IProductService, environmentService: IWorkbenchEnvironmentService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, telemetryService: ITelemetryService, logService: ILogService, storageService: IStorageService);
     readonly onDidChangeEntitlement: Event<void>;
     readonly entitlementObs: IObservable<ChatEntitlement>;
     get entitlement(): ChatEntitlement;
@@ -155,10 +159,13 @@ export declare class ChatEntitlementService extends Disposable implements IChatE
     get copilotTrackingId(): string | undefined;
     get previewFeaturesDisabled(): boolean;
     get clientByokEnabled(): boolean;
+    get hasByokModels(): boolean;
     private readonly _onDidChangeQuotaExceeded;
     readonly onDidChangeQuotaExceeded: Event<void>;
     private readonly _onDidChangeQuotaRemaining;
     readonly onDidChangeQuotaRemaining: Event<void>;
+    private readonly _onDidChangeUsageBasedBilling;
+    readonly onDidChangeUsageBasedBilling: Event<void>;
     private _quotas;
     get quotas(): IQuotas;
     private readonly chatQuotaExceededContextKey;
@@ -192,6 +199,7 @@ interface IEntitlements {
 export interface IQuotaSnapshot {
     readonly percentRemaining: number;
     readonly unlimited: boolean;
+    readonly hasQuota?: boolean;
     readonly resetAt?: number;
     readonly usageBasedBilling?: boolean;
     readonly entitlement?: number;
@@ -200,6 +208,7 @@ export interface IQuotas {
     readonly resetDate?: string;
     readonly resetDateHasTime?: boolean;
     readonly usageBasedBilling?: boolean;
+    readonly canUpgradePlan?: boolean;
     readonly chat?: IQuotaSnapshot;
     readonly completions?: IQuotaSnapshot;
     readonly premiumChat?: IQuotaSnapshot;

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.js

@@ -32,7 +32,7 @@ import '../../../../base/common/observableInternal/index.js';
 import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.service.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
-var ChatEntitlementContext_1;
+var ChatEntitlementService_1, ChatEntitlementContext_1;
 var ChatEntitlementContextKeys;
 (function(ChatEntitlementContextKeys) {
     ChatEntitlementContextKeys.Setup = {
@@ -62,6 +62,8 @@ var ChatEntitlementContextKeys;
     ChatEntitlementContextKeys.chatQuotaExceeded = ( new RawContextKey("chatQuotaExceeded", false, true));
     ChatEntitlementContextKeys.completionsQuotaExceeded = ( new RawContextKey("completionsQuotaExceeded", false, true));
     ChatEntitlementContextKeys.chatAnonymous = ( new RawContextKey("chatAnonymous", false, true));
+    ChatEntitlementContextKeys.clientByokEnabled = ( new RawContextKey("github.copilot.clientByokEnabled", true, true));
+    ChatEntitlementContextKeys.hasByokModels = ( new RawContextKey("github.copilot.hasByokModels", false, true));
 })(ChatEntitlementContextKeys || (ChatEntitlementContextKeys = {}));
 var ChatEntitlement;
 (function(ChatEntitlement) {
@@ -83,19 +85,19 @@ function isProUser(chatEntitlement) {
 function getChatPlanName(chatEntitlement) {
     switch (chatEntitlement) {
     case ChatEntitlement.EDU:
-        return localize(16375, "Copilot EDU");
+        return localize(16507, "Copilot Student");
     case ChatEntitlement.Pro:
-        return localize(16376, "Copilot Pro");
+        return localize(16508, "Copilot Pro");
     case ChatEntitlement.ProPlus:
-        return localize(16377, "Copilot Pro+");
+        return localize(16509, "Copilot Pro+");
     case ChatEntitlement.Max:
-        return localize(16378, "Copilot Max");
+        return localize(16510, "Copilot Max");
     case ChatEntitlement.Business:
-        return localize(16379, "Copilot Business");
+        return localize(16511, "Copilot Business");
     case ChatEntitlement.Enterprise:
-        return localize(16380, "Copilot Enterprise");
+        return localize(16512, "Copilot Enterprise");
     default:
-        return localize(16381, "Copilot Free");
+        return localize(16513, "Copilot Free");
     }
 }
 const defaultChatAgent = {
@@ -127,6 +129,12 @@ function logChatEntitlements(state, configurationService, telemetryService) {
     });
 }
 let ChatEntitlementService = class ChatEntitlementService extends Disposable {
+    static {
+        ChatEntitlementService_1 = this;
+    }
+    static {
+        this.CACHED_UBB_STORAGE_KEY = "chat.usageBasedBilling";
+    }
     constructor(
         instantiationService,
         productService,
@@ -134,18 +142,21 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         contextKeyService,
         configurationService,
         telemetryService,
-        logService
+        logService,
+        storageService
     ) {
         super();
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
         this.logService = logService;
+        this.storageService = storageService;
         this._onDidChangeQuotaExceeded = this._register(( new Emitter()));
         this.onDidChangeQuotaExceeded = this._onDidChangeQuotaExceeded.event;
         this._onDidChangeQuotaRemaining = this._register(( new Emitter()));
         this.onDidChangeQuotaRemaining = this._onDidChangeQuotaRemaining.event;
-        this._quotas = {};
+        this._onDidChangeUsageBasedBilling = this._register(( new Emitter()));
+        this.onDidChangeUsageBasedBilling = this._onDidChangeUsageBasedBilling.event;
         this.ExtensionQuotaContextKeys = {
             chatQuotaExceeded: defaultChatAgent.chatQuotaExceededContext,
             completionsQuotaExceeded: defaultChatAgent.completionsQuotaExceededContext
@@ -153,10 +164,17 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         this._onDidChangeAnonymous = this._register(( new Emitter()));
         this.onDidChangeAnonymous = this._onDidChangeAnonymous.event;
         this.anonymousObs = observableFromEvent(this.onDidChangeAnonymous, () => this.anonymous);
+        const cachedUBB = this.storageService.getBoolean(ChatEntitlementService_1.CACHED_UBB_STORAGE_KEY, StorageScope.PROFILE);
+        this._quotas = cachedUBB !== undefined ? {
+            usageBasedBilling: cachedUBB
+        } : {};
         this.chatQuotaExceededContextKey = ChatEntitlementContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
         this.completionsQuotaExceededContextKey = ChatEntitlementContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
         this.anonymousContextKey = ChatEntitlementContextKeys.chatAnonymous.bindTo(this.contextKeyService);
         this.anonymousContextKey.set(this.anonymous);
+        if (this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.clientByokEnabled.key) === undefined) {
+            ChatEntitlementContextKeys.clientByokEnabled.bindTo(this.contextKeyService);
+        }
         this.onDidChangeEntitlement = ( Event.map(Event.filter(
             this.contextKeyService.onDidChangeContext,
             e => e.affectsSome(( new Set([
@@ -244,6 +262,9 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
     get clientByokEnabled() {
         return this.contextKeyService.getContextKeyValue("github.copilot.clientByokEnabled") === true;
     }
+    get hasByokModels() {
+        return this.contextKeyService.getContextKeyValue("github.copilot.hasByokModels") === true;
+    }
     get quotas() {
         return this._quotas;
     }
@@ -286,6 +307,18 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         const oldQuota = this._quotas;
         this._quotas = quotas;
         this.updateContextKeys();
+        if (oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
+            if (quotas.usageBasedBilling !== undefined) {
+                this.storageService.store(
+                    ChatEntitlementService_1.CACHED_UBB_STORAGE_KEY,
+                    quotas.usageBasedBilling,
+                    StorageScope.PROFILE,
+                    StorageTarget.MACHINE
+                );
+            } else {
+                this.storageService.remove(ChatEntitlementService_1.CACHED_UBB_STORAGE_KEY, StorageScope.PROFILE);
+            }
+        }
         if (this.logService.getLevel() === LogLevel.Trace) {
             this.logService.trace(`[chat entitlement]: acceptQuotas: ${JSON.stringify(quotas)}`);
         }
@@ -304,6 +337,9 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         if (chatChanged.remaining || completionsChanged.remaining || premiumChatChanged.remaining || oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
             this._onDidChangeQuotaRemaining.fire();
         }
+        if (oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
+            this._onDidChangeUsageBasedBilling.fire();
+        }
         if (oldQuota.additionalUsageEnabled !== undefined && quotas.additionalUsageEnabled !== undefined && oldQuota.additionalUsageEnabled !== quotas.additionalUsageEnabled) {
             this.telemetryService.publicLog2("chatAdditionalSpendConfiguration", {
                 enabled: quotas.additionalUsageEnabled ?? false,
@@ -329,7 +365,10 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         this.acceptQuotas({});
     }
     updateContextKeys() {
-        this.chatQuotaExceededContextKey.set(this._quotas.chat?.percentRemaining === 0);
+        const chatExhausted = this._quotas.chat?.percentRemaining === 0;
+        const premiumChatExhausted = this._quotas.premiumChat?.unlimited ? this._quotas.premiumChat.hasQuota === false : this._quotas.premiumChat?.percentRemaining === 0;
+        const additionalUsageEnabled = this._quotas.additionalUsageEnabled ?? false;
+        this.chatQuotaExceededContextKey.set(chatExhausted || (premiumChatExhausted && !additionalUsageEnabled));
         this.completionsQuotaExceededContextKey.set(this._quotas.completions?.percentRemaining === 0);
     }
     get sentiment() {
@@ -370,12 +409,13 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         await this.requests?.value.forceResolveEntitlement(token);
     }
 };
-ChatEntitlementService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IProductService)), ( __param(2, IWorkbenchEnvironmentService)), ( __param(3, IContextKeyService)), ( __param(4, IConfigurationService)), ( __param(5, ITelemetryService)), ( __param(6, ILogService))], ChatEntitlementService));
+ChatEntitlementService = ChatEntitlementService_1 = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IProductService)), ( __param(2, IWorkbenchEnvironmentService)), ( __param(3, IContextKeyService)), ( __param(4, IConfigurationService)), ( __param(5, ITelemetryService)), ( __param(6, ILogService)), ( __param(7, IStorageService))], ChatEntitlementService));
 function parseQuotas(entitlementsData) {
     const quotas = {
         resetDate: entitlementsData.quota_reset_date_utc ?? entitlementsData.quota_reset_date ?? entitlementsData.limited_user_reset_date,
         resetDateHasTime: typeof entitlementsData.quota_reset_date_utc === "string",
-        usageBasedBilling: entitlementsData.token_based_billing
+        usageBasedBilling: entitlementsData.token_based_billing,
+        canUpgradePlan: entitlementsData.can_upgrade_plan
     };
     if (entitlementsData.monthly_quotas?.chat && typeof entitlementsData.limited_user_quotas?.chat === "number") {
         quotas.chat = {
@@ -408,6 +448,7 @@ function parseQuotas(entitlementsData) {
             const quotaSnapshot = {
                 percentRemaining: Math.min(100, Math.max(0, rawQuotaSnapshot.percent_remaining)),
                 unlimited: rawQuotaSnapshot.unlimited,
+                hasQuota: rawQuotaSnapshot.has_quota,
                 usageBasedBilling: entitlementsData.token_based_billing,
                 resetAt: rawQuotaSnapshot.quota_reset_at || undefined,
                 entitlement: parsedEntitlement !== undefined && Number.isSafeInteger(parsedEntitlement) && parsedEntitlement >= 0 ? parsedEntitlement : undefined
@@ -520,6 +561,8 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
         let entitlement;
         if (entitlementsData.access_type_sku === "free_limited_copilot") {
             entitlement = ChatEntitlement.Free;
+        } else if (entitlementsData.access_type_sku === "free_educational_quota") {
+            entitlement = ChatEntitlement.EDU;
         } else if (entitlementsData.can_signup_for_limited) {
             entitlement = ChatEntitlement.Available;
         } else if (entitlementsData.copilot_plan === "individual_edu") {
@@ -637,7 +680,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             "chatEntitlementService.signUpFree"
         );
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(16382, "No response received.")), "[chat entitlement] sign-up: no response");
+            const retry = await this.onUnknownSignUpError(( localize(16514, "No response received.")), "[chat entitlement] sign-up: no response");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 1
             };
@@ -660,7 +703,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     }
                 } catch (error) {}
             }
-            const retry = await this.onUnknownSignUpError(( localize(16383, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(16515, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: response.res.statusCode
             };
@@ -670,7 +713,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             responseText = await asText(response);
         } catch (error) {}
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(16384, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
+            const retry = await this.onUnknownSignUpError(( localize(16516, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 2
             };
@@ -680,7 +723,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             parsedResult = JSON.parse(responseText);
             this.logService.trace(`[chat entitlement] sign-up: response is ${responseText}`);
         } catch (err) {
-            const retry = await this.onUnknownSignUpError(( localize(16385, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(16517, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 3
             };
@@ -711,11 +754,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16386,
+                    16518,
                     "An error occurred while signing up for the GitHub Copilot Free plan. Would you like to try again?"
                 )),
                 detail,
-                primaryButton: ( localize(16387, "Retry"))
+                primaryButton: ( localize(16519, "Retry"))
             });
             return confirmed;
         }
@@ -727,15 +770,15 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             this.dialogService.prompt({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16388,
+                    16520,
                     "An error occurred while signing up for the GitHub Copilot Free plan."
                 )),
                 detail: logDetails,
                 buttons: [{
-                    label: ( localize(16389, "OK")),
+                    label: ( localize(16521, "OK")),
                     run: () => {}
                 }, {
-                    label: ( localize(16390, "Learn More")),
+                    label: ( localize(16522, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChatAgent.upgradePlanUrl)))
                 }]
             });

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.service.d.ts

@@ -10,12 +10,14 @@ export interface IChatEntitlementService {
     readonly entitlementObs: IObservable<ChatEntitlement>;
     readonly previewFeaturesDisabled: boolean;
     readonly clientByokEnabled: boolean;
+    readonly hasByokModels: boolean;
     readonly organisations: string[] | undefined;
     readonly isInternal: boolean;
     readonly sku: string | undefined;
     readonly copilotTrackingId: string | undefined;
     readonly onDidChangeQuotaExceeded: Event<void>;
     readonly onDidChangeQuotaRemaining: Event<void>;
+    readonly onDidChangeUsageBasedBilling: Event<void>;
     readonly quotas: IQuotas;
     readonly onDidChangeSentiment: Event<void>;
     readonly sentiment: IChatSentiment;