@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.0

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

@@ -56,6 +56,9 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
     static {
         this.QUICK_SETTINGS_COLLAPSED_KEY = "chatStatusDashboard.quickSettingsCollapsed";
     }
+    static {
+        this.HIDDEN_ENTRY_IDS = ( new Set(["copilot.otelStatus"]));
+    }
     constructor(
         options,
         chatEntitlementService,
@@ -121,19 +124,20 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         } = this.chatEntitlementService.quotas;
         const hasQuotas = !!(chat || premiumChat);
         const isAnonymousWithSentiment = this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.completed;
-        const isPooledQuotaDepleted = premiumChat?.unlimited && premiumChat.hasQuota === false && !(this.chatEntitlementService.quotas.additionalUsageEnabled ?? false);
+        const isPooledQuotaDepleted = premiumChat?.unlimited && premiumChat.hasQuota === false;
         const hasUsageSection = hasQuotas || isAnonymousWithSentiment;
         const hasVisibleUsageContent = chat?.unlimited === false || premiumChat?.unlimited === false || (!this.options?.compactQuotaLayout && completions?.unlimited === false) || isAnonymousWithSentiment || isPooledQuotaDepleted;
-        const contributedEntries = [...this.chatStatusItemService.getEntries()];
+        const contributedEntries = [...this.chatStatusItemService.getEntries()].filter(entry => !( ChatStatusDashboard_1.HIDDEN_ENTRY_IDS.has(entry.id)));
         const hasQuickSettingsContent = !this.options?.disableInlineSuggestionsSettings || !this.options?.disableModelSelection || !this.options?.disableProviderOptions || !this.options?.disableCompletionsSnooze;
         let headerAdditionalSpendButton;
+        let headerUpgradeButton;
         if (hasUsageSection && !this.options?.compactQuotaLayout) {
             const planName = getChatPlanName(this.chatEntitlementService.entitlement);
             const headerHost = this.options?.titleHeaderContainer ?? this.element;
             const header = this.renderHeader(headerHost, this._store, planName, toAction({
                 id: "workbench.action.manageCopilot",
-                label: ( localize(6688, "Manage Copilot Settings")),
-                tooltip: ( localize(6689, "Manage Copilot Settings")),
+                label: ( localize(6804, "Manage Copilot Settings")),
+                tooltip: ( localize(6805, "Manage Copilot Settings")),
                 class: ThemeIcon.asClassName(Codicon.settings),
                 run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(this.defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings)))))
             }));
@@ -147,7 +151,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                     secondary: true
                 })));
                 headerAdditionalSpendButton.element.classList.add("header-cta-button");
