@codingame/monaco-vscode-chat-service-override 32.0.1 → 33.0.4

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

@@ -18,7 +18,6 @@ import { language } from '@codingame/monaco-vscode-api/vscode/vs/base/common/pla
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { IInlineCompletionsService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/inlineCompletionsService.service';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
@@ -43,6 +42,8 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IContextViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { isNewUser } from './chatStatus.js';
 import { IChatStatusItemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service';
+import { GitHubPaths } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount';
+import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { isCompletionsEnabled } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/completionsEnablement';
 
@@ -55,9 +56,6 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
     static {
         this.QUICK_SETTINGS_COLLAPSED_KEY = "chatStatusDashboard.quickSettingsCollapsed";
     }
-    static {
-        this.CONTRIBUTED_COLLAPSED_KEY_PREFIX = "chatStatusDashboard.contributedCollapsed.";
-    }
     constructor(
         options,
         chatEntitlementService,
@@ -74,7 +72,8 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         markdownRendererService,
         languageFeaturesService,
         contextViewService,
-        storageService
+        storageService,
+        defaultAccountService
     ) {
         super();
         this.options = options;
@@ -93,6 +92,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         this.languageFeaturesService = languageFeaturesService;
         this.contextViewService = contextViewService;
         this.storageService = storageService;
+        this.defaultAccountService = defaultAccountService;
         this.element = $("div.chat-status-bar-entry-tooltip");
         this.dateFormatter = safeIntl.DateTimeFormat(language, {
             month: "short",
@@ -121,26 +121,25 @@ 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 hasUsageSection = hasQuotas || isAnonymousWithSentiment;
-        const hasVisibleUsageContent = chat?.unlimited === false || premiumChat?.unlimited === false || completions?.unlimited === false || isAnonymousWithSentiment;
+        const hasVisibleUsageContent = chat?.unlimited === false || premiumChat?.unlimited === false || (!this.options?.compactQuotaLayout && completions?.unlimited === false) || isAnonymousWithSentiment || isPooledQuotaDepleted;
         const contributedEntries = [...this.chatStatusItemService.getEntries()];
         const hasQuickSettingsContent = !this.options?.disableInlineSuggestionsSettings || !this.options?.disableModelSelection || !this.options?.disableProviderOptions || !this.options?.disableCompletionsSnooze;
         let headerAdditionalSpendButton;
-        if (hasUsageSection) {
+        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(6625, "Manage Copilot Settings")),
-                tooltip: ( localize(6626, "Manage Copilot Settings")),
+                label: ( localize(6688, "Manage Copilot Settings")),
+                tooltip: ( localize(6689, "Manage Copilot Settings")),
                 class: ThemeIcon.asClassName(Codicon.settings),
-                run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageSettingsUrl))))
+                run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(this.defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings)))))
             }));
             const canConfigureAdditionalSpend = this.chatEntitlementService.entitlement === ChatEntitlement.EDU || this.chatEntitlementService.entitlement === ChatEntitlement.Pro || this.chatEntitlementService.entitlement === ChatEntitlement.ProPlus || this.chatEntitlementService.entitlement === ChatEntitlement.Max;
-            const showUpgrade = this.chatEntitlementService.entitlement !== ChatEntitlement.ProPlus && this.chatEntitlementService.entitlement !== ChatEntitlement.Max && this.chatEntitlementService.entitlement !== ChatEntitlement.Business && this.chatEntitlementService.entitlement !== ChatEntitlement.Enterprise;
+            const showUpgrade = this.chatEntitlementService.quotas.canUpgradePlan ?? false;
             const actionBarElement = header.lastElementChild;
-            const initialAdditionalUsageEnabled = this.chatEntitlementService.quotas.additionalUsageEnabled ?? false;
-            const initialIsUsageBasedBilling = this.chatEntitlementService.quotas.usageBasedBilling === true;
             if (canConfigureAdditionalSpend) {
                 headerAdditionalSpendButton = this._store.add(( new Button(header, {
                     ...defaultButtonStyles,
@@ -148,29 +147,25 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                     secondary: true
                 })));
                 headerAdditionalSpendButton.element.classList.add("header-cta-button");
-                if (initialIsUsageBasedBilling) {
-                    headerAdditionalSpendButton.label = initialAdditionalUsageEnabled ? ( localize(6627, "Manage Additional Spend")) : ( localize(6628, "Configure Additional Spend"));
-                } else {
-                    headerAdditionalSpendButton.label = initialAdditionalUsageEnabled ? ( localize(6629, "Manage Budget")) : ( localize(6630, "Configure Budget"));
-                }
+                headerAdditionalSpendButton.label = ( localize(6690, "Manage Budget"));
                 this._store.add(headerAdditionalSpendButton.onDidClick(() => {
                     this.telemetryService.publicLog2("workbenchActionExecuted", {
                         id: "workbench.action.chat.manageAdditionalSpend",
                         from: "chat-status"
                     });
-                    this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))));
+                    this.runCommandAndClose(() => this.openerService.open(( URI.parse(this.defaultAccountService.resolveGitHubUrl(GitHubPaths.billingBudgets)))));
                 }));
                 if (actionBarElement) {
                     header.insertBefore(headerAdditionalSpendButton.element, actionBarElement);
                 }
             }
