@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IStatusbarService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
-import { ChatEntitlementService } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlementService } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -16,7 +16,7 @@ export declare class ChatStatusBarEntry extends Disposable implements IWorkbench
     private dashboard;
     private readonly activeCodeEditorListener;
     constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService);
-    private create;
+    private update;
     private registerListeners;
     private onDidActiveEditorChange;
     private getEntryProps;

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus.js

@@ -9,7 +9,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { StatusbarAlignment, ShowTooltipCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { $, clearNode, append, EventType, addDisposableListener, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { ChatSentiment, ChatEntitlement } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+import { ChatSentiment, ChatEntitlement } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
 import { defaultButtonStyles, defaultCheckboxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { Checkbox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/toggle/toggle';
@@ -27,6 +27,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { nativeHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
 import { Gesture, EventType as EventType$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/touch';
@@ -37,6 +38,7 @@ import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { parseLinkedText } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedText';
 import { Link } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/browser/link';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
@@ -45,6 +47,10 @@ import { IChatStatusItemService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 
 registerCss(chatStatus);
 const gaugeBackground = registerColor('gauge.background', {
@@ -52,47 +58,48 @@ const gaugeBackground = registerColor('gauge.background', {
     light: inputValidationInfoBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4841, "Gauge background color.")));
+}, ( localize(4901, "Gauge background color.")));
 registerColor('gauge.foreground', {
     dark: ( transparent(gaugeBackground, 0.3)),
     light: ( transparent(gaugeBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(4842, "Gauge foreground color.")));
+}, ( localize(4902, "Gauge foreground color.")));
 registerColor('gauge.border', {
     dark: null,
     light: null,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4843, "Gauge border color.")));
+}, ( localize(4903, "Gauge border color.")));
 const gaugeWarningBackground = registerColor('gauge.warningBackground', {
     dark: inputValidationWarningBorder,
     light: inputValidationWarningBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4844, "Gauge warning background color.")));
+}, ( localize(4904, "Gauge warning background color.")));
 registerColor('gauge.warningForeground', {
     dark: ( transparent(gaugeWarningBackground, 0.3)),
     light: ( transparent(gaugeWarningBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(4845, "Gauge warning foreground color.")));
+}, ( localize(4905, "Gauge warning foreground color.")));
 const gaugeErrorBackground = registerColor('gauge.errorBackground', {
     dark: inputValidationErrorBorder,
     light: inputValidationErrorBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4846, "Gauge error background color.")));
+}, ( localize(4906, "Gauge error background color.")));
 registerColor('gauge.errorForeground', {
     dark: ( transparent(gaugeErrorBackground, 0.3)),
     light: ( transparent(gaugeErrorBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(4847, "Gauge error foreground color.")));
+}, ( localize(4907, "Gauge error foreground color.")));
 const defaultChat = {
-    extensionId: product.defaultChatAgent?.extensionId ?? '',
     completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
-    nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? ''
+    nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
+    manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
+    manageOverageUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
 };
 let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     static { this.ID = 'workbench.contrib.chatStatusBarEntry'; }
@@ -106,16 +113,17 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.entry = undefined;
         this.dashboard = ( new Lazy(() => this.instantiationService.createInstance(ChatStatusDashboard)));
         this.activeCodeEditorListener = this._register(( new MutableDisposable()));
-        this.create();
+        this.update();
         this.registerListeners();
     }
