@codingame/monaco-vscode-api 33.0.8 → 34.0.0

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

@@ -0,0 +1,63 @@
+
+import { isObject, isString } from '../../../../base/common/types.js';
+
+function adaptManagedSettings(response, onWarn) {
+    let extraKnownMarketplaces;
+    if (isObject(response.extraKnownMarketplaces)) {
+        const seen = ( new Set());
+        const entries = [];
+        for (const [name, entry] of Object.entries(response.extraKnownMarketplaces)) {
+            if (!isObject(entry) || !isObject(entry.source)) {
+                onWarn?.(
+                    `[DefaultAccount] Skipping malformed extraKnownMarketplaces entry "${name}": expected { source: { source, repo|url } }`
+                );
+                continue;
+            }
+            const src = entry.source;
+            let normalized;
+            if (src.source === "github" && isString(src.repo)) {
+                normalized = {
+                    name,
+                    source: {
+                        source: "github",
+                        repo: src.repo,
+                        ...(src.ref ? {
+                            ref: src.ref
+                        } : {})
+                    }
+                };
+            } else if (src.source === "git" && isString(src.url)) {
+                normalized = {
+                    name,
+                    source: {
+                        source: "git",
+                        url: src.url,
+                        ...(src.ref ? {
+                            ref: src.ref
+                        } : {})
+                    }
+                };
+            } else if (src.source === "github" || src.source === "git") {
+                onWarn?.(
+                    `[DefaultAccount] Skipping extraKnownMarketplaces entry "${name}": source "${src.source}" requires ${src.source === "github" ? "\"repo\"" : "\"url\""}`
+                );
+            } else {
+                onWarn?.(
+                    `[DefaultAccount] Skipping extraKnownMarketplaces entry "${name}": unknown source type "${src.source}"`
+                );
+            }
+            if (normalized && !( seen.has(name))) {
+                seen.add(name);
+                entries.push(normalized);
+            }
+        }
+        extraKnownMarketplaces = entries;
+    }
+    return {
+        enabledPlugins: isObject(response.enabledPlugins) ? response.enabledPlugins : undefined,
+        extraKnownMarketplaces,
+        strictKnownMarketplaces: typeof response.strictKnownMarketplaces === "boolean" ? response.strictKnownMarketplaces : undefined
+    };
+}
+
+export { adaptManagedSettings };

package/vscode/src/vs/workbench/services/activity/browser/activityService.js