-            if (showUpgrade) {
+            if (showUpgrade && !canConfigureAdditionalSpend) {
                 const upgradeButton = this._store.add(( new Button(header, {
                     ...defaultButtonStyles,
                     hoverDelegate: nativeHoverDelegate
                 })));
                 upgradeButton.element.classList.add("header-cta-button");
-                upgradeButton.label = ( localize(6631, "Upgrade"));
+                upgradeButton.label = ( localize(6691, "Upgrade"));
                 this._store.add(
                     upgradeButton.onDidClick(() => this.runCommandAndClose("workbench.action.chat.upgradePlan"))
                 );
@@ -179,16 +174,56 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 }
             }
         }
+        if (hasUsageSection && this.options?.compactQuotaLayout && this.options.ctaButtonsContainer) {
+            const ctaContainer = this.options.ctaButtonsContainer;
+            const canConfigureAdditionalSpend = this.chatEntitlementService.entitlement === ChatEntitlement.EDU || this.chatEntitlementService.entitlement === ChatEntitlement.Pro || this.chatEntitlementService.entitlement === ChatEntitlement.ProPlus || this.chatEntitlementService.entitlement === ChatEntitlement.Max;
+            const showUpgrade = this.chatEntitlementService.quotas.canUpgradePlan ?? false;
+            if (canConfigureAdditionalSpend) {
+                headerAdditionalSpendButton = this._store.add(( new Button(ctaContainer, {
+                    ...defaultButtonStyles,
+                    hoverDelegate: nativeHoverDelegate,
+                    secondary: true
+                })));
+                headerAdditionalSpendButton.label = ( localize(6690, "Manage Budget"));
+                this._store.add(headerAdditionalSpendButton.onDidClick(() => {
+                    this.telemetryService.publicLog2("workbenchActionExecuted", {
+                        id: "workbench.action.chat.manageAdditionalSpend",
+                        from: "chat-status"
+                    });
+                    this.runCommandAndClose(() => this.openerService.open(( URI.parse(this.defaultAccountService.resolveGitHubUrl(GitHubPaths.billingBudgets)))));
+                }));
+            }
+            if (showUpgrade && !canConfigureAdditionalSpend) {
+                const upgradeButton = this._store.add(( new Button(ctaContainer, {
+                    ...defaultButtonStyles,
+                    hoverDelegate: nativeHoverDelegate
+                })));
+                upgradeButton.label = ( localize(6691, "Upgrade"));
+                this._store.add(
+                    upgradeButton.onDidClick(() => this.runCommandAndClose("workbench.action.chat.upgradePlan"))
+                );
+            }
+        }
+        if (this.options?.compactQuotaLayout) {
+            this.element.classList.add("compact");
+        }
         const updatePromise = this.chatEntitlementService.update(token);
         if (hasVisibleUsageContent) {
             this.renderUsageContent(this.element, token, headerAdditionalSpendButton, updatePromise);
         }
         const hasPremiumUnlimited = !!premiumChat?.unlimited;
         if (hasPremiumUnlimited) {
-            const includedTitle = this.chatEntitlementService.quotas.usageBasedBilling ? ( localize(6632, "Credits")) : ( localize(6633, "Premium Requests"));
+            const includedTitle = this.chatEntitlementService.quotas.usageBasedBilling ? ( localize(6692, "Credits")) : ( localize(6693, "Premium Requests"));
             const includedContainer = this.element.appendChild($("div.quota-indicator.included"));
-            includedContainer.appendChild($("div.quota-title", undefined, includedTitle));
-            includedContainer.appendChild($("div.description", undefined, ( localize(6634, "Included with your organization's plan."))));
+            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))));
+            } 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."))));
+            }
         }
         if (hasQuickSettingsContent) {
             const hasContentAbove = hasUsageSection || hasVisibleUsageContent || hasPremiumUnlimited;
@@ -207,14 +242,16 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             resetDate,
             resetDateHasTime
         } = this.chatEntitlementService.quotas;
