@codingame/monaco-vscode-api 31.0.0 → 32.0.0

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

@@ -12,6 +12,7 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { LogLevel } from '../../../../platform/log/common/log.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IProductService } from '../../../../platform/product/common/productService.service.js';
 import { asText } from '../../../../platform/request/common/request.js';
@@ -51,6 +52,7 @@ var ChatEntitlementContextKeys;
         planPro: ( new RawContextKey("chatPlanPro", false, true)),
         planEdu: ( new RawContextKey("chatPlanEdu", false, true)),
         planProPlus: ( new RawContextKey("chatPlanProPlus", false, true)),
+        planMax: ( new RawContextKey("chatPlanMax", false, true)),
         planBusiness: ( new RawContextKey("chatPlanBusiness", false, true)),
         planEnterprise: ( new RawContextKey("chatPlanEnterprise", false, true)),
         organisations: ( new RawContextKey("chatEntitlementOrganisations", undefined, true)),
@@ -73,24 +75,27 @@ var ChatEntitlement;
     ChatEntitlement[ChatEntitlement["ProPlus"] = 7] = "ProPlus";
     ChatEntitlement[ChatEntitlement["Business"] = 8] = "Business";
     ChatEntitlement[ChatEntitlement["Enterprise"] = 9] = "Enterprise";
