@codingame/monaco-vscode-chat-service-override 19.1.4 → 20.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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlementService } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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, disposableWindowInterval, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService';
+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 { 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';
@@ -59,43 +59,43 @@ const gaugeBackground = registerColor('gauge.background', {
     light: inputValidationInfoBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5031, "Gauge background color.")));
+}, ( localize(5130, "Gauge background color.")));
 registerColor('gauge.foreground', {
     dark: ( transparent(gaugeBackground, 0.3)),
     light: ( transparent(gaugeBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5032, "Gauge foreground color.")));
+}, ( localize(5131, "Gauge foreground color.")));
 registerColor('gauge.border', {
     dark: null,
     light: null,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5033, "Gauge border color.")));
+}, ( localize(5132, "Gauge border color.")));
 const gaugeWarningBackground = registerColor('gauge.warningBackground', {
     dark: inputValidationWarningBorder,
     light: inputValidationWarningBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5034, "Gauge warning background color.")));
+}, ( localize(5133, "Gauge warning background color.")));
 registerColor('gauge.warningForeground', {
     dark: ( transparent(gaugeWarningBackground, 0.3)),
     light: ( transparent(gaugeWarningBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5035, "Gauge warning foreground color.")));
+}, ( localize(5134, "Gauge warning foreground color.")));
 const gaugeErrorBackground = registerColor('gauge.errorBackground', {
     dark: inputValidationErrorBorder,
     light: inputValidationErrorBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(5036, "Gauge error background color.")));
+}, ( localize(5135, "Gauge error background color.")));
 registerColor('gauge.errorForeground', {
     dark: ( transparent(gaugeErrorBackground, 0.3)),
     light: ( transparent(gaugeErrorBackground, 0.3)),
     hcDark: Color.white,
     hcLight: Color.white
-}, ( localize(5037, "Gauge error foreground color.")));
+}, ( localize(5136, "Gauge error foreground color.")));
 const defaultChat = {
     completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
     nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
@@ -156,7 +156,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = '$(copilot)';
-        let ariaLabel = ( localize(5038, "Copilot Status"));
+        let ariaLabel = ( localize(5137, "Copilot Status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
@@ -165,7 +165,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
                 isProUser(entitlement) ||
                 entitlement === ChatEntitlement.Free
             ) {
-                const finishSetup = ( localize(5039, "Finish Setup"));
+                const finishSetup = ( localize(5138, "Finish Setup"));
                 text = `$(copilot) ${finishSetup}`;
                 ariaLabel = finishSetup;
                 kind = 'prominent';
@@ -176,10 +176,10 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = `$(copilot-unavailable)`;
-                ariaLabel = ( localize(5040, "Copilot Disabled"));
+                ariaLabel = ( localize(5139, "Copilot Disabled"));
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signedOutWarning = ( localize(5041, "Signed out"));
+                const signedOutWarning = ( localize(5140, "Signed out"));
                 text = `$(copilot-not-connected) ${signedOutWarning}`;
                 ariaLabel = signedOutWarning;
                 kind = 'prominent';
@@ -187,13 +187,13 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(5042, "Chat quota reached"));
+                    quotaWarning = ( localize(5141, "Chat quota reached"));
                 }
                 else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(5043, "Completions quota reached"));