+        const compact = !!this.options?.compactQuotaLayout;
+        const planName = compact ? getChatPlanName(this.chatEntitlementService.entitlement) : undefined;
         if (chatQuota || premiumChatQuota || completionsQuota) {
             const resetLabel = resetDate ? (resetDateHasTime ? ( localize(
-                6635,
+                6698,
                 "Resets {0} at {1}",
                 this.dateFormatter.value.format(( new Date(resetDate))),
                 this.timeFormatter.value.format(( new Date(resetDate)))
             )) : ( localize(
-                6636,
+                6699,
                 "Resets {0}",
                 this.dateFormatter.value.format(( new Date(resetDate)))
             ))) : undefined;
@@ -227,26 +264,34 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             }
             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(6637, "Credits")) : ( localize(6638, "Chat messages"));
-                chatQuotaIndicator = this.createQuotaIndicator(container, chatQuota, chatLabel, resetLabel);
+                const chatLabel = this.chatEntitlementService.quotas.usageBasedBilling && this.chatEntitlementService.entitlement === ChatEntitlement.Free ? ( localize(6700, "Credits")) : ( localize(6701, "Chat messages"));
+                chatQuotaIndicator = this.createQuotaIndicator(
+                    container,
+                    chatQuota,
+                    chatLabel,
+                    resetLabel,
+                    compact ? planName : undefined
+                );
             }
             let premiumChatQuotaIndicator;
             if (premiumChatQuota && !premiumChatQuota.unlimited && premiumChatQuota.percentRemaining >= 0) {
                 const isUBB = this.chatEntitlementService.quotas.usageBasedBilling;
-                const premiumChatLabel = isUBB ? ( localize(6637, "Credits")) : this.chatEntitlementService.quotas.additionalUsageEnabled ? ( localize(6639, "Included premium requests")) : ( localize(6640, "Premium requests"));
+                const premiumChatLabel = isUBB ? ( localize(6700, "Credits")) : this.chatEntitlementService.quotas.additionalUsageEnabled ? ( localize(6702, "Included premium requests")) : ( localize(6703, "Premium requests"));
                 const premiumChatResetLabel = isUBB ? this.formatResetAtLabel(premiumChatQuota.resetAt) ?? resetLabel : resetLabel;
-                premiumChatQuotaIndicator = this.createQuotaIndicator(container, premiumChatQuota, premiumChatLabel, premiumChatResetLabel);
+                premiumChatQuotaIndicator = this.createQuotaIndicator(
+                    container,
+                    premiumChatQuota,
+                    premiumChatLabel,
+                    premiumChatResetLabel,
+                    compact ? planName : undefined
+                );
             }
             let completionsQuotaIndicator;
-            const showCompletions = completionsQuota && !completionsQuota.unlimited && completionsQuota.percentRemaining >= 0 && (!this.chatEntitlementService.quotas.usageBasedBilling || this.chatEntitlementService.entitlement === ChatEntitlement.Free);
+            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(6641, "Inline Suggestions")), resetLabel);
+                completionsQuotaIndicator = this.createQuotaIndicator(container, completionsQuota, ( localize(6704, "Inline Suggestions")), resetLabel, compact ? planName : undefined);
             }
