@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -53,8 +53,9 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 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';
-import { MarkdownRenderer } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { AGENT_SESSIONS_VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 registerCss(chatStatus);
 const gaugeForeground = registerColor('gauge.foreground', {
@@ -62,43 +63,43 @@ const gaugeForeground = registerColor('gauge.foreground', {
     light: inputValidationInfoBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5296, "Gauge foreground color.")));
+}, ( localize(5460, "Gauge foreground color.")));
 registerColor('gauge.background', {
     dark: ( transparent(gaugeForeground, 0.3)),
     light: ( transparent(gaugeForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5297, "Gauge background color.")));
+}, ( localize(5461, "Gauge background color.")));
 registerColor('gauge.border', {
     dark: null,
     light: null,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5298, "Gauge border color.")));
+}, ( localize(5462, "Gauge border color.")));
 const gaugeWarningForeground = registerColor('gauge.warningForeground', {
     dark: inputValidationWarningBorder,
     light: inputValidationWarningBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5299, "Gauge warning foreground color.")));
+}, ( localize(5463, "Gauge warning foreground color.")));
 registerColor('gauge.warningBackground', {
     dark: ( transparent(gaugeWarningForeground, 0.3)),
     light: ( transparent(gaugeWarningForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5300, "Gauge warning background color.")));
+}, ( localize(5464, "Gauge warning background color.")));
 const gaugeErrorForeground = registerColor('gauge.errorForeground', {
     dark: inputValidationErrorBorder,
     light: inputValidationErrorBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5301, "Gauge error foreground color.")));
+}, ( localize(5465, "Gauge error foreground color.")));
 registerColor('gauge.errorBackground', {
     dark: ( transparent(gaugeErrorForeground, 0.3)),
     light: ( transparent(gaugeErrorForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5302, "Gauge error background color.")));
+}, ( localize(5466, "Gauge error background color.")));
 const defaultChat = {
     completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
     nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
@@ -166,7 +167,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = '$(copilot)';
-        let ariaLabel = ( localize(5303, "Copilot Status"));
+        let ariaLabel = ( localize(5467, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
@@ -175,7 +176,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
                 isProUser(entitlement) ||
                 entitlement === ChatEntitlement.Free
             ) {
-                const finishSetup = ( localize(5304, "Finish Setup"));
+                const finishSetup = ( localize(5468, "Finish Setup"));
                 text = `$(copilot) ${finishSetup}`;
                 ariaLabel = finishSetup;
                 kind = 'prominent';
@@ -187,19 +188,19 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             const chatSessionsInProgressCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = '$(copilot-unavailable)';
-                ariaLabel = ( localize(5305, "Copilot disabled"));
+                ariaLabel = ( localize(5469, "Copilot disabled"));
             }
             else if (chatSessionsInProgressCount > 0) {
                 text = '$(copilot-in-progress)';
                 if (chatSessionsInProgressCount > 1) {
-                    ariaLabel = ( localize(5306, "{0} chat sessions in progress", chatSessionsInProgressCount));
+                    ariaLabel = ( localize(5470, "{0} agent sessions in progress", chatSessionsInProgressCount));
                 }
                 else {
-                    ariaLabel = ( localize(5307, "1 chat session in progress"));
+                    ariaLabel = ( localize(5471, "1 agent session in progress"));
                 }
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signedOutWarning = ( localize(5308, "Signed out"));
+                const signedOutWarning = ( localize(5472, "Signed out"));
                 text = `${this.chatEntitlementService.anonymous ? '$(copilot)' : '$(copilot-not-connected)'} ${signedOutWarning}`;
                 ariaLabel = signedOutWarning;
                 kind = 'prominent';
@@ -207,13 +208,13 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(5309, "Chat quota reached"));
+                    quotaWarning = ( localize(5473, "Chat quota reached"));
                 }
                 else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(5310, "Completions quota reached"));