+    ChatEntitlement[ChatEntitlement["Max"] = 11] = "Max";
 })(ChatEntitlement || (ChatEntitlement = {}));
 function isProUser(chatEntitlement) {
-    return chatEntitlement === ChatEntitlement.EDU || chatEntitlement === ChatEntitlement.Pro || chatEntitlement === ChatEntitlement.ProPlus || chatEntitlement === ChatEntitlement.Business || chatEntitlement === ChatEntitlement.Enterprise;
+    return chatEntitlement === ChatEntitlement.EDU || chatEntitlement === ChatEntitlement.Pro || chatEntitlement === ChatEntitlement.ProPlus || chatEntitlement === ChatEntitlement.Max || chatEntitlement === ChatEntitlement.Business || chatEntitlement === ChatEntitlement.Enterprise;
 }
 function getChatPlanName(chatEntitlement) {
     switch (chatEntitlement) {
     case ChatEntitlement.EDU:
-        return localize(16044, "Copilot EDU");
+        return localize(16350, "Copilot EDU");
     case ChatEntitlement.Pro:
-        return localize(16045, "Copilot Pro");
+        return localize(16351, "Copilot Pro");
     case ChatEntitlement.ProPlus:
-        return localize(16046, "Copilot Pro+");
+        return localize(16352, "Copilot Pro+");
+    case ChatEntitlement.Max:
+        return localize(16353, "Copilot Max");
     case ChatEntitlement.Business:
-        return localize(16047, "Copilot Business");
+        return localize(16354, "Copilot Business");
     case ChatEntitlement.Enterprise:
-        return localize(16048, "Copilot Enterprise");
+        return localize(16355, "Copilot Enterprise");
     default:
-        return localize(16049, "Copilot Free");
+        return localize(16356, "Copilot Free");
     }
 }
 const defaultChatAgent = {
@@ -128,12 +133,14 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         environmentService,
         contextKeyService,
         configurationService,
-        telemetryService
+        telemetryService,
+        logService
     ) {
         super();
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
+        this.logService = logService;
         this._onDidChangeQuotaExceeded = this._register(( new Emitter()));
         this.onDidChangeQuotaExceeded = this._onDidChangeQuotaExceeded.event;
         this._onDidChangeQuotaRemaining = this._register(( new Emitter()));
@@ -158,6 +165,7 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
                 ChatEntitlementContextKeys.Entitlement.planBusiness.key,
                 ChatEntitlementContextKeys.Entitlement.planEnterprise.key,
                 ChatEntitlementContextKeys.Entitlement.planProPlus.key,
+                ChatEntitlementContextKeys.Entitlement.planMax.key,
                 ChatEntitlementContextKeys.Entitlement.planFree.key,
                 ChatEntitlementContextKeys.Entitlement.canSignUp.key,
                 ChatEntitlementContextKeys.Entitlement.signedOut.key,
@@ -207,6 +215,8 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
             return ChatEntitlement.Enterprise;
         } else if (this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Entitlement.planProPlus.key) === true) {
             return ChatEntitlement.ProPlus;
+        } else if (this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Entitlement.planMax.key) === true) {
+            return ChatEntitlement.Max;
         } else if (this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Entitlement.planFree.key) === true) {
             return ChatEntitlement.Free;
         } else if (this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Entitlement.canSignUp.key) === true) {
@@ -276,6 +286,9 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         const oldQuota = this._quotas;
         this._quotas = quotas;
         this.updateContextKeys();
+        if (this.logService.getLevel() === LogLevel.Trace) {
+            this.logService.trace(`[chat entitlement]: acceptQuotas: ${JSON.stringify(quotas)}`);
+        }
         const {
             changed: chatChanged
         } = this.compareQuotas(oldQuota.chat, quotas.chat);
@@ -288,15 +301,27 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         if (chatChanged.exceeded || completionsChanged.exceeded || premiumChatChanged.exceeded) {
             this._onDidChangeQuotaExceeded.fire();
         }
-        if (chatChanged.remaining || completionsChanged.remaining || premiumChatChanged.remaining) {
+        if (chatChanged.remaining || completionsChanged.remaining || premiumChatChanged.remaining || oldQuota.usageBasedBilling !== quotas.usageBasedBilling) {
             this._onDidChangeQuotaRemaining.fire();
         }
+        if (oldQuota.additionalUsageEnabled !== undefined && quotas.additionalUsageEnabled !== undefined && oldQuota.additionalUsageEnabled !== quotas.additionalUsageEnabled) {
+            this.telemetryService.publicLog2("chatAdditionalSpendConfiguration", {
+                enabled: quotas.additionalUsageEnabled ?? false,
+                entitlement: this.entitlement
+            });
+        }
+        if (quotas.additionalUsageEnabled && quotas.premiumChat?.percentRemaining === 0 && oldQuota.premiumChat?.percentRemaining !== undefined && oldQuota.premiumChat.percentRemaining > 0) {
+            this.telemetryService.publicLog2("chatAdditionalSpendActive", {
+                entitlement: this.entitlement,
+                additionalUsageCount: quotas.additionalUsageCount ?? 0
+            });
+        }
     }
     compareQuotas(oldQuota, newQuota) {
         return {
             changed: {
                 exceeded: (oldQuota?.percentRemaining === 0) !== (newQuota?.percentRemaining === 0),
-                remaining: oldQuota?.percentRemaining !== newQuota?.percentRemaining
+                remaining: oldQuota?.percentRemaining !== newQuota?.percentRemaining || oldQuota?.usageBasedBilling !== newQuota?.usageBasedBilling
             }
         };
     }
@@ -329,11 +354,82 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         this.chatQuotaExceededContextKey.set(true);
         this._onDidChangeQuotaExceeded.fire();
     }
+    markSetupCompleted() {
+        this.context?.value.update({
+            completed: true
+        });
+    }
+    setForceHidden(hidden) {
+        if (this.context) {
+            this.context.value.setForceHidden(hidden);
+        } else {
+            ChatEntitlementContextKeys.Setup.hidden.bindTo(this.contextKeyService).set(hidden);
+        }
+    }
     async update(token) {
         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))], ChatEntitlementService));
