@codingame/monaco-vscode-chat-service-override 17.2.1 → 18.0.0

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IStatusbarService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
-import { ChatEntitlementService } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlementService } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";

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

@@ -9,7 +9,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { StatusbarAlignment, ShowTooltipCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { $, clearNode, append, EventType, addDisposableListener, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { ChatSentiment, ChatEntitlement } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
 import { defaultButtonStyles, defaultCheckboxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { Checkbox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/toggle/toggle';
@@ -58,43 +58,43 @@ const gaugeBackground = registerColor('gauge.background', {
     light: inputValidationInfoBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4901, "Gauge background color.")));
+}, ( localize(4962, "Gauge background color.")));
 registerColor('gauge.foreground', {
     dark: ( transparent(gaugeBackground, 0.3)),
     light: ( transparent(gaugeBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(4902, "Gauge foreground color.")));
+}, ( localize(4963, "Gauge foreground color.")));
 registerColor('gauge.border', {
     dark: null,
     light: null,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4903, "Gauge border color.")));
+}, ( localize(4964, "Gauge border color.")));
 const gaugeWarningBackground = registerColor('gauge.warningBackground', {
     dark: inputValidationWarningBorder,
     light: inputValidationWarningBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4904, "Gauge warning background color.")));
+}, ( localize(4965, "Gauge warning background color.")));
 registerColor('gauge.warningForeground', {
     dark: ( transparent(gaugeWarningBackground, 0.3)),
     light: ( transparent(gaugeWarningBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(4905, "Gauge warning foreground color.")));
+}, ( localize(4966, "Gauge warning foreground color.")));
 const gaugeErrorBackground = registerColor('gauge.errorBackground', {
     dark: inputValidationErrorBorder,
     light: inputValidationErrorBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(4906, "Gauge error background color.")));
+}, ( localize(4967, "Gauge error background color.")));
 registerColor('gauge.errorForeground', {
     dark: ( transparent(gaugeErrorBackground, 0.3)),
     light: ( transparent(gaugeErrorBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(4907, "Gauge error foreground color.")));
+}, ( localize(4968, "Gauge error foreground color.")));
 const defaultChat = {
     completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
     nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
@@ -117,7 +117,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.registerListeners();
     }
     update() {
-        if (this.chatEntitlementService.sentiment !== ChatSentiment.Disabled) {
+        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 });
             }
@@ -153,27 +153,45 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = '$(copilot)';
-        let ariaLabel = ( localize(4908, "Copilot Status"));
+        let ariaLabel = ( localize(4969, "Copilot Status"));
         let kind;
-        if (!isNewUser(this.chatEntitlementService)) {
+        if (isNewUser(this.chatEntitlementService)) {
+            const entitlement = this.chatEntitlementService.entitlement;
+            if (((
+            this.chatEntitlementService.sentiment.later ||
+                entitlement === ChatEntitlement.Available ||
+                isProUser(entitlement) || entitlement === ChatEntitlement.Free)
+            ) &&
+                this.configurationService.getValue('chat.setup.continueLaterIndicator') === true) {
+                const finishSetup = ( localize(4970, "Finish Setup"));
+                text = `$(copilot) ${finishSetup}`;
+                ariaLabel = finishSetup;
+                kind = this.chatEntitlementService.sentiment.later ? 'prominent' : undefined;
+            }
+        }
+        else {
             const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
             const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
-            if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signedOutWarning = ( localize(4909, "Signed out"));
+            if (this.chatEntitlementService.sentiment.disabled) {
+                text = `$(copilot-unavailable)`;
+                ariaLabel = ( localize(4971, "Copilot Disabled"));
+            }
+            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
+                const signedOutWarning = ( localize(4972, "Signed out"));
                 text = `$(copilot-not-connected) ${signedOutWarning}`;
                 ariaLabel = signedOutWarning;
                 kind = 'prominent';
             }
-            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited && (chatQuotaExceeded || completionsQuotaExceeded)) {
+            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(4910, "Chat quota reached"));
+                    quotaWarning = ( localize(4973, "Chat quota reached"));
                 }
                 else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(4911, "Completions quota reached"));
