@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/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,8 +9,8 @@ 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, disposableWindowInterval, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
-import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
+import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/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';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -53,6 +53,8 @@ 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 { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 
 registerCss(chatStatus);
 const gaugeForeground = registerColor('gauge.foreground', {
@@ -60,48 +62,51 @@ const gaugeForeground = registerColor('gauge.foreground', {
     light: inputValidationInfoBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5244, "Gauge foreground color.")));
+}, ( localize(5296, "Gauge foreground color.")));
 registerColor('gauge.background', {
     dark: ( transparent(gaugeForeground, 0.3)),
     light: ( transparent(gaugeForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5245, "Gauge background color.")));
+}, ( localize(5297, "Gauge background color.")));
 registerColor('gauge.border', {
     dark: null,
     light: null,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5246, "Gauge border color.")));
+}, ( localize(5298, "Gauge border color.")));
 const gaugeWarningForeground = registerColor('gauge.warningForeground', {
     dark: inputValidationWarningBorder,
     light: inputValidationWarningBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5247, "Gauge warning foreground color.")));
+}, ( localize(5299, "Gauge warning foreground color.")));
 registerColor('gauge.warningBackground', {
     dark: ( transparent(gaugeWarningForeground, 0.3)),
     light: ( transparent(gaugeWarningForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5248, "Gauge warning background color.")));
+}, ( localize(5300, "Gauge warning background color.")));
 const gaugeErrorForeground = registerColor('gauge.errorForeground', {
     dark: inputValidationErrorBorder,
     light: inputValidationErrorBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5249, "Gauge error foreground color.")));
+}, ( localize(5301, "Gauge error foreground color.")));
 registerColor('gauge.errorBackground', {
     dark: ( transparent(gaugeErrorForeground, 0.3)),
     light: ( transparent(gaugeErrorForeground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5250, "Gauge error background color.")));
+}, ( localize(5302, "Gauge error background color.")));
 const defaultChat = {
     completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
     nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
     manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
     manageOverageUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
+    provider: product.defaultChatAgent?.provider ?? { default: { name: '' }},
+    termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
+    privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
 };
 let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     static { this.ID = 'workbench.contrib.chatStatusBarEntry'; }
@@ -161,10 +166,8 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = '$(copilot)';
-        let ariaLabel = ( localize(5251, "Copilot Status"));
+        let ariaLabel = ( localize(5303, "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 ||
@@ -172,7 +175,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
                 isProUser(entitlement) ||
                 entitlement === ChatEntitlement.Free
             ) {
-                const finishSetup = ( localize(5252, "Finish Setup"));
+                const finishSetup = ( localize(5304, "Finish Setup"));
                 text = `$(copilot) ${finishSetup}`;
                 ariaLabel = finishSetup;
                 kind = 'prominent';
@@ -181,47 +184,52 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         else {
             const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
             const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
+            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(5253, "Copilot Disabled"));
+                text = '$(copilot-unavailable)';
+                ariaLabel = ( localize(5305, "Copilot disabled"));
+            }
+            else if (chatSessionsInProgressCount > 0) {
+                text = '$(copilot-in-progress)';
+                if (chatSessionsInProgressCount > 1) {
+                    ariaLabel = ( localize(5306, "{0} chat sessions in progress", chatSessionsInProgressCount));
+                }
+                else {
+                    ariaLabel = ( localize(5307, "1 chat session in progress"));
+                }
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signedOutWarning = ( localize(5254, "Signed out"));
-                text = `$(copilot-not-connected) ${signedOutWarning}`;
+                const signedOutWarning = ( localize(5308, "Signed out"));
+                text = `${this.chatEntitlementService.anonymous ? '$(copilot)' : '$(copilot-not-connected)'} ${signedOutWarning}`;
                 ariaLabel = signedOutWarning;
                 kind = 'prominent';
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(5255, "Chat quota reached"));
+                    quotaWarning = ( localize(5309, "Chat quota reached"));
                 }
                 else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(5256, "Completions quota reached"));