+ChatEntitlementService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IProductService)), ( __param(2, IWorkbenchEnvironmentService)), ( __param(3, IContextKeyService)), ( __param(4, IConfigurationService)), ( __param(5, ITelemetryService)), ( __param(6, ILogService))], 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
+    };
+    if (entitlementsData.monthly_quotas?.chat && typeof entitlementsData.limited_user_quotas?.chat === "number") {
+        quotas.chat = {
+            percentRemaining: Math.min(100, Math.max(
+                0,
+                (entitlementsData.limited_user_quotas.chat / entitlementsData.monthly_quotas.chat) * 100
+            )),
+            unlimited: false
+        };
+    }
+    if (entitlementsData.monthly_quotas?.completions && typeof entitlementsData.limited_user_quotas?.completions === "number") {
+        quotas.completions = {
+            percentRemaining: Math.min(100, Math.max(
+                0,
+                (entitlementsData.limited_user_quotas.completions / entitlementsData.monthly_quotas.completions) * 100
+            )),
+            unlimited: false
+        };
+    }
+    if (entitlementsData.quota_snapshots) {
+        for (const quotaType of ["chat", "completions", "premium_interactions"]) {
+            const rawQuotaSnapshot = entitlementsData.quota_snapshots[quotaType];
+            if (!rawQuotaSnapshot) {
+                continue;
+            }
+            const parsedEntitlement = rawQuotaSnapshot.entitlement !== undefined ? Number(rawQuotaSnapshot.entitlement) : undefined;
+            if (!rawQuotaSnapshot.unlimited && parsedEntitlement === 0) {
+                continue;
+            }
+            const quotaSnapshot = {
+                percentRemaining: Math.min(100, Math.max(0, rawQuotaSnapshot.percent_remaining)),
+                unlimited: rawQuotaSnapshot.unlimited,
+                usageBasedBilling: entitlementsData.token_based_billing,
+                resetAt: rawQuotaSnapshot.quota_reset_at || undefined,
+                entitlement: parsedEntitlement !== undefined && Number.isSafeInteger(parsedEntitlement) && parsedEntitlement >= 0 ? parsedEntitlement : undefined
+            };
+            switch (quotaType) {
+            case "chat":
+                quotas.chat = quotaSnapshot;
+                break;
+            case "completions":
+                quotas.completions = quotaSnapshot;
+                break;
+            case "premium_interactions":
+                quotas.premiumChat = quotaSnapshot;
+                break;
+            }
+        }
+        const overageSource = entitlementsData.quota_snapshots["premium_interactions"];
+        quotas.additionalUsageEnabled = overageSource?.overage_permitted ?? false;
+        quotas.additionalUsageCount = overageSource?.overage_count ?? 0;
+    }
+    return quotas;
+}
 let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
     constructor(
         context,
@@ -432,6 +528,8 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             entitlement = ChatEntitlement.Pro;
         } else if (entitlementsData.copilot_plan === "individual_pro") {
             entitlement = ChatEntitlement.ProPlus;
+        } else if (entitlementsData.copilot_plan === "individual_max") {
+            entitlement = ChatEntitlement.Max;
         } else if (entitlementsData.copilot_plan === "business") {
             entitlement = ChatEntitlement.Business;
         } else if (entitlementsData.copilot_plan === "enterprise") {
@@ -453,72 +551,18 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             entitlement: entitlements.entitlement,
             tid: entitlementsData.analytics_tracking_id,
             sku: entitlements.sku,
-            quotaChat: entitlements.quotas?.chat?.remaining,
-            quotaPremiumChat: entitlements.quotas?.premiumChat?.remaining,
-            quotaCompletions: entitlements.quotas?.completions?.remaining,
-            quotaResetDate: entitlements.quotas?.resetDate
+            quotaChat: entitlements.quotas?.chat?.percentRemaining,
+            quotaPremiumChat: entitlements.quotas?.premiumChat?.percentRemaining,
+            quotaCompletions: entitlements.quotas?.completions?.percentRemaining,
+            quotaResetDate: entitlements.quotas?.resetDate,
+            usageBasedBilling: entitlements.quotas?.usageBasedBilling,
+            additionalUsageEnabled: entitlements.quotas?.additionalUsageEnabled,
+            additionalUsageCount: entitlements.quotas?.additionalUsageCount
         });
         return entitlements;
     }
     toQuotas(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"
-        };
-        if (entitlementsData.monthly_quotas?.chat && typeof entitlementsData.limited_user_quotas?.chat === "number") {
-            quotas.chat = {
-                total: entitlementsData.monthly_quotas.chat,
-                remaining: entitlementsData.limited_user_quotas.chat,
-                percentRemaining: Math.min(100, Math.max(
-                    0,
-                    (entitlementsData.limited_user_quotas.chat / entitlementsData.monthly_quotas.chat) * 100
-                )),
-                overageEnabled: false,
-                overageCount: 0,
-                unlimited: false
-            };
-        }
-        if (entitlementsData.monthly_quotas?.completions && typeof entitlementsData.limited_user_quotas?.completions === "number") {
-            quotas.completions = {
-                total: entitlementsData.monthly_quotas.completions,
-                remaining: entitlementsData.limited_user_quotas.completions,
-                percentRemaining: Math.min(100, Math.max(
-                    0,
-                    (entitlementsData.limited_user_quotas.completions / entitlementsData.monthly_quotas.completions) * 100
-                )),
-                overageEnabled: false,
-                overageCount: 0,
-                unlimited: false
-            };
-        }
-        if (entitlementsData.quota_snapshots) {
-            for (const quotaType of ["chat", "completions", "premium_interactions"]) {
-                const rawQuotaSnapshot = entitlementsData.quota_snapshots[quotaType];
-                if (!rawQuotaSnapshot) {
-                    continue;
-                }
-                const quotaSnapshot = {
-                    total: rawQuotaSnapshot.entitlement,
-                    remaining: rawQuotaSnapshot.remaining,
-                    percentRemaining: Math.min(100, Math.max(0, rawQuotaSnapshot.percent_remaining)),
-                    overageEnabled: rawQuotaSnapshot.overage_permitted,
-                    overageCount: rawQuotaSnapshot.overage_count,
-                    unlimited: rawQuotaSnapshot.unlimited
-                };
-                switch (quotaType) {
-                case "chat":
-                    quotas.chat = quotaSnapshot;
-                    break;
-                case "completions":
-                    quotas.completions = quotaSnapshot;
-                    break;
-                case "premium_interactions":
-                    quotas.premiumChat = quotaSnapshot;
-                    break;
-                }
-            }
-        }
-        return quotas;
+        return parseQuotas(entitlementsData);
     }
     async request(url, type, body, sessions, token, callSite) {
         let lastRequest;
@@ -593,7 +637,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             "chatEntitlementService.signUpFree"
         );
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(16050, "No response received.")), "[chat entitlement] sign-up: no response");
+            const retry = await this.onUnknownSignUpError(( localize(16357, "No response received.")), "[chat entitlement] sign-up: no response");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 1
             };