+                    quotaWarning = ( localize(4974, "Completions quota reached"));
                 }
                 else {
-                    quotaWarning = ( localize(4912, "Quota reached"));
+                    quotaWarning = ( localize(4975, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
@@ -181,11 +199,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = `$(copilot-unavailable)`;
-                ariaLabel = ( localize(4913, "Code Completions Disabled"));
+                ariaLabel = ( localize(4976, "Code completions disabled"));
             }
         }
         return {
-            name: ( localize(4908, "Copilot Status")),
+            name: ( localize(4969, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -208,15 +226,16 @@ ChatStatusBarEntry = ( __decorate([
     ( __param(4, IConfigurationService))
 ], ChatStatusBarEntry));
 function isNewUser(chatEntitlementService) {
-    return chatEntitlementService.sentiment !== ChatSentiment.Installed ||
+    return !chatEntitlementService.sentiment.installed ||
         chatEntitlementService.entitlement === ChatEntitlement.Available;
 }
 function canUseCopilot(chatEntitlementService) {
     const newUser = isNewUser(chatEntitlementService);
+    const disabled = chatEntitlementService.sentiment.disabled;
     const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
-    const limited = chatEntitlementService.entitlement === ChatEntitlement.Limited;
-    const allFreeQuotaReached = limited && chatEntitlementService.quotas.chat?.percentRemaining === 0 && chatEntitlementService.quotas.completions?.percentRemaining === 0;
-    return !newUser && !signedOut && !allFreeQuotaReached;
+    const free = chatEntitlementService.entitlement === ChatEntitlement.Free;
+    const allFreeQuotaReached = free && chatEntitlementService.quotas.chat?.percentRemaining === 0 && chatEntitlementService.quotas.completions?.percentRemaining === 0;
+    return !newUser && !signedOut && !allFreeQuotaReached && !disabled;
 }
 function isCompletionsEnabled(configurationService, modeId = '*') {
     const result = configurationService.getValue(defaultChat.completionsEnablementSetting);
@@ -242,9 +261,9 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         this.telemetryService = telemetryService;
         this.textResourceConfigurationService = textResourceConfigurationService;
         this.element = $('div.chat-status-bar-entry-tooltip');
-        this.dateFormatter = ( new Lazy(
-            () => safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' })
-        ));
+        this.dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: '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()));
     }
     show(token) {
@@ -263,29 +282,29 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         };
         const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate } = this.chatEntitlementService.quotas;
         if (chatQuota || completionsQuota || premiumChatQuota) {
-            addSeparator(( localize(4914, "Copilot Usage")), toAction({
+            addSeparator(( localize(4977, "Copilot Usage")), toAction({
                 id: 'workbench.action.manageCopilot',
-                label: ( localize(4915, "Manage Copilot")),
-                tooltip: ( localize(4916, "Manage Copilot")),
+                label: ( localize(4978, "Manage Copilot")),
+                tooltip: ( localize(4979, "Manage Copilot")),
                 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(4917, "Code completions")), false) : undefined;
-            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(4918, "Chat messages")), false) : undefined;
-            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(4919, "Premium requests")), true) : undefined;
+            const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, ( localize(4980, "Code completions")), false) : undefined;
+            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(4981, "Chat messages")), false) : undefined;
+            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(4982, "Premium requests")), true) : undefined;
             if (resetDate) {
                 this.element.appendChild($('div.description', undefined, ( localize(
-                    4920,
+                    4983,
                     "Allowance resets {0}.",
                     this.dateFormatter.value.format(( new Date(resetDate)))
                 ))));
             }
-            if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
+            if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
                 const upgradeProButton = disposables.add(( new Button(
                     this.element,
                     { ...defaultButtonStyles, secondary: canUseCopilot(this.chatEntitlementService)  }
                 )));
