@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -6,6 +6,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 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";
 import { IInlineCompletionsService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/inlineCompletionsService.service";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 export declare class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
     private readonly chatEntitlementService;
     private readonly instantiationService;
@@ -13,11 +14,12 @@ export declare class ChatStatusBarEntry extends Disposable implements IWorkbench
     private readonly editorService;
     private readonly configurationService;
     private readonly completionsService;
+    private readonly chatSessionsService;
     static readonly ID = "workbench.contrib.chatStatusBarEntry";
     private entry;
     private dashboard;
     private readonly activeCodeEditorListener;
-    constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService);
+    constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService);
     private update;
     private registerListeners;
     private onDidActiveEditorChange;

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

@@ -52,50 +52,51 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IInlineCompletionsService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/inlineCompletionsService.service';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 
 registerCss(chatStatus);
-const gaugeBackground = registerColor('gauge.background', {
+const gaugeForeground = registerColor('gauge.foreground', {
     dark: inputValidationInfoBorder,
     light: inputValidationInfoBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5133, "Gauge background color.")));
-registerColor('gauge.foreground', {
-    dark: ( transparent(gaugeBackground, 0.3)),
-    light: ( transparent(gaugeBackground, 0.3)),
+}, ( localize(5244, "Gauge foreground color.")));
+registerColor('gauge.background', {
+    dark: ( transparent(gaugeForeground, 0.3)),
+    light: ( transparent(gaugeForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5134, "Gauge foreground color.")));
+}, ( localize(5245, "Gauge background color.")));
 registerColor('gauge.border', {
     dark: null,
     light: null,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5135, "Gauge border color.")));
-const gaugeWarningBackground = registerColor('gauge.warningBackground', {
+}, ( localize(5246, "Gauge border color.")));
+const gaugeWarningForeground = registerColor('gauge.warningForeground', {
     dark: inputValidationWarningBorder,
     light: inputValidationWarningBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5136, "Gauge warning background color.")));
-registerColor('gauge.warningForeground', {
-    dark: ( transparent(gaugeWarningBackground, 0.3)),
-    light: ( transparent(gaugeWarningBackground, 0.3)),
+}, ( localize(5247, "Gauge warning foreground color.")));
+registerColor('gauge.warningBackground', {
+    dark: ( transparent(gaugeWarningForeground, 0.3)),
+    light: ( transparent(gaugeWarningForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5137, "Gauge warning foreground color.")));
-const gaugeErrorBackground = registerColor('gauge.errorBackground', {
+}, ( localize(5248, "Gauge warning background color.")));
+const gaugeErrorForeground = registerColor('gauge.errorForeground', {
     dark: inputValidationErrorBorder,
     light: inputValidationErrorBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5138, "Gauge error background color.")));
-registerColor('gauge.errorForeground', {
-    dark: ( transparent(gaugeErrorBackground, 0.3)),
-    light: ( transparent(gaugeErrorBackground, 0.3)),
+}, ( localize(5249, "Gauge error foreground color.")));
+registerColor('gauge.errorBackground', {
+    dark: ( transparent(gaugeErrorForeground, 0.3)),
+    light: ( transparent(gaugeErrorForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5139, "Gauge error foreground color.")));
+}, ( localize(5250, "Gauge error background color.")));
 const defaultChat = {
     completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
     nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
@@ -104,7 +105,7 @@ const defaultChat = {
 };
 let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     static { this.ID = 'workbench.contrib.chatStatusBarEntry'; }
-    constructor(chatEntitlementService, instantiationService, statusbarService, editorService, configurationService, completionsService) {
+    constructor(chatEntitlementService, instantiationService, statusbarService, editorService, configurationService, completionsService, chatSessionsService) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.instantiationService = instantiationService;
@@ -112,6 +113,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.editorService = editorService;
         this.configurationService = configurationService;
         this.completionsService = completionsService;
+        this.chatSessionsService = chatSessionsService;
         this.entry = undefined;
         this.dashboard = ( new Lazy(() => this.instantiationService.createInstance(ChatStatusDashboard)));
         this.activeCodeEditorListener = this._register(( new MutableDisposable()));
@@ -119,12 +121,14 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.registerListeners();
     }
     update() {
-        if (!this.chatEntitlementService.sentiment.hidden) {
-            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 });
+        const sentiment = this.chatEntitlementService.sentiment;
+        if (!sentiment.hidden) {
+            const props = this.getEntryProps();
+            if (this.entry) {
+                this.entry.update(props);
             }
             else {
-                this.entry.update(this.getEntryProps());
+                this.entry = this.statusbarService.addEntry(props, 'chat.statusBarEntry', StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
             }
         }
         else {
@@ -137,6 +141,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.update()));
         this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.update()));
         this._register(this.completionsService.onDidChangeIsSnoozing(() => this.update()));