-            (async () => {
-                await updatePromise;
-                if (token.isCancellationRequested) {
-                    return;
-                }
+            const updateIndicators = () => {
                 const {
                     chat: chatQuota,
                     premiumChat: premiumChatQuota,
@@ -262,22 +307,29 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                     completionsQuotaIndicator?.(completionsQuota);
                 }
                 const {
-                    calloutVisible,
-                    additionalUsageEnabled: isAdditionalUsageEnabled
+                    calloutVisible
                 } = globalCalloutUpdater();
                 if (headerAdditionalSpendButton) {
                     headerAdditionalSpendButton.element.style.display = calloutVisible ? "" : "none";
-                    const isUBB = this.chatEntitlementService.quotas.usageBasedBilling === true;
-                    if (isUBB) {
-                        headerAdditionalSpendButton.label = isAdditionalUsageEnabled ? ( localize(6627, "Manage Additional Spend")) : ( localize(6628, "Configure Additional Spend"));
-                    } else {
-                        headerAdditionalSpendButton.label = isAdditionalUsageEnabled ? ( localize(6629, "Manage Budget")) : ( localize(6630, "Configure Budget"));
-                    }
+                    headerAdditionalSpendButton.label = ( localize(6690, "Manage Budget"));
                 }
+            };
+            (async () => {
+                await updatePromise;
+                if (token.isCancellationRequested) {
+                    return;
+                }
+                updateIndicators();
             })();
+            this._store.add(
+                this.chatEntitlementService.onDidChangeQuotaRemaining(() => updateIndicators())
+            );
+            this._store.add(
+                this.chatEntitlementService.onDidChangeQuotaExceeded(() => updateIndicators())
+            );
         }
         else if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.completed) {
-            this.createQuotaIndicator(container, ( localize(6642, "Limited")), ( localize(6638, "Chat messages")));
+            this.createQuotaIndicator(container, ( localize(6705, "Limited")), ( localize(6701, "Chat messages")));
         }
     }
     renderInlineSuggestionsSection(hasContentAbove) {
@@ -290,10 +342,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         const activeLanguageId = this.editorService.activeTextEditorLanguageId;
         const getStatusText = () => {
             if (!this.canUseChat()) {
-                return localize(6643, "Disabled");
+                return localize(6706, "Disabled");
             }
             const enabled = activeLanguageId ? isCompletionsEnabled(this.configurationService, activeLanguageId) : isCompletionsEnabled(this.configurationService);
-            return enabled ? ( localize(6644, "Enabled")) : ( localize(6643, "Disabled"));
+            return enabled ? ( localize(6707, "Enabled")) : ( localize(6706, "Disabled"));
         };
         let disclosureHeader;
         let chevron;
@@ -304,7 +356,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(6645, "Inline Suggestions"))));
+            disclosureHeader.appendChild($("span.collapsible-label", undefined, ( localize(6708, "Inline Suggestions"))));
             chevron = disclosureHeader.appendChild($("span.collapsible-chevron"));
             chevron.classList.add(
                 ...ThemeIcon.asClassNameArray(collapsed ? Codicon.chevronRight : Codicon.chevronDown)
@@ -345,66 +397,61 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         this.renderInlineSuggestionsContent(collapsibleInner);
     }
     renderContributedSections(contributedEntries) {
-        const nonCollapsible = !!this.options?.disableContributedSectionsCollapsible;
         for (const item of contributedEntries) {
-            const storageKey = ChatStatusDashboard_1.CONTRIBUTED_COLLAPSED_KEY_PREFIX + item.id;
-            const collapsed = !nonCollapsible && this.storageService.getBoolean(storageKey, StorageScope.PROFILE, true);
             const headerLabel = typeof item.label === "string" ? item.label : item.label.label;
-            const headerLink = typeof item.label === "string" ? undefined : item.label.link;
-            const linkDescription = typeof item.label === "string" ? undefined : item.label.helpText;
-            const disclosureHeader = this.element.appendChild(
-                nonCollapsible ? $("div.collapsible-header.non-collapsible") : $("button.collapsible-header")
-            );
-            let chevron;
-            disclosureHeader.appendChild($("span.collapsible-label", undefined, headerLabel));
-            if (!nonCollapsible) {
-                disclosureHeader.setAttribute("aria-expanded", String(!collapsed));
-                chevron = disclosureHeader.appendChild($("span.collapsible-chevron"));
-                chevron.classList.add(
-                    ...ThemeIcon.asClassNameArray(collapsed ? Codicon.chevronRight : Codicon.chevronDown)
-                );
+            let headerLink = typeof item.label === "string" ? undefined : item.label.link;
+            let linkDescription = typeof item.label === "string" ? undefined : item.label.helpText;
+            const section = this.element.appendChild($("div.contributed-section"));
+            const header = section.appendChild($("div.collapsible-header.non-collapsible"));
+            header.appendChild($("span.collapsible-label", undefined, headerLabel));
+            if (linkDescription || headerLink) {
+                const infoIcon = header.appendChild($("span.contributed-info-icon"));
+                infoIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.info));
+                this._store.add(this.hoverService.setupDelayedHover(infoIcon, () => {
+                    const hoverContent = ( new MarkdownString("", {
+                        isTrusted: true
+                    }));
+                    if (linkDescription) {
+                        hoverContent.appendText(linkDescription);
+                    }
+                    if (headerLink) {
+                        if (linkDescription) {
+                            hoverContent.appendText(" ");
+                        }
+                        hoverContent.appendMarkdown(`[${( localize(6709, "Learn More"))}](${headerLink})`);
+                    }
+                    return {
+                        content: hoverContent
+                    };
+                }, {
+                    reducedDelay: true
+                }));
             }
-            const statusEl = disclosureHeader.appendChild($("span.collapsible-status"));
+            const statusEl = header.appendChild($("span.collapsible-status"));
             statusEl.append(...renderLabelWithIcons(item.description));
-            statusEl.title = stripIcons(item.description).trim();
-            const collapsibleContent = this.element.appendChild($("div.collapsible-content"));
-            const collapsibleInner = collapsibleContent.appendChild($("div.collapsible-inner"));
-            if (collapsed) {
-                collapsibleContent.classList.add("collapsed");
-                collapsibleInner.inert = true;
-            }
-            if (!nonCollapsible) {
-                const toggle = () => {
-                    const isCollapsed = collapsibleContent.classList.toggle("collapsed");
-                    collapsibleInner.inert = isCollapsed;
-                    disclosureHeader.setAttribute("aria-expanded", String(!isCollapsed));
-                    chevron.className = "collapsible-chevron";
-                    chevron.classList.add(
-                        ...ThemeIcon.asClassNameArray(isCollapsed ? Codicon.chevronRight : Codicon.chevronDown)
-                    );
-                    this.storageService.store(storageKey, isCollapsed, StorageScope.PROFILE, StorageTarget.USER);
-                };
-                this._store.add(addDisposableListener(disclosureHeader, EventType.CLICK, () => toggle()));
+            let currentTooltip = item.tooltip;
+            if (currentTooltip) {
+                this._store.add(this.hoverService.setupDelayedHover(statusEl, () => ({
+                    content: currentTooltip ?? ""
+                }), {
+                    reducedDelay: true
+                }));
             }
             const sectionDisposables = this._store.add(( new MutableDisposable()));
             const sectionStore = ( new DisposableStore());
             sectionDisposables.value = sectionStore;
-            let descriptionEl;
-            if (headerLink) {
-                descriptionEl = collapsibleInner.appendChild($("div.section-description"));
-                const descText = linkDescription ? `${linkDescription} [${( localize(6646, "Learn More"))}](${headerLink})` : `[${( localize(6646, "Learn More"))}](${headerLink})`;
-                this.renderTextPlus(descriptionEl, descText, sectionStore);
-            }
             let detailEl;
             if (item.detail) {
-                detailEl = collapsibleInner.appendChild($("div.section-detail"));
+                detailEl = section.appendChild($("div.contributed-detail"));
                 this.renderTextPlus(detailEl, item.detail, sectionStore);
             }
             this._store.add(this.chatStatusItemService.onDidChange(e => {
                 if (e.entry.id === item.id) {
                     statusEl.textContent = "";
                     statusEl.append(...renderLabelWithIcons(e.entry.description));
-                    statusEl.title = stripIcons(e.entry.description).trim();
+                    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;
                     const newStore = ( new DisposableStore());
                     sectionDisposables.value = newStore;
                     if (detailEl) {
@@ -416,34 +463,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                             detailEl = undefined;
                         }
                     } else if (e.entry.detail) {
-                        detailEl = collapsibleInner.appendChild($("div.section-detail"));
+                        detailEl = section.appendChild($("div.contributed-detail"));
                         this.renderTextPlus(detailEl, e.entry.detail, newStore);
                     }
-                    const updatedLink = typeof e.entry.label === "string" ? undefined : e.entry.label.link;
-                    const updatedLinkDesc = typeof e.entry.label === "string" ? undefined : e.entry.label.helpText;
-                    if (descriptionEl) {
-                        if (updatedLink) {
-                            descriptionEl.textContent = "";
-                            const descText = updatedLinkDesc ? `${updatedLinkDesc} [${( localize(6646, "Learn More"))}](${updatedLink})` : `[${( localize(6646, "Learn More"))}](${updatedLink})`;
-                            this.renderTextPlus(descriptionEl, descText, newStore);
-                        } else {
-                            descriptionEl.remove();
-                            descriptionEl = undefined;
-                        }
-                    } else if (updatedLink) {
-                        descriptionEl = collapsibleInner.insertBefore($("div.section-description"), detailEl ?? null);
-                        const descText = updatedLinkDesc ? `${updatedLinkDesc} [${( localize(6646, "Learn More"))}](${updatedLink})` : `[${( localize(6646, "Learn More"))}](${updatedLink})`;
-                        this.renderTextPlus(descriptionEl, descText, newStore);
-                    }
                 }
             }));
         }
     }
     renderSetupSection() {
-        const newUser = isNewUser(this.chatEntitlementService);
+        const hasByokModels = this.chatEntitlementService.hasByokModels;
+        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;
+        const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown && !hasByokModels;
         if (!(newUser || signedOut || disabled)) {
             return;
         }
@@ -452,7 +484,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         let descriptionClass = ".description";
         if (newUser && anonymousUser) {
             descriptionText = ( new MarkdownString(( localize(
-                6647,
+                6710,
                 "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                 defaultChat.provider.default.name,
                 defaultChat.provider.default.name,
@@ -463,23 +495,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             }));
             descriptionClass = `${descriptionClass}.terms`;
         } else if (newUser) {
-            descriptionText = ( localize(6648, "Set up Copilot to use AI features."));
+            descriptionText = ( localize(6711, "Set up Copilot to use AI features."));
         } else if (anonymousUser) {
-            descriptionText = ( localize(6649, "Sign in to enable more Copilot AI features."));
+            descriptionText = ( localize(6712, "Sign in to enable more Copilot AI features."));
         } else if (disabled) {
-            descriptionText = ( localize(6650, "Enable Copilot to use AI features."));
+            descriptionText = ( localize(6713, "Enable Copilot to use AI features."));
         } else {
-            descriptionText = ( localize(6651, "Sign in to use Copilot AI features."));
+            descriptionText = ( localize(6714, "Sign in to use Copilot AI features."));
         }
         let buttonLabel;
         if (newUser) {
-            buttonLabel = ( localize(6652, "Use AI Features"));
+            buttonLabel = ( localize(6715, "Use AI Features"));
         } else if (anonymousUser) {
-            buttonLabel = ( localize(6653, "Enable more AI Features"));
+            buttonLabel = ( localize(6716, "Enable more AI Features"));
         } else if (disabled) {
-            buttonLabel = ( localize(6654, "Enable AI Features"));
+            buttonLabel = ( localize(6717, "Enable AI Features"));
         } else {
-            buttonLabel = ( localize(6655, "Sign in to use AI Features"));
+            buttonLabel = ( localize(6718, "Sign in to use AI Features"));
         }
         let commandId;
         if (newUser && anonymousUser) {
@@ -515,7 +547,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(6656, "Model"))));
+                    modelContainer.appendChild($("span.model-text", undefined, ( localize(6719, "Model"))));
                     const selectOptions = ( modelInfo.models.map(m => ({
                         text: m.name
                     })));