-                upgradeProButton.label = ( localize(4921, "Upgrade to Copilot Pro"));
+                upgradeProButton.label = ( localize(4984, "Upgrade to Copilot Pro"));
                 disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
             }
             (async () => {
@@ -323,10 +342,11 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
         }
         {
-            addSeparator(( localize(4922, "Settings")), this.chatEntitlementService.sentiment === ChatSentiment.Installed ? toAction({
+            const chatSentiment = this.chatEntitlementService.sentiment;
+            addSeparator(( localize(4985, "Settings")), chatSentiment.installed && !chatSentiment.disabled ? toAction({
                 id: 'workbench.action.openChatSettings',
-                label: ( localize(4923, "Settings")),
-                tooltip: ( localize(4924, "Open Settings")),
+                label: ( localize(4986, "Settings")),
+                tooltip: ( localize(4987, "Open Settings")),
                 class: ThemeIcon.asClassName(Codicon.settingsGear),
                 run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
             }) : undefined);
@@ -334,13 +354,34 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         {
             const newUser = isNewUser(this.chatEntitlementService);
+            const disabled = this.chatEntitlementService.sentiment.disabled;
             const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
-            if (newUser || signedOut) {
+            if (newUser || signedOut || disabled) {
                 addSeparator();
-                this.element.appendChild($('div.description', undefined, newUser ? ( localize(4925, "Set up Copilot to use AI features.")) : ( localize(4926, "Sign in to use Copilot AI features."))));
+                let descriptionText;
+                if (newUser) {
+                    descriptionText = ( localize(4988, "Set up Copilot to use AI features."));
+                }
+                else if (disabled) {
+                    descriptionText = ( localize(4989, "Enable Copilot to use AI features."));
+                }
+                else {
+                    descriptionText = ( localize(4990, "Sign in to use Copilot AI features."));
+                }
+                let buttonLabel;
+                if (newUser) {
+                    buttonLabel = ( localize(4991, "Set up Copilot"));
+                }
+                else if (disabled) {
+                    buttonLabel = ( localize(4992, "Enable Copilot"));
+                }
+                else {
+                    buttonLabel = ( localize(4993, "Sign in to use Copilot"));
+                }
+                this.element.appendChild($('div.description', undefined, descriptionText));
                 const button = disposables.add(( new Button(this.element, { ...defaultButtonStyles })));
-                button.label = newUser ? ( localize(4927, "Set up Copilot")) : ( localize(4928, "Sign in to use Copilot"));
-                disposables.add(button.onDidClick(() => this.runCommandAndClose(newUser ? 'workbench.action.chat.triggerSetup' : () => this.chatEntitlementService.requests?.value.signIn())));
+                button.label = buttonLabel;
+                disposables.add(button.onDidClick(() => this.runCommandAndClose('workbench.action.chat.triggerSetup')));
             }
         }
         return this.element;
@@ -359,8 +400,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(4929, "Learn More")),
-            tooltip: ( localize(4929, "Learn More")),
+            label: ( localize(4994, "Learn More")),
+            tooltip: ( localize(4994, "Learn More")),
             class: ThemeIcon.asClassName(Codicon.linkExternal),
             run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(headerLink)))),
         }) : undefined);
