@codingame/monaco-vscode-chat-service-override 28.4.1 → 29.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/tools/usagesTool.js

@@ -7,12 +7,13 @@ import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/b
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { relativePath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { getDefinitionsAtPosition, getReferencesAtPosition, getImplementationsAtPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/gotoSymbol/browser/goToSymbol';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
@@ -40,6 +41,7 @@ If the tool returns an error, retry with corrected input - ensure the file path
 let UsagesTool = class UsagesTool extends Disposable {
     constructor(
         _languageFeaturesService,
+        _languageService,
         _modelService,
         _searchService,
         _textModelService,
@@ -47,6 +49,7 @@ let UsagesTool = class UsagesTool extends Disposable {
     ) {
         super();
         this._languageFeaturesService = _languageFeaturesService;
+        this._languageService = _languageService;
         this._modelService = _modelService;
         this._searchService = _searchService;
         this._textModelService = _textModelService;
@@ -61,22 +64,31 @@ let UsagesTool = class UsagesTool extends Disposable {
     }
     getToolData() {
         const languageIds = this._languageFeaturesService.referenceProvider.registeredLanguageIds;
+        if (languageIds.size === 0) {
+            return undefined;
+        }
         let modelDescription = BaseModelDescription;
+        let userDescription;
         if (( languageIds.has("*"))) {
             modelDescription += "\n\nSupported for all languages.";
-        } else if (languageIds.size > 0) {
+            userDescription = ( localize(6645, "Find references, definitions, and implementations of a symbol"));
+        } else {
             const sorted = [...languageIds].sort();
             modelDescription += `\n\nCurrently supported for: ${sorted.join(", ")}.`;
-        } else {
-            modelDescription += "\n\nNo languages currently have reference providers registered.";
+            const niceNames = ( sorted.map(id => this._languageService.getLanguageName(id) ?? id));
+            userDescription = ( localize(
+                6646,
+                "Find references, definitions, and implementations of a symbol ({0})",
+                niceNames.join(", ")
+            ));
         }
         return {
             id: UsagesToolId,
             toolReferenceName: "usages",
             canBeReferencedInPrompt: false,
             icon: ThemeIcon.fromId(Codicon.references.id),
-            displayName: ( localize(6478, "List Code Usages")),
-            userDescription: ( localize(6479, "Find references, definitions, and implementations of a symbol")),
+            displayName: ( localize(6647, "List Code Usages")),
+            userDescription,
             modelDescription,
             source: ToolDataSource.Internal,
             when: ( ContextKeyExpr.has("config.chat.tools.usagesTool.enabled")),
@@ -107,7 +119,7 @@ let UsagesTool = class UsagesTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const input = context.parameters;
         return {
-            invocationMessage: ( localize(6480, "Analyzing usages of `{0}`", input.symbol))
+            invocationMessage: ( localize(6648, "Analyzing usages of `{0}`", input.symbol))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -160,7 +172,7 @@ let UsagesTool = class UsagesTool extends Disposable {
             )]);
             if (references.length === 0) {
                 const result = createToolSimpleTextResult(`No usages found for \`${input.symbol}\`.`);
-                result.toolResultMessage = ( new MarkdownString(( localize(6481, "Analyzed usages of `{0}`, no results", input.symbol))));
+                result.toolResultMessage = ( new MarkdownString(( localize(6649, "Analyzed usages of `{0}`, no results", input.symbol))));
                 return result;
             }
             const previews = await this._getLinePreviews(input.symbol, references, token);
@@ -181,8 +193,8 @@ let UsagesTool = class UsagesTool extends Disposable {
             }
             const text = lines.join("\n");
             const result = createToolSimpleTextResult(text);
-            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(6482, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
-                6483,
+            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(6650, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
+                6651,
                 "Analyzed usages of `{0}`, {1} results",
                 input.symbol,
                 references.length
@@ -278,13 +290,13 @@ let UsagesTool = class UsagesTool extends Disposable {
         return "reference";
     }
     _overlaps(a, b) {
-        if (( a.uri.toString()) !== ( b.uri.toString())) {
+        if (!isEqual(a.uri, b.uri)) {
             return false;
         }
         return Range.areIntersectingOrTouching(a.range, b.range);
     }
 };
-UsagesTool = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IModelService)), ( __param(2, ISearchService)), ( __param(3, ITextModelService)), ( __param(4, IWorkspaceContextService))], UsagesTool));
+UsagesTool = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, ILanguageService)), ( __param(2, IModelService)), ( __param(3, ISearchService)), ( __param(4, ITextModelService)), ( __param(5, IWorkspaceContextService))], UsagesTool));
 let UsagesToolContribution = class UsagesToolContribution extends Disposable {
     static {
         this.ID = "chat.usagesTool";
@@ -295,9 +307,12 @@ let UsagesToolContribution = class UsagesToolContribution extends Disposable {
         let registration;
         const registerUsagesTool = () => {
             registration?.dispose();
+            registration = undefined;
             toolsService.flushToolUpdates();
             const toolData = usagesTool.getToolData();
-            registration = toolsService.registerTool(toolData, usagesTool);
+            if (toolData) {
+                registration = toolsService.registerTool(toolData, usagesTool);
+            }
         };
         registerUsagesTool();
         this._store.add(usagesTool.onDidUpdateToolData(registerUsagesTool));

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -17,29 +17,29 @@ const chatViewsWelcomeJsonSchema = {
     properties: {
         icon: {
             type: "string",
-            description: ( localize(6484, "The icon for the welcome message."))
+            description: ( localize(6652, "The icon for the welcome message."))
         },
         title: {
             type: "string",
-            description: ( localize(6485, "The title of the welcome message."))
+            description: ( localize(6653, "The title of the welcome message."))
         },
         content: {
             type: "string",
             description: ( localize(
-                6486,
+                6654,
                 "The content of the welcome message. The first command link will be rendered as a button."
             ))
         },
         when: {
             type: "string",
-            description: ( localize(6487, "Condition when the welcome message is shown."))
+            description: ( localize(6655, "Condition when the welcome message is shown."))
         }
     }
 };
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatViewsWelcome",
     jsonSchema: {
-        description: ( localize(6488, "Contributes a welcome message to a chat view")),
+        description: ( localize(6656, "Contributes a welcome message to a chat view")),
         type: "array",
         items: chatViewsWelcomeJsonSchema
     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatQueuePickerActionItem.js

@@ -39,7 +39,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this.configurationService = configurationService;
         this._altKeyPressed = false;
         const isSteerDefault = this._isSteerDefault();
-        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(6805, "Steer with Message")) : ( localize(6806, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
+        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7007, "Steer with Message")) : ( localize(7008, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
         this._primaryAction = this._register(( new ActionViewItem(undefined, this._primaryActionAction, {
             icon: true,
             label: false
@@ -47,7 +47,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this._register(contextKeyService.onDidChangeContext(e => {
             this._primaryActionAction.enabled = !!contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key);
         }));
-        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(6807, "More Actions...")))));
+        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7009, "More Actions...")))));
         this._dropdown = this._register(( new ChevronActionWidgetDropdown(dropdownAction, {
             actionProvider: {
                 getActions: () => this._getDropdownActions()
@@ -75,7 +75,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
     }
     _updatePrimaryAction() {
         const isSteer = this._isEffectiveSteer();
-        this._primaryActionAction.label = isSteer ? ( localize(6805, "Steer with Message")) : ( localize(6806, "Add to Queue"));
+        this._primaryActionAction.label = isSteer ? ( localize(7007, "Steer with Message")) : ( localize(7008, "Add to Queue"));
         this._primaryActionAction.class = ThemeIcon.asClassName(isSteer ? Codicon.arrowUp : Codicon.add);
     }
     _runDefaultAction() {
@@ -125,7 +125,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         const isSteerDefault = this._isSteerDefault();
         const queueAction = {
             id: ChatQueueMessageAction.ID,
-            label: ( localize(6806, "Add to Queue")),
+            label: ( localize(7008, "Add to Queue")),
             tooltip: "",
             enabled: true,
             checked: !isSteerDefault,
@@ -133,7 +133,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             class: undefined,
             hover: {
                 content: ( localize(
-                    6808,
+                    7010,
                     "Queue this message to send after the current request completes. The current response will finish uninterrupted before the queued message is sent."
                 ))
             },
@@ -143,7 +143,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const steerAction = {
             id: ChatSteerWithMessageAction.ID,
-            label: ( localize(6805, "Steer with Message")),
+            label: ( localize(7007, "Steer with Message")),
             tooltip: "",
             enabled: true,
             checked: isSteerDefault,
@@ -151,7 +151,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             class: undefined,
             hover: {
                 content: ( localize(
-                    6809,
+                    7011,
                     "Send this message at the next opportunity, signaling the current request to yield. The current response will stop and the new message will be sent immediately."
                 ))
             },
@@ -161,13 +161,13 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const sendAction = {
             id: "_" + ChatSubmitAction.ID,
-            label: ( localize(6810, "Stop and Send")),
+            label: ( localize(7012, "Stop and Send")),
             tooltip: "",
             enabled: true,
             icon: Codicon.arrowRight,
             class: undefined,
             hover: {
-                content: ( localize(6811, "Cancel the current request and send this message immediately."))
+                content: ( localize(7013, "Cancel the current request and send this message immediately."))
             },
             run: () => {
                 this.commandService.executeCommand(ChatSubmitAction.ID);

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.js

@@ -65,19 +65,19 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
         this.actionButton.element.classList.add("chat-status-button");
         if (enabledSku === "anonymous") {
             const message = ( localize(
-                6812,
+                7014,
                 "You've reached the limit for chat messages. Sign in to use Copilot Free."
             ));
-            const buttonLabel = ( localize(6813, "Sign In"));
+            const buttonLabel = ( localize(7015, "Sign In"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(6814, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(7016, "{0} {1}", message, buttonLabel));
         } else {
-            const message = ( localize(6815, "You've reached the limit for chat messages."));
-            const buttonLabel = ( localize(6816, "Upgrade"));
+            const message = ( localize(7017, "You've reached the limit for chat messages."));
+            const buttonLabel = ( localize(7018, "Upgrade"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(6817, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(7019, "{0} {1}", message, buttonLabel));
         }
         this._register(this.actionButton.onDidClick(async () => {
             const commandId = this.chatEntitlementService.anonymous ? CHAT_SETUP_ACTION_ID : "workbench.action.chat.upgradePlan";

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js

@@ -60,6 +60,7 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service';
 import { createDebugEventsAttachment } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment';
 import { getPromptFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 var BuiltinDynamicCompletions_1, ToolCompletions_1;
 const SlashCommandWord = /\/[\p{L}0-9_.:-]*/gu;
@@ -92,12 +93,9 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 }
                 let customAgentTarget = undefined;
                 if (widget.lockedAgentId) {
-                    if (!widget.attachmentCapabilities.supportsPromptAttachments) {
-                        return null;
-                    }
                     const sessionResource = widget.viewModel.model.sessionResource;
                     const ctx = sessionResource && chatService.getChatSessionFromInternalUri(sessionResource);
-                    customAgentTarget = (ctx ? chatSessionsService.getCustomAgentTargetForSessionType(ctx.chatSessionType) : undefined) ?? Target.Undefined;
+                    customAgentTarget = (ctx ? chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource)) : undefined) ?? Target.Undefined;
                 }
                 const range = computeCompletionRanges(model, position, SlashCommandWord);
                 if (!range) {
@@ -117,13 +115,19 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 }
                 return {
                     suggestions: ( slashCommands.filter(c => {
+                        if (!c.silent && !widget.attachmentCapabilities.supportsPromptAttachments) {
+                            return false;
+                        }
+                        if (c.when && !widget.scopedContextKeyService.contextMatchesRules(c.when)) {
+                            return false;
+                        }
                         if (!widget.lockedAgentId) {
                             return true;
                         }
                         if (c.modes && c.modes.length && !c.modes.includes(ChatModeKind.Agent)) {
                             return false;
                         }
-                        if (c.target && customAgentTarget && c.target !== customAgentTarget) {
+                        if (c.targets && customAgentTarget && !c.targets.includes(customAgentTarget)) {
                             return false;
                         }
                         return true;
@@ -178,7 +182,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                     return null;
                 }
                 return {
-                    suggestions: ( slashCommands.map((c, i) => {
+                    suggestions: ( slashCommands.filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when)).map((c, i) => {
                         const withSlash = `${chatSubcommandLeader}${c.command}`;
                         return {
                             label: {
@@ -247,7 +251,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                         } catch {}
                     }
                     return true;
-                }).filter(c => c.parsedPromptFile?.header?.userInvocable !== false);
+                }).filter(c => c.parsedPromptFile?.header?.userInvocable !== false).filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when));
                 if (userInvocableCommands.length === 0) {
                     return null;
                 }
@@ -559,7 +563,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(6823, "Install Chat Extensions..."));
+                const label = ( localize(7026, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -707,7 +711,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(6824, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(7027, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -735,15 +739,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(6825, "Prompt Resource"))
+                            name: ( localize(7028, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(6826, "Prompt Image")),
-                        fullName: ( localize(6826, "Prompt Image")),
+                        name: ( localize(7029, "Prompt Image")),
+                        fullName: ( localize(7029, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -980,7 +984,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             result.suggestions.push({
                 label: {
                     label: text,
-                    description: ( localize(6827, "Attach debug events snapshot"))
+                    description: ( localize(7030, "Attach debug events snapshot"))
                 },
                 filterText: text,
                 insertText: "",
@@ -1073,7 +1077,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(6828, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(7031, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1121,7 +1125,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(6829, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7032, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1354,7 +1358,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(6830, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(7033, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

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

@@ -5,7 +5,9 @@ import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vsco
 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 { MouseTargetType } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -23,6 +25,7 @@ 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/participants/chatAgents.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
 import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
@@ -33,12 +36,14 @@ import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vsco
 import { NativeEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry';
 import { TextAreaEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var InputEditorDecorations_1;
 const decorationDescription = "chat";
 const placeholderDecorationType = "chat-session-detail";
 const slashCommandTextDecorationType = "chat-session-text";
+const clickableSlashPromptTextDecorationType = "chat-session-clickable-text";
 const variableTextDecorationType = "chat-variable-text";
 function agentAndCommandToKey(agent, subcommand) {
     return subcommand ? `${agent.id}__${subcommand}` : agent.id;
@@ -75,7 +80,8 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         themeService,
         chatAgentService,
         labelService,
-        promptsService
+        promptsService,
+        editorService
     ) {
         super();
         this.widget = widget;
@@ -84,6 +90,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this.chatAgentService = chatAgentService;
         this.labelService = labelService;
         this.promptsService = promptsService;
+        this.editorService = editorService;
         this.id = "inputEditorDecorations";
         this.previouslyUsedAgents = ( new Set());
         this.viewModelDisposables = this._register(( new MutableDisposable()));
@@ -104,6 +111,34 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this._register(this.widget.onDidSubmitAgent(e => {
             this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent, e.slashCommand?.name));
         }));
+        this._register(this.widget.inputEditor.onMouseDown(e => {
+            this.mouseDownPromptSlashCommand = undefined;
+            if (!e.event.leftButton || e.target.type !== MouseTargetType.CONTENT_TEXT || !e.target.position) {
+                return;
+            }
+            const clickablePromptSlashCommand = this.clickablePromptSlashCommand;
+            if (!clickablePromptSlashCommand || !clickablePromptSlashCommand.range.containsPosition(e.target.position)) {
+                return;
+            }
+            this.mouseDownPromptSlashCommand = {
+                position: Position.lift(e.target.position),
+                uri: clickablePromptSlashCommand.uri,
+                range: clickablePromptSlashCommand.range
+            };
+        }));
+        this._register(this.widget.inputEditor.onMouseUp(e => {
+            const mouseDownPromptSlashCommand = this.mouseDownPromptSlashCommand;
+            this.mouseDownPromptSlashCommand = undefined;
+            if (!mouseDownPromptSlashCommand || e.target.type !== MouseTargetType.CONTENT_TEXT || !e.target.position) {
+                return;
+            }
+            if (!mouseDownPromptSlashCommand.range.containsPosition(e.target.position) || !Position.equals(mouseDownPromptSlashCommand.position, e.target.position)) {
+                return;
+            }
+            void this.editorService.openEditor({
+                resource: mouseDownPromptSlashCommand.uri
+            });
+        }));
         this._register(
             this.chatAgentService.onDidChangeAgents(() => this.triggerInputEditorDecorationsUpdate())
         );
@@ -137,6 +172,14 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 borderRadius: "3px"
             })
         );
+        this._register(
+            this.codeEditorService.registerDecorationType(decorationDescription, clickableSlashPromptTextDecorationType, {
+                color: themeColorFromId(chatSlashCommandForeground),
+                backgroundColor: themeColorFromId(chatSlashCommandBackground),
+                borderRadius: "3px",
+                cursor: "pointer"
+            })
+        );
         this._register(
             this.codeEditorService.registerDecorationType(decorationDescription, variableTextDecorationType, {
                 color: themeColorFromId(chatSlashCommandForeground),
@@ -255,6 +298,8 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         );
     }
     async updateAsyncInputEditorDecorations(token) {
+        this.clickablePromptSlashCommand = undefined;
+        this.widget.inputEditor.setDecorationsByType(decorationDescription, clickableSlashPromptTextDecorationType, []);
         const parsedRequest = this.widget.parsedInput.parts;
         const agentPart = parsedRequest.find(p => p instanceof ChatRequestAgentPart);
         const agentSubcommandPart = parsedRequest.find(p => p instanceof ChatRequestAgentSubcommandPart);
@@ -299,9 +344,27 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             });
         }
         if (slashPromptPart && promptSlashCommand) {
-            textDecorations.push({
-                range: slashPromptPart.editorRange
-            });
+            this.clickablePromptSlashCommand = {
+                range: Range.lift(slashPromptPart.editorRange),
+                uri: promptSlashCommand.promptPath.uri
+            };
+            const promptHoverMessage = ( new MarkdownString());
+            promptHoverMessage.appendText(( localize(
+                7034,
+                "Click to open {0}",
+                this.labelService.getUriLabel(promptSlashCommand.promptPath.uri, {
+                    relative: true
+                })
+            )));
+            const promptDecoration = {
+                range: slashPromptPart.editorRange,
+                hoverMessage: promptHoverMessage
+            };
+            this.widget.inputEditor.setDecorationsByType(
+                decorationDescription,
+                clickableSlashPromptTextDecorationType,
+                [promptDecoration]
+            );
         }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
         const varDecorations = [];
@@ -349,7 +412,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         }
     }
 };
-InputEditorDecorations = InputEditorDecorations_1 = ( __decorate([( __param(1, ICodeEditorService)), ( __param(2, IThemeService)), ( __param(3, IChatAgentService)), ( __param(4, ILabelService)), ( __param(5, IPromptsService))], InputEditorDecorations));
+InputEditorDecorations = InputEditorDecorations_1 = ( __decorate([( __param(1, ICodeEditorService)), ( __param(2, IThemeService)), ( __param(3, IChatAgentService)), ( __param(4, ILabelService)), ( __param(5, IPromptsService)), ( __param(6, IEditorService))], InputEditorDecorations));
 class InputEditorSlashCommandMode extends Disposable {
     constructor(widget) {
         super();

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

@@ -62,7 +62,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(6831, "There is a chat agent hover part here.");
+        return localize(7035, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    6875,
+                    7081,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js

@@ -174,7 +174,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(6876, "Loading..."));
+            const loadingMessage = ( localize(7082, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);

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

@@ -56,6 +56,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly lastDimensionsPerOrientation;
     private welcomeController;
     private restoringSession;
+    private readonly loadSessionCts;
     private readonly modelRef;
     private readonly activityBadge;
     constructor(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, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, workbenchEnvironmentService: IWorkbenchEnvironmentService, hostService: IHostService);