-    async create() {
-        const hidden = this.chatEntitlementService.sentiment === ChatSentiment.Disabled;
-        if (!hidden) {
-            this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), 'chat.statusBarEntry', StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
-            const completionsStatusId = `${defaultChat.extensionId}.status`;
-            this.statusbarService.updateEntryVisibility(completionsStatusId, false);
-            this.statusbarService.overrideEntry(completionsStatusId, { name: ( localize(4848, "Copilot Code Completions")), text: ( localize(4849, "$(copilot) Completions")) });
+    update() {
+        if (this.chatEntitlementService.sentiment !== ChatSentiment.Disabled) {
+            if (!this.entry) {
+                this.entry = this.statusbarService.addEntry(this.getEntryProps(), 'chat.statusBarEntry', StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
+            }
+            else {
+                this.entry.update(this.getEntryProps());
+            }
         }
         else {
             this.entry?.dispose();
@@ -123,60 +131,61 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         }
     }
     registerListeners() {
-        this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
-        this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.entry?.update(this.getEntryProps())));
-        this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
+        this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.update()));
+        this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.update()));
+        this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.update()));
         this._register(this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange()));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(defaultChat.completionsEnablementSetting)) {
-                this.entry?.update(this.getEntryProps());
+                this.update();
             }
         }));
     }
     onDidActiveEditorChange() {
-        this.entry?.update(this.getEntryProps());
+        this.update();
         this.activeCodeEditorListener.clear();
         const activeCodeEditor = getCodeEditor(this.editorService.activeTextEditorControl);
         if (activeCodeEditor) {
             this.activeCodeEditorListener.value = activeCodeEditor.onDidChangeModelLanguage(() => {
-                this.entry?.update(this.getEntryProps());
+                this.update();
             });
         }
     }
     getEntryProps() {
         let text = '$(copilot)';
-        let ariaLabel = ( localize(4850, "Copilot Status"));
+        let ariaLabel = ( localize(4908, "Copilot Status"));
         let kind;
         if (!isNewUser(this.chatEntitlementService)) {
-            const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
+            const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
+            const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
             if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signedOutWarning = ( localize(4851, "Signed out"));
+                const signedOutWarning = ( localize(4909, "Signed out"));
                 text = `$(copilot-not-connected) ${signedOutWarning}`;
                 ariaLabel = signedOutWarning;
                 kind = 'prominent';
             }
-            else if (chatQuotaExceeded || completionsQuotaExceeded) {
+            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(4852, "Chat limit reached"));
+                    quotaWarning = ( localize(4910, "Chat quota reached"));
                 }
                 else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(4853, "Completions limit reached"));