@@ -401,7 +442,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const quotaIndicator = container.appendChild($('div.quota-indicator', undefined, $('div.quota-label', undefined, $('span', undefined, label), quotaValue), $('div.quota-bar', undefined, quotaBit), $('div.description', undefined, overageLabel)));
         if (supportsOverage && (this.chatEntitlementService.entitlement === ChatEntitlement.Pro || this.chatEntitlementService.entitlement === ChatEntitlement.ProPlus)) {
             const manageOverageButton = disposables.add(( new Button(quotaIndicator, { ...defaultButtonStyles, secondary: true })));
-            manageOverageButton.label = ( localize(4930, "Manage paid premium requests"));
+            manageOverageButton.label = ( localize(4995, "Manage paid premium requests"));
             disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))))));
         }
         const update = (quota) => {
@@ -414,16 +455,18 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             else {
                 usedPercentage = Math.max(0, 100 - quota.percentRemaining);
             }
-            const quotaPercentageFormatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 1, minimumFractionDigits: 0 });
-            const overageFormatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 0 });
             if (quota.unlimited) {
-                quotaValue.textContent = ( localize(4931, "Included"));
+                quotaValue.textContent = ( localize(4996, "Included"));
             }
             else if (quota.overageCount) {
-                quotaValue.textContent = ( localize(4932, "+{0} requests", overageFormatter.format(quota.overageCount)));
+                quotaValue.textContent = ( localize(
+                    4997,
+                    "+{0} requests",
+                    this.quotaOverageFormatter.value.format(quota.overageCount)
+                ));
             }
             else {
-                quotaValue.textContent = ( localize(4933, "{0}%", quotaPercentageFormatter.format(usedPercentage)));
+                quotaValue.textContent = ( localize(4998, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
             }
             quotaBit.style.width = `${usedPercentage}%`;
             if (usedPercentage >= 90) {
@@ -434,10 +477,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
             if (supportsOverage) {
                 if (quota.overageEnabled) {
-                    overageLabel.textContent = ( localize(4934, "Additional paid premium requests enabled."));
+                    overageLabel.textContent = ( localize(4999, "Additional paid premium requests enabled."));
                 }
                 else {
-                    overageLabel.textContent = ( localize(4935, "Additional paid premium requests disabled."));
+                    overageLabel.textContent = ( localize(5000, "Additional paid premium requests disabled."));
                 }
             }
             else {
@@ -452,19 +495,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const settings = container.appendChild($('div.settings'));
         {
             const globalSetting = append(settings, $('div.setting'));
-            this.createCodeCompletionsSetting(globalSetting, ( localize(4936, "Code Completions (all files)")), '*', disposables);
+            this.createCodeCompletionsSetting(globalSetting, ( localize(5001, "Code completions (all files)")), '*', disposables);
             if (modeId) {
                 const languageSetting = append(settings, $('div.setting'));
                 this.createCodeCompletionsSetting(languageSetting, ( localize(
-                    4937,
-                    "Code Completions ({0})",
+                    5002,
+                    "Code completions ({0})",
                     this.languageService.getLanguageName(modeId) ?? modeId
                 )), modeId, disposables);
             }
         }
         {
             const setting = append(settings, $('div.setting'));
-            this.createNextEditSuggestionsSetting(setting, ( localize(4938, "Next Edit Suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
+            this.createNextEditSuggestionsSetting(setting, ( localize(5003, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
         }
         return settings;
     }

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

@@ -1,6 +1,6 @@
 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 } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IToolData, 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";
 export declare class ChatVariablesService implements IChatVariablesService {
     private readonly chatWidgetService;
@@ -8,4 +8,5 @@ export declare class ChatVariablesService implements IChatVariablesService {
     constructor(chatWidgetService: IChatWidgetService);
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
     getSelectedTools(sessionId: string): ReadonlyArray<IToolData>;
+    getSelectedToolSets(sessionId: string): ReadonlyArray<ToolSet>;
 }

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

@@ -1,5 +1,6 @@
 
 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';
 
@@ -23,7 +24,16 @@ let ChatVariablesService = class ChatVariablesService {
         if (!widget) {
             return [];
         }
-        return widget.input.selectedToolsModel.tools.get();
+        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 Array.from(widget.input.selectedToolsModel.entries.get())
+            .filter((t) => t instanceof ToolSet);
     }
 };
 ChatVariablesService = ( __decorate([

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

@@ -9,7 +9,7 @@ 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-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-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";
@@ -31,8 +31,6 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly modelDisposables;
     private memento;
     private readonly viewState;
-    private defaultParticipantRegistrationFailed;
-    private didUnregisterProvider;
     private _restoringSession;
     constructor(chatOptions: {
         location: ChatAgentLocation.Panel;

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

@@ -28,13 +28,14 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from '@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common/vscode/vs/workbench/common/memento';
+import { ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common/vscode/vs/workbench/common/memento';
 import { SIDE_BAR_FOREGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
+import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatModelInitState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
@@ -52,8 +53,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.logService = logService;
         this.layoutService = layoutService;
         this.modelDisposables = this._register(( new DisposableStore()));
-        this.defaultParticipantRegistrationFailed = false;
-        this.didUnregisterProvider = false;
         this.memento = ( new Memento('interactive-session-view-' + CHAT_PROVIDER_ID, this.storageService));
         this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         if (this.chatOptions.location === ChatAgentLocation.Panel && !this.viewState.hasMigratedCurrentSession) {
@@ -89,9 +88,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                             try {
                                 this._widget.setVisible(false);
                                 await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
-                                this.defaultParticipantRegistrationFailed = false;
-                                this.didUnregisterProvider = false;
-                                this._onDidChangeViewWelcomeState.fire();
                             }
                             finally {
                                 this.widget.setVisible(wasVisible);
@@ -100,11 +96,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                     this._restoringSession.finally(() => this._restoringSession = undefined);
                 }
             }
-            else if (this._widget?.viewModel?.initState === ChatModelInitState.Initialized) {
-                this.didUnregisterProvider = true;
-            }
             this._onDidChangeViewWelcomeState.fire();
         }));
+        ChatContextKeys.panelLocation.bindTo(contextKeyService).set(viewDescriptorService.getViewLocationById(options.id) ?? ViewContainerLocation.AuxiliaryBar);
     }
     getActionsContext() {
         return this.widget?.viewModel ? {
@@ -132,8 +126,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const hasCoreAgent = ( this.chatAgentService.getAgents().some(
             agent => agent.isCore && agent.locations.includes(this.chatOptions.location)
         ));
-        const shouldShow = !hasCoreAgent && (this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed);
-        this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: hasCoreAgent=${hasCoreAgent} didUnregister=${this.didUnregisterProvider} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed}`);
+        const hasDefaultAgent = this.chatAgentService.getDefaultAgent(this.chatOptions.location) !== undefined;
+        const shouldShow = !hasCoreAgent && (!hasDefaultAgent || !this._widget?.viewModel && noPersistedSessions);
+        this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: hasCoreAgent=${hasCoreAgent} hasDefaultAgent=${hasDefaultAgent} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions}`);
         return !!shouldShow;
     }
     getTransferredOrPersistedSessionInfo() {
@@ -185,13 +180,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             this._register(this._widget.onDidClear(() => this.clear()));
             this._widget.render(parent);
             const info = this.getTransferredOrPersistedSessionInfo();
-            const disposeListener = this._register(this.chatService.onDidDisposeSession((e) => {
-                if (e.reason === 'initializationFailed') {
-                    this.defaultParticipantRegistrationFailed = true;
-                    disposeListener?.dispose();
-                    this._onDidChangeViewWelcomeState.fire();
-                }
-            }));
             const model = info.sessionId ? await this.chatService.getOrRestoreSession(info.sessionId) : undefined;
             await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
         }

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

@@ -1,5 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService {
     _serviceBrand: undefined;

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

@@ -21,7 +21,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { IChatModeService } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModes.service';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
@@ -34,12 +35,13 @@ function agentAndCommandToKey(agent, subcommand) {
     return subcommand ? `${agent.id}__${subcommand}` : agent.id;
 }
 let InputEditorDecorations = class InputEditorDecorations extends Disposable {
-    constructor(widget, codeEditorService, themeService, chatAgentService) {
+    constructor(widget, codeEditorService, themeService, chatAgentService, chatModeService) {
         super();
         this.widget = widget;
         this.codeEditorService = codeEditorService;
         this.themeService = themeService;
         this.chatAgentService = chatAgentService;
+        this.chatModeService = chatModeService;
         this.id = 'inputEditorDecorations';
         this.previouslyUsedAgents = ( new Set());
         this.viewModelDisposables = this._register(( new MutableDisposable()));
@@ -57,6 +59,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent, e.slashCommand?.name));
         }));
         this._register(this.chatAgentService.onDidChangeAgents(() => this.updateInputEditorDecorations()));
+        this._register(this.chatModeService.onDidChangeChatModes(() => this.updateInputEditorDecorations()));
         this.registerViewModelListeners();
     }
     registerViewModelListeners() {
@@ -101,7 +104,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             return;
         }
         if (!inputValue) {
-            const defaultAgent = this.chatAgentService.getDefaultAgent(this.widget.location, this.widget.input.currentMode);
+            const description = this.widget.input.currentMode2.description;
             const decoration = [
                 {
                     range: {
@@ -112,7 +115,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                     },
                     renderOptions: {
                         after: {
-                            contentText: viewModel.inputPlaceholder || (defaultAgent?.description ?? ''),
+                            contentText: viewModel.inputPlaceholder || (description ?? ''),
                             color: this.getPlaceholderColor()
                         }
                     }
@@ -203,7 +206,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
         const varDecorations = [];
-        const toolParts = parsedRequest.filter((p) => p instanceof ChatRequestToolPart);
+        const toolParts = parsedRequest.filter((p) => p instanceof ChatRequestToolPart || p instanceof ChatRequestToolSetPart);
         for (const tool of toolParts) {
             varDecorations.push({ range: tool.editorRange });
         }
@@ -213,7 +216,8 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
 InputEditorDecorations = ( __decorate([
     ( __param(1, ICodeEditorService)),
     ( __param(2, IThemeService)),
-    ( __param(3, IChatAgentService))
+    ( __param(3, IChatAgentService)),
+    ( __param(4, IChatModeService))
 ], InputEditorDecorations));
 class InputEditorSlashCommandMode extends Disposable {
     constructor(widget) {

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

@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(4967, 'There is a chat agent hover part here.');
+        return localize(5034, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([