+                    quotaWarning = ( localize(5310, "Completions quota reached"));
                 }
                 else {
-                    quotaWarning = ( localize(5257, "Quota reached"));
+                    quotaWarning = ( localize(5311, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
                 kind = 'prominent';
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
-                text = `$(copilot-unavailable)`;
-                ariaLabel = ( localize(5258, "Code completions disabled"));
+                text = '$(copilot-unavailable)';
+                ariaLabel = ( localize(5312, "Code completions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
-                text = `$(copilot-snooze)`;
-                ariaLabel = ( localize(5259, "Code completions snoozed"));
+                text = '$(copilot-snooze)';
+                ariaLabel = ( localize(5313, "Code completions snoozed"));
             }
         }
-        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")),
+            name: ( localize(5303, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -269,7 +277,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) {
+    constructor(chatEntitlementService, chatStatusItemService, commandService, configurationService, editorService, hoverService, languageService, openerService, telemetryService, textResourceConfigurationService, inlineCompletionsService, chatSessionsService, instantiationService) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.chatStatusItemService = chatStatusItemService;
@@ -283,6 +291,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         this.textResourceConfigurationService = textResourceConfigurationService;
         this.inlineCompletionsService = inlineCompletionsService;
         this.chatSessionsService = chatSessionsService;
+        this.instantiationService = instantiationService;
         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' });
@@ -306,19 +315,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(5260, "Copilot Usage")), toAction({
+            addSeparator(( localize(5314, "Copilot Usage")), toAction({
                 id: 'workbench.action.manageCopilot',
-                label: ( localize(5261, "Manage Chat")),
-                tooltip: ( localize(5262, "Manage Chat")),
+                label: ( localize(5315, "Manage Chat")),
+                tooltip: ( localize(5316, "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(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;
+            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;
             if (resetDate) {
                 this.element.appendChild($('div.description', undefined, ( localize(
-                    5266,
+                    5320,
                     "Allowance resets {0}.",
                     resetDateHasTime ? this.dateTimeFormatter.value.format(( new Date(resetDate))) : this.dateFormatter.value.format(( new Date(resetDate)))
                 ))));
@@ -328,7 +337,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                     this.element,
                     { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: canUseCopilot(this.chatEntitlementService)  }
                 )));
-                upgradeProButton.label = ( localize(5267, "Upgrade to GitHub Copilot Pro"));
+                upgradeProButton.label = ( localize(5321, "Upgrade to GitHub Copilot Pro"));
                 disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
             }
             (async () => {
@@ -348,25 +357,26 @@ 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);
+        }
         {
             let chatSessionsElement;
             const updateStatus = () => {
                 const inProgress = this.chatSessionsService.getInProgress();
                 if (( inProgress.some(item => item.count > 0))) {
-                    addSeparator(( localize(5268, "Chat Sessions")), toAction({
+                    addSeparator(( localize(5325, "Chat Sessions")), toAction({
                         id: 'workbench.view.chat.status.sessions',
-                        label: ( localize(5269, "View Chat Sessions")),
-                        tooltip: ( localize(5270, "View Chat Sessions")),
+                        label: ( localize(5326, "View Chat Sessions")),
+                        tooltip: ( localize(5327, "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));
+                            const text = ( localize(5328, "$(loading~spin) {0} in progress", displayName));
                             chatSessionsElement = this.element.appendChild($('div.description'));
                             const parts = renderLabelWithIcons(text);
                             chatSessionsElement.append(...parts);
@@ -399,10 +409,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         {
             const chatSentiment = this.chatEntitlementService.sentiment;
-            addSeparator(( localize(5272, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
+            addSeparator(( localize(5329, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
                 id: 'workbench.action.openChatSettings',
-                label: ( localize(5273, "Settings")),
-                tooltip: ( localize(5274, "Open Settings")),
+                label: ( localize(5330, "Settings")),
+                tooltip: ( localize(5331, "Open Settings")),
                 class: ThemeIcon.asClassName(Codicon.settingsGear),
                 run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
             }) : undefined);
@@ -410,41 +420,73 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         if (canUseCopilot(this.chatEntitlementService)) {
             const snooze = append(this.element, $('div.snooze-completions'));
-            this.createCompletionsSnooze(snooze, ( localize(5275, "Snooze")), disposables);
+            this.createCompletionsSnooze(snooze, ( localize(5332, "Snooze")), disposables);
         }
         {
             const newUser = isNewUser(this.chatEntitlementService);
+            const anonymousUser = this.chatEntitlementService.anonymous;
             const disabled = this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted;
             const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
             if (newUser || signedOut || disabled) {
                 addSeparator();
                 let descriptionText;
-                if (newUser) {
-                    descriptionText = ( localize(5276, "Set up Copilot to use AI features."));
+                let descriptionClass = '.description';
+                if (newUser && anonymousUser) {
+                    descriptionText = ( new MarkdownString(( localize(
+                        5333,
+                        "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
+                        defaultChat.provider.default.name,
+                        defaultChat.provider.default.name,
+                        defaultChat.termsStatementUrl,
+                        defaultChat.privacyStatementUrl
+                    )), { isTrusted: true }));
+                    descriptionClass = `${descriptionClass}.terms`;
+                }
+                else if (newUser) {
+                    descriptionText = ( localize(5334, "Set up Copilot to use AI features."));
+                }
+                else if (anonymousUser) {
+                    descriptionText = ( localize(5335, "Sign in to enable more Copilot AI features."));
                 }
                 else if (disabled) {
-                    descriptionText = ( localize(5277, "Enable Copilot to use AI features."));
+                    descriptionText = ( localize(5336, "Enable Copilot to use AI features."));
                 }
                 else {
-                    descriptionText = ( localize(5278, "Sign in to use Copilot AI features."));
+                    descriptionText = ( localize(5337, "Sign in to use Copilot AI features."));
                 }
                 let buttonLabel;
                 if (newUser) {
-                    buttonLabel = ( localize(5279, "Set up Copilot"));
+                    buttonLabel = ( localize(5338, "Set up Copilot"));
+                }
+                else if (anonymousUser) {
+                    buttonLabel = ( localize(5339, "Enable more AI Features"));
                 }
                 else if (disabled) {
-                    buttonLabel = ( localize(5280, "Enable Copilot"));
+                    buttonLabel = ( localize(5340, "Enable Copilot"));
+                }
+                else {
+                    buttonLabel = ( localize(5341, "Sign in to use Copilot"));
+                }
+                let commandId;
+                if (newUser && anonymousUser) {
+                    commandId = 'workbench.action.chat.triggerSetupAnonymousWithoutDialog';
                 }
                 else {
-                    buttonLabel = ( localize(5281, "Sign in to use Copilot"));
+                    commandId = 'workbench.action.chat.triggerSetup';
+                }
+                if (typeof descriptionText === 'string') {
+                    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.description', undefined, descriptionText));
                 const button = disposables.add(( new Button(
                     this.element,
                     { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate }
                 )));
                 button.label = buttonLabel;
-                disposables.add(button.onDidClick(() => this.runCommandAndClose('workbench.action.chat.triggerSetup')));
+                disposables.add(button.onDidClick(() => this.runCommandAndClose(commandId)));
             }
         }
         return this.element;
@@ -463,8 +505,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(5282, "Learn More")),
-            tooltip: ( localize(5282, "Learn More")),
+            label: ( localize(5342, "Learn More")),
+            tooltip: ( localize(5342, "Learn More")),
             class: ThemeIcon.asClassName(Codicon.linkExternal),
             run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(headerLink)))),
         }) : undefined);
@@ -488,13 +530,13 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
         }
     }
-    runCommandAndClose(commandOrFn) {
+    runCommandAndClose(commandOrFn, ...args) {
         if (typeof commandOrFn === 'function') {
-            commandOrFn();
+            commandOrFn(...args);
         }
         else {
             this.telemetryService.publicLog2('workbenchActionExecuted', { id: commandOrFn, from: 'chat-status' });
-            this.commandService.executeCommand(commandOrFn);
+            this.commandService.executeCommand(commandOrFn, ...args);
         }
         this.hoverService.hideHover(true);
     }
@@ -508,31 +550,34 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 quotaIndicator,
                 { ...defaultButtonStyles, secondary: true, hoverDelegate: nativeHoverDelegate }
             )));
-            manageOverageButton.label = ( localize(5283, "Manage paid premium requests"));
+            manageOverageButton.label = ( localize(5343, "Manage paid premium requests"));
             disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))))));
         }
         const update = (quota) => {
             quotaIndicator.classList.remove('error');
             quotaIndicator.classList.remove('warning');
             let usedPercentage;
-            if (quota.unlimited) {
+            if (typeof quota === 'string' || quota.unlimited) {
                 usedPercentage = 0;
             }
             else {
                 usedPercentage = Math.max(0, 100 - quota.percentRemaining);
             }
-            if (quota.unlimited) {
-                quotaValue.textContent = ( localize(5284, "Included"));
+            if (typeof quota === 'string') {
+                quotaValue.textContent = quota;
+            }
+            else if (quota.unlimited) {
+                quotaValue.textContent = ( localize(5344, "Included"));
             }
             else if (quota.overageCount) {
                 quotaValue.textContent = ( localize(
-                    5285,
+                    5345,
                     "+{0} requests",
                     this.quotaOverageFormatter.value.format(quota.overageCount)
                 ));
             }
             else {
-                quotaValue.textContent = ( localize(5286, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
+                quotaValue.textContent = ( localize(5346, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
             }
             quotaBit.style.width = `${usedPercentage}%`;
             if (usedPercentage >= 90) {
@@ -542,11 +587,11 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 quotaIndicator.classList.add('warning');
             }
             if (supportsOverage) {
-                if (quota.overageEnabled) {
-                    overageLabel.textContent = ( localize(5287, "Additional paid premium requests enabled."));
+                if (typeof quota !== 'string' && quota?.overageEnabled) {
+                    overageLabel.textContent = ( localize(5347, "Additional paid premium requests enabled."));
                 }
                 else {
-                    overageLabel.textContent = ( localize(5288, "Additional paid premium requests disabled."));
+                    overageLabel.textContent = ( localize(5348, "Additional paid premium requests disabled."));
                 }
             }
             else {
@@ -561,15 +606,15 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const settings = container.appendChild($('div.settings'));
         {
             const globalSetting = append(settings, $('div.setting'));
-            this.createCodeCompletionsSetting(globalSetting, ( localize(5289, "All files")), '*', disposables);
+            this.createCodeCompletionsSetting(globalSetting, ( localize(5349, "All files")), '*', disposables);
             if (modeId) {
                 const languageSetting = append(settings, $('div.setting'));
-                this.createCodeCompletionsSetting(languageSetting, ( localize(5290, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
+                this.createCodeCompletionsSetting(languageSetting, ( localize(5350, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
             }
         }
         {
             const setting = append(settings, $('div.setting'));
-            this.createNextEditSuggestionsSetting(setting, ( localize(5291, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
+            this.createNextEditSuggestionsSetting(setting, ( localize(5351, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
         }
         return settings;
     }
@@ -674,7 +719,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(5292, "Cancel Snooze")),
+            label: ( localize(5352, "Cancel Snooze")),
             run: () => this.inlineCompletionsService.cancelSnooze(),
             class: ThemeIcon.asClassName(Codicon.stopCircle)
         });
@@ -683,19 +728,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             toolbar.clear();
             const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
             if (!isEnabled || timeLeftMs <= 0) {
-                timerDisplay.textContent = ( localize(5293, "Hide completions for 5 min"));
+                timerDisplay.textContent = ( localize(5353, "Hide completions for 5 min"));
                 timerDisplay.title = '';
                 button.label = label;
-                button.setTitle(( localize(5294, "Hide completions and NES for 5 min")));
+                button.setTitle(( localize(5354, "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(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")));
+            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")));
             toolbar.push([cancelAction], { icon: true, label: false });
             return false;
         };
@@ -736,7 +781,8 @@ ChatStatusDashboard = ( __decorate([
     ( __param(8, ITelemetryService)),
     ( __param(9, ITextResourceConfigurationService)),
     ( __param(10, IInlineCompletionsService)),
-    ( __param(11, IChatSessionsService))
+    ( __param(11, IChatSessionsService)),
+    ( __param(12, IInstantiationService))
 ], ChatStatusDashboard));
 
 export { ChatStatusBarEntry };

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

@@ -10,7 +10,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-4fad3647-b95d-5c19-bab1-bb9de627a5ec-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";
@@ -36,7 +36,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly viewState;
     private _restoringSession;
     constructor(chatOptions: {
-        location: ChatAgentLocation.Panel;
+        location: ChatAgentLocation.Chat;
     }, 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;

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

@@ -30,8 +30,8 @@ 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-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-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-60014c9d-b815-501d-83a9-4b08725c2ec2-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';
@@ -40,8 +40,8 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 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, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatViewWelcomeController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
 
@@ -60,7 +60,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.modelDisposables = this._register(( new DisposableStore()));
         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) {
+        if (this.chatOptions.location === ChatAgentLocation.Chat && !this.viewState.hasMigratedCurrentSession) {
             const editsMemento = ( new Memento(
                 'interactive-session-view-' + CHAT_PROVIDER_ID + `-edits`,
                 this.storageService
@@ -158,7 +158,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this._register({ dispose: () => editorOverflowNode.remove() });
         this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, this.chatOptions.location, { viewId: this.id }, {
             autoScroll: mode => mode !== ChatModeKind.Ask,
-            renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
+            renderFollowups: this.chatOptions.location === ChatAgentLocation.Chat,
             supportsFileReferences: true,
             rendererOptions: {
                 renderTextEditsAsSummary: (uri) => {
@@ -168,7 +168,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
             },
             editorOverflowWidgetsDomNode: editorOverflowNode,
-            enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
+            enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Chat,
             enableWorkingSet: 'explicit',
             supportsChangingModes: true,
         }, {
@@ -213,7 +213,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 }
             }
         }
-        const newModel = await (URI.isUri(sessionId) ? this.chatService.loadSessionForResource(sessionId, ChatAgentLocation.Panel, CancellationToken.None) : this.chatService.getOrRestoreSession(sessionId));
+        const newModel = await (URI.isUri(sessionId) ? this.chatService.loadSessionForResource(sessionId, ChatAgentLocation.Chat, CancellationToken.None) : this.chatService.getOrRestoreSession(sessionId));
         await this.updateModel(newModel, viewState);
     }
     focusInput() {
@@ -228,7 +228,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this._widget.layout(height, width);
     }
     saveState() {
-        if (this._widget) {
+        if (this._widget?.viewModel) {
             this._widget.saveState();
             this.updateViewState();
             this.memento.saveMemento();

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

@@ -27,7 +27,7 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/chatColors';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatRequestParser } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-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';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -119,7 +119,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             const mode = this.widget.input.currentModeObs.get();
             let description = mode.description.get();
             if (this.configurationService.getValue('chat.emptyChatState.enabled')) {
-                description = ( localize(5352, "Add context (#), extensions (@), commands (/)"));
+                description = ( localize(5412, "Add context (#), extensions (@), commands (/)"));
             }
             const decoration = [
                 {

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(5353, 'There is a chat agent hover part here.');
+        return localize(5413, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([