@@ -616,7 +660,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     }
                 } catch (error) {}
             }
-            const retry = await this.onUnknownSignUpError(( localize(16051, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(16358, "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
             };
@@ -626,7 +670,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             responseText = await asText(response);
         } catch (error) {}
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(16052, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
+            const retry = await this.onUnknownSignUpError(( localize(16359, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 2
             };
@@ -636,7 +680,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(16053, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(16360, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 3
             };
@@ -667,11 +711,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16054,
+                    16361,
                     "An error occurred while signing up for the GitHub Copilot Free plan. Would you like to try again?"
                 )),
                 detail,
-                primaryButton: ( localize(16055, "Retry"))
+                primaryButton: ( localize(16362, "Retry"))
             });
             return confirmed;
         }
@@ -683,15 +727,15 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             this.dialogService.prompt({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16056,
+                    16363,
                     "An error occurred while signing up for the GitHub Copilot Free plan."
                 )),
                 detail: logDetails,
                 buttons: [{
-                    label: ( localize(16057, "OK")),
+                    label: ( localize(16364, "OK")),
                     run: () => {}
                 }, {
-                    label: ( localize(16058, "Learn More")),
+                    label: ( localize(16365, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChatAgent.upgradePlanUrl)))
                 }]
             });
@@ -752,12 +796,14 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this.updateBarrier = undefined;
+        this._forceHidden = false;
         this.canSignUpContextKey = ChatEntitlementContextKeys.Entitlement.canSignUp.bindTo(contextKeyService);
         this.signedOutContextKey = ChatEntitlementContextKeys.Entitlement.signedOut.bindTo(contextKeyService);
         this.freeContextKey = ChatEntitlementContextKeys.Entitlement.planFree.bindTo(contextKeyService);
         this.eduContextKey = ChatEntitlementContextKeys.Entitlement.planEdu.bindTo(contextKeyService);
         this.proContextKey = ChatEntitlementContextKeys.Entitlement.planPro.bindTo(contextKeyService);
         this.proPlusContextKey = ChatEntitlementContextKeys.Entitlement.planProPlus.bindTo(contextKeyService);