@@ -526,7 +558,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                         this.contextViewService,
                         defaultSelectBoxStyles,
                         {
-                            ariaLabel: ( localize(6657, "Select Model")),
+                            ariaLabel: ( localize(6720, "Select Model")),
                             optionsAsChildren: true
                         }
                     )));
@@ -559,7 +591,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                                 this.contextViewService,
                                 defaultSelectBoxStyles,
                                 {
-                                    ariaLabel: ( localize(6658, "Select {0}", option.label)),
+                                    ariaLabel: ( localize(6721, "Select {0}", option.label)),
                                     optionsAsChildren: true
                                 }
                             )));
@@ -578,7 +610,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         if (!this.options?.disableCompletionsSnooze && this.canUseChat()) {
             const snooze = append(container, $("div.snooze-completions"));
-            this.createCompletionsSnooze(snooze, ( localize(6659, "Snooze")));
+            this.createCompletionsSnooze(snooze, ( localize(6722, "Snooze")));
         }
     }
     canUseChat() {
@@ -635,14 +667,16 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }
         const resetDate = ( new Date(resetAt * 1000));
         return localize(
-            6635,
+            6698,
             "Resets {0} at {1}",
             this.dateFormatter.value.format(resetDate),
             this.timeFormatter.value.format(resetDate)
         );
     }