-                headerAdditionalSpendButton.label = ( localize(6690, "Manage Budget"));
+                headerAdditionalSpendButton.label = ( localize(6806, "Manage Budget"));
                 this._store.add(headerAdditionalSpendButton.onDidClick(() => {
                     this.telemetryService.publicLog2("workbenchActionExecuted", {
                         id: "workbench.action.chat.manageAdditionalSpend",
@@ -159,18 +163,18 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                     header.insertBefore(headerAdditionalSpendButton.element, actionBarElement);
                 }
             }
-            if (showUpgrade && !canConfigureAdditionalSpend) {
-                const upgradeButton = this._store.add(( new Button(header, {
+            if (showUpgrade) {
+                headerUpgradeButton = this._store.add(( new Button(header, {
                     ...defaultButtonStyles,
                     hoverDelegate: nativeHoverDelegate
                 })));
-                upgradeButton.element.classList.add("header-cta-button");
-                upgradeButton.label = ( localize(6691, "Upgrade"));
+                headerUpgradeButton.element.classList.add("header-cta-button");
+                headerUpgradeButton.label = ( localize(6807, "Upgrade"));
                 this._store.add(
-                    upgradeButton.onDidClick(() => this.runCommandAndClose("workbench.action.chat.upgradePlan"))
+                    headerUpgradeButton.onDidClick(() => this.runCommandAndClose("workbench.action.chat.upgradePlan"))
                 );
                 if (actionBarElement) {
-                    header.insertBefore(upgradeButton.element, actionBarElement);
+                    header.insertBefore(headerUpgradeButton.element, actionBarElement);
                 }
             }
         }
@@ -184,7 +188,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                     hoverDelegate: nativeHoverDelegate,
                     secondary: true
                 })));
-                headerAdditionalSpendButton.label = ( localize(6690, "Manage Budget"));
+                headerAdditionalSpendButton.label = ( localize(6806, "Manage Budget"));
                 this._store.add(headerAdditionalSpendButton.onDidClick(() => {
                     this.telemetryService.publicLog2("workbenchActionExecuted", {
                         id: "workbench.action.chat.manageAdditionalSpend",
@@ -193,14 +197,14 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                     this.runCommandAndClose(() => this.openerService.open(( URI.parse(this.defaultAccountService.resolveGitHubUrl(GitHubPaths.billingBudgets)))));
                 }));
             }
-            if (showUpgrade && !canConfigureAdditionalSpend) {
-                const upgradeButton = this._store.add(( new Button(ctaContainer, {
+            if (showUpgrade) {
+                headerUpgradeButton = this._store.add(( new Button(ctaContainer, {
                     ...defaultButtonStyles,
                     hoverDelegate: nativeHoverDelegate
                 })));
-                upgradeButton.label = ( localize(6691, "Upgrade"));
+                headerUpgradeButton.label = ( localize(6807, "Upgrade"));
                 this._store.add(
-                    upgradeButton.onDidClick(() => this.runCommandAndClose("workbench.action.chat.upgradePlan"))
+                    headerUpgradeButton.onDidClick(() => this.runCommandAndClose("workbench.action.chat.upgradePlan"))
                 );
             }
         }
@@ -209,20 +213,26 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         const updatePromise = this.chatEntitlementService.update(token);
         if (hasVisibleUsageContent) {
-            this.renderUsageContent(this.element, token, headerAdditionalSpendButton, updatePromise);
+            this.renderUsageContent(
+                this.element,
+                token,
+                headerAdditionalSpendButton,
+                headerUpgradeButton,
+                updatePromise
+            );
         }
         const hasPremiumUnlimited = !!premiumChat?.unlimited;
         if (hasPremiumUnlimited) {
-            const includedTitle = this.chatEntitlementService.quotas.usageBasedBilling ? ( localize(6692, "Credits")) : ( localize(6693, "Premium Requests"));
+            const includedTitle = this.chatEntitlementService.quotas.usageBasedBilling ? ( localize(6808, "Credits")) : ( localize(6809, "Premium Requests"));
             const includedContainer = this.element.appendChild($("div.quota-indicator.included"));
             if (this.options?.compactQuotaLayout) {
                 const planName = getChatPlanName(this.chatEntitlementService.entitlement);
                 includedContainer.classList.add("compact");
                 includedContainer.appendChild($("div.quota-title", undefined, planName));
-                includedContainer.appendChild($("div.description", undefined, isPooledQuotaDepleted ? ( localize(6694, "{0} limit reached.", includedTitle)) : ( localize(6695, "{0} included with your organization's plan.", includedTitle))));
+                includedContainer.appendChild($("div.description", undefined, isPooledQuotaDepleted ? ( localize(6810, "{0} limit reached.", includedTitle)) : ( localize(6811, "{0} included with your organization's plan.", includedTitle))));
             } else {
                 includedContainer.appendChild($("div.quota-title", undefined, includedTitle));
-                includedContainer.appendChild($("div.description", undefined, isPooledQuotaDepleted ? ( localize(6696, "Organization limit reached.")) : ( localize(6697, "Included with your organization's plan."))));
+                includedContainer.appendChild($("div.description", undefined, isPooledQuotaDepleted ? ( localize(6812, "Organization limit reached.")) : ( localize(6813, "Included with your organization's plan."))));
             }
         }
         if (hasQuickSettingsContent) {
@@ -234,7 +244,13 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         this.renderSetupSection();
     }
-    renderUsageContent(container, token, headerAdditionalSpendButton, updatePromise) {
+    renderUsageContent(
+        container,
+        token,
+        headerAdditionalSpendButton,
+        headerUpgradeButton,
+        updatePromise
+    ) {
         const {
             chat: chatQuota,
             completions: completionsQuota,
@@ -246,12 +262,12 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         const planName = compact ? getChatPlanName(this.chatEntitlementService.entitlement) : undefined;
         if (chatQuota || premiumChatQuota || completionsQuota) {
             const resetLabel = resetDate ? (resetDateHasTime ? ( localize(
-                6698,
+                6814,
                 "Resets {0} at {1}",
                 this.dateFormatter.value.format(( new Date(resetDate))),
                 this.timeFormatter.value.format(( new Date(resetDate)))
             )) : ( localize(
-                6699,
+                6815,
                 "Resets {0}",
                 this.dateFormatter.value.format(( new Date(resetDate)))
             ))) : undefined;
@@ -262,9 +278,12 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             if (headerAdditionalSpendButton) {
                 headerAdditionalSpendButton.element.style.display = initialCalloutVisible ? "" : "none";
             }
+            if (headerUpgradeButton) {
+                headerUpgradeButton.element.style.display = (headerAdditionalSpendButton && initialCalloutVisible) ? "none" : "";
+            }
             let chatQuotaIndicator;
             if (chatQuota && !chatQuota.unlimited && (!this.chatEntitlementService.quotas.usageBasedBilling || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
-                const chatLabel = this.chatEntitlementService.quotas.usageBasedBilling && this.chatEntitlementService.entitlement === ChatEntitlement.Free ? ( localize(6700, "Credits")) : ( localize(6701, "Chat messages"));
+                const chatLabel = this.chatEntitlementService.quotas.usageBasedBilling && this.chatEntitlementService.entitlement === ChatEntitlement.Free ? ( localize(6816, "Credits")) : ( localize(6817, "Chat messages"));
                 chatQuotaIndicator = this.createQuotaIndicator(
                     container,
                     chatQuota,
@@ -276,7 +295,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             let premiumChatQuotaIndicator;
             if (premiumChatQuota && !premiumChatQuota.unlimited && premiumChatQuota.percentRemaining >= 0) {
                 const isUBB = this.chatEntitlementService.quotas.usageBasedBilling;
-                const premiumChatLabel = isUBB ? ( localize(6700, "Credits")) : this.chatEntitlementService.quotas.additionalUsageEnabled ? ( localize(6702, "Included premium requests")) : ( localize(6703, "Premium requests"));
+                const premiumChatLabel = isUBB ? ( localize(6816, "Credits")) : this.chatEntitlementService.quotas.additionalUsageEnabled ? ( localize(6818, "Included premium requests")) : ( localize(6819, "Premium requests"));
                 const premiumChatResetLabel = isUBB ? this.formatResetAtLabel(premiumChatQuota.resetAt) ?? resetLabel : resetLabel;
                 premiumChatQuotaIndicator = this.createQuotaIndicator(
                     container,
@@ -289,7 +308,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             let completionsQuotaIndicator;
             const showCompletions = !compact && completionsQuota && !completionsQuota.unlimited && completionsQuota.percentRemaining >= 0 && (!this.chatEntitlementService.quotas.usageBasedBilling || this.chatEntitlementService.entitlement === ChatEntitlement.Free);
             if (showCompletions) {
-                completionsQuotaIndicator = this.createQuotaIndicator(container, completionsQuota, ( localize(6704, "Inline Suggestions")), resetLabel, compact ? planName : undefined);
+                completionsQuotaIndicator = this.createQuotaIndicator(container, completionsQuota, ( localize(6820, "Inline Suggestions")), resetLabel, compact ? planName : undefined);
             }
             const updateIndicators = () => {
                 const {
@@ -311,7 +330,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 } = globalCalloutUpdater();
                 if (headerAdditionalSpendButton) {
                     headerAdditionalSpendButton.element.style.display = calloutVisible ? "" : "none";
-                    headerAdditionalSpendButton.label = ( localize(6690, "Manage Budget"));
+                    headerAdditionalSpendButton.label = ( localize(6806, "Manage Budget"));
+                }
+                if (headerUpgradeButton) {
+                    headerUpgradeButton.element.style.display = (headerAdditionalSpendButton && calloutVisible) ? "none" : "";
                 }
             };
             (async () => {
@@ -329,7 +351,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             );
         }
         else if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.completed) {
-            this.createQuotaIndicator(container, ( localize(6705, "Limited")), ( localize(6701, "Chat messages")));
+            this.createQuotaIndicator(container, ( localize(6821, "Limited")), ( localize(6817, "Chat messages")));
         }
     }
     renderInlineSuggestionsSection(hasContentAbove) {
@@ -342,10 +364,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         const activeLanguageId = this.editorService.activeTextEditorLanguageId;
         const getStatusText = () => {
             if (!this.canUseChat()) {
-                return localize(6706, "Disabled");
+                return localize(6822, "Disabled");
             }
             const enabled = activeLanguageId ? isCompletionsEnabled(this.configurationService, activeLanguageId) : isCompletionsEnabled(this.configurationService);
-            return enabled ? ( localize(6707, "Enabled")) : ( localize(6706, "Disabled"));
+            return enabled ? ( localize(6823, "Enabled")) : ( localize(6822, "Disabled"));
         };
         let disclosureHeader;
         let chevron;
@@ -356,7 +378,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 disclosureHeader.classList.add("no-border");
             }
             disclosureHeader.setAttribute("aria-expanded", String(!collapsed));
-            disclosureHeader.appendChild($("span.collapsible-label", undefined, ( localize(6708, "Inline Suggestions"))));
+            disclosureHeader.appendChild($("span.collapsible-label", undefined, ( localize(6824, "Inline Suggestions"))));
             chevron = disclosureHeader.appendChild($("span.collapsible-chevron"));
             chevron.classList.add(
                 ...ThemeIcon.asClassNameArray(collapsed ? Codicon.chevronRight : Codicon.chevronDown)
@@ -418,7 +440,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                         if (linkDescription) {
                             hoverContent.appendText(" ");
                         }
-                        hoverContent.appendMarkdown(`[${( localize(6709, "Learn More"))}](${headerLink})`);
+                        hoverContent.appendMarkdown(`[${( localize(6825, "Learn More"))}](${headerLink})`);
                     }
                     return {
                         content: hoverContent
@@ -428,7 +450,13 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 }));
             }
             const statusEl = header.appendChild($("span.collapsible-status"));
-            statusEl.append(...renderLabelWithIcons(item.description));
+            const statusDisposables = this._store.add(( new MutableDisposable()));
+            const renderStatus = text => {
+                const newStore = ( new DisposableStore());
+                statusDisposables.value = newStore;
+                this.renderTextPlus(statusEl, text, newStore);
+            };
+            renderStatus(item.description);
             let currentTooltip = item.tooltip;
             if (currentTooltip) {
                 this._store.add(this.hoverService.setupDelayedHover(statusEl, () => ({
@@ -448,7 +476,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             this._store.add(this.chatStatusItemService.onDidChange(e => {
                 if (e.entry.id === item.id) {
                     statusEl.textContent = "";
-                    statusEl.append(...renderLabelWithIcons(e.entry.description));
+                    renderStatus(e.entry.description);
                     currentTooltip = e.entry.tooltip;
                     headerLink = typeof e.entry.label === "string" ? undefined : e.entry.label.link;
                     linkDescription = typeof e.entry.label === "string" ? undefined : e.entry.label.helpText;
@@ -475,7 +503,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         const newUser = isNewUser(this.chatEntitlementService) && !hasByokModels;
         const anonymousUser = this.chatEntitlementService.anonymous;
         const disabled = this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted;
-        const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown && !hasByokModels;
+        const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
         if (!(newUser || signedOut || disabled)) {
             return;
         }
@@ -484,7 +512,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         let descriptionClass = ".description";
         if (newUser && anonymousUser) {
             descriptionText = ( new MarkdownString(( localize(
-                6710,
+                6826,
                 "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                 defaultChat.provider.default.name,
                 defaultChat.provider.default.name,
@@ -495,23 +523,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             }));
             descriptionClass = `${descriptionClass}.terms`;
         } else if (newUser) {
-            descriptionText = ( localize(6711, "Set up Copilot to use AI features."));
+            descriptionText = ( localize(6827, "Set up Copilot to use AI features."));
         } else if (anonymousUser) {
-            descriptionText = ( localize(6712, "Sign in to enable more Copilot AI features."));
+            descriptionText = ( localize(6828, "Sign in to enable more Copilot AI features."));
         } else if (disabled) {
-            descriptionText = ( localize(6713, "Enable Copilot to use AI features."));
+            descriptionText = ( localize(6829, "Enable Copilot to use AI features."));
         } else {
-            descriptionText = ( localize(6714, "Sign in to use Copilot AI features."));
+            descriptionText = ( localize(6830, "Sign in to use GitHub Copilot AI features."));
         }
         let buttonLabel;
         if (newUser) {
-            buttonLabel = ( localize(6715, "Use AI Features"));
+            buttonLabel = ( localize(6831, "Use AI Features"));
         } else if (anonymousUser) {
-            buttonLabel = ( localize(6716, "Enable more AI Features"));
+            buttonLabel = ( localize(6832, "Enable more AI Features"));
         } else if (disabled) {
-            buttonLabel = ( localize(6717, "Enable AI Features"));
+            buttonLabel = ( localize(6833, "Enable AI Features"));
         } else {
-            buttonLabel = ( localize(6718, "Sign in to use AI Features"));
+            buttonLabel = ( localize(6834, "Sign in to use GitHub Copilot"));
         }
         let commandId;
         if (newUser && anonymousUser) {
@@ -547,7 +575,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 const currentModel = modelInfo.models.find(m => m.id === modelInfo.currentModelId);
                 if (currentModel) {
                     const modelContainer = container.appendChild($("div.model-selection"));
-                    modelContainer.appendChild($("span.model-text", undefined, ( localize(6719, "Model"))));
+                    modelContainer.appendChild($("span.model-text", undefined, ( localize(6835, "Model"))));
                     const selectOptions = ( modelInfo.models.map(m => ({
                         text: m.name
                     })));
@@ -558,7 +586,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                         this.contextViewService,
                         defaultSelectBoxStyles,
                         {
-                            ariaLabel: ( localize(6720, "Select Model")),
+                            ariaLabel: ( localize(6836, "Select Model")),
                             optionsAsChildren: true
                         }
                     )));
@@ -591,7 +619,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                                 this.contextViewService,
                                 defaultSelectBoxStyles,
                                 {
-                                    ariaLabel: ( localize(6721, "Select {0}", option.label)),
+                                    ariaLabel: ( localize(6837, "Select {0}", option.label)),
                                     optionsAsChildren: true
                                 }
                             )));
@@ -610,7 +638,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         if (!this.options?.disableCompletionsSnooze && this.canUseChat()) {
             const snooze = append(container, $("div.snooze-completions"));
-            this.createCompletionsSnooze(snooze, ( localize(6722, "Snooze")));
+            this.createCompletionsSnooze(snooze, ( localize(6838, "Snooze")));
         }
     }
     canUseChat() {
@@ -667,7 +695,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         const resetDate = ( new Date(resetAt * 1000));
         return localize(
-            6698,
+            6814,
             "Resets {0} at {1}",
             this.dateFormatter.value.format(resetDate),
             this.timeFormatter.value.format(resetDate)
@@ -685,13 +713,17 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         const quotaPercentage = $("div.quota-percentage", undefined, quotaValue, quotaValueSuffix);
         quotaPercentage.tabIndex = isCompact ? -1 : 0;
-        const indicatorElement = $(
-            "div.quota-indicator",
+        const indicatorElement = $("div.quota-indicator", undefined, $(
+            "div.quota-title",
             undefined,
-            $("div.quota-title", undefined, isCompact ? compactTitle : label),
-            $("div.quota-details", undefined, quotaPercentage, resetValue),
-            ...(isCompact ? [] : [$("div.quota-bar", undefined, quotaBit)])
-        );
+            $("span", undefined, isCompact ? compactTitle : label),
+            ...(isCompact ? [] : [resetValue])
+        ), $(
+            "div.quota-details",
+            undefined,
+            quotaPercentage,
+            ...(isCompact ? [resetValue] : [])
+        ), ...(isCompact ? [] : [$("div.quota-bar", undefined, quotaBit)]));
         if (isCompact) {
             indicatorElement.classList.add("compact");
         }
@@ -705,21 +737,21 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             } else {
                 const usedPercentage = Math.max(0, 100 - currentQuota.percentRemaining);
                 quotaValueText.textContent = ( localize(
-                    6723,
+                    6839,
                     "{0}%",
                     this.quotaPercentageFormatter.value.format(Math.floor(usedPercentage))
                 ));
-                quotaValueSuffix.textContent = isCompact ? ( localize(6724, "{0} used", label)) : ` ${( localize(6725, "used"))}`;
+                quotaValueSuffix.textContent = isCompact ? ( localize(6840, "{0} used", label)) : ` ${( localize(6841, "used"))}`;
             }
         };
         const showCredits = () => {
             if (typeof currentQuota !== "string" && currentQuota.entitlement) {
                 const total = currentQuota.entitlement;
-                const used = total * (100 - currentQuota.percentRemaining) / 100;
+                const used = currentQuota.quotaRemaining !== undefined ? total - currentQuota.quotaRemaining : total * (100 - currentQuota.percentRemaining) / 100;
                 const usedFormatted = this.quotaCreditsFormatter.value.format(used);
                 const totalFormatted = this.quotaCreditsFormatter.value.format(total);
-                quotaValueText.textContent = ( localize(6726, "{0} / {1}", usedFormatted, totalFormatted));
-                quotaValueSuffix.textContent = isCompact ? ( localize(6724, "{0} used", label)) : ` ${( localize(6725, "used"))}`;
+                quotaValueText.textContent = ( localize(6842, "{0} / {1}", usedFormatted, totalFormatted));
+                quotaValueSuffix.textContent = isCompact ? ( localize(6840, "{0} used", label)) : ` ${( localize(6841, "used"))}`;
             }
         };
         const hoverTarget = isCompact ? quotaValueText : quotaPercentage;
@@ -779,38 +811,52 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             }
             const maxUsedPercentage = allQuotas.length > 0 ? Math.max(...( allQuotas.map(q => Math.max(0, 100 - q.percentRemaining)))) : 0;
             const isPooledQuotaExhausted = quotas.premiumChat?.unlimited && quotas.premiumChat.hasQuota === false;
-            if (maxUsedPercentage >= 100 && additionalUsageEnabled) {
+            if (isEnterpriseUser && isPooledQuotaExhausted) {
                 quotaCallout.style.display = "";
                 quotaCallout.className = "quota-callout info";
                 calloutIcon.className = `callout-icon ${ThemeIcon.asClassName(Codicon.info)}`;
-                calloutText.textContent = isUsageBasedBilling ? ( localize(
-                    6727,
+                calloutText.textContent = ( localize(
+                    6843,
+                    "Your organization or enterprise has exceeded its Copilot budget. Contact your admin to resume usage."
+                ));
+            } else if (maxUsedPercentage >= 100 && additionalUsageEnabled) {
+                quotaCallout.style.display = "";
+                quotaCallout.className = "quota-callout info";
+                calloutIcon.className = `callout-icon ${ThemeIcon.asClassName(Codicon.info)}`;
+                calloutText.textContent = isEnterpriseUser ? ( localize(
+                    6844,
+                    "You've used your included credits. Your organization covers additional usage, so you can keep working."
+                )) : isUsageBasedBilling ? ( localize(
+                    6845,
                     "Additional budget is configured. Usage will continue until limits reset."
                 )) : ( localize(
-                    6728,
+                    6846,
                     "Premium request budget is configured. Usage will continue until limits reset."
                 ));
             } else if (maxUsedPercentage >= 75 && maxUsedPercentage < 100 && additionalUsageEnabled) {
                 quotaCallout.style.display = "";
                 quotaCallout.className = "quota-callout info";
                 calloutIcon.className = `callout-icon ${ThemeIcon.asClassName(Codicon.info)}`;
-                calloutText.textContent = isUsageBasedBilling ? ( localize(6729, "Once the limit is reached, additional budget will be used.")) : ( localize(6730, "Once the limit is reached, premium request budget will be used."));
+                calloutText.textContent = isEnterpriseUser ? ( localize(
+                    6847,
+                    "You're approaching your included credits. Your organization covers additional usage, so there's no interruption."
+                )) : isUsageBasedBilling ? ( localize(6848, "Once the limit is reached, additional budget will be used.")) : ( localize(6849, "Once the limit is reached, premium request budget will be used."));
             } else if ((maxUsedPercentage >= 100 || isPooledQuotaExhausted) && !additionalUsageEnabled) {
                 quotaCallout.style.display = "";
                 quotaCallout.className = "quota-callout info";
                 calloutIcon.className = `callout-icon ${ThemeIcon.asClassName(Codicon.info)}`;
                 calloutText.textContent = isEnterpriseUser ? ( localize(
-                    6731,
+                    6850,
                     "Copilot is paused until the limit resets. Contact your administrator for more information."
-                )) : ( localize(6732, "Copilot is paused until the limit resets."));
+                )) : ( localize(6851, "Copilot is paused until the limit resets."));
             } else if (maxUsedPercentage >= 75 && !additionalUsageEnabled) {
                 quotaCallout.style.display = "";
                 quotaCallout.className = "quota-callout info";
                 calloutIcon.className = `callout-icon ${ThemeIcon.asClassName(Codicon.info)}`;
                 calloutText.textContent = isEnterpriseUser ? ( localize(
-                    6733,
+                    6852,
                     "Copilot will pause when the limit is reached. Contact your administrator for more information."
-                )) : ( localize(6734, "Copilot will pause when the limit is reached."));
+                )) : ( localize(6853, "Copilot will pause when the limit is reached."));
             } else {
                 quotaCallout.style.display = "none";
             }
@@ -827,23 +873,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         const settings = container.appendChild($("div.settings"));
         {
             const globalSetting = append(settings, $("div.setting"));
-            this.createInlineSuggestionsSetting(globalSetting, ( localize(6735, "Ghost text suggestions")), "*");
+            this.createInlineSuggestionsSetting(globalSetting, ( localize(6854, "Ghost text suggestions")), "*");
             const overriddenHint = globalSetting.appendChild($("span.setting-overridden"));
             const updateOverriddenHint = () => {
                 const obj = this.configurationService.getValue(defaultChat.completionsEnablementSetting);
                 const hasOverride = modeId && isObject(obj) && typeof obj[modeId] !== "undefined" && Boolean(obj[modeId]) !== Boolean(obj["*"]);
-                overriddenHint.textContent = hasOverride ? ( localize(6736, "(overridden)")) : "";
+                overriddenHint.textContent = hasOverride ? ( localize(6855, "(overridden)")) : "";
             };
             updateOverriddenHint();
             if (modeId) {
                 const languageSetting = append(settings, $("div.setting"));
                 const languageName = this.languageService.getLanguageName(modeId) ?? modeId;
-                this.createTriStateLanguageSetting(languageSetting, ( localize(6737, "Ghost text suggestions for {0}", languageName)), modeId, updateOverriddenHint);
+                this.createTriStateLanguageSetting(languageSetting, ( localize(6856, "Ghost text suggestions for {0}", languageName)), modeId, updateOverriddenHint);
             }
         }
         {
             const setting = append(settings, $("div.setting"));
-            this.createNextEditSuggestionsSetting(setting, ( localize(6738, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId));
+            this.createNextEditSuggestionsSetting(setting, ( localize(6857, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId));
         }
     }
     createSetting(container, settingIdsToReEvaluate, label, accessor) {
@@ -1045,7 +1091,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         })));
         const cancelAction = toAction({
             id: "workbench.action.cancelSnoozeStatusBarLink",
-            label: ( localize(6739, "Cancel Snooze")),
+            label: ( localize(6858, "Cancel Snooze")),
             run: () => this.inlineCompletionsService.cancelSnooze(),
             class: ThemeIcon.asClassName(Codicon.stopCircle)
         });
@@ -1054,19 +1100,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             toolbar.clear();
             const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
             if (!isEnabled || timeLeftMs <= 0) {
-                timerDisplay.textContent = ( localize(6740, "Hide suggestions for 5 min"));
+                timerDisplay.textContent = ( localize(6859, "Hide suggestions for 5 min"));
                 timerDisplay.title = "";
                 button.label = label;
-                button.setTitle(( localize(6741, "Hide inline suggestions for 5 min")));
+                button.setTitle(( localize(6860, "Hide inline suggestions for 5 min")));
                 return true;
             }
             const timeLeftSeconds = Math.ceil(timeLeftMs / 1000);
             const minutes = Math.floor(timeLeftSeconds / 60);
             const seconds = timeLeftSeconds % 60;
-            timerDisplay.textContent = `${minutes}:${seconds < 10 ? "0" : ""}${seconds} ${( localize(6742, "remaining"))}`;
-            timerDisplay.title = ( localize(6743, "Inline suggestions are hidden for the remaining duration"));
-            button.label = ( localize(6744, "+5 min"));
-            button.setTitle(( localize(6745, "Snooze additional 5 min")));
+            timerDisplay.textContent = `${minutes}:${seconds < 10 ? "0" : ""}${seconds} ${( localize(6861, "remaining"))}`;
+            timerDisplay.title = ( localize(6862, "Inline suggestions are hidden for the remaining duration"));
+            button.label = ( localize(6863, "+5 min"));
+            button.setTitle(( localize(6864, "Snooze additional 5 min")));
             toolbar.push([cancelAction], {
                 icon: true,
                 label: false

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

@@ -22,6 +22,7 @@ export declare class ChatStatusBarEntry extends Disposable implements IWorkbench
     private entry;
     private readonly activeCodeEditorListener;
     private readonly entryAnchor;
+    private readonly dashboardTooltip;
     private runningSessionsCount;
     constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService);
     private update;