+        this._register(this.chatSessionsService.onDidChangeInProgress(() => this.update()));
         this._register(this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange()));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(defaultChat.completionsEnablementSetting)) {
@@ -156,8 +161,10 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = '$(copilot)';
-        let ariaLabel = ( localize(5140, "Copilot Status"));
+        let ariaLabel = ( localize(5251, "Copilot Status"));
         let kind;
+        const inProgress = this.chatSessionsService.getInProgress();
+        const hasInProgressSessions = ( inProgress.some(item => item.count > 0));
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
             if (this.chatEntitlementService.sentiment.later ||
@@ -165,7 +172,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
                 isProUser(entitlement) ||
                 entitlement === ChatEntitlement.Free
             ) {
-                const finishSetup = ( localize(5141, "Finish Setup"));
+                const finishSetup = ( localize(5252, "Finish Setup"));
                 text = `$(copilot) ${finishSetup}`;
                 ariaLabel = finishSetup;
                 kind = 'prominent';
@@ -176,10 +183,10 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = `$(copilot-unavailable)`;
-                ariaLabel = ( localize(5142, "Copilot Disabled"));
+                ariaLabel = ( localize(5253, "Copilot Disabled"));
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signedOutWarning = ( localize(5143, "Signed out"));
+                const signedOutWarning = ( localize(5254, "Signed out"));
                 text = `$(copilot-not-connected) ${signedOutWarning}`;
                 ariaLabel = signedOutWarning;
                 kind = 'prominent';
@@ -187,13 +194,13 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(5144, "Chat quota reached"));
+                    quotaWarning = ( localize(5255, "Chat quota reached"));
                 }
                 else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(5145, "Completions quota reached"));
+                    quotaWarning = ( localize(5256, "Completions quota reached"));
                 }
                 else {
-                    quotaWarning = ( localize(5146, "Quota reached"));
+                    quotaWarning = ( localize(5257, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
@@ -201,22 +208,28 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = `$(copilot-unavailable)`;
-                ariaLabel = ( localize(5147, "Code completions disabled"));
+                ariaLabel = ( localize(5258, "Code completions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = `$(copilot-snooze)`;
-                ariaLabel = ( localize(5148, "Code completions snoozed"));
+                ariaLabel = ( localize(5259, "Code completions snoozed"));
             }
         }
-        return {
-            name: ( localize(5140, "Copilot Status")),
+        if (hasInProgressSessions) {
+            text = `$(loading~spin)\u00A0${text}`;
+            const sessionCount = inProgress.reduce((total, item) => total + item.count, 0);
+            ariaLabel = `${ariaLabel}, ${sessionCount} chat session${sessionCount === 1 ? '' : 's'} in progress`;
+        }
+        const baseResult = {
+            name: ( localize(5251, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
             showInAllWindows: true,
             kind,
-            tooltip: { element: token => this.dashboard.value.show(token) }
+            tooltip: { element: (token) => this.dashboard.value.show(token) }
         };
+        return baseResult;
     }
     dispose() {
         super.dispose();
@@ -230,7 +243,8 @@ ChatStatusBarEntry = ( __decorate([
     ( __param(2, IStatusbarService)),
     ( __param(3, IEditorService)),
     ( __param(4, IConfigurationService)),
-    ( __param(5, IInlineCompletionsService))
+    ( __param(5, IInlineCompletionsService)),
+    ( __param(6, IChatSessionsService))
 ], ChatStatusBarEntry));
 function isNewUser(chatEntitlementService) {
     return !chatEntitlementService.sentiment.installed ||
@@ -255,7 +269,7 @@ function isCompletionsEnabled(configurationService, modeId = '*') {
     return Boolean(result['*']);
 }
 let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
-    constructor(chatEntitlementService, chatStatusItemService, commandService, configurationService, editorService, hoverService, languageService, openerService, telemetryService, textResourceConfigurationService, inlineCompletionsService) {
+    constructor(chatEntitlementService, chatStatusItemService, commandService, configurationService, editorService, hoverService, languageService, openerService, telemetryService, textResourceConfigurationService, inlineCompletionsService, chatSessionsService) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.chatStatusItemService = chatStatusItemService;
@@ -268,8 +282,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         this.telemetryService = telemetryService;
         this.textResourceConfigurationService = textResourceConfigurationService;
         this.inlineCompletionsService = inlineCompletionsService;
+        this.chatSessionsService = chatSessionsService;
         this.element = $('div.chat-status-bar-entry-tooltip');
         this.dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
+        this.dateTimeFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
         this.quotaPercentageFormatter = safeIntl.NumberFormat(undefined, { maximumFractionDigits: 1, minimumFractionDigits: 0 });
         this.quotaOverageFormatter = safeIntl.NumberFormat(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 0 });
         this.entryDisposables = this._register(( new MutableDisposable()));
@@ -288,23 +304,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
             needsSeparator = true;
         };
-        const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate } = this.chatEntitlementService.quotas;
+        const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate, resetDateHasTime } = this.chatEntitlementService.quotas;
         if (chatQuota || completionsQuota || premiumChatQuota) {
-            addSeparator(( localize(5149, "Copilot Usage")), toAction({
+            addSeparator(( localize(5260, "Copilot Usage")), toAction({
                 id: 'workbench.action.manageCopilot',
-                label: ( localize(5150, "Manage Copilot")),
-                tooltip: ( localize(5151, "Manage Copilot")),
+                label: ( localize(5261, "Manage Chat")),
+                tooltip: ( localize(5262, "Manage Chat")),
                 class: ThemeIcon.asClassName(Codicon.settings),
                 run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageSettingsUrl)))),
             }));
-            const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, ( localize(5152, "Code completions")), false) : undefined;
-            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(5153, "Chat messages")), false) : undefined;
-            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(5154, "Premium requests")), true) : undefined;
+            const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, ( localize(5263, "Code completions")), false) : undefined;
+            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(5264, "Chat messages")), false) : undefined;
+            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(5265, "Premium requests")), true) : undefined;
             if (resetDate) {
                 this.element.appendChild($('div.description', undefined, ( localize(
-                    5155,
+                    5266,
                     "Allowance resets {0}.",
-                    this.dateFormatter.value.format(( new Date(resetDate)))
+                    resetDateHasTime ? this.dateTimeFormatter.value.format(( new Date(resetDate))) : this.dateFormatter.value.format(( new Date(resetDate)))
                 ))));
             }
             if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