+        this.maxContextKey = ChatEntitlementContextKeys.Entitlement.planMax.bindTo(contextKeyService);
         this.businessContextKey = ChatEntitlementContextKeys.Entitlement.planBusiness.bindTo(contextKeyService);
         this.enterpriseContextKey = ChatEntitlementContextKeys.Entitlement.planEnterprise.bindTo(contextKeyService);
         this.organisationsContextKey = ChatEntitlementContextKeys.Entitlement.organisations.bindTo(contextKeyService);
@@ -812,7 +858,7 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
         }));
     }
     withConfiguration(state) {
-        if (this.configurationService.getValue(ChatEntitlementContext_1.CHAT_DISABLED_CONFIGURATION_KEY) === true) {
+        if (this._forceHidden || this.configurationService.getValue(ChatEntitlementContext_1.CHAT_DISABLED_CONFIGURATION_KEY) === true) {
             return {
                 ...state,
                 hidden: true
@@ -820,6 +866,12 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
         }
         return state;
     }
+    setForceHidden(hidden) {
+        if (this._forceHidden !== hidden) {
+            this._forceHidden = hidden;
+            this.updateContext();
+        }
+    }
     async update(context) {
         this.logService.trace(`[chat entitlement context] update(): ${JSON.stringify(context)}`);
         const oldState = JSON.stringify(this._state);
@@ -876,6 +928,7 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
         this.eduContextKey.set(state.entitlement === ChatEntitlement.EDU);
         this.proContextKey.set(state.entitlement === ChatEntitlement.Pro);
         this.proPlusContextKey.set(state.entitlement === ChatEntitlement.ProPlus);
+        this.maxContextKey.set(state.entitlement === ChatEntitlement.Max);
         this.businessContextKey.set(state.entitlement === ChatEntitlement.Business);
         this.enterpriseContextKey.set(state.entitlement === ChatEntitlement.Enterprise);
         this.organisationsContextKey.set(state.organisations);
@@ -909,4 +962,4 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
 };
 ChatEntitlementContext = ChatEntitlementContext_1 = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IStorageService)), ( __param(2, ILogService)), ( __param(3, IConfigurationService)), ( __param(4, ITelemetryService))], ChatEntitlementContext));
 
-export { ChatEntitlement, ChatEntitlementContext, ChatEntitlementContextKeys, ChatEntitlementRequests, ChatEntitlementService, getChatPlanName, isProUser };
+export { ChatEntitlement, ChatEntitlementContext, ChatEntitlementContextKeys, ChatEntitlementRequests, ChatEntitlementService, getChatPlanName, isProUser, parseQuotas };

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

@@ -24,5 +24,15 @@ export interface IChatEntitlementService {
     readonly anonymous: boolean;
     readonly anonymousObs: IObservable<boolean>;
     markAnonymousRateLimited(): void;
+    /**
+    * Mark the chat setup flow as completed.
+    */
+    markSetupCompleted(): void;
+    /**
+    * Force the hidden state on or off, overriding the normal entitlement logic.
+    * Used by the account policy gate to hide all AI features when the gate is
+    * active and unsatisfied.
+    */
+    setForceHidden(hidden: boolean): void;
     update(token: CancellationToken): Promise<void>;
 }

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js