+                    quotaWarning = ( localize(4911, "Completions quota reached"));
                 }
                 else {
-                    quotaWarning = ( localize(4854, "Limit reached"));
+                    quotaWarning = ( localize(4912, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
                 kind = 'prominent';
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
-                text = `$(copilot-not-connected)`;
-                ariaLabel = ( localize(4855, "Code Completions Disabled"));
+                text = `$(copilot-unavailable)`;
+                ariaLabel = ( localize(4913, "Code Completions Disabled"));
             }
         }
         return {
-            name: ( localize(4850, "Copilot Status")),
+            name: ( localize(4908, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -205,8 +214,9 @@ function isNewUser(chatEntitlementService) {
 function canUseCopilot(chatEntitlementService) {
     const newUser = isNewUser(chatEntitlementService);
     const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
-    const allQuotaReached = chatEntitlementService.quotas.chatQuotaExceeded && chatEntitlementService.quotas.completionsQuotaExceeded;
-    return !newUser && !signedOut && !allQuotaReached;
+    const limited = chatEntitlementService.entitlement === ChatEntitlement.Limited;
+    const allFreeQuotaReached = limited && chatEntitlementService.quotas.chat?.percentRemaining === 0 && chatEntitlementService.quotas.completions?.percentRemaining === 0;
+    return !newUser && !signedOut && !allFreeQuotaReached;
 }
 function isCompletionsEnabled(configurationService, modeId = '*') {
     const result = configurationService.getValue(defaultChat.completionsEnablementSetting);
@@ -242,90 +252,126 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const disposables = this.entryDisposables.value = ( new DisposableStore());
         disposables.add(token.onCancellationRequested(() => disposables.dispose()));
         let needsSeparator = false;
-        const addSeparator = (label) => {
+        const addSeparator = (label, action) => {
             if (needsSeparator) {
                 this.element.appendChild($('hr'));
-                needsSeparator = false;
             }
-            if (label) {
-                this.element.appendChild($('div.header', undefined, label));
+            if (label || action) {
+                this.renderHeader(this.element, disposables, label ?? '', action);
             }
             needsSeparator = true;
         };
-        if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
-            const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate, chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
-            addSeparator(( localize(4856, "Copilot Free Plan Usage")));
-            const chatQuotaIndicator = this.createQuotaIndicator(this.element, chatTotal, chatRemaining, ( localize(4857, "Chat messages")));
-            const completionsQuotaIndicator = this.createQuotaIndicator(this.element, completionsTotal, completionsRemaining, ( localize(4858, "Code completions")));
-            this.element.appendChild($('div.description', undefined, ( localize(
-                4859,
-                "Limits will reset on {0}.",
-                this.dateFormatter.value.format(quotaResetDate)
-            ))));
-            if (chatQuotaExceeded || completionsQuotaExceeded) {
-                const upgradePlanButton = disposables.add(( new Button(
+        const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate } = this.chatEntitlementService.quotas;
+        if (chatQuota || completionsQuota || premiumChatQuota) {
+            addSeparator(( localize(4914, "Copilot Usage")), toAction({
+                id: 'workbench.action.manageCopilot',
+                label: ( localize(4915, "Manage Copilot")),
+                tooltip: ( localize(4916, "Manage Copilot")),
+                class: ThemeIcon.asClassName(Codicon.settings),
+                run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageSettingsUrl)))),
+            }));
+            const completionsQuotaIndicator = completionsQuota ? this.createQuotaIndicator(this.element, disposables, completionsQuota, ( localize(4917, "Code completions")), false) : undefined;
+            const chatQuotaIndicator = chatQuota ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(4918, "Chat messages")), false) : undefined;
+            const premiumChatQuotaIndicator = premiumChatQuota ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(4919, "Premium requests")), true) : undefined;
+            if (resetDate) {
+                this.element.appendChild($('div.description', undefined, ( localize(
+                    4920,
+                    "Allowance resets {0}.",
+                    this.dateFormatter.value.format(( new Date(resetDate)))
+                ))));
+            }
+            if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
+                const upgradeProButton = disposables.add(( new Button(
                     this.element,
                     { ...defaultButtonStyles, secondary: canUseCopilot(this.chatEntitlementService)  }
                 )));
-                upgradePlanButton.label = ( localize(4860, "Upgrade to Copilot Pro"));
-                disposables.add(upgradePlanButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
+                upgradeProButton.label = ( localize(4921, "Upgrade to Copilot Pro"));
+                disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
             }
             (async () => {
                 await this.chatEntitlementService.update(token);
                 if (token.isCancellationRequested) {
                     return;
                 }
-                const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatEntitlementService.quotas;
-                chatQuotaIndicator(chatTotal, chatRemaining);
-                completionsQuotaIndicator(completionsTotal, completionsRemaining);
+                const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota } = this.chatEntitlementService.quotas;
+                if (completionsQuota) {
+                    completionsQuotaIndicator?.(completionsQuota);
+                }
+                if (chatQuota) {
+                    chatQuotaIndicator?.(chatQuota);
+                }
+                if (premiumChatQuota) {
+                    premiumChatQuotaIndicator?.(premiumChatQuota);
+                }
             })();
         }
         {
             for (const item of this.chatStatusItemService.getEntries()) {
-                addSeparator(undefined);
-                const chatItemDisposables = disposables.add(( new MutableDisposable()));
+                addSeparator();
+                const itemDisposables = disposables.add(( new MutableDisposable()));
                 let rendered = this.renderContributedChatStatusItem(item);
-                chatItemDisposables.value = rendered.disposables;
+                itemDisposables.value = rendered.disposables;
                 this.element.appendChild(rendered.element);
                 disposables.add(this.chatStatusItemService.onDidChange(e => {
                     if (e.entry.id === item.id) {
-                        const oldEl = rendered.element;
+                        const previousElement = rendered.element;
                         rendered = this.renderContributedChatStatusItem(e.entry);
-                        chatItemDisposables.value = rendered.disposables;
-                        oldEl.replaceWith(rendered.element);
+                        itemDisposables.value = rendered.disposables;
+                        previousElement.replaceWith(rendered.element);
                     }
                 }));
             }
         }
         {
-            addSeparator(( localize(4861, "Settings")));
+            addSeparator(( localize(4922, "Settings")), this.chatEntitlementService.sentiment === ChatSentiment.Installed ? toAction({
+                id: 'workbench.action.openChatSettings',
+                label: ( localize(4923, "Settings")),
+                tooltip: ( localize(4924, "Open Settings")),
+                class: ThemeIcon.asClassName(Codicon.settingsGear),
+                run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
+            }) : undefined);
             this.createSettings(this.element, disposables);
         }
         {
             const newUser = isNewUser(this.chatEntitlementService);
             const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
             if (newUser || signedOut) {
-                addSeparator(undefined);
-                this.element.appendChild($('div.description', undefined, newUser ? ( localize(4862, "Set up Copilot to use AI features.")) : ( localize(4863, "Sign in to use Copilot AI features."))));
+                addSeparator();
+                this.element.appendChild($('div.description', undefined, newUser ? ( localize(4925, "Set up Copilot to use AI features.")) : ( localize(4926, "Sign in to use Copilot AI features."))));
                 const button = disposables.add(( new Button(this.element, { ...defaultButtonStyles })));
-                button.label = newUser ? ( localize(4864, "Set up Copilot")) : ( localize(4865, "Sign in to use Copilot"));
+                button.label = newUser ? ( localize(4927, "Set up Copilot")) : ( localize(4928, "Sign in to use Copilot"));
                 disposables.add(button.onDidClick(() => this.runCommandAndClose(newUser ? 'workbench.action.chat.triggerSetup' : () => this.chatEntitlementService.requests?.value.signIn())));
             }
         }
         return this.element;
     }
+    renderHeader(container, disposables, label, action) {
+        const header = container.appendChild($('div.header', undefined, label ?? ''));
+        if (action) {
+            const toolbar = disposables.add(( new ActionBar(header, { hoverDelegate: nativeHoverDelegate })));
+            toolbar.push([action], { icon: true, label: false });
+        }
+    }
     renderContributedChatStatusItem(item) {
         const disposables = ( new DisposableStore());
-        const entryEl = $('div.contribution');
-        entryEl.appendChild($('div.header', undefined, item.label));
-        const bodyEl = entryEl.appendChild($('div.body'));
-        const descriptionEl = bodyEl.appendChild($('span.description'));
-        this.renderTextPlus(descriptionEl, item.description, disposables);
+        const itemElement = $('div.contribution');
+        const headerLabel = typeof item.label === 'string' ? item.label : item.label.label;
+        const headerLink = typeof item.label === 'string' ? undefined : item.label.link;
+        this.renderHeader(itemElement, disposables, headerLabel, headerLink ? toAction({
+            id: 'workbench.action.openChatStatusItemLink',
+            label: ( localize(4929, "Learn More")),
+            tooltip: ( localize(4929, "Learn More")),
+            class: ThemeIcon.asClassName(Codicon.linkExternal),
+            run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(headerLink)))),
+        }) : undefined);
+        const itemBody = itemElement.appendChild($('div.body'));
+        const description = itemBody.appendChild($('span.description'));
+        this.renderTextPlus(description, item.description, disposables);
         if (item.detail) {
-            const itemElement = bodyEl.appendChild($('div.detail-item'));
-            this.renderTextPlus(itemElement, item.detail, disposables);
+            const detail = itemBody.appendChild($('div.detail-item'));
+            this.renderTextPlus(detail, item.detail, disposables);
         }