@@ -312,7 +328,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                     this.element,
                     { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: canUseCopilot(this.chatEntitlementService)  }
                 )));
-                upgradeProButton.label = ( localize(5156, "Upgrade to Copilot Pro"));
+                upgradeProButton.label = ( localize(5267, "Upgrade to GitHub Copilot Pro"));
                 disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
             }
             (async () => {
@@ -332,6 +348,38 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 }
             })();
         }
+        {
+            let chatSessionsElement;
+            const updateStatus = () => {
+                const inProgress = this.chatSessionsService.getInProgress();
+                if (( inProgress.some(item => item.count > 0))) {
+                    addSeparator(( localize(5268, "Chat Sessions")), toAction({
+                        id: 'workbench.view.chat.status.sessions',
+                        label: ( localize(5269, "View Chat Sessions")),
+                        tooltip: ( localize(5270, "View Chat Sessions")),
+                        class: ThemeIcon.asClassName(Codicon.eye),
+                        run: () => this.runCommandAndClose('workbench.view.chat.sessions'),
+                    }));
+                    for (const { displayName, count } of inProgress) {
+                        if (count > 0) {
+                            let lowerCaseName = displayName.toLocaleLowerCase();
+                            if (lowerCaseName.endsWith('session') || lowerCaseName.endsWith('sessions')) {
+                                lowerCaseName = lowerCaseName.replace(/session$|sessions$/g, count > 1 ? 'sessions' : 'session');
+                            }
+                            const text = ( localize(5271, "$(loading~spin) {0} {1} in progress", count, lowerCaseName));
+                            chatSessionsElement = this.element.appendChild($('div.description'));
+                            const parts = renderLabelWithIcons(text);
+                            chatSessionsElement.append(...parts);
+                        }
+                    }
+                }
+                else {
+                    chatSessionsElement?.remove();
+                }
+            };
+            updateStatus();
+            disposables.add(this.chatSessionsService.onDidChangeInProgress(updateStatus));
+        }
         {
             for (const item of this.chatStatusItemService.getEntries()) {
                 addSeparator();
@@ -351,10 +399,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         {
             const chatSentiment = this.chatEntitlementService.sentiment;
-            addSeparator(( localize(5157, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
+            addSeparator(( localize(5272, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
                 id: 'workbench.action.openChatSettings',
-                label: ( localize(5158, "Settings")),
-                tooltip: ( localize(5159, "Open Settings")),
+                label: ( localize(5273, "Settings")),
+                tooltip: ( localize(5274, "Open Settings")),
                 class: ThemeIcon.asClassName(Codicon.settingsGear),
                 run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
             }) : undefined);
@@ -362,7 +410,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         if (canUseCopilot(this.chatEntitlementService)) {
             const snooze = append(this.element, $('div.snooze-completions'));
-            this.createCompletionsSnooze(snooze, ( localize(5160, "Snooze")), disposables);
+            this.createCompletionsSnooze(snooze, ( localize(5275, "Snooze")), disposables);
         }
         {
             const newUser = isNewUser(this.chatEntitlementService);
@@ -372,23 +420,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 addSeparator();
                 let descriptionText;
                 if (newUser) {
-                    descriptionText = ( localize(5161, "Set up Copilot to use AI features."));
+                    descriptionText = ( localize(5276, "Set up Copilot to use AI features."));
                 }
                 else if (disabled) {
-                    descriptionText = ( localize(5162, "Enable Copilot to use AI features."));
+                    descriptionText = ( localize(5277, "Enable Copilot to use AI features."));
                 }
                 else {
-                    descriptionText = ( localize(5163, "Sign in to use Copilot AI features."));
+                    descriptionText = ( localize(5278, "Sign in to use Copilot AI features."));
                 }
                 let buttonLabel;
                 if (newUser) {
-                    buttonLabel = ( localize(5164, "Set up Copilot"));
+                    buttonLabel = ( localize(5279, "Set up Copilot"));
                 }
                 else if (disabled) {
-                    buttonLabel = ( localize(5165, "Enable Copilot"));
+                    buttonLabel = ( localize(5280, "Enable Copilot"));
                 }
                 else {
-                    buttonLabel = ( localize(5166, "Sign in to use Copilot"));
+                    buttonLabel = ( localize(5281, "Sign in to use Copilot"));
                 }
                 this.element.appendChild($('div.description', undefined, descriptionText));
                 const button = disposables.add(( new Button(
@@ -415,8 +463,8 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const headerLink = typeof item.label === 'string' ? undefined : item.label.link;
         this.renderHeader(itemElement, disposables, headerLabel, headerLink ? toAction({
             id: 'workbench.action.openChatStatusItemLink',
-            label: ( localize(5167, "Learn More")),
-            tooltip: ( localize(5167, "Learn More")),
+            label: ( localize(5282, "Learn More")),
+            tooltip: ( localize(5282, "Learn More")),
             class: ThemeIcon.asClassName(Codicon.linkExternal),
             run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(headerLink)))),
         }) : undefined);
@@ -460,7 +508,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 quotaIndicator,
                 { ...defaultButtonStyles, secondary: true, hoverDelegate: nativeHoverDelegate }
             )));
-            manageOverageButton.label = ( localize(5168, "Manage paid premium requests"));
+            manageOverageButton.label = ( localize(5283, "Manage paid premium requests"));
             disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))))));
         }
         const update = (quota) => {
@@ -474,17 +522,17 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 usedPercentage = Math.max(0, 100 - quota.percentRemaining);
             }
             if (quota.unlimited) {
-                quotaValue.textContent = ( localize(5169, "Included"));
+                quotaValue.textContent = ( localize(5284, "Included"));
             }
             else if (quota.overageCount) {
                 quotaValue.textContent = ( localize(
-                    5170,
+                    5285,
                     "+{0} requests",
                     this.quotaOverageFormatter.value.format(quota.overageCount)
                 ));
             }
             else {
-                quotaValue.textContent = ( localize(5171, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
+                quotaValue.textContent = ( localize(5286, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
             }
             quotaBit.style.width = `${usedPercentage}%`;
             if (usedPercentage >= 90) {
@@ -495,10 +543,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
             if (supportsOverage) {
                 if (quota.overageEnabled) {
-                    overageLabel.textContent = ( localize(5172, "Additional paid premium requests enabled."));
+                    overageLabel.textContent = ( localize(5287, "Additional paid premium requests enabled."));
                 }
                 else {
-                    overageLabel.textContent = ( localize(5173, "Additional paid premium requests disabled."));
+                    overageLabel.textContent = ( localize(5288, "Additional paid premium requests disabled."));
                 }
             }
             else {
@@ -513,15 +561,15 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const settings = container.appendChild($('div.settings'));
         {
             const globalSetting = append(settings, $('div.setting'));
-            this.createCodeCompletionsSetting(globalSetting, ( localize(5174, "All files")), '*', disposables);
+            this.createCodeCompletionsSetting(globalSetting, ( localize(5289, "All files")), '*', disposables);
             if (modeId) {
                 const languageSetting = append(settings, $('div.setting'));
-                this.createCodeCompletionsSetting(languageSetting, ( localize(5175, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
+                this.createCodeCompletionsSetting(languageSetting, ( localize(5290, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
             }
         }
         {
             const setting = append(settings, $('div.setting'));
-            this.createNextEditSuggestionsSetting(setting, ( localize(5176, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
+            this.createNextEditSuggestionsSetting(setting, ( localize(5291, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
         }
         return settings;
     }
@@ -626,7 +674,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const toolbar = disposables.add(( new ActionBar(actionBar, { hoverDelegate: nativeHoverDelegate })));
         const cancelAction = toAction({
             id: 'workbench.action.cancelSnoozeStatusBarLink',
-            label: ( localize(5177, "Cancel Snooze")),
+            label: ( localize(5292, "Cancel Snooze")),
             run: () => this.inlineCompletionsService.cancelSnooze(),
             class: ThemeIcon.asClassName(Codicon.stopCircle)
         });
@@ -635,19 +683,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             toolbar.clear();
             const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
             if (!isEnabled || timeLeftMs <= 0) {
-                timerDisplay.textContent = ( localize(5178, "Hide completions for 5 min"));
+                timerDisplay.textContent = ( localize(5293, "Hide completions for 5 min"));
                 timerDisplay.title = '';
                 button.label = label;
-                button.setTitle(( localize(5179, "Hide completions and NES for 5 min")));
+                button.setTitle(( localize(5294, "Hide completions and NES 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(5180, "remaining"))}`;
-            timerDisplay.title = ( localize(5181, "Completions are hidden for the remaining duration"));
-            button.label = ( localize(5182, "+5 min"));
-            button.setTitle(( localize(5183, "Snooze additional 5 min")));
+            timerDisplay.textContent = `${minutes}:${seconds < 10 ? '0' : ''}${seconds} ${( localize(5295, "remaining"))}`;
+            timerDisplay.title = ( localize(5296, "Completions are hidden for the remaining duration"));
+            button.label = ( localize(5297, "+5 min"));
+            button.setTitle(( localize(5298, "Snooze additional 5 min")));
             toolbar.push([cancelAction], { icon: true, label: false });
             return false;
         };
@@ -687,7 +735,8 @@ ChatStatusDashboard = ( __decorate([
     ( __param(7, IOpenerService)),
     ( __param(8, ITelemetryService)),
     ( __param(9, ITextResourceConfigurationService)),
-    ( __param(10, IInlineCompletionsService))
+    ( __param(10, IInlineCompletionsService)),
+    ( __param(11, IChatSessionsService))
 ], ChatStatusDashboard));
 
 export { ChatStatusBarEntry };

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

@@ -1,12 +1,11 @@
 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 { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IToolAndToolSetEnablementMap } 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;
     _serviceBrand: undefined;
     constructor(chatWidgetService: IChatWidgetService);
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
-    getSelectedTools(sessionId: string): ReadonlyArray<IToolData>;
-    getSelectedToolSets(sessionId: string): ReadonlyArray<ToolSet>;
+    getSelectedToolAndToolSets(sessionId: string): IToolAndToolSetEnablementMap;
 }

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

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { ToolSet } 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';
 import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -39,21 +38,12 @@ let ChatVariablesService = class ChatVariablesService {
         }
         return model.variables;
     }
-    getSelectedTools(sessionId) {
+    getSelectedToolAndToolSets(sessionId) {
         const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
         if (!widget) {
-            return [];
-        }
-        return Array.from(widget.input.selectedToolsModel.entries.get())
-            .filter((t) => !(t instanceof ToolSet));
-    }
-    getSelectedToolSets(sessionId) {
-        const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
-        if (!widget) {
-            return [];
+            return ( new Map());
         }
-        return Array.from(widget.input.selectedToolsModel.entries.get())
-            .filter((t) => t instanceof ToolSet);
+        return widget.input.selectedToolsModel.entriesMap.get();
     }
 };
 ChatVariablesService = ( __decorate([

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

@@ -10,11 +10,12 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IChatViewTitleActionContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { ChatWidget, IChatViewState } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
@@ -27,6 +28,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly chatAgentService;
     private readonly logService;
     private readonly layoutService;
+    private readonly chatSessionsService;
     private _widget;
     get widget(): ChatWidget;
     private readonly modelDisposables;
@@ -35,7 +37,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private _restoringSession;
     constructor(chatOptions: {
         location: ChatAgentLocation.Panel;
-    }, options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, layoutService: ILayoutService);
+    }, options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, layoutService: ILayoutService, chatSessionsService: IChatSessionsService);
     getActionsContext(): IChatViewTitleActionContext | undefined;
     private updateModel;
     shouldShowWelcome(): boolean;