@@ -68,7 +68,10 @@ let ActivityService = class ActivityService extends Disposable {
         activities.push(activity);
         this._onDidChangeActivity.fire(viewContainer);
         return toDisposable(() => {
-            activities.splice(activities.indexOf(activity), 1);
+            const idx = activities.indexOf(activity);
+            if (idx !== -1) {
+                activities.splice(idx, 1);
+            }
             if (activities.length === 0) {
                 this.viewContainerActivities.delete(viewContainerId);
             }
@@ -121,7 +124,10 @@ let ActivityService = class ActivityService extends Disposable {
         activities.push(activity);
         this._onDidChangeActivity.fire(id);
         return toDisposable(() => {
-            activities.splice(activities.indexOf(activity), 1);
+            const idx = activities.indexOf(activity);
+            if (idx !== -1) {
+                activities.splice(idx, 1);
+            }
             if (activities.length === 0) {
                 this.globalActivities.delete(id);
             }

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service.d.ts

@@ -8,7 +8,9 @@ export interface IAuthenticationMcpAccessService {
         accountName: string;
     }>;
     /**
-    * Check MCP server access to an account
+    * Inspect the stored access decision for an MCP server, keyed by id alone. Used by management and
+    * inspection surfaces (e.g. the "Manage Trusted MCP Servers" UI) that operate on a server id without
+    * a live URL. For the security-critical token-release gate use {@link isAccessAllowedForUrl} instead.
     * @param providerId The id of the authentication provider
     * @param accountName The account name that access is checked for
     * @param mcpServerId The id of the MCP server requesting access
@@ -16,6 +18,19 @@ export interface IAuthenticationMcpAccessService {
     * if they haven't made a choice yet
     */
     isAccessAllowed(providerId: string, accountName: string, mcpServerId: string): boolean | undefined;
+    /**
+    * Gate for releasing a token to an HTTP MCP server. Access is only allowed if {@link mcpServerUrl}
+    * matches the URL stored when access was granted, so re-pointing a server at a new endpoint (while
+    * keeping the same id) requires the user to re-consent. `product.json`-trusted servers bypass the
+    * URL check. Only HTTP servers authenticate, so the URL is always known and therefore required.
+    * @param providerId The id of the authentication provider
+    * @param accountName The account name that access is checked for
+    * @param mcpServerId The id of the MCP server requesting access
+    * @param mcpServerUrl The MCP server's current URL
+    * @returns Returns true or false if the user has opted to permanently grant or disallow access, and undefined
+    * if they haven't made a choice yet (or the URL no longer matches the granted one)
+    */
+    isAccessAllowedForUrl(providerId: string, accountName: string, mcpServerId: string, mcpServerUrl: string): boolean | undefined;
     readAllowedMcpServers(providerId: string, accountName: string): AllowedMcpServer[];
     updateAllowedMcpServers(providerId: string, accountName: string, mcpServers: AllowedMcpServer[]): void;
     removeAllowedMcpServers(providerId: string, accountName: string): void;

package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.d.ts

@@ -58,7 +58,8 @@ export declare class AuthenticationService extends Disposable implements IAuthen
     createSession(id: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, options?: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
     removeSession(id: string, sessionId: string): Promise<void>;
     getOrActivateProviderIdForServer(authorizationServer: URI, resourceServer?: URI): Promise<string | undefined>;
-    createDynamicAuthenticationProvider(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resource: IAuthorizationProtectedResourceMetadata | undefined, clientId?: string): Promise<IAuthenticationProvider | undefined>;
+    createDynamicAuthenticationProvider(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resource: IAuthorizationProtectedResourceMetadata | undefined, clientId?: string, clientSecret?: string): Promise<IAuthenticationProvider | undefined>;
+    createOrGetXaaProvider(issuer: URI): Promise<string | undefined>;
     registerAuthenticationProviderHostDelegate(delegate: IAuthenticationProviderHostDelegate): IDisposable;
     private matchesProvider;
     private tryActivateProvider;

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

@@ -42,23 +42,23 @@ const authenticationDefinitionSchema = {
     properties: {
         id: {
             type: "string",
-            description: ( localize(16494, "The id of the authentication provider."))
+            description: ( localize(16707, "The id of the authentication provider."))
         },
         label: {
             type: "string",
-            description: ( localize(16495, "The human readable name of the authentication provider."))
+            description: ( localize(16708, "The human readable name of the authentication provider."))
         },
         authorizationServerGlobs: {
             type: "array",
             items: {
                 type: "string",
                 description: ( localize(
-                    16496,
+                    16709,
                     "A list of globs that match the authorization servers that this provider supports."
                 ))
             },
             description: ( localize(
-                16497,
+                16710,
                 "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(16498, "Contributes authentication")),
+        description: ( localize(16711, "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(16499, "An authentication contribution must specify an id.")));
+                        point.collector.error(( localize(16712, "An authentication contribution must specify an id.")));
                         continue;
                     }
                     if (isFalsyOrWhitespace(provider.label)) {
-                        point.collector.error(( localize(16500, "An authentication contribution must specify a label.")));
+                        point.collector.error(( localize(16713, "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(
-                            16501,
+                            16714,
                             "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(16499, "An authentication contribution must specify an id."))));
+            throw ( new Error(( localize(16712, "An authentication contribution must specify an id."))));
         }
         if (isFalsyOrWhitespace(provider.label)) {
-            throw ( new Error(( localize(16500, "An authentication contribution must specify a label."))));
+            throw ( new Error(( localize(16713, "An authentication contribution must specify a label."))));
         }
         if (( this.declaredProviders.some(p => p.id === provider.id))) {
             throw ( new Error(( localize(
-                16501,
+                16714,
                 "This authentication id '{0}' has already been registered",
                 provider.id
             ))));
@@ -350,13 +350,13 @@ let AuthenticationService = class AuthenticationService extends Disposable {
         }
         return undefined;
     }
-    async createDynamicAuthenticationProvider(authorizationServer, serverMetadata, resource, clientId) {
+    async createDynamicAuthenticationProvider(authorizationServer, serverMetadata, resource, clientId, clientSecret) {
         const delegate = this._delegates[0];
         if (!delegate) {
             this._logService.error("No authentication provider host delegate found");
             return undefined;
         }
-        const providerId = await delegate.create(authorizationServer, serverMetadata, resource, clientId);
+        const providerId = await delegate.create(authorizationServer, serverMetadata, resource, clientId, clientSecret);
         const provider = this._authenticationProviders.get(providerId);
         if (provider) {
             this._logService.debug(`Created dynamic authentication provider: ${providerId}`);
@@ -366,6 +366,24 @@ let AuthenticationService = class AuthenticationService extends Disposable {
         this._logService.error(`Failed to create dynamic authentication provider: ${providerId}`);
         return undefined;
     }
+    async createOrGetXaaProvider(issuer) {
+        const providerId = `xaa:${( issuer.toString(true))}`;
+        if (( this._authenticationProviders.has(providerId))) {
+            return providerId;
+        }
+        const delegate = this._delegates.find(d => !!d.createXaa);
+        if (!delegate) {
+            this._logService.error("No authentication provider host delegate supports XAA");
+            return undefined;
+        }
+        const created = await delegate.createXaa(issuer);
+        if (( this._authenticationProviders.has(created))) {
+            this._logService.debug(`Created XAA authentication provider: ${created}`);
+            return created;
+        }
+        this._logService.error(`Failed to create XAA authentication provider for issuer: ${( issuer.toString(true))}`);
+        return undefined;
+    }
     registerAuthenticationProviderHostDelegate(delegate) {
         this._delegates.push(delegate);
         this._delegates.sort((a, b) => b.priority - a.priority);

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

@@ -46,6 +46,13 @@ export interface IAuthenticationCreateSessionOptions {
      * (RFC 8707 resource indicator).
      */
     resource?: string;
+    /**
+     * The audience for the requested access token. Primarily used for OAuth Identity Assertion
+     * Authorization Grant (ID-JAG, defined in `draft-ietf-oauth-identity-assertion-authz-grant` using RFC 8693 token-exchange semantics) flows where the audience identifies the authorization server of the resource that
+     * will redeem the assertion (typically the resource's authorization server URL). Providers that do not understand audience-bound tokens should
+     * ignore this option.
+     */
+    audience?: 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.
@@ -103,6 +110,13 @@ export interface IAuthenticationGetSessionsOptions {
      * (RFC 8707 resource indicator).
      */
     resource?: string;
+    /**
+     * The audience for the requested access token. Primarily used for OAuth Identity Assertion
+     * Authorization Grant (ID-JAG, defined in `draft-ietf-oauth-identity-assertion-authz-grant` using RFC 8693 token-exchange semantics) flows where the audience identifies the authorization server of the resource that
+     * will redeem the assertion (typically the resource's authorization server URL). Providers that do not understand audience-bound tokens should
+     * ignore this option.
+     */
+    audience?: 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.
@@ -126,7 +140,12 @@ export interface AllowedExtension {
 export interface IAuthenticationProviderHostDelegate {
     /** Priority for this delegate, delegates are tested in descending priority order */
     readonly priority: number;
-    create(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resource: IAuthorizationProtectedResourceMetadata | undefined, clientId?: string): Promise<string>;
+    create(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resource: IAuthorizationProtectedResourceMetadata | undefined, clientId?: string, clientSecret?: string): Promise<string>;
+    /**
+     * Creates an XAA (enterprise-managed, ID-JAG) authentication provider for the given SSO issuer.
+     * The returned string is the provider id.
+     */
+    createXaa?(issuer: URI): Promise<string>;
 }
 export declare function isAuthenticationSession(thing: unknown): thing is AuthenticationSession;
 /**
@@ -148,6 +167,13 @@ export interface IAuthenticationProviderSessionOptions {
      * (RFC 8707 resource indicator).
      */
     resource?: string;
+    /**
+     * The audience for the requested access token. Primarily used for OAuth Identity Assertion
+     * Authorization Grant (ID-JAG, defined in `draft-ietf-oauth-identity-assertion-authz-grant` using RFC 8693 token-exchange semantics) flows where the audience identifies the authorization server of the resource that
+     * will redeem the assertion (typically the resource's authorization server URL). Providers that do not understand audience-bound tokens should
+     * ignore this option.
+     */
+    audience?: 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/authentication/common/authentication.service.d.ts

@@ -113,7 +113,15 @@ export interface IAuthenticationService {
     * Creates a dynamic authentication provider for the given server metadata
     * @param serverMetadata The metadata for the server that is being authenticated against
     */
-    createDynamicAuthenticationProvider(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, clientId?: string): Promise<IAuthenticationProvider | undefined>;
+    createDynamicAuthenticationProvider(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, clientId?: string, clientSecret?: string): Promise<IAuthenticationProvider | undefined>;
+    /**
+    * Gets or creates a built-in XAA (enterprise-managed, ID-JAG) authentication provider for the given
+    * SSO issuer. Subsequent calls with the same issuer return the existing provider. The returned id
+    * can be used with {@link getSessions}/{@link createSession} just like any other provider.
+    *
+    * @param issuer The OAuth/OIDC issuer URL (typically read from `mcp.enterpriseManagedAuth.idp`).
+    */
+    createOrGetXaaProvider(issuer: URI): Promise<string | undefined>;
 }
 export declare const IAuthenticationExtensionsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAuthenticationExtensionsService>;
 export interface IAuthenticationExtensionsService {

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(
-            16502,
+            16715,
             "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(16503, "Unable to open a new window."))));
+            throw ( new Error(( localize(16716, "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(
-                    16504,
+                    16717,
                     "The browser blocked opening a new window. Press 'Retry' to try again."
                 )),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            16505,
+                            16718,
                             "Please allow pop-ups for this website in your [browser settings]({0}).",
                             "https://aka.ms/allow-vscode-popup"
                         )), true))
                     }]
                 },
                 buttons: [{
-                    label: ( localize(16506, "&&Retry")),
+                    label: ( localize(16719, "&&Retry")),
                     run: () => this.openWindow(options)
                 }],
                 cancelButton: true

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

@@ -203,6 +203,12 @@ export interface IQuotaSnapshot {
     readonly resetAt?: number;
     readonly usageBasedBilling?: boolean;
     readonly entitlement?: number;
+    readonly quotaRemaining?: number;
+}
+export interface IRateLimitSnapshot {
+    readonly percentRemaining: number;
+    readonly unlimited: boolean;
+    readonly resetDate?: string;
 }
 export interface IQuotas {
     readonly resetDate?: string;
@@ -214,6 +220,8 @@ export interface IQuotas {
     readonly premiumChat?: IQuotaSnapshot;
     readonly additionalUsageEnabled?: boolean;
     readonly additionalUsageCount?: number;
+    readonly sessionRateLimit?: IRateLimitSnapshot;
+    readonly weeklyRateLimit?: IRateLimitSnapshot;
 }
 export declare function parseQuotas(entitlementsData: IEntitlementsData): IQuotas;
 export declare class ChatEntitlementRequests extends Disposable {

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

@@ -85,19 +85,19 @@ function isProUser(chatEntitlement) {
 function getChatPlanName(chatEntitlement) {
     switch (chatEntitlement) {
     case ChatEntitlement.EDU:
-        return localize(16507, "Copilot Student");
+        return localize(16720, "Copilot Student");
     case ChatEntitlement.Pro:
-        return localize(16508, "Copilot Pro");
+        return localize(16721, "Copilot Pro");
     case ChatEntitlement.ProPlus:
-        return localize(16509, "Copilot Pro+");
+        return localize(16722, "Copilot Pro+");
     case ChatEntitlement.Max:
-        return localize(16510, "Copilot Max");
+        return localize(16723, "Copilot Max");
     case ChatEntitlement.Business:
-        return localize(16511, "Copilot Business");
+        return localize(16724, "Copilot Business");
     case ChatEntitlement.Enterprise:
-        return localize(16512, "Copilot Enterprise");
+        return localize(16725, "Copilot Enterprise");
     default:
-        return localize(16513, "Copilot Free");
+        return localize(16726, "Copilot Free");
     }
 }
 const defaultChatAgent = {
@@ -334,7 +334,9 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         if (chatChanged.exceeded || completionsChanged.exceeded || premiumChatChanged.exceeded) {
             this._onDidChangeQuotaExceeded.fire();
         }
-        if (chatChanged.remaining || completionsChanged.remaining || premiumChatChanged.remaining || oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
+        const sessionRateLimitChanged = oldQuota.sessionRateLimit?.percentRemaining !== quotas.sessionRateLimit?.percentRemaining;
+        const weeklyRateLimitChanged = oldQuota.weeklyRateLimit?.percentRemaining !== quotas.weeklyRateLimit?.percentRemaining;
+        if (chatChanged.remaining || completionsChanged.remaining || premiumChatChanged.remaining || sessionRateLimitChanged || weeklyRateLimitChanged || oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
             this._onDidChangeQuotaRemaining.fire();
         }
         if (oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
@@ -368,7 +370,10 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         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));
+        const isManagedPlan = this.entitlement === ChatEntitlement.Business || this.entitlement === ChatEntitlement.Enterprise;
+        this.chatQuotaExceededContextKey.set(
+            chatExhausted || (premiumChatExhausted && (isManagedPlan || !additionalUsageEnabled))
+        );
         this.completionsQuotaExceededContextKey.set(this._quotas.completions?.percentRemaining === 0);
     }
     get sentiment() {
@@ -445,13 +450,15 @@ function parseQuotas(entitlementsData) {
             if (!rawQuotaSnapshot.unlimited && parsedEntitlement === 0) {
                 continue;
             }
+            const parsedQuotaRemaining = rawQuotaSnapshot.quota_remaining !== undefined ? Number(rawQuotaSnapshot.quota_remaining) : undefined;
             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
+                entitlement: parsedEntitlement !== undefined && Number.isFinite(parsedEntitlement) && parsedEntitlement >= 0 ? parsedEntitlement : undefined,
+                quotaRemaining: parsedQuotaRemaining !== undefined && Number.isFinite(parsedQuotaRemaining) && parsedQuotaRemaining >= 0 ? parsedQuotaRemaining : undefined
             };
             switch (quotaType) {
             case "chat":
@@ -594,13 +601,22 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             entitlement: entitlements.entitlement,
             tid: entitlementsData.analytics_tracking_id,
             sku: entitlements.sku,
-            quotaChat: entitlements.quotas?.chat?.percentRemaining,
+            quotaChatUnlimited: entitlements.quotas?.chat?.unlimited,
+            quotaChatHasQuota: entitlements.quotas?.chat?.hasQuota,
+            quotaChatEntitlement: entitlements.quotas?.chat?.entitlement,
             quotaPremiumChat: entitlements.quotas?.premiumChat?.percentRemaining,
+            quotaPremiumChatUnlimited: entitlements.quotas?.premiumChat?.unlimited,
+            quotaPremiumChatHasQuota: entitlements.quotas?.premiumChat?.hasQuota,
+            quotaPremiumChatEntitlement: entitlements.quotas?.premiumChat?.entitlement,
             quotaCompletions: entitlements.quotas?.completions?.percentRemaining,
+            quotaCompletionsUnlimited: entitlements.quotas?.completions?.unlimited,
+            quotaCompletionsHasQuota: entitlements.quotas?.completions?.hasQuota,
+            quotaCompletionsEntitlement: entitlements.quotas?.completions?.entitlement,
             quotaResetDate: entitlements.quotas?.resetDate,
             usageBasedBilling: entitlements.quotas?.usageBasedBilling,
             additionalUsageEnabled: entitlements.quotas?.additionalUsageEnabled,
-            additionalUsageCount: entitlements.quotas?.additionalUsageCount
+            additionalUsageCount: entitlements.quotas?.additionalUsageCount,
+            canUpgradePlan: entitlements.quotas?.canUpgradePlan
         });
         return entitlements;
     }
@@ -680,7 +696,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             "chatEntitlementService.signUpFree"
         );
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(16514, "No response received.")), "[chat entitlement] sign-up: no response");
+            const retry = await this.onUnknownSignUpError(( localize(16727, "No response received.")), "[chat entitlement] sign-up: no response");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 1
             };
@@ -703,7 +719,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     }
                 } catch (error) {}
             }
-            const retry = await this.onUnknownSignUpError(( localize(16515, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(16728, "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
             };
@@ -713,7 +729,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             responseText = await asText(response);
         } catch (error) {}
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(16516, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
+            const retry = await this.onUnknownSignUpError(( localize(16729, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 2
             };
@@ -723,7 +739,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(16517, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(16730, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 3
             };
@@ -754,11 +770,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16518,
+                    16731,
                     "An error occurred while signing up for the GitHub Copilot Free plan. Would you like to try again?"
                 )),
                 detail,
-                primaryButton: ( localize(16519, "Retry"))
+                primaryButton: ( localize(16732, "Retry"))
             });
             return confirmed;
         }
@@ -770,15 +786,15 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             this.dialogService.prompt({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16520,
+                    16733,
                     "An error occurred while signing up for the GitHub Copilot Free plan."
                 )),
                 detail: logDetails,
                 buttons: [{
-                    label: ( localize(16521, "OK")),
+                    label: ( localize(16734, "OK")),
                     run: () => {}
                 }, {
-                    label: ( localize(16522, "Learn More")),
+                    label: ( localize(16735, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChatAgent.upgradePlanUrl)))
                 }]
             });

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

@@ -25,6 +25,11 @@ export interface IChatEntitlementService {
     readonly onDidChangeAnonymous: Event<void>;
     readonly anonymous: boolean;
     readonly anonymousObs: IObservable<boolean>;
+    acceptQuotas(quotas: IQuotas): void;
+    /**
+    * Clear all quota state.
+    */
+    clearQuotas(): void;
     markAnonymousRateLimited(): void;
     /**
     * Mark the chat setup flow as completed.