-        return { element: entryEl, disposables };
+        return { element: itemElement, disposables };
     }
     renderTextPlus(target, text, store) {
         for (const node of parseLinkedText(text).nodes) {
@@ -348,29 +394,57 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         this.hoverService.hideHover(true);
     }
-    createQuotaIndicator(container, total, remaining, label) {
-        const quotaText = $('span');
+    createQuotaIndicator(container, disposables, quota, label, supportsOverage) {
+        const quotaValue = $('span.quota-value');
         const quotaBit = $('div.quota-bit');
-        const quotaIndicator = container.appendChild($('div.quota-indicator', undefined, $('div.quota-label', undefined, $('span', undefined, label), quotaText), $('div.quota-bar', undefined, quotaBit)));
-        const update = (total, remaining) => {
+        const overageLabel = $('span.overage-label');
+        const quotaIndicator = container.appendChild($('div.quota-indicator', undefined, $('div.quota-label', undefined, $('span', undefined, label), quotaValue), $('div.quota-bar', undefined, quotaBit), $('div.description', undefined, overageLabel)));
+        if (supportsOverage && (this.chatEntitlementService.entitlement === ChatEntitlement.Pro || this.chatEntitlementService.entitlement === ChatEntitlement.ProPlus)) {
+            const manageOverageButton = disposables.add(( new Button(quotaIndicator, { ...defaultButtonStyles, secondary: true })));
+            manageOverageButton.label = ( localize(4930, "Manage paid premium requests"));
+            disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))))));
+        }
+        const update = (quota) => {
             quotaIndicator.classList.remove('error');
             quotaIndicator.classList.remove('warning');
-            if (typeof total === 'number' && typeof remaining === 'number') {
-                let usedPercentage = Math.round(((total - remaining) / total) * 100);
-                if (total !== remaining && usedPercentage === 0) {
-                    usedPercentage = 1;
-                }
-                quotaText.textContent = ( localize(4866, "{0}%", usedPercentage));
-                quotaBit.style.width = `${usedPercentage}%`;
-                if (usedPercentage >= 90) {
-                    quotaIndicator.classList.add('error');
+            let usedPercentage;
+            if (quota.unlimited) {
+                usedPercentage = 0;
+            }
+            else {
+                usedPercentage = Math.max(0, 100 - quota.percentRemaining);
+            }
+            const quotaPercentageFormatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 1, minimumFractionDigits: 0 });
+            const overageFormatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 0 });
+            if (quota.unlimited) {
+                quotaValue.textContent = ( localize(4931, "Included"));
+            }
+            else if (quota.overageCount) {
+                quotaValue.textContent = ( localize(4932, "+{0} requests", overageFormatter.format(quota.overageCount)));
+            }
+            else {
+                quotaValue.textContent = ( localize(4933, "{0}%", quotaPercentageFormatter.format(usedPercentage)));
+            }
+            quotaBit.style.width = `${usedPercentage}%`;
+            if (usedPercentage >= 90) {
+                quotaIndicator.classList.add('error');
+            }
+            else if (usedPercentage >= 75) {
+                quotaIndicator.classList.add('warning');
+            }
+            if (supportsOverage) {
+                if (quota.overageEnabled) {
+                    overageLabel.textContent = ( localize(4934, "Additional paid premium requests enabled."));
                 }
-                else if (usedPercentage >= 75) {
-                    quotaIndicator.classList.add('warning');
+                else {
+                    overageLabel.textContent = ( localize(4935, "Additional paid premium requests disabled."));
                 }
             }
+            else {
+                overageLabel.textContent = '';
+            }
         };