+                    quotaWarning = ( localize(5474, "Inline suggestions quota reached"));
                 }
                 else {
-                    quotaWarning = ( localize(5311, "Quota reached"));
+                    quotaWarning = ( localize(5475, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
@@ -221,15 +222,15 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = '$(copilot-unavailable)';
-                ariaLabel = ( localize(5312, "Code completions disabled"));
+                ariaLabel = ( localize(5476, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = '$(copilot-snooze)';
-                ariaLabel = ( localize(5313, "Code completions snoozed"));
+                ariaLabel = ( localize(5477, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(5303, "Copilot Status")),
+            name: ( localize(5478, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -258,13 +259,17 @@ function isNewUser(chatEntitlementService) {
     return !chatEntitlementService.sentiment.installed ||
         chatEntitlementService.entitlement === ChatEntitlement.Available;
 }
-function canUseCopilot(chatEntitlementService) {
-    const newUser = isNewUser(chatEntitlementService);
-    const disabled = chatEntitlementService.sentiment.disabled || chatEntitlementService.sentiment.untrusted;
-    const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
-    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 canUseChat(chatEntitlementService) {
+    if (!chatEntitlementService.sentiment.installed || chatEntitlementService.sentiment.disabled || chatEntitlementService.sentiment.untrusted) {
+        return false;
+    }
+    if (chatEntitlementService.entitlement === ChatEntitlement.Unknown || chatEntitlementService.entitlement === ChatEntitlement.Available) {
+        return chatEntitlementService.anonymous;
+    }
+    if (chatEntitlementService.entitlement === ChatEntitlement.Free && chatEntitlementService.quotas.chat?.percentRemaining === 0 && chatEntitlementService.quotas.completions?.percentRemaining === 0) {
+        return false;
+    }
+    return true;
 }
 function isCompletionsEnabled(configurationService, modeId = '*') {
     const result = configurationService.getValue(defaultChat.completionsEnablementSetting);
@@ -277,7 +282,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, chatSessionsService, instantiationService) {
+    constructor(chatEntitlementService, chatStatusItemService, commandService, configurationService, editorService, hoverService, languageService, openerService, telemetryService, textResourceConfigurationService, inlineCompletionsService, chatSessionsService, markdownRendererService) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.chatStatusItemService = chatStatusItemService;
@@ -291,7 +296,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         this.textResourceConfigurationService = textResourceConfigurationService;
         this.inlineCompletionsService = inlineCompletionsService;
         this.chatSessionsService = chatSessionsService;
-        this.instantiationService = instantiationService;
+        this.markdownRendererService = markdownRendererService;
         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' });
@@ -315,19 +320,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         };
         const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate, resetDateHasTime } = this.chatEntitlementService.quotas;
         if (chatQuota || completionsQuota || premiumChatQuota) {
-            addSeparator(( localize(5314, "Copilot Usage")), toAction({
+            addSeparator(( localize(5479, "Copilot Usage")), toAction({
                 id: 'workbench.action.manageCopilot',
-                label: ( localize(5315, "Manage Chat")),
-                tooltip: ( localize(5316, "Manage Chat")),
+                label: ( localize(5480, "Manage Chat")),
+                tooltip: ( localize(5481, "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(5317, "Code completions")), false) : undefined;
-            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(5318, "Chat messages")), false) : undefined;
-            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(5319, "Premium requests")), true) : undefined;
+            const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, ( localize(5482, "Inline Suggestions")), false) : undefined;
+            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(5483, "Chat messages")), false) : undefined;
+            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(5484, "Premium requests")), true) : undefined;
             if (resetDate) {
                 this.element.appendChild($('div.description', undefined, ( localize(
-                    5320,
+                    5485,
                     "Allowance resets {0}.",
                     resetDateHasTime ? this.dateTimeFormatter.value.format(( new Date(resetDate))) : this.dateFormatter.value.format(( new Date(resetDate)))
                 ))));
@@ -335,9 +340,9 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
                 const upgradeProButton = disposables.add(( new Button(
                     this.element,
-                    { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: canUseCopilot(this.chatEntitlementService)  }
+                    { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: canUseChat(this.chatEntitlementService)  }
                 )));
-                upgradeProButton.label = ( localize(5321, "Upgrade to GitHub Copilot Pro"));
+                upgradeProButton.label = ( localize(5486, "Upgrade to GitHub Copilot Pro"));
                 disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
             }
             (async () => {
@@ -358,25 +363,32 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             })();
         }
         else if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.installed) {
-            addSeparator(( localize(5322, "Copilot Usage")));
-            this.createQuotaIndicator(this.element, disposables, ( localize(5323, "Disabled")), ( localize(5317, "Code completions")), false);
-            this.createQuotaIndicator(this.element, disposables, ( localize(5324, "Limited")), ( localize(5318, "Chat messages")), false);
+            addSeparator(( localize(5487, "Copilot Usage")));
+            this.createQuotaIndicator(this.element, disposables, ( localize(5488, "Limited")), ( localize(5482, "Inline Suggestions")), false);
+            this.createQuotaIndicator(this.element, disposables, ( localize(5488, "Limited")), ( localize(5483, "Chat messages")), false);
         }
         {
             let chatSessionsElement;
             const updateStatus = () => {
                 const inProgress = this.chatSessionsService.getInProgress();
                 if (( inProgress.some(item => item.count > 0))) {
-                    addSeparator(( localize(5325, "Chat Sessions")), toAction({
+                    addSeparator(( localize(5489, "Agent Sessions")), toAction({
                         id: 'workbench.view.chat.status.sessions',
-                        label: ( localize(5326, "View Chat Sessions")),
-                        tooltip: ( localize(5327, "View Chat Sessions")),
+                        label: ( localize(5490, "View Agent Sessions")),
+                        tooltip: ( localize(5491, "View Agent Sessions")),
                         class: ThemeIcon.asClassName(Codicon.eye),
-                        run: () => this.runCommandAndClose('workbench.view.chat.sessions'),
+                        run: () => {
+                            if (this.configurationService.getValue('chat.agentSessionsViewLocation') === 'single-view') {
+                                this.runCommandAndClose('workbench.view.agentSessions');
+                            }
+                            else {
+                                this.runCommandAndClose(AGENT_SESSIONS_VIEWLET_ID);
+                            }
+                        }
                     }));
                     for (const { displayName, count } of inProgress) {
                         if (count > 0) {
-                            const text = ( localize(5328, "$(loading~spin) {0} in progress", displayName));
+                            const text = ( localize(5492, "$(loading~spin) {0} in progress", displayName));
                             chatSessionsElement = this.element.appendChild($('div.description'));
                             const parts = renderLabelWithIcons(text);
                             chatSessionsElement.append(...parts);
@@ -409,18 +421,18 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         {
             const chatSentiment = this.chatEntitlementService.sentiment;
-            addSeparator(( localize(5329, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
+            addSeparator(( localize(5493, "Inline Suggestions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
                 id: 'workbench.action.openChatSettings',
-                label: ( localize(5330, "Settings")),
-                tooltip: ( localize(5331, "Open Settings")),
+                label: ( localize(5494, "Settings")),
+                tooltip: ( localize(5495, "Open Settings")),
                 class: ThemeIcon.asClassName(Codicon.settingsGear),
                 run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
             }) : undefined);
             this.createSettings(this.element, disposables);
         }
-        if (canUseCopilot(this.chatEntitlementService)) {
+        if (canUseChat(this.chatEntitlementService)) {
             const snooze = append(this.element, $('div.snooze-completions'));
-            this.createCompletionsSnooze(snooze, ( localize(5332, "Snooze")), disposables);
+            this.createCompletionsSnooze(snooze, ( localize(5496, "Snooze")), disposables);
         }
         {
             const newUser = isNewUser(this.chatEntitlementService);
@@ -433,7 +445,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 let descriptionClass = '.description';
                 if (newUser && anonymousUser) {
                     descriptionText = ( new MarkdownString(( localize(
-                        5333,
+                        5497,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                         defaultChat.provider.default.name,
                         defaultChat.provider.default.name,
@@ -443,29 +455,29 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                     descriptionClass = `${descriptionClass}.terms`;
                 }
                 else if (newUser) {
-                    descriptionText = ( localize(5334, "Set up Copilot to use AI features."));
+                    descriptionText = ( localize(5498, "Set up Copilot to use AI features."));
                 }
                 else if (anonymousUser) {
-                    descriptionText = ( localize(5335, "Sign in to enable more Copilot AI features."));
+                    descriptionText = ( localize(5499, "Sign in to enable more Copilot AI features."));
                 }
                 else if (disabled) {
-                    descriptionText = ( localize(5336, "Enable Copilot to use AI features."));
+                    descriptionText = ( localize(5500, "Enable Copilot to use AI features."));
                 }
                 else {
-                    descriptionText = ( localize(5337, "Sign in to use Copilot AI features."));
+                    descriptionText = ( localize(5501, "Sign in to use Copilot AI features."));
                 }
                 let buttonLabel;
                 if (newUser) {
-                    buttonLabel = ( localize(5338, "Set up Copilot"));
+                    buttonLabel = ( localize(5502, "Use AI Features"));
                 }
                 else if (anonymousUser) {
-                    buttonLabel = ( localize(5339, "Enable more AI Features"));
+                    buttonLabel = ( localize(5503, "Enable more AI Features"));
                 }
                 else if (disabled) {
-                    buttonLabel = ( localize(5340, "Enable Copilot"));
+                    buttonLabel = ( localize(5504, "Enable AI Features"));
                 }
                 else {
-                    buttonLabel = ( localize(5341, "Sign in to use Copilot"));
+                    buttonLabel = ( localize(5505, "Sign in to use AI Features"));
                 }
                 let commandId;
                 if (newUser && anonymousUser) {
@@ -478,8 +490,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                     this.element.appendChild($(`div${descriptionClass}`, undefined, descriptionText));
                 }
                 else {
-                    const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
-                    this.element.appendChild($(`div${descriptionClass}`, undefined, disposables.add(markdown.render(descriptionText)).element));
+                    this.element.appendChild($(`div${descriptionClass}`, undefined, disposables.add(this.markdownRendererService.render(descriptionText)).element));
                 }
                 const button = disposables.add(( new Button(
                     this.element,
@@ -505,8 +516,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(5342, "Learn More")),
-            tooltip: ( localize(5342, "Learn More")),
+            label: ( localize(5506, "Learn More")),
+            tooltip: ( localize(5506, "Learn More")),
             class: ThemeIcon.asClassName(Codicon.linkExternal),
             run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(headerLink)))),
         }) : undefined);
@@ -550,7 +561,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 quotaIndicator,
                 { ...defaultButtonStyles, secondary: true, hoverDelegate: nativeHoverDelegate }
             )));
-            manageOverageButton.label = ( localize(5343, "Manage paid premium requests"));
+            manageOverageButton.label = ( localize(5507, "Manage paid premium requests"));
             disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))))));
         }
         const update = (quota) => {
@@ -567,17 +578,17 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 quotaValue.textContent = quota;
             }
             else if (quota.unlimited) {
-                quotaValue.textContent = ( localize(5344, "Included"));
+                quotaValue.textContent = ( localize(5508, "Included"));
             }
             else if (quota.overageCount) {
                 quotaValue.textContent = ( localize(
-                    5345,
+                    5509,
                     "+{0} requests",
                     this.quotaOverageFormatter.value.format(quota.overageCount)
                 ));
             }
             else {
-                quotaValue.textContent = ( localize(5346, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
+                quotaValue.textContent = ( localize(5510, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
             }
             quotaBit.style.width = `${usedPercentage}%`;
             if (usedPercentage >= 90) {
@@ -588,10 +599,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
             if (supportsOverage) {
                 if (typeof quota !== 'string' && quota?.overageEnabled) {
-                    overageLabel.textContent = ( localize(5347, "Additional paid premium requests enabled."));
+                    overageLabel.textContent = ( localize(5511, "Additional paid premium requests enabled."));
                 }
                 else {
-                    overageLabel.textContent = ( localize(5348, "Additional paid premium requests disabled."));
+                    overageLabel.textContent = ( localize(5512, "Additional paid premium requests disabled."));
                 }
             }
             else {
@@ -606,24 +617,20 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const settings = container.appendChild($('div.settings'));
         {
             const globalSetting = append(settings, $('div.setting'));
-            this.createCodeCompletionsSetting(globalSetting, ( localize(5349, "All files")), '*', disposables);
+            this.createInlineSuggestionsSetting(globalSetting, ( localize(5513, "All files")), '*', disposables);
             if (modeId) {
                 const languageSetting = append(settings, $('div.setting'));
-                this.createCodeCompletionsSetting(languageSetting, ( localize(5350, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
+                this.createInlineSuggestionsSetting(languageSetting, ( localize(5514, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
             }
         }
         {
             const setting = append(settings, $('div.setting'));
-            this.createNextEditSuggestionsSetting(setting, ( localize(5351, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
+            this.createNextEditSuggestionsSetting(setting, ( localize(5515, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
         }
         return settings;
     }
     createSetting(container, settingIdsToReEvaluate, label, accessor, disposables) {
-        const checkbox = disposables.add(( new Checkbox(
-            label,
-            Boolean(accessor.readSetting()),
-            { ...defaultCheckboxStyles, hoverDelegate: nativeHoverDelegate }
-        )));
+        const checkbox = disposables.add(( new Checkbox(label, Boolean(accessor.readSetting()), { ...defaultCheckboxStyles })));
         container.appendChild(checkbox.domNode);
         const settingLabel = append(container, $('span.setting-label', undefined, label));
         disposables.add(Gesture.addTarget(settingLabel));
@@ -645,14 +652,14 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 checkbox.checked = Boolean(accessor.readSetting());
             }
         }));
-        if (!canUseCopilot(this.chatEntitlementService)) {
+        if (!canUseChat(this.chatEntitlementService)) {
             container.classList.add('disabled');
             checkbox.disable();
             checkbox.checked = false;
         }
         return checkbox;
     }
-    createCodeCompletionsSetting(container, label, modeId, disposables) {
+    createInlineSuggestionsSetting(container, label, modeId, disposables) {
         this.createSetting(container, [defaultChat.completionsEnablementSetting], label, this.getCompletionsSettingAccessor(modeId), disposables);
     }
     getCompletionsSettingAccessor(modeId = '*') {
@@ -693,7 +700,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         disposables.add(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(completionsSettingId)) {
-                if (completionsSettingAccessor.readSetting() && canUseCopilot(this.chatEntitlementService)) {
+                if (completionsSettingAccessor.readSetting() && canUseChat(this.chatEntitlementService)) {
                     checkbox.enable();
                     container.classList.remove('disabled');
                 }
@@ -719,7 +726,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(5352, "Cancel Snooze")),
+            label: ( localize(5516, "Cancel Snooze")),
             run: () => this.inlineCompletionsService.cancelSnooze(),
             class: ThemeIcon.asClassName(Codicon.stopCircle)
         });
@@ -728,19 +735,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             toolbar.clear();
             const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
             if (!isEnabled || timeLeftMs <= 0) {
-                timerDisplay.textContent = ( localize(5353, "Hide completions for 5 min"));
+                timerDisplay.textContent = ( localize(5517, "Hide suggestions for 5 min"));
                 timerDisplay.title = '';
                 button.label = label;
-                button.setTitle(( localize(5354, "Hide completions and NES for 5 min")));
+                button.setTitle(( localize(5518, "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(5355, "remaining"))}`;
-            timerDisplay.title = ( localize(5356, "Completions are hidden for the remaining duration"));
-            button.label = ( localize(5357, "+5 min"));
-            button.setTitle(( localize(5358, "Snooze additional 5 min")));
+            timerDisplay.textContent = `${minutes}:${seconds < 10 ? '0' : ''}${seconds} ${( localize(5519, "remaining"))}`;
+            timerDisplay.title = ( localize(5520, "Inline suggestions are hidden for the remaining duration"));
+            button.label = ( localize(5521, "+5 min"));
+            button.setTitle(( localize(5522, "Snooze additional 5 min")));
             toolbar.push([cancelAction], { icon: true, label: false });
             return false;
         };
@@ -782,7 +789,7 @@ ChatStatusDashboard = ( __decorate([
     ( __param(9, ITextResourceConfigurationService)),
     ( __param(10, IInlineCompletionsService)),
     ( __param(11, IChatSessionsService)),
-    ( __param(12, IInstantiationService))
+    ( __param(12, IMarkdownRendererService))
 ], ChatStatusDashboard));
 
 export { ChatStatusBarEntry };

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

@@ -2,10 +2,11 @@ import { IDynamicVariable } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IChatVariablesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service";
 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";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 export declare class ChatVariablesService implements IChatVariablesService {
     private readonly chatWidgetService;
     _serviceBrand: undefined;
     constructor(chatWidgetService: IChatWidgetService);
-    getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
-    getSelectedToolAndToolSets(sessionId: string): IToolAndToolSetEnablementMap;
+    getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable>;
+    getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap;
 }

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

@@ -1,15 +1,15 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 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 { ChatDynamicVariableModel } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 
 let ChatVariablesService = class ChatVariablesService {
     constructor(chatWidgetService) {
         this.chatWidgetService = chatWidgetService;
     }
-    getDynamicVariables(sessionId) {
-        const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
+    getDynamicVariables(sessionResource) {
+        const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
         if (!widget || !widget.viewModel || !widget.supportsFileReferences) {
             return [];
         }
@@ -38,8 +38,8 @@ let ChatVariablesService = class ChatVariablesService {
         }
         return model.variables;
     }
-    getSelectedToolAndToolSets(sessionId) {
-        const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
+    getSelectedToolAndToolSets(sessionResource) {
+        const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
         if (!widget) {
             return ( new Map());
         }

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

@@ -17,9 +17,8 @@ import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 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";
-export declare const CHAT_SIDEBAR_OLD_VIEW_PANEL_ID = "workbench.panel.chatSidebar";
+import { ChatWidget, IChatViewState } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
 export declare const CHAT_SIDEBAR_PANEL_ID = "workbench.panel.chat";
 export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
     private readonly chatOptions;
@@ -45,7 +44,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     protected renderBody(parent: HTMLElement): Promise<void>;
     acceptInput(query?: string): void;
     private clear;
-    loadSession(sessionId: string | URI, viewState?: IChatViewState): Promise<void>;
+    loadSession(sessionId: URI, viewState?: IChatViewState): Promise<void>;
     focusInput(): void;
     focus(): void;
     protected layoutBody(height: number, width: number): void;