@@ -2,18 +2,18 @@
 import { localize } from '../../../../nls.js';
 
 const idDescription = ( localize(
-    16111,
+    16418,
     "The input's id is used to associate an input with a variable of the form ${input:id}."
 ));
-const typeDescription = ( localize(16112, "The type of user input prompt to use."));
-const descriptionDescription = ( localize(16113, "The description is shown when the user is prompted for input."));
-const defaultDescription = ( localize(16114, "The default value for the input."));
+const typeDescription = ( localize(16419, "The type of user input prompt to use."));
+const descriptionDescription = ( localize(16420, "The description is shown when the user is prompted for input."));
+const defaultDescription = ( localize(16421, "The default value for the input."));
 const inputsSchema = {
     definitions: {
         inputs: {
             type: "array",
             description: ( localize(
-                16115,
+                16422,
                 "User inputs. Used for defining user input prompts, such as free string input or a choice from several options."
             )),
             items: {
@@ -31,7 +31,7 @@ const inputsSchema = {
                             description: typeDescription,
                             enum: ["promptString"],
                             enumDescriptions: [( localize(
-                                16116,
+                                16423,
                                 "The 'promptString' type opens an input box to ask the user for input."
                             ))]
                         },
@@ -46,7 +46,7 @@ const inputsSchema = {
                         password: {
                             type: "boolean",
                             description: ( localize(
-                                16117,
+                                16424,
                                 "Controls if a password input is shown. Password input hides the typed text."
                             ))
                         }
@@ -64,7 +64,7 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["pickString"],
-                            enumDescriptions: [( localize(16118, "The 'pickString' type shows a selection list."))]
+                            enumDescriptions: [( localize(16425, "The 'pickString' type shows a selection list."))]
                         },
                         description: {
                             type: "string",
@@ -76,7 +76,7 @@ const inputsSchema = {
                         },
                         options: {
                             type: "array",
-                            description: ( localize(16119, "An array of strings that defines the options for a quick pick.")),
+                            description: ( localize(16426, "An array of strings that defines the options for a quick pick.")),
                             items: {
                                 oneOf: [{
                                     type: "string"
@@ -87,11 +87,11 @@ const inputsSchema = {
                                     properties: {
                                         label: {
                                             type: "string",
-                                            description: ( localize(16120, "Label for the option."))
+                                            description: ( localize(16427, "Label for the option."))
                                         },
                                         value: {
                                             type: "string",
-                                            description: ( localize(16121, "Value for the option."))
+                                            description: ( localize(16428, "Value for the option."))
                                         }
                                     }
                                 }]
@@ -111,22 +111,22 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["command"],
-                            enumDescriptions: [( localize(16122, "The 'command' type executes a command."))]
+                            enumDescriptions: [( localize(16429, "The 'command' type executes a command."))]
                         },
                         command: {
                             type: "string",
-                            description: ( localize(16123, "The command to execute for this input variable."))
+                            description: ( localize(16430, "The command to execute for this input variable."))
                         },
                         args: {
                             oneOf: [{
                                 type: "object",
-                                description: ( localize(16124, "Optional arguments passed to the command."))
+                                description: ( localize(16431, "Optional arguments passed to the command."))
                             }, {
                                 type: "array",
-                                description: ( localize(16124, "Optional arguments passed to the command."))
+                                description: ( localize(16431, "Optional arguments passed to the command."))
                             }, {
                                 type: "string",
-                                description: ( localize(16124, "Optional arguments passed to the command."))
+                                description: ( localize(16431, "Optional arguments passed to the command."))
                             }]
                         }
                     }

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js

@@ -4,7 +4,7 @@ import { localize } from '../../../../nls.js';
 function applyDeprecatedVariableMessage(schema) {
     schema.pattern = schema.pattern || "^(?!.*\\$\\{(env|config|command)\\.)";
     schema.patternErrorMessage = schema.patternErrorMessage || ( localize(
-        16125,
+        16432,
         "'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead."
     ));
 }