-        update(total, remaining);
+        update(quota);
         return update;
     }
     createSettings(container, disposables) {
@@ -378,11 +452,11 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const settings = container.appendChild($('div.settings'));
         {
             const globalSetting = append(settings, $('div.setting'));
-            this.createCodeCompletionsSetting(globalSetting, ( localize(4867, "Code Completions (all files)")), '*', disposables);
+            this.createCodeCompletionsSetting(globalSetting, ( localize(4936, "Code Completions (all files)")), '*', disposables);
             if (modeId) {
                 const languageSetting = append(settings, $('div.setting'));
                 this.createCodeCompletionsSetting(languageSetting, ( localize(
-                    4868,
+                    4937,
                     "Code Completions ({0})",
                     this.languageService.getLanguageName(modeId) ?? modeId
                 )), modeId, disposables);
@@ -390,11 +464,11 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         {
             const setting = append(settings, $('div.setting'));
-            this.createNextEditSuggestionsSetting(setting, ( localize(4869, "Next Edit Suggestions")), modeId, this.getCompletionsSettingAccessor(modeId), disposables);
+            this.createNextEditSuggestionsSetting(setting, ( localize(4938, "Next Edit Suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
         }
         return settings;
     }
-    createSetting(container, settingId, label, accessor, disposables) {
+    createSetting(container, settingIdsToReEvaluate, label, accessor, disposables) {
         const checkbox = disposables.add(( new Checkbox(label, Boolean(accessor.readSetting()), defaultCheckboxStyles)));
         container.appendChild(checkbox.domNode);
         const settingLabel = append(container, $('span.setting-label', undefined, label));
@@ -413,24 +487,30 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             accessor.writeSetting(checkbox.checked);
         }));
         disposables.add(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(settingId)) {
+            if (( settingIdsToReEvaluate.some(id => e.affectsConfiguration(id)))) {
                 checkbox.checked = Boolean(accessor.readSetting());
             }
         }));
         if (!canUseCopilot(this.chatEntitlementService)) {
             container.classList.add('disabled');
             checkbox.disable();
+            checkbox.checked = false;
         }
         return checkbox;
     }
     createCodeCompletionsSetting(container, label, modeId, disposables) {
-        this.createSetting(container, defaultChat.completionsEnablementSetting, label, this.getCompletionsSettingAccessor(modeId), disposables);
+        this.createSetting(container, [defaultChat.completionsEnablementSetting], label, this.getCompletionsSettingAccessor(modeId), disposables);
     }
     getCompletionsSettingAccessor(modeId = '*') {
         const settingId = defaultChat.completionsEnablementSetting;
         return {
             readSetting: () => isCompletionsEnabled(this.configurationService, modeId),
             writeSetting: (value) => {
+                this.telemetryService.publicLog2('chatStatus.settingChanged', {
+                    settingIdentifier: settingId,
+                    settingMode: modeId,
+                    settingEnablement: value ? 'enabled' : 'disabled'
+                });
                 let result = this.configurationService.getValue(settingId);
                 if (!isObject(result)) {
                     result = Object.create(null);
@@ -439,13 +519,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
         };
     }
-    createNextEditSuggestionsSetting(container, label, modeId, completionsSettingAccessor, disposables) {
+    createNextEditSuggestionsSetting(container, label, completionsSettingAccessor, disposables) {
         const nesSettingId = defaultChat.nextEditSuggestionsSetting;
         const completionsSettingId = defaultChat.completionsEnablementSetting;
         const resource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
-        const checkbox = this.createSetting(container, nesSettingId, label, {
-            readSetting: () => this.textResourceConfigurationService.getValue(resource, nesSettingId),
-            writeSetting: (value) => this.textResourceConfigurationService.updateValue(resource, nesSettingId, value)
+        const checkbox = this.createSetting(container, [nesSettingId, completionsSettingId], label, {
+            readSetting: () => completionsSettingAccessor.readSetting() && this.textResourceConfigurationService.getValue(resource, nesSettingId),
+            writeSetting: (value) => {
+                this.telemetryService.publicLog2('chatStatus.settingChanged', {
+                    settingIdentifier: nesSettingId,
+                    settingEnablement: value ? 'enabled' : 'disabled'
+                });
+                return this.textResourceConfigurationService.updateValue(resource, nesSettingId, value);
+            }
         }, disposables);
         if (!completionsSettingAccessor.readSetting()) {
             container.classList.add('disabled');

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatusItemService.d.ts

@@ -4,7 +4,10 @@ export interface IChatStatusItemChangeEvent {
 }
 export type ChatStatusEntry = {
     id: string;
-    label: string;
+    label: string | {
+        label: string;
+        link: string;
+    };
     description: string;
     detail: string | undefined;
 };

package/vscode/src/vs/workbench/contrib/chat/browser/chatVariables.d.ts

@@ -1,20 +1,11 @@
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IDynamicVariable } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables";
 import { IChatVariablesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service";
-import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { IToolData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatVariablesService implements IChatVariablesService {
     private readonly chatWidgetService;
-    private readonly viewsService;
-    private readonly configurationService;
     _serviceBrand: undefined;
-    constructor(chatWidgetService: IChatWidgetService, viewsService: IViewsService, configurationService: IConfigurationService);
-    resolveVariables(prompt: IParsedChatRequest, attachedContextVariables: IChatRequestVariableEntry[] | undefined): IChatRequestVariableData;
+    constructor(chatWidgetService: IChatWidgetService);
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
-    attachContext(name: string, value: string | URI | Location, location: ChatAgentLocation): Promise<void>;
+    getSelectedTools(sessionId: string): ReadonlyArray<IToolData>;
 }