-    createQuotaIndicator(container, quota, label, resetLabel) {
+    createQuotaIndicator(container, quota, label, resetLabel, compactTitle) {
+        const isCompact = !!compactTitle;
         const quotaValue = $("span.quota-value");
+        const quotaValueText = isCompact ? quotaValue.appendChild($("span.quota-value-text")) : quotaValue;
         const quotaValueSuffix = $("span.quota-value-suffix");
         const quotaBit = $("div.quota-bit");
         const resetValue = $("span.quota-reset");
@@ -650,28 +684,32 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             resetValue.textContent = resetLabel;
         }
         const quotaPercentage = $("div.quota-percentage", undefined, quotaValue, quotaValueSuffix);
-        quotaPercentage.tabIndex = 0;
-        container.appendChild($(
+        quotaPercentage.tabIndex = isCompact ? -1 : 0;
+        const indicatorElement = $(
             "div.quota-indicator",
             undefined,
-            $("div.quota-title", undefined, label),
+            $("div.quota-title", undefined, isCompact ? compactTitle : label),
             $("div.quota-details", undefined, quotaPercentage, resetValue),
-            $("div.quota-bar", undefined, quotaBit)
-        ));
+            ...(isCompact ? [] : [$("div.quota-bar", undefined, quotaBit)])
+        );
+        if (isCompact) {
+            indicatorElement.classList.add("compact");
+        }
+        container.appendChild(indicatorElement);
         let currentQuota = quota;
         let isHovered = false;
         const showPercentage = () => {
             if (typeof currentQuota === "string") {
-                quotaValue.textContent = currentQuota;
+                quotaValueText.textContent = currentQuota;
                 quotaValueSuffix.textContent = "";
             } else {
                 const usedPercentage = Math.max(0, 100 - currentQuota.percentRemaining);
-                quotaValue.textContent = ( localize(
-                    6660,
+                quotaValueText.textContent = ( localize(
+                    6723,
                     "{0}%",
                     this.quotaPercentageFormatter.value.format(Math.floor(usedPercentage))
                 ));
-                quotaValueSuffix.textContent = ` ${( localize(6661, "used"))}`;
+                quotaValueSuffix.textContent = isCompact ? ( localize(6724, "{0} used", label)) : ` ${( localize(6725, "used"))}`;
             }
         };
         const showCredits = () => {
@@ -680,23 +718,24 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 const used = total * (100 - currentQuota.percentRemaining) / 100;
                 const usedFormatted = this.quotaCreditsFormatter.value.format(used);
                 const totalFormatted = this.quotaCreditsFormatter.value.format(total);
-                quotaValue.textContent = ( localize(6662, "{0} / {1}", usedFormatted, totalFormatted));
-                quotaValueSuffix.textContent = ` ${( localize(6661, "used"))}`;
+                quotaValueText.textContent = ( localize(6726, "{0} / {1}", usedFormatted, totalFormatted));
+                quotaValueSuffix.textContent = isCompact ? ( localize(6724, "{0} used", label)) : ` ${( localize(6725, "used"))}`;
             }
         };
-        this._store.add(addDisposableListener(quotaPercentage, EventType.MOUSE_ENTER, () => {
+        const hoverTarget = isCompact ? quotaValueText : quotaPercentage;
+        this._store.add(addDisposableListener(hoverTarget, EventType.MOUSE_ENTER, () => {
             isHovered = true;
             showCredits();
         }));
-        this._store.add(addDisposableListener(quotaPercentage, EventType.MOUSE_LEAVE, () => {
+        this._store.add(addDisposableListener(hoverTarget, EventType.MOUSE_LEAVE, () => {
             isHovered = false;
             showPercentage();
         }));
-        this._store.add(addDisposableListener(quotaPercentage, EventType.FOCUS, () => {
+        this._store.add(addDisposableListener(hoverTarget, EventType.FOCUS, () => {
             isHovered = true;
             showCredits();
         }));
-        this._store.add(addDisposableListener(quotaPercentage, EventType.BLUR, () => {
+        this._store.add(addDisposableListener(hoverTarget, EventType.BLUR, () => {
             isHovered = false;
             showPercentage();
         }));
@@ -739,38 +778,39 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
                 allQuotas.push(quotas.completions);
             }
             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) {
                 quotaCallout.style.display = "";
                 quotaCallout.className = "quota-callout info";
                 calloutIcon.className = `callout-icon ${ThemeIcon.asClassName(Codicon.info)}`;
                 calloutText.textContent = isUsageBasedBilling ? ( localize(
-                    6663,
-                    "Additional spend is configured. Usage will continue until limits reset."
+                    6727,
+                    "Additional budget is configured. Usage will continue until limits reset."
                 )) : ( localize(
-                    6664,
+                    6728,
                     "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(6665, "Once the limit is reached, additional spend will be used.")) : ( localize(6666, "Once the limit is reached, premium request budget will be used."));
-            } else if (maxUsedPercentage >= 100 && !additionalUsageEnabled) {
+                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."));
+            } 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(
-                    6667,
+                    6731,
                     "Copilot is paused until the limit resets. Contact your administrator for more information."
-                )) : ( localize(6668, "Copilot is paused until the limit resets."));
+                )) : ( localize(6732, "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(
-                    6669,
+                    6733,
                     "Copilot will pause when the limit is reached. Contact your administrator for more information."
-                )) : ( localize(6670, "Copilot will pause when the limit is reached."));
+                )) : ( localize(6734, "Copilot will pause when the limit is reached."));
             } else {
                 quotaCallout.style.display = "none";
             }
@@ -787,23 +827,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         const settings = container.appendChild($("div.settings"));
         {
             const globalSetting = append(settings, $("div.setting"));
-            this.createInlineSuggestionsSetting(globalSetting, ( localize(6671, "Ghost text suggestions")), "*");
+            this.createInlineSuggestionsSetting(globalSetting, ( localize(6735, "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(6672, "(overridden)")) : "";
+                overriddenHint.textContent = hasOverride ? ( localize(6736, "(overridden)")) : "";
             };
             updateOverriddenHint();
             if (modeId) {
                 const languageSetting = append(settings, $("div.setting"));
                 const languageName = this.languageService.getLanguageName(modeId) ?? modeId;
-                this.createTriStateLanguageSetting(languageSetting, ( localize(6673, "Ghost text suggestions for {0}", languageName)), modeId, updateOverriddenHint);
+                this.createTriStateLanguageSetting(languageSetting, ( localize(6737, "Ghost text suggestions for {0}", languageName)), modeId, updateOverriddenHint);
             }
         }
         {
             const setting = append(settings, $("div.setting"));
-            this.createNextEditSuggestionsSetting(setting, ( localize(6674, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId));
+            this.createNextEditSuggestionsSetting(setting, ( localize(6738, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId));
         }
     }
     createSetting(container, settingIdsToReEvaluate, label, accessor) {
@@ -1005,7 +1045,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         })));
         const cancelAction = toAction({
             id: "workbench.action.cancelSnoozeStatusBarLink",
-            label: ( localize(6675, "Cancel Snooze")),
+            label: ( localize(6739, "Cancel Snooze")),
             run: () => this.inlineCompletionsService.cancelSnooze(),
             class: ThemeIcon.asClassName(Codicon.stopCircle)
         });
@@ -1014,19 +1054,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
             toolbar.clear();
             const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
             if (!isEnabled || timeLeftMs <= 0) {
-                timerDisplay.textContent = ( localize(6676, "Hide suggestions for 5 min"));
+                timerDisplay.textContent = ( localize(6740, "Hide suggestions for 5 min"));
                 timerDisplay.title = "";
                 button.label = label;
-                button.setTitle(( localize(6677, "Hide inline suggestions for 5 min")));
+                button.setTitle(( localize(6741, "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(6678, "remaining"))}`;
-            timerDisplay.title = ( localize(6679, "Inline suggestions are hidden for the remaining duration"));
-            button.label = ( localize(6680, "+5 min"));
-            button.setTitle(( localize(6681, "Snooze additional 5 min")));
+            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")));
             toolbar.push([cancelAction], {
                 icon: true,
                 label: false
@@ -1060,6 +1100,6 @@ let ChatStatusDashboard = class ChatStatusDashboard extends DomWidget {
         }));
     }
 };
-ChatStatusDashboard = ChatStatusDashboard_1 = ( __decorate([( __param(1, IChatEntitlementService)), ( __param(2, IChatStatusItemService)), ( __param(3, ICommandService)), ( __param(4, IConfigurationService)), ( __param(5, IEditorService)), ( __param(6, IHoverService)), ( __param(7, ILanguageService)), ( __param(8, IOpenerService)), ( __param(9, ITelemetryService)), ( __param(10, ITextResourceConfigurationService)), ( __param(11, IInlineCompletionsService)), ( __param(12, IMarkdownRendererService)), ( __param(13, ILanguageFeaturesService)), ( __param(14, IContextViewService)), ( __param(15, IStorageService))], ChatStatusDashboard));
+ChatStatusDashboard = ChatStatusDashboard_1 = ( __decorate([( __param(1, IChatEntitlementService)), ( __param(2, IChatStatusItemService)), ( __param(3, ICommandService)), ( __param(4, IConfigurationService)), ( __param(5, IEditorService)), ( __param(6, IHoverService)), ( __param(7, ILanguageService)), ( __param(8, IOpenerService)), ( __param(9, ITelemetryService)), ( __param(10, ITextResourceConfigurationService)), ( __param(11, IInlineCompletionsService)), ( __param(12, IMarkdownRendererService)), ( __param(13, ILanguageFeaturesService)), ( __param(14, IContextViewService)), ( __param(15, IStorageService)), ( __param(16, IDefaultAccountService))], ChatStatusDashboard));
 
 export { ChatStatusDashboard };