+                    quotaWarning = ( localize(5142, "Completions quota reached"));
                 }
                 else {
-                    quotaWarning = ( localize(5044, "Quota reached"));
+                    quotaWarning = ( localize(5143, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
@@ -201,15 +201,15 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = `$(copilot-unavailable)`;
-                ariaLabel = ( localize(5045, "Code completions disabled"));
+                ariaLabel = ( localize(5144, "Code completions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = `$(copilot-snooze)`;
-                ariaLabel = ( localize(5046, "Code completions snoozed"));
+                ariaLabel = ( localize(5145, "Code completions snoozed"));
             }
         }
         return {
-            name: ( localize(5038, "Copilot Status")),
+            name: ( localize(5137, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -290,19 +290,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         };
         const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate } = this.chatEntitlementService.quotas;
         if (chatQuota || completionsQuota || premiumChatQuota) {
-            addSeparator(( localize(5047, "Copilot Usage")), toAction({
+            addSeparator(( localize(5146, "Copilot Usage")), toAction({
                 id: 'workbench.action.manageCopilot',
-                label: ( localize(5048, "Manage Copilot")),
-                tooltip: ( localize(5049, "Manage Copilot")),
+                label: ( localize(5147, "Manage Copilot")),
+                tooltip: ( localize(5148, "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(5050, "Code completions")), false) : undefined;
-            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(5051, "Chat messages")), false) : undefined;
-            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(5052, "Premium requests")), true) : undefined;
+            const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, ( localize(5149, "Code completions")), false) : undefined;
+            const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, ( localize(5150, "Chat messages")), false) : undefined;
+            const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, ( localize(5151, "Premium requests")), true) : undefined;
             if (resetDate) {
                 this.element.appendChild($('div.description', undefined, ( localize(
-                    5053,
+                    5152,
                     "Allowance resets {0}.",
                     this.dateFormatter.value.format(( new Date(resetDate)))
                 ))));
@@ -312,7 +312,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                     this.element,
                     { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: canUseCopilot(this.chatEntitlementService)  }
                 )));
-                upgradeProButton.label = ( localize(5054, "Upgrade to Copilot Pro"));
+                upgradeProButton.label = ( localize(5153, "Upgrade to Copilot Pro"));
                 disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
             }
             (async () => {
@@ -351,10 +351,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         {
             const chatSentiment = this.chatEntitlementService.sentiment;
-            addSeparator(( localize(5055, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
+            addSeparator(( localize(5154, "Code Completions")), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
                 id: 'workbench.action.openChatSettings',
-                label: ( localize(5056, "Settings")),
-                tooltip: ( localize(5057, "Open Settings")),
+                label: ( localize(5155, "Settings")),
+                tooltip: ( localize(5156, "Open Settings")),
                 class: ThemeIcon.asClassName(Codicon.settingsGear),
                 run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
             }) : undefined);
@@ -362,7 +362,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         }
         if (canUseCopilot(this.chatEntitlementService)) {
             const snooze = append(this.element, $('div.snooze-completions'));
-            this.createCompletionsSnooze(snooze, ( localize(5058, "Snooze")), disposables);
+            this.createCompletionsSnooze(snooze, ( localize(5157, "Snooze")), disposables);
         }
         {
             const newUser = isNewUser(this.chatEntitlementService);
@@ -372,23 +372,23 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 addSeparator();
                 let descriptionText;
                 if (newUser) {
-                    descriptionText = ( localize(5059, "Set up Copilot to use AI features."));
+                    descriptionText = ( localize(5158, "Set up Copilot to use AI features."));
                 }
                 else if (disabled) {
-                    descriptionText = ( localize(5060, "Enable Copilot to use AI features."));
+                    descriptionText = ( localize(5159, "Enable Copilot to use AI features."));
                 }
                 else {
-                    descriptionText = ( localize(5061, "Sign in to use Copilot AI features."));
+                    descriptionText = ( localize(5160, "Sign in to use Copilot AI features."));
                 }
                 let buttonLabel;
                 if (newUser) {
-                    buttonLabel = ( localize(5062, "Set up Copilot"));
+                    buttonLabel = ( localize(5161, "Set up Copilot"));
                 }
                 else if (disabled) {
-                    buttonLabel = ( localize(5063, "Enable Copilot"));
+                    buttonLabel = ( localize(5162, "Enable Copilot"));
                 }
                 else {
-                    buttonLabel = ( localize(5064, "Sign in to use Copilot"));
+                    buttonLabel = ( localize(5163, "Sign in to use Copilot"));
                 }
                 this.element.appendChild($('div.description', undefined, descriptionText));
                 const button = disposables.add(( new Button(
@@ -415,8 +415,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(5065, "Learn More")),
-            tooltip: ( localize(5065, "Learn More")),
+            label: ( localize(5164, "Learn More")),
+            tooltip: ( localize(5164, "Learn More")),
             class: ThemeIcon.asClassName(Codicon.linkExternal),
             run: () => this.runCommandAndClose(() => this.openerService.open(( URI.parse(headerLink)))),
         }) : undefined);
@@ -460,7 +460,7 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 quotaIndicator,
                 { ...defaultButtonStyles, secondary: true, hoverDelegate: nativeHoverDelegate }
             )));
-            manageOverageButton.label = ( localize(5066, "Manage paid premium requests"));
+            manageOverageButton.label = ( localize(5165, "Manage paid premium requests"));
             disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(( URI.parse(defaultChat.manageOverageUrl))))));
         }
         const update = (quota) => {
@@ -474,17 +474,17 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
                 usedPercentage = Math.max(0, 100 - quota.percentRemaining);
             }
             if (quota.unlimited) {
-                quotaValue.textContent = ( localize(5067, "Included"));
+                quotaValue.textContent = ( localize(5166, "Included"));
             }
             else if (quota.overageCount) {
                 quotaValue.textContent = ( localize(
-                    5068,
+                    5167,
                     "+{0} requests",
                     this.quotaOverageFormatter.value.format(quota.overageCount)
                 ));
             }
             else {
-                quotaValue.textContent = ( localize(5069, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
+                quotaValue.textContent = ( localize(5168, "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage)));
             }
             quotaBit.style.width = `${usedPercentage}%`;
             if (usedPercentage >= 90) {
@@ -495,10 +495,10 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             }
             if (supportsOverage) {
                 if (quota.overageEnabled) {
-                    overageLabel.textContent = ( localize(5070, "Additional paid premium requests enabled."));
+                    overageLabel.textContent = ( localize(5169, "Additional paid premium requests enabled."));
                 }
                 else {
-                    overageLabel.textContent = ( localize(5071, "Additional paid premium requests disabled."));
+                    overageLabel.textContent = ( localize(5170, "Additional paid premium requests disabled."));
                 }
             }
             else {
@@ -513,15 +513,15 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
         const settings = container.appendChild($('div.settings'));
         {
             const globalSetting = append(settings, $('div.setting'));
-            this.createCodeCompletionsSetting(globalSetting, ( localize(5072, "All files")), '*', disposables);
+            this.createCodeCompletionsSetting(globalSetting, ( localize(5171, "All files")), '*', disposables);
             if (modeId) {
                 const languageSetting = append(settings, $('div.setting'));
-                this.createCodeCompletionsSetting(languageSetting, ( localize(5073, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
+                this.createCodeCompletionsSetting(languageSetting, ( localize(5172, "{0}", this.languageService.getLanguageName(modeId) ?? modeId)), modeId, disposables);
             }
         }
         {
             const setting = append(settings, $('div.setting'));
-            this.createNextEditSuggestionsSetting(setting, ( localize(5074, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
+            this.createNextEditSuggestionsSetting(setting, ( localize(5173, "Next edit suggestions")), this.getCompletionsSettingAccessor(modeId), disposables);
         }
         return settings;
     }
@@ -626,7 +626,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(5075, "Cancel Snooze")),
+            label: ( localize(5174, "Cancel Snooze")),
             run: () => this.inlineCompletionsService.cancelSnooze(),
             class: ThemeIcon.asClassName(Codicon.stopCircle)
         });
@@ -635,19 +635,19 @@ let ChatStatusDashboard = class ChatStatusDashboard extends Disposable {
             toolbar.clear();
             const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
             if (!isEnabled || timeLeftMs <= 0) {
-                timerDisplay.textContent = ( localize(5076, "Hide completions for 5 min"));
+                timerDisplay.textContent = ( localize(5175, "Hide completions for 5 min"));
                 timerDisplay.title = '';
                 button.label = label;
-                button.setTitle(( localize(5077, "Hide completions and NES for 5 min")));
+                button.setTitle(( localize(5176, "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(5078, "remaining"))}`;
-            timerDisplay.title = ( localize(5079, "Completions are hidden for the remaining duration"));
-            button.label = ( localize(5080, "+5 min"));
-            button.setTitle(( localize(5081, "Snooze additional 5 min")));
+            timerDisplay.textContent = `${minutes}:${seconds < 10 ? '0' : ''}${seconds} ${( localize(5177, "remaining"))}`;
+            timerDisplay.title = ( localize(5178, "Completions are hidden for the remaining duration"));
+            button.label = ( localize(5179, "+5 min"));
+            button.setTitle(( localize(5180, "Snooze additional 5 min")));
             toolbar.push([cancelAction], { icon: true, label: false });
             return false;
         };

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 
 let ChatVariablesService = class ChatVariablesService {
     constructor(chatWidgetService) {
@@ -17,6 +18,25 @@ let ChatVariablesService = class ChatVariablesService {
         if (!model) {
             return [];
         }
+        if (widget.input.attachmentModel.attachments.length > 0 && widget.viewModel.editing) {
+            const references = [];
+            for (const attachment of widget.input.attachmentModel.attachments) {
+                if (attachment.range) {
+                    const referenceObj = {
+                        id: attachment.id,
+                        fullName: attachment.name,
+                        modelDescription: attachment.modelDescription,
+                        range: ( new Range(1, attachment.range.start + 1, 1, attachment.range.endExclusive + 1)),
+                        icon: attachment.icon,
+                        isFile: attachment.kind === 'file',
+                        isDirectory: attachment.kind === 'directory',
+                        data: attachment.value
+                    };
+                    references.push(referenceObj);
+                }
+            }
+            return [...model.variables, ...references];
+        }
         return model.variables;
     }
     getSelectedTools(sessionId) {

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

@@ -1,3 +1,4 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
@@ -15,8 +16,8 @@ import { IChatViewTitleActionContext } from "@codingame/monaco-vscode-api/vscode
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
-import { ChatWidget, IChatViewState } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
-import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
+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";
 export declare const CHAT_SIDEBAR_PANEL_ID = "workbench.panel.chat";
 export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
@@ -42,7 +43,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     protected renderBody(parent: HTMLElement): Promise<void>;
     acceptInput(query?: string): void;
     private clear;
-    loadSession(sessionId: string, viewState?: IChatViewState): Promise<void>;
+    loadSession(sessionId: string | URI, viewState?: IChatViewState): Promise<void>;
     focusInput(): void;
     focus(): void;
     protected layoutBody(height: number, width: number): void;

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

@@ -4,6 +4,7 @@ import { getWindow, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browse
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
@@ -35,11 +36,11 @@ import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/wo
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+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 { ChatAgentLocation, ChatModeKind } 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';
-import { ChatViewWelcomeController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
+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';
 
 const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
 let ChatViewPane = class ChatViewPane extends ViewPane {
@@ -203,7 +204,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (this.widget.viewModel) {
             await this.chatService.clearSession(this.widget.viewModel.sessionId);
         }
-        const newModel = await this.chatService.getOrRestoreSession(sessionId);
+        const newModel = await (URI.isUri(sessionId) ? this.chatService.loadSessionForResource(sessionId, ChatAgentLocation.Panel, CancellationToken.None) : this.chatService.getOrRestoreSession(sessionId));
         await this.updateModel(newModel, viewState);
     }
     focusInput() {

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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-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

@@ -4,10 +4,14 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { Disposable, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -21,10 +25,10 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 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 { 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, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-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 { 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 { 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';
 
@@ -36,12 +40,14 @@ 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, configurationService, labelService) {
         super();
         this.widget = widget;
         this.codeEditorService = codeEditorService;
         this.themeService = themeService;
         this.chatAgentService = chatAgentService;
+        this.configurationService = configurationService;
+        this.labelService = labelService;
         this.id = 'inputEditorDecorations';
         this.previouslyUsedAgents = ( new Set());
         this.viewModelDisposables = this._register(( new MutableDisposable()));
@@ -110,7 +116,11 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             return;
         }
         if (!inputValue) {
-            const description = this.widget.input.currentModeObs.get().description.get();
+            const mode = this.widget.input.currentModeObs.get();
+            let description = mode.description.get();
+            if (this.configurationService.getValue('chat.emptyChatState.enabled')) {
+                description = ( localize(5228, "Add context (#), extensions (@), commands (/)"));
+            }
             const decoration = [
                 {
                     range: {
@@ -216,13 +226,19 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         for (const tool of toolParts) {
             varDecorations.push({ range: tool.editorRange });
         }
+        const dynamicVariableParts = parsedRequest.filter((p) => p instanceof ChatRequestDynamicVariablePart);
+        for (const variable of dynamicVariableParts) {
+            varDecorations.push({ range: variable.editorRange, hoverMessage: URI.isUri(variable.data) ? ( new MarkdownString(this.labelService.getUriLabel(variable.data, { relative: true }))) : undefined });
+        }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
     }
 };
 InputEditorDecorations = ( __decorate([
     ( __param(1, ICodeEditorService)),
     ( __param(2, IThemeService)),
-    ( __param(3, IChatAgentService))
+    ( __param(3, IChatAgentService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, ILabelService))
 ], InputEditorDecorations));
 class InputEditorSlashCommandMode extends Disposable {
     constructor(widget) {

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

@@ -5,7 +5,7 @@ import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHover
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentData } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
     private readonly editor;
     private readonly instantiationService;

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

@@ -6,9 +6,9 @@ import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from '@
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(5123, 'There is a chat agent hover part here.');
+        return localize(5229, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

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

@@ -40,6 +40,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     dispose(): void;
     registerToolData(toolData: IToolData): IDisposable;
     private _refreshAllToolContextKeys;
+    flushToolChanges(): void;
     registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
     getTools(includeDisabled?: boolean): Iterable<Readonly<IToolData>>;
     getTool(id: string): IToolData | undefined;